Update app.py

app.py

@@ -436,7 +436,7 @@ def get_card(item: dict, index: int, card_type: str = "space") -> str:
     </div>
     """
 
-def get_trending_spaces(progress=gr.Progress()) -> Tuple[str, str]:
+def get_trending_spaces(search_query="", sort_by="rank", progress=gr.Progress()) -> Tuple[str, str]:
     """트렌딩 스페이스 가져오기"""
     url = "https://huggingface.co/api/spaces"
     
@@ -444,13 +444,31 @@ def get_trending_spaces(progress=gr.Progress()) -> Tuple[str, str]:
         progress(0, desc="Fetching spaces data...")
         params = {
             'full': 'true',
-            'limit': 10  # sort 파라미터 제거
+            'limit': 1000,  # 검색을 위해 더 많은 항목 로드
+            'search': search_query
         }
 
         response = requests.get(url, params=params)
         response.raise_for_status()
         spaces = response.json()
         
+        # 검색어로 필터링
+        if search_query:
+            spaces = [space for space in spaces if search_query.lower() in 
+                     (space.get('id', '') + space.get('title', '')).lower()]
+        
+        # 정렬
+        if sort_by == "rising_rate":
+            spaces.sort(key=lambda x: calculate_rising_rate(x.get('createdAt', ''), 0), reverse=True)
+        elif sort_by == "popularity":
+            spaces.sort(key=lambda x: get_popularity_grade(
+                int(str(x.get('likes', '0')).replace(',', '')),
+                calculate_rising_rate(x.get('createdAt', ''), 0))[1],
+                reverse=True)
+        
+        # 상위 300개만 선택
+        spaces = spaces[:300]
+        
         progress(0.1, desc="Creating gallery...")
         html_content = """
         <div style='padding: 20px; background: #f5f5f5;'>
@@ -459,18 +477,18 @@ def get_trending_spaces(progress=gr.Progress()) -> Tuple[str, str]:
         
         for idx, space in enumerate(spaces):
             html_content += get_card(space, idx, "space")
-            progress((0.1 + 0.9 * idx/10), desc=f"Loading space {idx+1}/10...")
+            progress((0.1 + 0.9 * idx/len(spaces)), desc=f"Loading space {idx+1}/{len(spaces)}...")
             
         html_content += "</div></div>"
         
         progress(1.0, desc="Complete!")
-        return html_content, "Gallery refresh complete!"
+        return html_content, f"Found {len(spaces)} spaces"
         
     except Exception as e:
         error_html = f'<div style="color: red; padding: 20px;">Error: {str(e)}</div>'
         return error_html, f"Error: {str(e)}"
 
-def get_models(progress=gr.Progress()) -> Tuple[str, str]:
+def get_models(search_query="", sort_by="rank", progress=gr.Progress()) -> Tuple[str, str]:
     """인기 모델 가져오기"""
     url = "https://huggingface.co/api/models"
     
@@ -478,12 +496,30 @@ def get_models(progress=gr.Progress()) -> Tuple[str, str]:
         progress(0, desc="Fetching models data...")
         params = {
             'full': 'true',
-            'limit': 300  # sort 파라미터 제거
+            'limit': 1000,
+            'search': search_query
         }
         response = requests.get(url, params=params)
         response.raise_for_status()
         models = response.json()
         
+        # 검색어로 필터링
+        if search_query:
+            models = [model for model in models if search_query.lower() in 
+                     (model.get('id', '') + model.get('title', '')).lower()]
+        
+        # 정렬
+        if sort_by == "rising_rate":
+            models.sort(key=lambda x: calculate_rising_rate(x.get('createdAt', ''), 0), reverse=True)
+        elif sort_by == "popularity":
+            models.sort(key=lambda x: get_popularity_grade(
+                int(str(x.get('likes', '0')).replace(',', '')),
+                calculate_rising_rate(x.get('createdAt', ''), 0))[1],
+                reverse=True)
+        
+        # 상위 300개만 선택
+        models = models[:300]
+        
         progress(0.1, desc="Creating gallery...")
         html_content = """
         <div style='padding: 20px; background: #f5f5f5;'>
@@ -492,18 +528,18 @@ def get_models(progress=gr.Progress()) -> Tuple[str, str]:
         
         for idx, model in enumerate(models):
             html_content += get_card(model, idx, "model")
-            progress((0.1 + 0.9 * idx/10), desc=f"Loading model {idx+1}/10...")
+            progress((0.1 + 0.9 * idx/len(models)), desc=f"Loading model {idx+1}/{len(models)}...")
             
         html_content += "</div></div>"
         
         progress(1.0, desc="Complete!")
-        return html_content, "Models gallery refresh complete!"
+        return html_content, f"Found {len(models)} models"
         
     except Exception as e:
         error_html = f'<div style="color: red; padding: 20px;">Error: {str(e)}</div>'
         return error_html, f"Error: {str(e)}"
 
-def get_datasets(progress=gr.Progress()) -> Tuple[str, str]:
+def get_datasets(search_query="", sort_by="rank", progress=gr.Progress()) -> Tuple[str, str]:
     """인기 데이터셋 가져오기"""
     url = "https://huggingface.co/api/datasets"
     
@@ -511,12 +547,30 @@ def get_datasets(progress=gr.Progress()) -> Tuple[str, str]:
         progress(0, desc="Fetching datasets data...")
         params = {
             'full': 'true',
-            'limit': 300  # sort 파라미터 제거
+            'limit': 1000,
+            'search': search_query
         }
         response = requests.get(url, params=params)
         response.raise_for_status()
         datasets = response.json()
         
+        # 검색어로 필터링
+        if search_query:
+            datasets = [dataset for dataset in datasets if search_query.lower() in 
+                       (dataset.get('id', '') + dataset.get('title', '')).lower()]
+        
+        # 정렬
+        if sort_by == "rising_rate":
+            datasets.sort(key=lambda x: calculate_rising_rate(x.get('createdAt', ''), 0), reverse=True)
+        elif sort_by == "popularity":
+            datasets.sort(key=lambda x: get_popularity_grade(
+                int(str(x.get('likes', '0')).replace(',', '')),
+                calculate_rising_rate(x.get('createdAt', ''), 0))[1],
+                reverse=True)
+        
+        # 상위 300개만 선택
+        datasets = datasets[:300]
+        
         progress(0.1, desc="Creating gallery...")
         html_content = """
         <div style='padding: 20px; background: #f5f5f5;'>
@@ -525,80 +579,161 @@ def get_datasets(progress=gr.Progress()) -> Tuple[str, str]:
         
         for idx, dataset in enumerate(datasets):
             html_content += get_card(dataset, idx, "dataset")
-            progress((0.1 + 0.9 * idx/10), desc=f"Loading dataset {idx+1}/10...")
+            progress((0.1 + 0.9 * idx/len(datasets)), desc=f"Loading dataset {idx+1}/{len(datasets)}...")
             
         html_content += "</div></div>"
         
         progress(1.0, desc="Complete!")
-        return html_content, "Datasets gallery refresh complete!"
+        return html_content, f"Found {len(datasets)} datasets"
         
     except Exception as e:
         error_html = f'<div style="color: red; padding: 20px;">Error: {str(e)}</div>'
         return error_html, f"Error: {str(e)}"
 
+# 정렬 함수 추가
+def sort_items(items, sort_by):
+    if sort_by == "rank":
+        return items  # 이미 순위대로 정렬되어 있음
+    elif sort_by == "rising_rate":
+        return sorted(items, key=lambda x: calculate_rising_rate(x.get('createdAt', ''), 0), reverse=True)
+    elif sort_by == "popularity":
+        return sorted(items, key=lambda x: get_popularity_grade(int(str(x.get('likes', '0')).replace(',', '')), 
+                     calculate_rising_rate(x.get('createdAt', ''), 0))[1], reverse=True)
+    return items
+
+# API 호출 함수 수정
+def fetch_items(item_type, search_query="", sort_by="rank", limit=1000):
+    """아이템 가져오기 (spaces/models/datasets)"""
+    base_url = f"https://huggingface.co/api/{item_type}"
+    params = {
+        'full': 'true',
+        'limit': limit,
+        'search': search_query
+    }
+    
+    try:
+        response = requests.get(base_url, params=params)
+        response.raise_for_status()
+        items = response.json()
+        
+        # 검색어로 필터링
+        if search_query:
+            items = [item for item in items if search_query.lower() in 
+                    (item.get('id', '') + item.get('title', '')).lower()]
+        
+        # 정렬
+        items = sort_items(items, sort_by)
+        
+        return items[:300]  # 상위 300개만 반환
+    except Exception as e:
+        print(f"Error fetching items: {e}")
+        return []
+
+# 인터페이스 수정
 def create_interface():
-    """Gradio 인터페이스 생성"""
     with gr.Blocks(title="HuggingFace Trending Board") as interface:
         gr.Markdown("# 🤗 HuggingFace Trending TOP 300 Board")
         
         with gr.Tabs() as tabs:
             # Spaces 탭
             with gr.Tab("🎯 Trending Spaces"):
-                gr.Markdown("Shows top 300 trending spaces with AI ratings")
                 with gr.Row():
-                    spaces_refresh_btn = gr.Button("Refresh Spaces", variant="primary")
+                    spaces_search = gr.Textbox(label="Search Spaces", placeholder="Enter search terms...")
+                    spaces_sort = gr.Radio(
+                        choices=["rank", "rising_rate", "popularity"],
+                        value="rank",
+                        label="Sort by",
+                        interactive=True
+                    )
+                    spaces_refresh_btn = gr.Button("Refresh", variant="primary")
                 spaces_gallery = gr.HTML()
                 spaces_status = gr.Markdown("Ready")
             
             # Models 탭
             with gr.Tab("🤖 Trending Models"):
-                gr.Markdown("Shows top 300 trending models with AI ratings")
                 with gr.Row():
-                    models_refresh_btn = gr.Button("Refresh Models", variant="primary")
+                    models_search = gr.Textbox(label="Search Models", placeholder="Enter search terms...")
+                    models_sort = gr.Radio(
+                        choices=["rank", "rising_rate", "popularity"],
+                        value="rank",
+                        label="Sort by",
+                        interactive=True
+                    )
+                    models_refresh_btn = gr.Button("Refresh", variant="primary")
                 models_gallery = gr.HTML()
                 models_status = gr.Markdown("Ready")
             
             # Datasets 탭
             with gr.Tab("📊 Trending Datasets"):
-                gr.Markdown("Shows top 300 trending datasets with AI ratings")
                 with gr.Row():
-                    datasets_refresh_btn = gr.Button("Refresh Datasets", variant="primary")
+                    datasets_search = gr.Textbox(label="Search Datasets", placeholder="Enter search terms...")
+                    datasets_sort = gr.Radio(
+                        choices=["rank", "rising_rate", "popularity"],
+                        value="rank",
+                        label="Sort by",
+                        interactive=True
+                    )
+                    datasets_refresh_btn = gr.Button("Refresh", variant="primary")
                 datasets_gallery = gr.HTML()
                 datasets_status = gr.Markdown("Ready")
-        
+
         # Event handlers
         spaces_refresh_btn.click(
             fn=get_trending_spaces,
-            outputs=[spaces_gallery, spaces_status],
-            show_progress=True
+            inputs=[spaces_search, spaces_sort],
+            outputs=[spaces_gallery, spaces_status]
         )
         
         models_refresh_btn.click(
             fn=get_models,
-            outputs=[models_gallery, models_status],
-            show_progress=True
+            inputs=[models_search, models_sort],
+            outputs=[models_gallery, models_status]
         )
         
         datasets_refresh_btn.click(
             fn=get_datasets,
-            outputs=[datasets_gallery, datasets_status],
-            show_progress=True
+            inputs=[datasets_search, datasets_sort],
+            outputs=[datasets_gallery, datasets_status]
         )
         
-        # 초기 로드
-        interface.load(
+        # 검색어 변경 시 자동 새로고침
+        spaces_search.change(
             fn=get_trending_spaces,
+            inputs=[spaces_search, spaces_sort],
             outputs=[spaces_gallery, spaces_status]
         )
-        interface.load(
+        
+        models_search.change(
             fn=get_models,
+            inputs=[models_search, models_sort],
             outputs=[models_gallery, models_status]
         )
-        interface.load(
+        
+        datasets_search.change(
             fn=get_datasets,
+            inputs=[datasets_search, datasets_sort],
             outputs=[datasets_gallery, datasets_status]
         )
-    
+        
+        # 정렬 방식 변경 시 자동 새로고침
+        spaces_sort.change(
+            fn=get_trending_spaces,
+            inputs=[spaces_search, spaces_sort],
+            outputs=[spaces_gallery, spaces_status]
+        )
+        
+        models_sort.change(
+            fn=get_models,
+            inputs=[models_search, models_sort],
+            outputs=[models_gallery, models_status]
+        )
+        
+        datasets_sort.change(
+            fn=get_datasets,
+            inputs=[datasets_search, datasets_sort],
+            outputs=[datasets_gallery, datasets_status]
+        )
+
     return interface
 
 if __name__ == "__main__":