Update app.py

app.py

@@ -1000,32 +1000,24 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
 
         with gr.Tab("전세계"):
             gr.Markdown("대륙별로 24시간 이내 뉴스를 검색합니다.")
-    
+
             with gr.Column():
                 with gr.Column(elem_id="status_area"):
                     with gr.Row():
                         query_global = gr.Textbox(label="검색어")
                         region_select = gr.Dropdown(
-                            choices=[
-                                "동아시아",
-                                "동남아시아/오세아니아",
-                                "동유럽",
-                                "서유럽",
-                                "중동/아프리카",
-                                "아메리카"
-                            ],
+                            choices=REGIONS,
                             label="지역 선택",
                             value="동아시아"
                         )
                         search_button_global = gr.Button("검색", variant="primary")
-                
+            
                     status_message_global = gr.Markdown("")
                     translated_query_display_global = gr.Markdown("")
-    
+        
                 with gr.Column(elem_id="results_area"):
                     articles_state_global = gr.State([])
                     global_article_components = create_article_components(MAX_GLOBAL_RESULTS)
-
             
                     global_article_components = []
                     for i in range(1000):
@@ -1136,112 +1128,109 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
         return outputs
 
 
-    def get_region_countries(region):
+def get_region_countries(region):
     """선택된 지역의 국가 및 언어 정보 반환"""
-        if region == "동아시아":
-            return COUNTRY_LOCATIONS_EAST_ASIA, COUNTRY_LANGUAGES_EAST_ASIA
-        elif region == "동남아시아/오세아니아":
-            return COUNTRY_LOCATIONS_SOUTHEAST_ASIA_OCEANIA, COUNTRY_LANGUAGES_SOUTHEAST_ASIA_OCEANIA
-        elif region == "동유럽":
-            return COUNTRY_LOCATIONS_EAST_EUROPE, COUNTRY_LANGUAGES_EAST_EUROPE
-        elif region == "서유럽":
-            return COUNTRY_LOCATIONS_WEST_EUROPE, COUNTRY_LANGUAGES_WEST_EUROPE
-        elif region == "중동/아프리카":
-            return COUNTRY_LOCATIONS_ARAB_AFRICA, COUNTRY_LANGUAGES_ARAB_AFRICA
-        elif region == "아메리카":
-            return COUNTRY_LOCATIONS_AMERICA, COUNTRY_LANGUAGES_AMERICA
-        return {}, {}
-    
-
-    
-    def search_global(query, region, articles_state_global):
+    if region == "동아시아":
+        return COUNTRY_LOCATIONS_EAST_ASIA, COUNTRY_LANGUAGES_EAST_ASIA
+    elif region == "동남아시아/오세아니아":
+        return COUNTRY_LOCATIONS_SOUTHEAST_ASIA_OCEANIA, COUNTRY_LANGUAGES_SOUTHEAST_ASIA_OCEANIA
+    elif region == "동유럽":
+        return COUNTRY_LOCATIONS_EAST_EUROPE, COUNTRY_LANGUAGES_EAST_EUROPE
+    elif region == "서유럽":
+        return COUNTRY_LOCATIONS_WEST_EUROPE, COUNTRY_LANGUAGES_WEST_EUROPE
+    elif region == "중동/아프리카":
+        return COUNTRY_LOCATIONS_ARAB_AFRICA, COUNTRY_LANGUAGES_ARAB_AFRICA
+    elif region == "아메리카":
+        return COUNTRY_LOCATIONS_AMERICA, COUNTRY_LANGUAGES_AMERICA
+    return {}, {}
+
+def search_global(query, region, articles_state_global):
     """지역별 검색 함수"""
-        status_msg = f"{region} 지역 검색을 시작합니다..."
-        all_results = []
+    status_msg = f"{region} 지역 검색을 시작합니다..."
+    all_results = []
+
+    outputs = [
+        gr.update(value=status_msg, visible=True),
+        gr.update(value=f"**검색어:** {query}", visible=True),
+    ]
     
-        outputs = [
-            gr.update(value=status_msg, visible=True),
-            gr.update(value=f"**검색어:** {query}", visible=True),
-        ]
-        
-        for _ in global_article_components:
-            outputs.extend([
-                gr.update(visible=False), gr.update(), gr.update(),
-                gr.update(), gr.update()
-            ])
-        outputs.append([])
-            
-        yield outputs
+    for _ in global_article_components:
+        outputs.extend([
+            gr.update(visible=False), gr.update(), gr.update(),
+            gr.update(), gr.update()
+        ])
+    outputs.append([])
         
-    # 선택된 지역의 국가 정보 가져오기
-        locations, languages = get_region_countries(region)
-        total_countries = len(locations)
+    yield outputs
     
-        for idx, (country, location) in enumerate(locations.items(), 1):
-            try:
-                status_msg = f"{region} - {country} 검색 중... ({idx}/{total_countries} 국가)"
-                outputs[0] = gr.update(value=status_msg, visible=True)
-                yield outputs
-                
-                error_message, articles = serphouse_search(query, country)
-                if not error_message and articles:
-                    for article in articles:
-                        article['source_country'] = country
-                        article['region'] = region
-                    
-                    all_results.extend(articles)
-                    sorted_results = sorted(all_results, key=lambda x: x.get('time', ''), reverse=True)
-                    
-                    seen_urls = set()
-                    unique_results = []
-                    for article in sorted_results:
-                        url = article.get('link', '')
-                        if url not in seen_urls:
-                            seen_urls.add(url)
-                            unique_results.append(article)
-                
-                    unique_results = unique_results[:MAX_GLOBAL_RESULTS]
+    # 선택된 지역의 국가 정보 가져오기
+    locations, languages = get_region_countries(region)
+    total_countries = len(locations)
+
+    for idx, (country, location) in enumerate(locations.items(), 1):
+        try:
+            status_msg = f"{region} - {country} 검색 중... ({idx}/{total_countries} 국가)"
+            outputs[0] = gr.update(value=status_msg, visible=True)
+            yield outputs
+            
+            error_message, articles = serphouse_search(query, country)
+            if not error_message and articles:
+                for article in articles:
+                    article['source_country'] = country
+                    article['region'] = region
                 
-                    outputs = [
-                        gr.update(value=f"{region} - {idx}/{total_countries} 국가 검색 완료\n현재까지 발견된 뉴스: {len(unique_results)}건", visible=True),
-                        gr.update(value=f"**검색어:** {query} | **지역:** {region}", visible=True),
-                    ]
+                all_results.extend(articles)
+                sorted_results = sorted(all_results, key=lambda x: x.get('time', ''), reverse=True)
                 
-                    for idx, comp in enumerate(global_article_components):
-                        if idx < len(unique_results):
-                            article = unique_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['region']} | **시간:** {article['time']}")
-                            ])
-                        else:
-                            outputs.extend([
-                                gr.update(visible=False),
-                                gr.update(),
-                                gr.update(),
-                                gr.update(),
-                                gr.update()
-                            ])
+                seen_urls = set()
+                unique_results = []
+                for article in sorted_results:
+                    url = article.get('link', '')
+                    if url not in seen_urls:
+                        seen_urls.add(url)
+                        unique_results.append(article)
+            
+                unique_results = unique_results[:MAX_GLOBAL_RESULTS]
+            
+                outputs = [
+                    gr.update(value=f"{region} - {idx}/{total_countries} 국가 검색 완료\n현재까지 발견된 뉴스: {len(unique_results)}건", visible=True),
+                    gr.update(value=f"**검색어:** {query} | **지역:** {region}", visible=True),
+                ]
+            
+                for idx, comp in enumerate(global_article_components):
+                    if idx < len(unique_results):
+                        article = unique_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['region']} | **시간:** {article['time']}")
+                        ])
+                    else:
+                        outputs.extend([
+                            gr.update(visible=False),
+                            gr.update(),
+                            gr.update(),
+                            gr.update(),
+                            gr.update()
+                        ])
+            
+                outputs.append(unique_results)
+                yield outputs
                 
-                    outputs.append(unique_results)
-                    yield outputs
-                    
-            except Exception as e:
-                print(f"Error searching {country}: {str(e)}")
-                continue
-        
-        final_status = f"{region} 검색 완료! 총 {len(unique_results)}개의 뉴스가 발견되었습니다."
-        outputs[0] = gr.update(value=final_status, visible=True)
-        yield outputs
+        except Exception as e:
+            print(f"Error searching {country}: {str(e)}")
+            continue
     
+    final_status = f"{region} 검색 완료! 총 {len(unique_results)}개의 뉴스가 발견되었습니다."
+    outputs[0] = gr.update(value=final_status, visible=True)
+    yield outputs