Update app.py

app.py

@@ -293,37 +293,40 @@ target_models = {
 
 def get_models_data(progress=gr.Progress()):
     """모델 데이터 가져오기"""
-    url = "https://huggingface.co/api/models/trending"  # trending 전용 엔드포인트
+    url = "https://huggingface.co/api/models"  # 기본 API 엔드포인트
     
     try:
         progress(0, desc="Fetching models data...")
         params = {
             'full': 'true',
-            'limit': 1000,  # 1000위까지 가져오기
-            'interval': 'day'  # 일간 트렌딩
+            'limit': 1000,
+            'sort': 'downloads',  # 다운로드 수로 정렬
+            'direction': -1
         }
         
-        response = requests.get(url, params=params)
-        response.raise_for_status()
+        headers = {
+            'Accept': 'application/json',
+            'User-Agent': 'Mozilla/5.0'
+        }
+        
+        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()
+        
         all_models = response.json()
         print(f"Total models fetched: {len(all_models)}")
         
-        # 전체 모델의 순위 정보 저장 (1000위까지)
-        model_ranks = {model['id']: idx + 1 for idx, model in enumerate(all_models)}
-        
-        # target_models에 있는 모델만 필터링하고 실제 순위 포함
+        # target_models에 있는 모델 필터링
         filtered_models = []
         for model in all_models:
             if model.get('id', '') in target_models:
-                model['rank'] = model_ranks[model['id']]
+                model['rank'] = len(filtered_models) + 1
                 filtered_models.append(model)
-                print(f"Found model: {model['id']} at rank {model['rank']}")
-        
-        # 순위로 정렬
-        filtered_models.sort(key=lambda x: x['rank'])
+                print(f"Found model: {model['id']}")
         
         if not filtered_models:
-            print("No matching models found in the response")
             return create_error_plot(), "<div>선택된 모델의 데이터를 찾을 수 없습니다.</div>", pd.DataFrame()
         
         progress(0.3, desc="Creating visualization...")
@@ -333,19 +336,25 @@ def get_models_data(progress=gr.Progress()):
         
         # 데이터 준비
         ids = [model['id'] for model in filtered_models]
-        ranks = [model['rank'] for model in filtered_models]
-        likes = [model.get('likes', 0) for model in filtered_models]
         downloads = [model.get('downloads', 0) for model in filtered_models]
+        likes = [model.get('likes', 0) for model in filtered_models]
+        
+        # 다운로드 수를 기준으로 순위 계산
+        sorted_models = sorted(filtered_models, key=lambda x: x.get('downloads', 0), reverse=True)
+        for idx, model in enumerate(sorted_models):
+            model['rank'] = idx + 1
+        
+        ranks = [model['rank'] for model in sorted_models]
         
-        # Y축 값을 반전 (1000 - rank + 1)
+        # Y축 값을 반전
         y_values = [1001 - r for r in ranks]
         
         # 막대 그래프 생성
         fig.add_trace(go.Bar(
             x=ids,
             y=y_values,
-            text=[f"Rank: {r}<br>Likes: {l}<br>Downloads: {d}" 
-                  for r, l, d in zip(ranks, likes, downloads)],
+            text=[f"Rank: {r}<br>Downloads: {d}<br>Likes: {l}" 
+                  for r, d, l in zip(ranks, downloads, likes)],
             textposition='auto',
             marker_color='rgb(158,202,225)',
             opacity=0.8
@@ -353,7 +362,7 @@ def get_models_data(progress=gr.Progress()):
         
         fig.update_layout(
             title={
-                'text': 'Hugging Face Models Trending Rankings (Top 1000)',
+                'text': 'Hugging Face Models Rankings (Top 1000)',
                 'y':0.95,
                 'x':0.5,
                 'xanchor': 'center',
@@ -377,16 +386,15 @@ def get_models_data(progress=gr.Progress()):
         # HTML 카드 생성
         html_content = """
         <div style='padding: 20px; background: #f5f5f5;'>
-            <h2 style='color: #2c3e50;'>Models Trending Rankings</h2>
+            <h2 style='color: #2c3e50;'>Models Rankings</h2>
             <div style='display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); gap: 20px;'>
         """
         
-        # 순위권 내 모델 카드 생성
-        for model in filtered_models:
+        for model in sorted_models:
             model_id = model.get('id', '')
             rank = model.get('rank', 'N/A')
-            likes = model.get('likes', 0)
             downloads = model.get('downloads', 0)
+            likes = model.get('likes', 0)
             
             html_content += f"""
             <div style='
@@ -397,8 +405,8 @@ def get_models_data(progress=gr.Progress()):
                 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>
+                <p style='color: #7f8c8d;'>👍 Likes: {likes}</p>
                 <a href='{target_models[model_id]}' 
                    target='_blank' 
                    style='
@@ -414,61 +422,17 @@ def get_models_data(progress=gr.Progress()):
                 </a>
             </div>
             """
-            progress((0.6 + 0.3 * filtered_models.index(model)/len(filtered_models)), 
-                    desc=f"Loading model {filtered_models.index(model)+1}/{len(filtered_models)}...")
-        
-        # 순위권 밖 모델 카드 생성
-        for model_id in target_models:
-            if model_id not in [m['id'] for m in filtered_models]:
-                html_content += f"""
-                <div style='
-                    background: #f8f9fa;
-                    padding: 20px;
-                    border-radius: 10px;
-                    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>
-                    <a href='{target_models[model_id]}' 
-                       target='_blank' 
-                       style='
-                        display: inline-block;
-                        padding: 8px 16px;
-                        background: #95a5a6;
-                        color: white;
-                        text-decoration: none;
-                        border-radius: 5px;
-                       '>
-                       Visit Model 🔗
-                    </a>
-                </div>
-                """
         
         html_content += "</div></div>"
         
         # 데이터프레임 생성
-        df_data = []
-        # 순위권 내 모델
-        for model in filtered_models:
-            df_data.append({
-                'Rank': model.get('rank', 'N/A'),
-                'Model ID': model.get('id', ''),
-                'Likes': model.get('likes', 'N/A'),
-                'Downloads': model.get('downloads', 'N/A'),
-                'URL': target_models[model.get('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',
-                    'Model ID': model_id,
-                    'Likes': 'N/A',
-                    'Downloads': 'N/A',
-                    'URL': target_models[model_id]
-                })
-        
-        df = pd.DataFrame(df_data)
+        df = pd.DataFrame([{
+            'Rank': model.get('rank', 'N/A'),
+            'Model ID': model.get('id', ''),
+            'Downloads': model.get('downloads', 'N/A'),
+            'Likes': model.get('likes', 'N/A'),
+            'URL': target_models[model.get('id', '')]
+        } for model in sorted_models])
         
         progress(1.0, desc="Complete!")
         return fig, html_content, df