Update app-backup.py

app-backup.py

@@ -18,6 +18,7 @@ target_models = {
     
     "moreh/Llama-3-Motif-102B-Instruct": "https://huggingface.co/moreh/Llama-3-Motif-102B-Instruct",
     "moreh/Llama-3-Motif-102B": "https://huggingface.co/moreh/Llama-3-Motif-102B",
+    "Samsung/TinyClick": "https://huggingface.co/Samsung/TinyClick",
     
     "Saxo/Linkbricks-Horizon-AI-Korean-Gemma-2-sft-dpo-27B": "https://huggingface.co/Saxo/Linkbricks-Horizon-AI-Korean-Gemma-2-sft-dpo-27B",
     "AALF/gemma-2-27b-it-SimPO-37K": "https://huggingface.co/AALF/gemma-2-27b-it-SimPO-37K",
@@ -291,7 +292,6 @@ target_models = {
     "sel303/llama3-diverce-ver1.6": "https://huggingface.co/sel303/llama3-diverce-ver1.6"    
 }
 
-# all_models 관련 코드 제거하고 get_models_data 함수 내부에서 처리하도록 수정
 
 def get_models_data(progress=gr.Progress()):
     """모델 데이터 가져오기"""
@@ -303,44 +303,83 @@ def get_models_data(progress=gr.Progress()):
     
     try:
         progress(0, desc="Fetching models data...")
+        params = {
+            'full': 'true',
+            'limit': 3000,  # 3000개로 증가
+            'sort': 'likes',
+            '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
-            }
-            
-            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)
+        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()
         
-        # 중복 제거
-        seen_ids = set()
-        filtered_models = []
-        for model in all_found_models:
+        models = response.json()
+        
+        # 전체 순위 정보 저장 (다운로드 수 기준)
+        model_ranks = {}
+        model_data = {}  # 모든 모델의 상세 데이터 저장
+        
+        for idx, model in enumerate(models, 1):
             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)
-                filtered_models.append(model)
+            model_data[model_id] = {
+                'rank': idx,
+                'downloads': model.get('downloads', 0),
+                'likes': model.get('likes', 0),
+                'title': model.get('title', 'No Title')
+            }
         
-        # 다운로드 수로 정렬
-        filtered_models.sort(key=lambda x: x.get('downloads', 0), reverse=True)
+        # target_models 중 순위권 내 모델 필터링
+        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,
+                    'rank': model_data[normalized_target_id]['rank'],
+                    'downloads': model_data[normalized_target_id]['downloads'],
+                    'likes': model_data[normalized_target_id]['likes'],
+                    'title': model_data[normalized_target_id]['title']
+                }
+            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)
         
-        # 순위 할당
-        for idx, model in enumerate(filtered_models, 1):
-            model['rank'] = idx
+        # 순위로 정렬 (순위가 숫자인 경우만)
+        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()
@@ -353,17 +392,17 @@ 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['likes'] for model in filtered_models]
+        downloads = [model['downloads'] for model in filtered_models]
         
-        # Y축 값을 반전
-        y_values = [1001 - r for r in ranks]
+        # Y축 값을 반전 (숫자 순위만)
+        y_values = [3001 - r if isinstance(r, int) else 0 for r in ranks]
         
         # 막대 그래프 생성
         fig.add_trace(go.Bar(
             x=ids,
             y=y_values,
-            text=[f"Rank: {r}<br>Likes: {l}<br>Downloads: {d}" 
+            text=[f"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)',
@@ -372,18 +411,18 @@ def get_models_data(progress=gr.Progress()):
         
         fig.update_layout(
             title={
-                'text': 'Hugging Face Models Trending Rankings (Top 1000)',
+                'text': 'Hugging Face Models Global Download Rankings (Top 3000)',
                 '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)],
-                range=[0, 1000]
+                ticktext=[str(i) for i in range(1, 3001, 150)],
+                tickvals=[3001 - i for i in range(1, 3001, 150)],
+                range=[0, 3000]
             ),
             height=800,
             showlegend=False,
@@ -396,7 +435,7 @@ 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 글로벌 인기 순위 (Top 3000)</h2>
             <div style='display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); gap: 20px;'>
         """
         
@@ -406,6 +445,7 @@ def get_models_data(progress=gr.Progress()):
             rank = model['rank']
             likes = model.get('likes', 0)
             downloads = model.get('downloads', 0)
+            title = model.get('title', 'No Title')
             
             html_content += f"""
             <div style='
@@ -416,8 +456,9 @@ 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: #2c3e50;'>{title}</p>
+                <p style='color: #7f8c8d;'>👍 Likes: {likes:,}</p>
+                <p style='color: #7f8c8d;'>⬇️ Downloads: {downloads:,}</p>
                 <a href='{target_models[model_id]}' 
                    target='_blank' 
                    style='
@@ -434,56 +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 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['rank'],
+                'Global Rank': model['rank'],
                 'Model ID': model['id'],
-                'Likes': model.get('likes', 'N/A'),
-                'Downloads': model.get('downloads', 'N/A'),
+                'Title': model.get('title', 'No Title'),
+                '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',
-                    'Model ID': model_id,
-                    'Likes': 'N/A',
-                    'Downloads': 'N/A',
-                    'URL': target_models[model_id]
-                })
         
         df = pd.DataFrame(df_data)
         
@@ -528,19 +533,28 @@ target_spaces = {
     "VIDraft/Mouse-Hackathon": "https://huggingface.co/spaces/VIDraft/Mouse-Hackathon",
     "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",
+    "etri-vilab/Ko-LLaVA": "https://huggingface.co/spaces/etri-vilab/Ko-LLaVA",
+    "etri-vilab/KOALA": "https://huggingface.co/spaces/etri-vilab/KOALA",
+    "naver-clova-ix/donut-base-finetuned-cord-v2": "https://huggingface.co/spaces/naver-clova-ix/donut-base-finetuned-cord-v2",    
+    
     "NCSOFT/VARCO_Arena": "https://huggingface.co/spaces/NCSOFT/VARCO_Arena"
 }
 
 def get_spaces_data(sort_type="trending", progress=gr.Progress()):
     """스페이스 데이터 가져오기 (trending 또는 modes)"""
-    url = f"https://huggingface.co/api/spaces"
+    url = "https://huggingface.co/api/spaces"
     params = {
         'full': 'true',
         'limit': 300
     }
     
     if sort_type == "modes":
-        params['sort'] = 'likes'  # modes는 좋아요 순으로 정렬
+        params['sort'] = 'likes'
     
     try:
         progress(0, desc=f"Fetching {sort_type} spaces data...")
@@ -549,16 +563,14 @@ def get_spaces_data(sort_type="trending", progress=gr.Progress()):
         all_spaces = response.json()
         
         # 순위 정보 저장
-        space_ranks = {space['id']: idx + 1 for idx, space in enumerate(all_spaces)}
-        
-        # target_spaces 필터링 및 순위 정보 포함
-        spaces = []
-        for space in all_spaces:
-            if space.get('id', '') in target_spaces:
-                space['rank'] = space_ranks.get(space['id'], 'N/A')
-                spaces.append(space)
+        space_ranks = {}
+        for idx, space in enumerate(all_spaces, 1):
+            space_id = space.get('id', '')
+            if space_id in target_spaces:
+                space['rank'] = idx
+                space_ranks[space_id] = space
         
-        # 순위별로 정렬
+        spaces = [space_ranks[space_id] for space_id in space_ranks.keys()]
         spaces.sort(key=lambda x: x['rank'])
         
         progress(0.3, desc="Creating visualization...")
@@ -570,15 +582,17 @@ 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('cardData', {}).get('title') or space.get('title', 'No Title') for space in spaces]
         
-        # Y축 값을 반전 (300 - rank + 1)
-        y_values = [301 - r for r in ranks]  # 순위를 반전된 값으로 변환
+        # Y축 값을 반전
+        y_values = [301 - r for r in ranks]
         
         # 막대 그래프 생성
         fig.add_trace(go.Bar(
             x=ids,
             y=y_values,
-            text=[f"Rank: {r}<br>Likes: {l}" for r, l in zip(ranks, likes)],
+            text=[f"Rank: {r}<br>Title: {t}<br>Likes: {l}" 
+                  for r, t, l in zip(ranks, titles, likes)],
             textposition='auto',
             marker_color='rgb(158,202,225)',
             opacity=0.8
@@ -595,9 +609,9 @@ def get_spaces_data(sort_type="trending", progress=gr.Progress()):
             xaxis_title='Space ID',
             yaxis_title='Rank',
             yaxis=dict(
-                ticktext=[str(i) for i in range(1, 301, 20)],  # 1부터 300까지 20 간격
-                tickvals=[301 - i for i in range(1, 301, 20)],  # 반전된 값
-                range=[0, 300]  # y축 범위 설정
+                ticktext=[str(i) for i in range(1, 301, 20)],
+                tickvals=[301 - i for i in range(1, 301, 20)],
+                range=[0, 300]
             ),
             height=800,
             showlegend=False,
@@ -615,12 +629,12 @@ def get_spaces_data(sort_type="trending", progress=gr.Progress()):
         """
         
         for space in spaces:
-            space_id = space.get('id', '')
-            rank = space.get('rank', 'N/A')
+            space_id = space['id']
+            rank = space['rank']
+            title = space.get('cardData', {}).get('title') or space.get('title', 'No Title')
             likes = space.get('likes', 0)
-            title = space.get('title', 'No Title')
-            description = space.get('description', 'No Description')[:100]
-            
+
+# 스페이스 함수의 HTML 카드 생성 부분 수정
             html_content += f"""
             <div style='
                 background: white;
@@ -630,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>
-                <p style='color: #7f8c8d;'>👍 Likes: {likes}</p>
-                <p style='color: #2c3e50;'>{title}</p>
-                <p style='color: #7f8c8d; font-size: 0.9em;'>{description}...</p>
+                <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>
                 <a href='{target_spaces[space_id]}' 
                    target='_blank' 
                    style='
@@ -648,29 +671,30 @@ def get_spaces_data(sort_type="trending", progress=gr.Progress()):
                 </a>
             </div>
             """
+
+       
         
         html_content += "</div></div>"
         
         # 데이터프레임 생성
         df = pd.DataFrame([{
-            'Rank': space.get('rank', 'N/A'),
-            'Space ID': space.get('id', ''),
-            'Likes': space.get('likes', 'N/A'),
-            'Title': space.get('title', 'N/A'),
-            'URL': target_spaces[space.get('id', '')]
+            'Rank': space['rank'],
+            'Space ID': space['id'],
+            '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])
         
         progress(1.0, desc="Complete!")
         return fig, html_content, df
         
     except Exception as e:
+        print(f"Error in get_spaces_data: {str(e)}")
         error_html = f'<div style="color: red; padding: 20px;">Error: {str(e)}</div>'
         error_plot = create_error_plot()
         return error_plot, error_html, pd.DataFrame()
 
 
-
-
 def create_trend_visualization(spaces_data):
     if not spaces_data:
         return create_error_plot()
@@ -877,13 +901,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]
+    # 🤗 허깅페이스 '한국(언어) 리더보드'
+    실시간으로 Hugging Face의 Spaces와 Models 인기 순위를 분석합니다. 한국인(기업)이 공개 및 한국어 'LLM 리더보드'에 공개된 리스트 등을 등록. 신규 등록 요청: [email protected]
     """)
     
+    # 새로 고침 버튼을 상단으로 이동하고 한글로 변경
+    refresh_btn = gr.Button("🔄 새로 고침", variant="primary")
+    
     with gr.Tab("Spaces Trending"):
         trending_plot = gr.Plot()
         trending_info = gr.HTML()
@@ -894,8 +920,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()
@@ -916,6 +940,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",