Update app.py

app.py

@@ -292,6 +292,7 @@ target_models = {
     "sel303/llama3-diverce-ver1.6": "https://huggingface.co/sel303/llama3-diverce-ver1.6"    
 }
 
+
 def get_models_data(progress=gr.Progress()):
     """모델 데이터 가져오기"""
     def normalize_model_id(model_id):
@@ -305,7 +306,7 @@ def get_models_data(progress=gr.Progress()):
         params = {
             'full': 'true',
             'limit': 3000,  # 3000개로 증가
-            'sort': 'likes',
+            'sort': 'downloads',
             'direction': -1
         }
         
@@ -336,6 +337,8 @@ def get_models_data(progress=gr.Progress()):
         filtered_models = []
         for target_id in target_models.keys():
             normalized_target_id = normalize_model_id(target_id)
+            
+            # 먼저 전체 순위에서 찾기
             if normalized_target_id in model_data:
                 model_info = {
                     'id': target_id,
@@ -344,10 +347,39 @@ def get_models_data(progress=gr.Progress()):
                     'likes': model_data[normalized_target_id]['likes'],
                     'title': model_data[normalized_target_id]['title']
                 }
-                filtered_models.append(model_info)
+            else:
+                # 순위권 밖의 모델은 개별 API 호출로 정보 가져오기
+                try:
+                    model_url = f"https://huggingface.co/api/models/{target_id}"
+                    model_response = requests.get(model_url, headers=headers)
+                    if model_response.status_code == 200:
+                        model_info = model_response.json()
+                        model_info['id'] = target_id
+                        model_info['rank'] = 'Not in top 3000'
+                    else:
+                        model_info = {
+                            'id': target_id,
+                            'rank': 'Not in top 3000',
+                            'downloads': 0,
+                            'likes': 0,
+                            'title': 'No Title'
+                        }
+                except Exception as e:
+                    print(f"Error fetching data for model {target_id}: {str(e)}")
+                    model_info = {
+                        'id': target_id,
+                        'rank': 'Not in top 3000',
+                        'downloads': 0,
+                        'likes': 0,
+                        'title': 'No Title'
+                    }
+            
+            filtered_models.append(model_info)
         
-        # 순위로 정렬
-        filtered_models.sort(key=lambda x: x['rank'])
+        # 순위로 정렬 (순위가 숫자인 경우만)
+        filtered_models.sort(key=lambda x: (
+            float('inf') if x['rank'] == 'Not in top 3000' else x['rank']
+        ))
         
         if not filtered_models:
             return create_error_plot(), "<div>선택된 모델의 데이터를 찾을 수 없습니다.</div>", pd.DataFrame()
@@ -363,8 +395,8 @@ def get_models_data(progress=gr.Progress()):
         likes = [model['likes'] for model in filtered_models]
         downloads = [model['downloads'] for model in filtered_models]
         
-        # Y축 값을 반전
-        y_values = [3001 - r for r in ranks]  # 3000으로 변경
+        # Y축 값을 반전 (숫자 순위만)
+        y_values = [3001 - r if isinstance(r, int) else 0 for r in ranks]
         
         # 막대 그래프 생성
         fig.add_trace(go.Bar(
@@ -388,7 +420,7 @@ def get_models_data(progress=gr.Progress()):
             xaxis_title='Model ID',
             yaxis_title='Global Rank',
             yaxis=dict(
-                ticktext=[str(i) for i in range(1, 3001, 150)],  # 간격 조정
+                ticktext=[str(i) for i in range(1, 3001, 150)],
                 tickvals=[3001 - i for i in range(1, 3001, 150)],
                 range=[0, 3000]
             ),
@@ -411,8 +443,8 @@ def get_models_data(progress=gr.Progress()):
         for model in filtered_models:
             model_id = model['id']
             rank = model['rank']
-            likes = model['likes']
-            downloads = model['downloads']
+            likes = model.get('likes', 0)
+            downloads = model.get('downloads', 0)
             title = model.get('title', 'No Title')
             
             html_content += f"""
@@ -443,58 +475,20 @@ def get_models_data(progress=gr.Progress()):
             </div>
             """
         
-        # 순위권 밖 모델 카드 생성
-        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 3000 by downloads</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({
                 'Global Rank': model['rank'],
                 'Model ID': model['id'],
                 'Title': model.get('title', 'No Title'),
-                'Likes': f"{model['likes']:,}",
-                'Downloads': f"{model['downloads']:,}",
+                '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({
-                    'Global Rank': 'Not in top 3000',
-                    'Model ID': model_id,
-                    'Title': 'N/A',
-                    'Likes': 'N/A',
-                    'Downloads': 'N/A',
-                    'URL': target_models[model_id]
-                })
         
         df = pd.DataFrame(df_data)
         
@@ -540,6 +534,7 @@ target_spaces = {
     "upstage/open-ko-llm-leaderboard": "https://huggingface.co/spaces/upstage/open-ko-llm-leaderboard",
     "LGAI-EXAONE/EXAONE-3.5-Instruct-Demo": "https://huggingface.co/spaces/LGAI-EXAONE/EXAONE-3.5-Instruct-Demo",
 
+    "cutechicken/TankWar3D": "https://huggingface.co/spaces/cutechicken/TankWar3D",
     "kolaslab/RC4-EnDecoder": "https://huggingface.co/spaces/kolaslab/RC4-EnDecoder",
     "kolaslab/simulator": "https://huggingface.co/spaces/kolaslab/simulator",
     "kolaslab/calculator": "https://huggingface.co/spaces/kolaslab/calculator",
@@ -553,14 +548,16 @@ target_spaces = {
 def get_spaces_data(sort_type="trending", progress=gr.Progress()):
     """스페이스 데이터 가져오기 (trending 또는 modes)"""
     url = "https://huggingface.co/api/spaces"
+    params = {
+        'full': 'true',
+        'limit': 300
+    }
+    
+    if sort_type == "modes":
+        params['sort'] = 'likes'
     
     try:
         progress(0, desc=f"Fetching {sort_type} spaces data...")
-        params = {
-            'full': 'true',
-            'limit': 300
-        }
-        
         response = requests.get(url, params=params)
         response.raise_for_status()
         all_spaces = response.json()
@@ -570,13 +567,11 @@ def get_spaces_data(sort_type="trending", progress=gr.Progress()):
         for idx, space in enumerate(all_spaces, 1):
             space_id = space.get('id', '')
             if space_id in target_spaces:
-                # 전체 space 정보 저장
                 space['rank'] = idx
                 space_ranks[space_id] = space
         
-        # target_spaces 중 순위권 내 space 필터링
         spaces = [space_ranks[space_id] for space_id in space_ranks.keys()]
-        spaces.sort(key=lambda x: x['rank'])  # 순위별로 정렬
+        spaces.sort(key=lambda x: x['rank'])
         
         progress(0.3, desc="Creating visualization...")
         
@@ -587,7 +582,7 @@ def get_spaces_data(sort_type="trending", progress=gr.Progress()):
         ids = [space['id'] for space in spaces]
         ranks = [space['rank'] for space in spaces]
         likes = [space.get('likes', 0) for space in spaces]
-        titles = [space.get('title', 'No Title') for space in spaces]
+        titles = [space.get('cardData', {}).get('title') or space.get('title', 'No Title') for space in spaces]
         
         # Y축 값을 반전
         y_values = [301 - r for r in ranks]
@@ -636,18 +631,10 @@ def get_spaces_data(sort_type="trending", progress=gr.Progress()):
         for space in spaces:
             space_id = space['id']
             rank = space['rank']
-            title = space.get('title', 'No Title')
+            title = space.get('cardData', {}).get('title') or space.get('title', 'No Title')
             likes = space.get('likes', 0)
-            description = space.get('description', '')
-            
-            # cardData에서 추가 정보 가져오기
-            card_data = space.get('cardData', {})
-            if not description and card_data:
-                description = card_data.get('description', 'No Description')
-            
-            # description이 너무 길면 자르기
-            short_description = description[:150] + '...' if description and len(description) > 150 else description
-            
+
+# 스페이스 함수의 HTML 카드 생성 부분 수정
             html_content += f"""
             <div style='
                 background: white;
@@ -657,9 +644,18 @@ def get_spaces_data(sort_type="trending", progress=gr.Progress()):
                 transition: transform 0.2s;
             '>
                 <h3 style='color: #34495e;'>Rank #{rank} - {space_id}</h3>
-                <h4 style='color: #2c3e50; margin: 10px 0; font-size: 1.1em;'>{title}</h4>
+                <h4 style='
+                    color: #2980b9;
+                    margin: 10px 0;
+                    font-size: 1.2em;
+                    font-weight: bold;
+                    text-shadow: 1px 1px 2px rgba(0,0,0,0.1);
+                    background: linear-gradient(to right, #3498db, #2980b9);
+                    -webkit-background-clip: text;
+                    -webkit-text-fill-color: transparent;
+                    padding: 5px 0;
+                '>{title}</h4>
                 <p style='color: #7f8c8d; margin-bottom: 10px;'>👍 Likes: {likes}</p>
-                <p style='color: #7f8c8d; font-size: 0.9em; margin-bottom: 15px; line-height: 1.4;'>{short_description}</p>
                 <a href='{target_spaces[space_id]}' 
                    target='_blank' 
                    style='
@@ -675,6 +671,8 @@ def get_spaces_data(sort_type="trending", progress=gr.Progress()):
                 </a>
             </div>
             """
+
+       
         
         html_content += "</div></div>"
         
@@ -682,8 +680,7 @@ def get_spaces_data(sort_type="trending", progress=gr.Progress()):
         df = pd.DataFrame([{
             'Rank': space['rank'],
             'Space ID': space['id'],
-            'Title': space.get('title', 'No Title'),
-            'Description': (space.get('description', '') or space.get('cardData', {}).get('description', 'No Description'))[:100] + '...',
+            'Title': space.get('cardData', {}).get('title') or space.get('title', 'No Title'),
             'Likes': space.get('likes', 0),
             'URL': target_spaces[space['id']]
         } for space in spaces])