Update app.py

app.py

@@ -996,73 +996,98 @@ def refresh_data():
 
 
 def create_registration_bar_chart(data, type_name="Spaces"):
-    # DataFrame인 경우 처리
-    if isinstance(data, pd.DataFrame):
-        registrations = data['Space ID' if type_name == "Spaces" else 'Model ID'].apply(
-            lambda x: x.split('/')[0]
-        ).value_counts()
-    else:
-        # 리스트나 다른 형태의 데이터인 경우 처리
-        registrations = {}
-        for item in data:
-            if isinstance(item, dict):
-                creator = item.get('id', '').split('/')[0]
-            else:
-                creator = str(item).split('/')[0]
-            registrations[creator] = registrations.get(creator, 0) + 1
-        registrations = pd.Series(registrations)
-    
-    # 정렬된 데이터 준비
-    registrations = registrations.sort_values(ascending=False)
-    
-    fig = go.Figure(data=[go.Bar(
-        x=registrations.index,
-        y=registrations.values,
-        text=registrations.values,
-        textposition='auto',
-        marker_color='#FF6B6B'
-    )])
-    
-    fig.update_layout(
-        title=f"Korean {type_name} Registrations by Creator",
-        xaxis_title="Creator ID",
-        yaxis_title="Number of Registrations",
-        showlegend=False,
-        height=400,
-        width=700
-    )
-    
-    return fig
+    try:
+        # DataFrame인 경우 처리
+        if isinstance(data, pd.DataFrame):
+            if type_name == "Models":
+                # 3000위 이내의 모델만 필터링
+                data = data[data['Global Rank'].apply(lambda x: isinstance(x, (int, float)) or (isinstance(x, str) and x.startswith('#')))]
+                # '#' 제거하고 숫자로 변환
+                data = data[data['Global Rank'].apply(lambda x: int(str(x).replace('#', '')) if isinstance(x, str) else x) <= 3000]
+            
+            # ID 컬럼 선택
+            id_column = 'Space ID' if type_name == "Spaces" else 'Model ID'
+            registrations = data[id_column].apply(lambda x: x.split('/')[0]).value_counts()
+        else:
+            # 리스트나 다른 형태의 데이터인 경우 처리
+            registrations = {}
+            for item in data:
+                if isinstance(item, dict):
+                    # Models의 경우 3000위 이내만 처리
+                    if type_name == "Models":
+                        rank = item.get('global_rank')
+                        if isinstance(rank, str) or rank > 3000:
+                            continue
+                    creator = item.get('id', '').split('/')[0]
+                    registrations[creator] = registrations.get(creator, 0) + 1
+            registrations = pd.Series(registrations)
+        
+        # 정렬된 데이터 준비
+        registrations = registrations.sort_values(ascending=False)
+        
+        fig = go.Figure(data=[go.Bar(
+            x=registrations.index,
+            y=registrations.values,
+            text=registrations.values,
+            textposition='auto',
+            marker_color='#FF6B6B'
+        )])
+        
+        fig.update_layout(
+            title=f"Korean {type_name} Registrations by Creator (Top 3000)",
+            xaxis_title="Creator ID",
+            yaxis_title="Number of Registrations",
+            showlegend=False,
+            height=400,
+            width=700
+        )
+        
+        return fig
+    except Exception as e:
+        print(f"Error in create_registration_bar_chart: {str(e)}")
+        return go.Figure()
 
 def create_pie_chart(data, total_count, type_name="Spaces"):
-    # DataFrame인 경우 처리
-    if isinstance(data, pd.DataFrame):
-        korean_count = len(data)
-    else:
-        # 리스트나 다른 형태의 데이터인 경우 처리
-        korean_count = len(data)
-    
-    other_count = total_count - korean_count
-    
-    fig = go.Figure(data=[go.Pie(
-        labels=[f'Korean {type_name}', f'Other {type_name}'],
-        values=[korean_count, other_count],
-        hole=.3,
-        marker_colors=['#FF6B6B', '#4ECDC4'],
-        textinfo='percent+value',
-        hovertemplate="<b>%{label}</b><br>" +
-                      "Count: %{value}<br>" +
-                      "Percentage: %{percent}<br>"
-    )])
-    
-    fig.update_layout(
-        title=f"Korean vs Other {type_name} Distribution",
-        showlegend=True,
-        height=400,
-        width=500
-    )
-    
-    return fig
+    try:
+        # DataFrame인 경우 처리
+        if isinstance(data, pd.DataFrame):
+            if type_name == "Models":
+                # 3000위 이내의 모델만 필터링
+                data = data[data['Global Rank'].apply(lambda x: isinstance(x, (int, float)) or (isinstance(x, str) and x.startswith('#')))]
+                data = data[data['Global Rank'].apply(lambda x: int(str(x).replace('#', '')) if isinstance(x, str) else x) <= 3000]
+            korean_count = len(data)
+        else:
+            # 리스트나 다른 형태의 데이터인 경우 처리
+            if type_name == "Models":
+                # 3000위 이내의 모델만 카운트
+                korean_count = sum(1 for item in data if isinstance(item.get('global_rank'), (int, float)) and item.get('global_rank') <= 3000)
+            else:
+                korean_count = len(data)
+        
+        other_count = total_count - korean_count
+        
+        fig = go.Figure(data=[go.Pie(
+            labels=[f'Korean {type_name} in Top 3000', f'Other {type_name} in Top 3000'],
+            values=[korean_count, other_count],
+            hole=.3,
+            marker_colors=['#FF6B6B', '#4ECDC4'],
+            textinfo='percent+value',
+            hovertemplate="<b>%{label}</b><br>" +
+                         "Count: %{value}<br>" +
+                         "Percentage: %{percent}<br>"
+        )])
+        
+        fig.update_layout(
+            title=f"Korean vs Other {type_name} Distribution (Top 3000)",
+            showlegend=True,
+            height=400,
+            width=500
+        )
+        
+        return fig
+    except Exception as e:
+        print(f"Error in create_pie_chart: {str(e)}")
+        return go.Figure()
 
 def refresh_all_data():
     spaces_results = get_spaces_data("trending")