Update app.py

app.py

@@ -5,7 +5,27 @@ import os
 from datetime import datetime, timedelta
 from huggingface_hub import InferenceClient
 
+MAX_COUNTRY_RESULTS = 100    # 국가별 최대 결과 수
+MAX_GLOBAL_RESULTS = 1000    # 전세계 최대 결과 수
 
+def create_article_components(max_results):
+    article_components = []
+    for i in range(max_results):
+        with gr.Group(visible=False) as article_group:
+            title = gr.Markdown()
+            image = gr.Image(width=200, height=150)
+            snippet = gr.Markdown()
+            info = gr.Markdown()
+            
+            article_components.append({
+                'group': article_group,
+                'title': title,
+                'image': image,
+                'snippet': snippet,
+                'info': info,
+                'index': i,
+            })
+    return article_components
     
 API_KEY = os.getenv("SERPHOUSE_API_KEY")
 # hf_client = InferenceClient("CohereForAI/c4ai-command-r-plus-08-2024", token=os.getenv("HF_TOKEN"))
@@ -295,49 +315,76 @@ footer {visibility: hidden;}
 """
 
 with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as iface:
-    gr.Markdown("검색어를 입력하고 원하는 국가(67개국)를 선택하면, 검색어와 일치하는 24시간 이내 뉴스를 최대 100개 출력합니다.")
-    gr.Markdown("국가 선택후 검색어에 '한글'을 입력하면 현지 언어로 번역되어 검색합니다. 예: 'Taiwan' 국가 선택후 '삼성' 입력시 '三星'으로 자동 검색")
-    
-    with gr.Column():
-        with gr.Row():
-            query = gr.Textbox(label="검색어")
-            country = gr.Dropdown(MAJOR_COUNTRIES, label="국가", value="South Korea")
-        
-        # 검색 상태 메시지    
-        status_message = gr.Markdown("", visible=True)
-        
-        # 번역 결과를 보여주는 컴포넌트
-        translated_query_display = gr.Markdown(visible=False)
-        
-        search_button = gr.Button("검색", variant="primary")
-        
-        progress = gr.Progress()
-        articles_state = gr.State([])
+    with gr.Tabs():
+        # 국가별 탭
+        with gr.Tab("국가별"):
+            gr.Markdown("검색어를 입력하고 원하는 국가(67개국)를 선택하면, 검색어와 일치하는 24시간 이내 뉴스를 최대 100개 출력합니다.")
+            gr.Markdown("국가 선택후 검색어에 '한글'을 입력하면 현지 언어로 번역되어 검색합니다. 예: 'Taiwan' 국가 선택후 '삼성' 입력시 '三星'으로 자동 검색")
+            
+            with gr.Column():
+                with gr.Row():
+                    query = gr.Textbox(label="검색어")
+                    country = gr.Dropdown(MAJOR_COUNTRIES, label="국가", value="South Korea")
+                
+                status_message = gr.Markdown("", visible=True)
+                translated_query_display = gr.Markdown(visible=False)
+                search_button = gr.Button("검색", variant="primary")
+                
+                progress = gr.Progress()
+                articles_state = gr.State([])
+
+                article_components = []
+                for i in range(100):
+                    with gr.Group(visible=False) as article_group:
+                        title = gr.Markdown()
+                        image = gr.Image(width=200, height=150)
+                        snippet = gr.Markdown()
+                        info = gr.Markdown()
+                        
+                        article_components.append({
+                            'group': article_group,
+                            'title': title,
+                            'image': image,
+                            'snippet': snippet,
+                            'info': info,
+                            'index': i,
+                        })
 
-        article_components = []
-        for i in range(100):
-            with gr.Group(visible=False) as article_group:
-                title = gr.Markdown()
-                image = gr.Image(width=200, height=150)
-                snippet = gr.Markdown()
-                info = gr.Markdown()
+        # 전세계 탭
+        with gr.Tab("전세계"):
+            gr.Markdown("검색어를 입력하면 67개국의 24시간 이내 뉴스를 최대 1000개 출력합니다.")
+            
+            with gr.Column():
+                query_global = gr.Textbox(label="검색어")
+                status_message_global = gr.Markdown("", visible=True)
+                translated_query_display_global = gr.Markdown(visible=False)
+                search_button_global = gr.Button("전세계 검색", variant="primary")
                 
-                article_components.append({
-                    'group': article_group,
-                    'title': title,
-                    'image': image,
-                    'snippet': snippet,
-                    'info': info,
-                    'index': i,
-                })
+                progress_global = gr.Progress()
+                articles_state_global = gr.State([])
+
+                global_article_components = []
+                for i in range(1000):
+                    with gr.Group(visible=False) as article_group:
+                        title = gr.Markdown()
+                        image = gr.Image(width=200, height=150)
+                        snippet = gr.Markdown()
+                        info = gr.Markdown()
+                        
+                        global_article_components.append({
+                            'group': article_group,
+                            'title': title,
+                            'image': image,
+                            'snippet': snippet,
+                            'info': info,
+                            'index': i,
+                        })
 
     def search_and_display(query, country, articles_state, progress=gr.Progress()):
-        # 검색 상태 메시지 업데이트
+        # 기존 search_and_display 함수 코드 유지
         status_msg = "검색을 진행중입니다. 잠시만 기다리세요..."
         
         progress(0, desc="검색어 번역 중...")
-        
-        # 검색어 번역
         translated_query = translate_query(query, country)
         translated_display = f"**원본 검색어:** {query}\n**번역된 검색어:** {translated_query}" if translated_query != query else f"**검색어:** {query}"
         
@@ -346,8 +393,8 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
         progress(0.5, desc="결과 처리 중...")
         
         outputs = []
-        outputs.append(gr.update(value=status_msg, visible=True))  # 상태 메시지
-        outputs.append(gr.update(value=translated_display, visible=True))  # 번역 결과
+        outputs.append(gr.update(value=status_msg, visible=True))
+        outputs.append(gr.update(value=translated_display, visible=True))
         
         if error_message:
             outputs.append(gr.update(value=error_message, visible=True))
@@ -367,7 +414,6 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                     image_url = article['image_url']
                     image_update = gr.update(value=image_url, visible=True) if image_url and not image_url.startswith('data:image') else gr.update(value=None, visible=False)
                     
-                    # 요약 내용 한글 번역
                     korean_summary = translate_to_korean(article['snippet'])
                     
                     outputs.extend([
@@ -386,12 +432,74 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
 
         progress(1.0, desc="완료!")
         outputs.append(articles_state)
+        outputs[0] = gr.update(value="", visible=False)
+        
+        return outputs
+
+    def search_global(query, articles_state_global, progress=gr.Progress()):
+        status_msg = "전세계 검색을 진행중입니다. 잠시만 기다리세요..."
+        all_results = []
         
-        # 검색 완료 후 상태 메시지 숨김
+        progress(0, desc="전세계 검색 시작...")
+        
+        for idx, (country, location) in enumerate(COUNTRY_LOCATIONS.items()):
+            progress(idx / len(COUNTRY_LOCATIONS), f"{country} 검색 중...")
+            try:
+                error_message, articles = serphouse_search(query, country)
+                if not error_message and articles:
+                    for article in articles:
+                        article['source_country'] = country
+                    all_results.extend(articles)
+            except Exception as e:
+                print(f"Error searching {country}: {str(e)}")
+                continue
+
+        # 결과 정렬 및 중복 제거
+        seen_urls = set()
+        unique_results = []
+        for article in sorted(all_results, key=lambda x: x.get('time', ''), reverse=True):
+            url = article.get('link', '')
+            if url not in seen_urls:
+                seen_urls.add(url)
+                unique_results.append(article)
+
+        # 최대 1000개로 제한
+        final_results = unique_results[:1000]
+        
+        outputs = []
+        outputs.append(gr.update(value=status_msg, visible=True))
+        outputs.append(gr.update(value=f"**검색어:** {query}", visible=True))
+        
+        progress(0.5, desc="결과 처리 중...")
+        
+        for idx, comp in enumerate(global_article_components):
+            if idx < len(final_results):
+                article = final_results[idx]
+                image_url = article.get('image_url', '')
+                image_update = gr.update(value=image_url, visible=True) if image_url and not image_url.startswith('data:image') else gr.update(value=None, visible=False)
+                
+                korean_summary = translate_to_korean(article['snippet'])
+                
+                outputs.extend([
+                    gr.update(visible=True),
+                    gr.update(value=f"### [{article['title']}]({article['link']})"),
+                    image_update,
+                    gr.update(value=f"**요약:** {article['snippet']}\n\n**한글 요약:** {korean_summary}"),
+                    gr.update(value=f"**출처:** {article['channel']} | **국가:** {article['source_country']} | **시간:** {article['time']}")
+                ])
+            else:
+                outputs.extend([
+                    gr.update(visible=False), gr.update(), gr.update(),
+                    gr.update(), gr.update()
+                ])
+        
+        progress(1.0, desc="완료!")
+        outputs.append(final_results)
         outputs[0] = gr.update(value="", visible=False)
         
         return outputs
 
+    # 국가별 검색 이벤트 연결
     search_outputs = [
         status_message,
         translated_query_display,
@@ -412,4 +520,24 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
         show_progress=True
     )
 
+    # 전세계 검색 이벤트 연결
+    global_search_outputs = [
+        status_message_global,
+        translated_query_display_global,
+    ]
+    
+    for comp in global_article_components:
+        global_search_outputs.extend([
+            comp['group'], comp['title'], comp['image'],
+            comp['snippet'], comp['info']
+        ])
+    global_search_outputs.append(articles_state_global)
+
+    search_button_global.click(
+        search_global,
+        inputs=[query_global, articles_state_global],
+        outputs=global_search_outputs,
+        show_progress=True
+    )
+
 iface.launch(auth=("it1","chosun1"))