Update app.py

app.py

@@ -32,28 +32,21 @@ MAJOR_COUNTRIES = list(COUNTRY_LOCATIONS.keys())
 def search_serphouse(query, country, page=1, num_result=100):
     url = "https://api.serphouse.com/serp/live"
     
-    now = datetime.utcnow()
-    yesterday = now - timedelta(days=1)
-    date_range = f"{yesterday.strftime('%Y-%m-%d')},{now.strftime('%Y-%m-%d')}"
-
     payload = {
         "data": {
             "q": query,
             "domain": "google.com",
-            "loc": country,    # 국가 이름
-            "loc_id": COUNTRY_LOCATIONS.get(country, "1026201"),  # loc_id
+            "loc_id": COUNTRY_LOCATIONS.get(country, "1026201"),
             "lang": "en",
             "device": "desktop",
             "serp_type": "news",
-            "page": str(page),
-            "verbatim": "0",   # 문서에 맞게 수정
-            "gfilter": "0",    # 추가
-            "num": str(num_result)
+            "page": "1",
+            "verbatim": "0",
+            "gfilter": "0",
+            "num_result": "100"  # num_result로 수정
         }
     }
 
-    print("Request payload:", json.dumps(payload, indent=2))  # 디버깅을 위한 출력
-
     headers = {
         "accept": "application/json",
         "content-type": "application/json",
@@ -62,8 +55,6 @@ def search_serphouse(query, country, page=1, num_result=100):
 
     try:
         response = requests.post(url, json=payload, headers=headers)
-        print("Response status:", response.status_code)  # 디버깅을 위한 출력
-        print("Response content:", response.text)  # 디버깅을 위한 출력
         response.raise_for_status()
         return response.json()
     except requests.RequestException as e:
@@ -108,8 +99,10 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
         with gr.Row():
             query = gr.Textbox(label="검색어")
             country = gr.Dropdown(MAJOR_COUNTRIES, label="국가", value="South Korea")
-            search_button = gr.Button("검색")
+            search_button = gr.Button("검색", variant="primary")
 
+        # 프로그레스바 추가
+        progress = gr.Progress()
         status_message = gr.Markdown(visible=False)
         articles_state = gr.State([])
 
@@ -130,8 +123,10 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                     'index': i,
                 })
 
-    def search_and_display(query, country, articles_state):
+    def search_and_display(query, country, articles_state, progress=gr.Progress()):
+        progress(0, desc="검색 시작...")
         error_message, articles = serphouse_search(query, country)
+        progress(0.5, desc="결과 처리 중...")
         outputs = []
         
         if error_message:
@@ -144,7 +139,9 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
             articles_state = []
         else:
             outputs.append(gr.update(value="", visible=False))
+            total_articles = len(articles)
             for idx, comp in enumerate(article_components):
+                progress((idx + 1) / total_articles, desc=f"결과 표시 중... {idx + 1}/{total_articles}")
                 if idx < len(articles):
                     article = articles[idx]
                     image_url = article['image_url']
@@ -164,6 +161,7 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
                     ])
             articles_state = articles
 
+        progress(1.0, desc="완료!")
         outputs.append(articles_state)
         outputs.append(gr.update(visible=False))
         return outputs
@@ -178,7 +176,7 @@ with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css, title="NewsAI 서비스") as
         search_and_display,
         inputs=[query, country, articles_state],
         outputs=search_outputs,
-        show_progress=False
+        show_progress=True
     )
 
 iface.launch()