Update app.py

app.py

@@ -180,6 +180,182 @@ COUNTRY_LOCATIONS = {
 
 MAJOR_COUNTRIES = list(COUNTRY_LOCATIONS.keys())
 
+# 동아시아 지역
+COUNTRY_LANGUAGES_EAST_ASIA = {
+    "Taiwan": "zh-TW",  
+    "Japan": "ja",
+    "China": "zh",
+    "South Korea": "ko",
+    "Hong Kong": "zh-HK"
+}
+
+COUNTRY_LOCATIONS_EAST_ASIA = {
+    "Taiwan": "Taiwan",  
+    "Japan": "Japan",
+    "China": "China",
+    "South Korea": "South Korea",
+    "Hong Kong": "Hong Kong"
+}
+
+# 동남아시아/오세아니아 지역
+COUNTRY_LANGUAGES_SOUTHEAST_ASIA_OCEANIA = {
+    "Indonesia": "id",
+    "Malaysia": "ms",
+    "Philippines": "tl",
+    "Thailand": "th",
+    "Vietnam": "vi",
+    "Singapore": "en",
+    "Papua New Guinea": "en",
+    "Australia": "en",
+    "New Zealand": "en"
+}
+
+COUNTRY_LOCATIONS_SOUTHEAST_ASIA_OCEANIA = {
+    "Indonesia": "Indonesia",
+    "Malaysia": "Malaysia",
+    "Philippines": "Philippines",
+    "Thailand": "Thailand",
+    "Vietnam": "Vietnam",
+    "Singapore": "Singapore",
+    "Papua New Guinea": "Papua New Guinea",
+    "Australia": "Australia",
+    "New Zealand": "New Zealand"
+}
+
+# 동유럽 지역
+COUNTRY_LANGUAGES_EAST_EUROPE = {
+    "Poland": "pl",
+    "Czech Republic": "cs",
+    "Greece": "el",
+    "Hungary": "hu",
+    "Romania": "ro",
+    "Ukraine": "uk",
+    "Croatia": "hr",
+    "Slovakia": "sk",
+    "Bulgaria": "bg",
+    "Serbia": "sr",
+    "Estonia": "et",
+    "Latvia": "lv",
+    "Lithuania": "lt",
+    "Slovenia": "sl",
+    "Malta": "mt",
+    "Cyprus": "el",
+    "Iceland": "is",
+    "Russia": "ru"
+}
+
+COUNTRY_LOCATIONS_EAST_EUROPE = {
+    "Poland": "Poland",
+    "Czech Republic": "Czech Republic",
+    "Greece": "Greece",
+    "Hungary": "Hungary",
+    "Romania": "Romania",
+    "Ukraine": "Ukraine",
+    "Croatia": "Croatia",
+    "Slovakia": "Slovakia",
+    "Bulgaria": "Bulgaria",
+    "Serbia": "Serbia",
+    "Estonia": "Estonia",
+    "Latvia": "Latvia",
+    "Lithuania": "Lithuania",
+    "Slovenia": "Slovenia",
+    "Malta": "Malta",
+    "Cyprus": "Cyprus",
+    "Iceland": "Iceland",
+    "Russia": "Russia"
+}
+
+# 서유럽 지역
+COUNTRY_LANGUAGES_WEST_EUROPE = {
+    "Germany": "de",
+    "France": "fr",
+    "Italy": "it",
+    "Spain": "es",
+    "Netherlands": "nl",
+    "Belgium": "nl",
+    "Ireland": "en",
+    "Sweden": "sv",
+    "Switzerland": "de",
+    "Austria": "de",
+    "Portugal": "pt",
+    "Luxembourg": "fr",
+    "United Kingdom": "en"
+}
+
+COUNTRY_LOCATIONS_WEST_EUROPE = {
+    "Germany": "Germany",
+    "France": "France",
+    "Italy": "Italy",
+    "Spain": "Spain",
+    "Netherlands": "Netherlands",
+    "Belgium": "Belgium",
+    "Ireland": "Ireland",
+    "Sweden": "Sweden",
+    "Switzerland": "Switzerland",
+    "Austria": "Austria",
+    "Portugal": "Portugal",
+    "Luxembourg": "Luxembourg",
+    "United Kingdom": "United Kingdom"
+}
+
+# 중동/아프리카 지역
+COUNTRY_LANGUAGES_ARAB_AFRICA = {
+    "South Africa": "en",
+    "Nigeria": "en",
+    "Kenya": "sw",
+    "Egypt": "ar",
+    "Morocco": "ar",
+    "Saudi Arabia": "ar",
+    "United Arab Emirates": "ar",
+    "Israel": "he"
+}
+
+COUNTRY_LOCATIONS_ARAB_AFRICA = {
+    "South Africa": "South Africa",
+    "Nigeria": "Nigeria",
+    "Kenya": "Kenya",
+    "Egypt": "Egypt",
+    "Morocco": "Morocco",
+    "Saudi Arabia": "Saudi Arabia",
+    "United Arab Emirates": "United Arab Emirates",
+    "Israel": "Israel"
+}
+
+# 아메리카 지역
+COUNTRY_LANGUAGES_AMERICA = {
+    "United States": "en",
+    "Canada": "en",
+    "Mexico": "es",
+    "Brazil": "pt",
+    "Argentina": "es",
+    "Chile": "es",
+    "Colombia": "es",
+    "Peru": "es",
+    "Venezuela": "es"
+}
+
+COUNTRY_LOCATIONS_AMERICA = {
+    "United States": "United States",
+    "Canada": "Canada",
+    "Mexico": "Mexico",
+    "Brazil": "Brazil",
+    "Argentina": "Argentina",
+    "Chile": "Chile",
+    "Colombia": "Colombia",
+    "Peru": "Peru",
+    "Venezuela": "Venezuela"
+}
+
+# 지역 선택 리스트
+REGIONS = [
+    "동아시아",
+    "동남아시아/오세아니아",
+    "동유럽",
+    "서유럽",
+    "중동/아프리카",
+    "아메리카"
+]
+
 def translate_query(query, country):
     try:
         # 영어 입력 확인
@@ -822,22 +998,34 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                             'index': i,
                         })
 
-        # 전세계 탭
         with gr.Tab("전세계"):
-            gr.Markdown("검색어를 입력하면 67개국(한국 제외) 전체에 대해 국가별로 구분하여 24시간 이내 뉴스가 최대 1000개 순차 출력됩니다.")
-            gr.Markdown("국가 선택후 검색어에 '한글'을 입력하면 현지 언어로 번역되어 검색합니다. 예: 'Taiwan' 국가 선택후 '삼성' 입력시 '三星'으로 자동 검색") 
-            
+            gr.Markdown("대륙별로 24시간 이내 뉴스를 검색합니다.")
+    
             with gr.Column():
                 with gr.Column(elem_id="status_area"):
                     with gr.Row():
                         query_global = gr.Textbox(label="검색어")
-                        search_button_global = gr.Button("전세계 검색", variant="primary")
-            
+                        region_select = gr.Dropdown(
+                            choices=[
+                                "동아시아",
+                                "동남아시아/오세아니아",
+                                "동유럽",
+                                "서유럽",
+                                "중동/아프리카",
+                                "아메리카"
+                            ],
+                            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):
@@ -947,10 +1135,30 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
         
         return outputs
 
-    def search_global(query, articles_state_global):
-        status_msg = "전세계 검색을 시작합니다..."
+
+    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):
+    """지역별 검색 함수"""
+        status_msg = f"{region} 지역 검색을 시작합니다..."
         all_results = []
-        
+    
         outputs = [
             gr.update(value=status_msg, visible=True),
             gr.update(value=f"**검색어:** {query}", visible=True),
@@ -962,13 +1170,16 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                 gr.update(), gr.update()
             ])
         outputs.append([])
-        
+            
         yield outputs
         
-        total_countries = len(COUNTRY_LOCATIONS)
-        for idx, (country, location) in enumerate(COUNTRY_LOCATIONS.items(), 1):
+    # 선택된 지역의 국가 정보 가져오기
+        locations, languages = get_region_countries(region)
+        total_countries = len(locations)
+    
+        for idx, (country, location) in enumerate(locations.items(), 1):
             try:
-                status_msg = f"{country} 검색 중... ({idx}/{total_countries} 국가)"
+                status_msg = f"{region} - {country} 검색 중... ({idx}/{total_countries} 국가)"
                 outputs[0] = gr.update(value=status_msg, visible=True)
                 yield outputs
                 
@@ -976,6 +1187,7 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                 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)
@@ -987,14 +1199,14 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                         if url not in seen_urls:
                             seen_urls.add(url)
                             unique_results.append(article)
-                    
-                    unique_results = unique_results[:1000]
-                    
+                
+                    unique_results = unique_results[:MAX_GLOBAL_RESULTS]
+                
                     outputs = [
-                        gr.update(value=f"{idx}/{total_countries} 국가 검색 완료\n현재까지 발견된 뉴스: {len(unique_results)}건", visible=True),
-                        gr.update(value=f"**검색어:** {query}", visible=True),
+                        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]
@@ -1008,14 +1220,17 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                                 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']}")
+                                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()
+                                gr.update(visible=False),
+                                gr.update(),
+                                gr.update(),
+                                gr.update(),
+                                gr.update()
                             ])
-                    
+                
                     outputs.append(unique_results)
                     yield outputs
                     
@@ -1023,9 +1238,11 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                 print(f"Error searching {country}: {str(e)}")
                 continue
         
-        final_status = f"검색 완료! 총 {len(unique_results)}개의 뉴스가 발견되었습니다."
+        final_status = f"{region} 검색 완료! 총 {len(unique_results)}개의 뉴스가 발견되었습니다."
         outputs[0] = gr.update(value=final_status, visible=True)
         yield outputs
+    
+
 
 
 
@@ -1053,11 +1270,26 @@ 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,
+    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(
+        fn=search_global,
+        inputs=[query_global, region_select, articles_state_global],
+        outputs=global_search_outputs
+    )
+    
 
     # AI 리포터 탭 이벤트 연결
     hn_outputs = [status_message_hn]