Update app.py

app.py

@@ -301,44 +301,43 @@ def get_models_data(progress=gr.Progress()):
     
     try:
         progress(0, desc="Fetching models data...")
+        params = {
+            'full': 'true',
+            'limit': 1000,
+            'sort': 'downloads',
+            'direction': -1
+        }
         
-        # 여러 정렬 방식으로 시도
-        all_found_models = []
-        sort_options = [
-            {'sort': 'downloads', 'direction': -1},
-            {'sort': 'lastModified', 'direction': -1},
-            {'sort': 'likes', 'direction': -1}
-        ]
+        headers = {'Accept': 'application/json'}
         
-        for sort_params in sort_options:
-            params = {
-                'full': 'true',
-                'limit': 1000,
-                **sort_params
+        response = requests.get(url, params=params, headers=headers)
+        if response.status_code != 200:
+            print(f"API 요청 실패: {response.status_code}")
+            print(f"Response: {response.text}")
+            return create_error_plot(), "<div>모델 데이터를 가져오는데 실패했습니다.</div>", pd.DataFrame()
+        
+        models = response.json()
+        
+        # 전체 순위 정보 저장 (다운로드 수 기준)
+        model_ranks = {}
+        for idx, model in enumerate(models, 1):
+            model_id = normalize_model_id(model.get('id', ''))
+            model_ranks[model_id] = {
+                'rank': idx,
+                'downloads': model.get('downloads', 0),
+                'likes': model.get('likes', 0)
             }
-            
-            headers = {'Accept': 'application/json'}
-            
-            response = requests.get(url, params=params, headers=headers)
-            if response.status_code == 200:
-                models = response.json()
-                all_found_models.extend(models)
         
-        # 중복 제거
-        seen_ids = set()
+        # target_models 중 순위권 내 모델 필터링
         filtered_models = []
-        for model in all_found_models:
+        for model in models:
             model_id = normalize_model_id(model.get('id', ''))
-            if model_id not in seen_ids and model_id in [normalize_model_id(tid) for tid in target_models.keys()]:
-                seen_ids.add(model_id)
+            if model_id in [normalize_model_id(tid) for tid in target_models.keys()]:
+                model['rank'] = model_ranks[model_id]['rank']
                 filtered_models.append(model)
         
-        # 다운로드 수와 좋아요 수로 정렬
-        filtered_models.sort(key=lambda x: (x.get('downloads', 0), x.get('likes', 0)), reverse=True)
-        
-        # 순위 할당
-        for idx, model in enumerate(filtered_models, 1):
-            model['rank'] = idx
+        # 순위로 정렬
+        filtered_models.sort(key=lambda x: x['rank'])
         
         if not filtered_models:
             return create_error_plot(), "<div>선택된 모델의 데이터를 찾을 수 없습니다.</div>", pd.DataFrame()
@@ -361,7 +360,7 @@ def get_models_data(progress=gr.Progress()):
         fig.add_trace(go.Bar(
             x=ids,
             y=y_values,
-            text=[f"Rank: {r}<br>Likes: {l}<br>Downloads: {d}" 
+            text=[f"Global Rank: {r}<br>Likes: {l:,}<br>Downloads: {d:,}" 
                   for r, l, d in zip(ranks, likes, downloads)],
             textposition='auto',
             marker_color='rgb(158,202,225)',
@@ -370,14 +369,14 @@ def get_models_data(progress=gr.Progress()):
         
         fig.update_layout(
             title={
-                'text': 'Hugging Face Models Rankings by Downloads (Top 1000)',
+                'text': 'Hugging Face Models Global Download Rankings (Top 1000)',
                 'y':0.95,
                 'x':0.5,
                 'xanchor': 'center',
                 'yanchor': 'top'
             },
             xaxis_title='Model ID',
-            yaxis_title='Rank',
+            yaxis_title='Global Rank',
             yaxis=dict(
                 ticktext=[str(i) for i in range(1, 1001, 50)],
                 tickvals=[1001 - i for i in range(1, 1001, 50)],
@@ -394,7 +393,7 @@ def get_models_data(progress=gr.Progress()):
         # HTML 카드 생성
         html_content = """
         <div style='padding: 20px; background: #f5f5f5;'>
-            <h2 style='color: #2c3e50;'>Models Rankings by Downloads</h2>
+            <h2 style='color: #2c3e50;'>Models Global Download Rankings</h2>
             <div style='display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); gap: 20px;'>
         """
         
@@ -413,9 +412,9 @@ def get_models_data(progress=gr.Progress()):
                 box-shadow: 0 2px 4px rgba(0,0,0,0.1);
                 transition: transform 0.2s;
             '>
-                <h3 style='color: #34495e;'>Rank #{rank} - {model_id}</h3>
-                <p style='color: #7f8c8d;'>👍 Likes: {likes}</p>
-                <p style='color: #7f8c8d;'>⬇️ Downloads: {downloads}</p>
+                <h3 style='color: #34495e;'>Global Rank #{rank} - {model_id}</h3>
+                <p style='color: #7f8c8d;'>👍 Likes: {likes:,}</p>
+                <p style='color: #7f8c8d;'>⬇️ Downloads: {downloads:,}</p>
                 <a href='{target_models[model_id]}' 
                    target='_blank' 
                    style='
@@ -443,7 +442,7 @@ def get_models_data(progress=gr.Progress()):
                     box-shadow: 0 2px 4px rgba(0,0,0,0.1);
                 '>
                     <h3 style='color: #34495e;'>{model_id}</h3>
-                    <p style='color: #7f8c8d;'>Not in top 1000</p>
+                    <p style='color: #7f8c8d;'>Not in top 1000 by downloads</p>
                     <a href='{target_models[model_id]}' 
                        target='_blank' 
                        style='
@@ -466,17 +465,17 @@ def get_models_data(progress=gr.Progress()):
         # 순위권 내 모델
         for model in filtered_models:
             df_data.append({
-                'Rank': model['rank'],
+                'Global Rank': model['rank'],
                 'Model ID': model['id'],
-                'Likes': model.get('likes', 'N/A'),
-                'Downloads': model.get('downloads', 'N/A'),
+                'Likes': f"{model.get('likes', 0):,}",
+                'Downloads': f"{model.get('downloads', 0):,}",
                 'URL': target_models[model['id']]
             })
         # 순위권 밖 모델
         for model_id in target_models:
             if model_id not in [m['id'] for m in filtered_models]:
                 df_data.append({
-                    'Rank': 'Not in top 1000',
+                    'Global Rank': 'Not in top 1000',
                     'Model ID': model_id,
                     'Likes': 'N/A',
                     'Downloads': 'N/A',
@@ -875,13 +874,15 @@ def refresh_data():
     else:
         return create_error_plot(), "<div>API 인증이 필요합니다.</div>", pd.DataFrame()
 
-
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.Markdown("""
     # 🤗 허깅페이스 '한국 리더보드'
     실시간으로 Hugging Face의 Spaces와 Models 인기 순위를 분석합니다. 신규 등록 요청: [email protected]
     """)
     
+    # 새로 고침 버튼을 상단으로 이동하고 한글로 변경
+    refresh_btn = gr.Button("🔄 새로 고침", variant="primary")
+    
     with gr.Tab("Spaces Trending"):
         trending_plot = gr.Plot()
         trending_info = gr.HTML()
@@ -892,8 +893,6 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         models_info = gr.HTML()
         models_df = gr.DataFrame()
     
-    refresh_btn = gr.Button("🔄 Refresh Data", variant="primary")
-    
     def refresh_all_data():
         spaces_results = get_spaces_data("trending")
         models_results = get_models_data()
@@ -914,6 +913,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     trending_plot.value, trending_info.value, trending_df.value = spaces_results
     models_plot.value, models_info.value, models_df.value = models_results
     
+    
 # Gradio 앱 실행
 demo.launch(
     server_name="0.0.0.0",