Update app.py

app.py

@@ -313,21 +313,27 @@ def serphouse_search(query, country):
 css = """
 footer {visibility: hidden;}
 
-/* 전역 검색 결과 컨테이너 스타일 */
-#global_results_container {
-    margin-top: 20px;
-    padding-top: 20px;
-}
-
-/* 진행 상태 컨테이너 스타일 */
-#progress_status_container {
+#status_area {
     position: sticky;
     top: 0;
-    background: white;
+    background-color: white;
     padding: 10px;
-    margin-bottom: 20px;
     border-bottom: 2px solid #eee;
-    z-index: 100;
+    z-index: 1000;
+    margin-bottom: 20px;
+}
+
+#results_area {
+    margin-top: 20px;
+    padding-top: 10px;
+}
+
+.progress-container {
+    display: none !important;
+}
+
+.progress-container:first-child {
+    display: block !important;
 }
 """
 
@@ -343,12 +349,8 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                     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()
@@ -371,28 +373,24 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                             'index': i,
                         })
 
+        # 전세계 탭
         with gr.Tab("전세계"):
             gr.Markdown("검색어를 입력하면 67개국의 24시간 이내 뉴스를 최대 1000개 출력합니다.")
-    
+            
             with gr.Column():
-        # 상단 검색 영역
                 with gr.Row():
                     query_global = gr.Textbox(label="검색어")
                     search_button_global = gr.Button("전세계 검색", variant="primary")
-        
-        # 진행 상태 표시 영역 (고정 위치)
-                with gr.Column(elem_id="progress_status_container"):
-                    status_message_global = gr.Markdown("", visible=True)
-                    translated_query_display_global = gr.Markdown(visible=False)
-                    progress_global = gr.Progress()
-        
-        # 구분선
+                
+                with gr.Column(elem_id="status_area", visible=True):
+                    status_message_global = gr.Markdown("")
+                    progress_global = gr.Progress(track_tqdm=True)
+                
                 gr.Markdown("---")
-        
-        # 결과 출력 영역 (스크롤 가능)
-                with gr.Column(elem_id="global_results_container"):
+                
+                with gr.Column(elem_id="results_area"):
                     articles_state_global = gr.State([])
-            
+                    
                     global_article_components = []
                     for i in range(1000):
                         with gr.Group(visible=False) as article_group:
@@ -400,7 +398,7 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                             image = gr.Image(width=200, height=150)
                             snippet = gr.Markdown()
                             info = gr.Markdown()
-                    
+                            
                             global_article_components.append({
                                 'group': article_group,
                                 'title': title,
@@ -410,16 +408,10 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                                 'index': i,
                             })
 
-                    
-    
-
     def search_and_display(query, country, articles_state, progress=gr.Progress()):
-        # 검색 상태 메시지 업데이트
         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}"
         
@@ -428,8 +420,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))
@@ -449,7 +441,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([
@@ -468,100 +459,88 @@ 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 = []
-          displayed_count = 0
-          
-          # 초기 출력 설정 - 상단 상태 표시만 업데이트
-          outputs = []
-          outputs.append(gr.update(value=status_msg, visible=True))  # 상태 메시지
-          outputs.append(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 idx, (country, location) in enumerate(COUNTRY_LOCATIONS.items()):
-               progress(idx / len(COUNTRY_LOCATIONS), f"진행 상황: {idx + 1}/{len(COUNTRY_LOCATIONS)} 국가 검색 중... (현재: {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)
-                         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[:1000]
-                         
-                         # 결과 출력 업데이트
-                         outputs = []
-                         # 상단 상태 표시 업데이트
-                         outputs.append(gr.update(
-                              value=f"검색 진행 중... ({idx + 1}/{len(COUNTRY_LOCATIONS)} 국가 완료)\n현재까지 발견된 뉴스: {len(unique_results)}건",
-                              visible=True
-                         ))
-                         outputs.append(gr.update(value=f"**검색어:** {query}", 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['time']}")
-                                   ])
-                              else:
-                                   outputs.extend([
-                                        gr.update(visible=False), gr.update(), gr.update(),
-                                        gr.update(), gr.update()
-                                   ])
-                         
-                         outputs.append(unique_results)
-                         yield outputs
-                         
-               except Exception as e:
-                    print(f"Error searching {country}: {str(e)}")
-                    continue
-          
-          # 최종 상태 업데이트
-          final_status = f"검색 완료! 총 {len(unique_results)}개의 뉴스가 발견되었습니다."
-          outputs[0] = gr.update(value=final_status, visible=True)
-          yield outputs
+        status_msg = "전세계 검색을 진행중입니다. 실시간으로 결과가 출력됩니다..."
+        all_results = []
+        
+        outputs = [
+            gr.update(value=status_msg, visible=True),
+            gr.update(value="", visible=False),
+        ]
+        
+        for _ in global_article_components:
+            outputs.extend([
+                gr.update(visible=False), gr.update(), gr.update(),
+                gr.update(), gr.update()
+            ])
+        outputs.append([])
+        
+        yield outputs
+        
+        for idx, (country, location) in enumerate(COUNTRY_LOCATIONS.items()):
+            progress((idx + 1) / len(COUNTRY_LOCATIONS), f"진행 상황: {idx + 1}/{len(COUNTRY_LOCATIONS)} 국가 검색 중... (현재: {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)
+                    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[:1000]
+                    
+                    outputs = []
+                    outputs.append(gr.update(
+                        value=f"검색 진행 중... ({idx + 1}/{len(COUNTRY_LOCATIONS)} 국가 완료)\n현재까지 발견된 뉴스: {len(unique_results)}건",
+                        visible=True
+                    ))
+                    outputs.append(gr.update(value=f"**검색어:** {query}", 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['time']}")
+                            ])
+                        else:
+                            outputs.extend([
+                                gr.update(visible=False), gr.update(), gr.update(),
+                                gr.update(), gr.update()
+                            ])
+                    
+                    outputs.append(unique_results)
+                    yield outputs
+                    
+            except Exception as e:
+                print(f"Error searching {country}: {str(e)}")
+                continue
+        
+        final_status = f"검색 완료! 총 {len(unique_results)}개의 뉴스가 발견되었습니다."
+        outputs[0] = gr.update(value=final_status, visible=True)
+        yield outputs
 
     search_outputs = [
         status_message,
@@ -583,7 +562,6 @@ 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,