Update app.py

app.py

@@ -59,25 +59,22 @@ def is_recent_news(time_str):
         unit = time_parts[1]
         if unit in ['minute', 'minutes', 'hour', 'hours']:
             return True
-        elif unit in ['day', 'days']:
-            return value <= 2
+        elif unit == 'day':
+            return value < 1
     except ValueError:
         return False
     return False
 
 def format_results(results):
-    markdown_output = "## Recent News Results\n\n"
+    all_results = "## All News Results\n\n"
+    recent_results = "## Recent News Results (Within 1 Day)\n\n"
     
     try:
         if isinstance(results, dict) and "results" in results and "news" in results["results"]:
             news_results = results["results"]["news"]
-            filtered_results = [result for result in news_results if is_recent_news(result.get("time", ""))]
             
-            if not filtered_results:
-                markdown_output += "*No recent news results found.*\n\n"
-            else:
-                for result in filtered_results:
-                    markdown_output += f"""
+            for result in news_results:
+                all_results += f"""
 ### [{result.get('title', 'No Title')}]({result.get('url', '#')})
 
 {result.get('snippet', 'No Snippet')}
@@ -87,19 +84,33 @@ def format_results(results):
 ---
 
 """
+                if is_recent_news(result.get("time", "")):
+                    recent_results += f"""
+### [{result.get('title', 'No Title')}]({result.get('url', '#')})
+
+{result.get('snippet', 'No Snippet')}
+
+**Source:** {result.get('channel', 'Unknown')} - {result.get('time', 'Unknown time')}
+
+---
+
+"""
+            
+            if recent_results == "## Recent News Results (Within 1 Day)\n\n":
+                recent_results += "*No recent news results found within 1 day.*\n\n"
         else:
-            markdown_output += "*No valid news results found in the API response.*\n\n"
+            all_results += "*No valid news results found in the API response.*\n\n"
+            recent_results += "*No valid news results found in the API response.*\n\n"
     except Exception as e:
-        markdown_output += f"*Error processing results: {str(e)}*\n\n"
+        all_results += f"*Error processing results: {str(e)}*\n\n"
+        recent_results += f"*Error processing results: {str(e)}*\n\n"
     
-    return markdown_output
+    return all_results, recent_results
 
 def serphouse_search(query, country, page, num_result):
     results = search_serphouse(query, country, page, num_result)
-    print("Raw results:", results)  # 콘솔에 원본 결과 출력
-    formatted_results = format_results(results)
-    print("Formatted results:", formatted_results)  # 콘솔에 포맷된 결과 출력
-    return f"Raw Results:\n\n```json\n{json.dumps(results, indent=2)}\n```\n\nFormatted Results:\n\n{formatted_results}"
+    all_results, recent_results = format_results(results)
+    return f"Raw Results:\n\n```json\n{json.dumps(results, indent=2)}\n```\n\n{all_results}", recent_results
 
 css = """
 footer {
@@ -115,9 +126,12 @@ iface = gr.Interface(
         gr.Slider(1, 10, 1, label="Page"),
         gr.Slider(1, 100, 10, label="Number of Results")
     ],
-    outputs=gr.Textbox(label="Results", lines=20),
+    outputs=[
+        gr.Textbox(label="All Results", lines=20),
+        gr.Markdown(label="Recent Results (Within 1 Day)")
+    ],
     title="SERPHouse News Search Interface",
-    description="Enter your search query and select a country to get recent news results from the SERPHouse API.",
+    description="Enter your search query and select a country to get news results from the SERPHouse API. Recent results (within 1 day) are shown separately.",
     theme="Nymbo/Nymbo_Theme",
     css=css
 )