seawolf2357 commited on
Commit
606cff4
ยท
verified ยท
1 Parent(s): 46b3475

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +11 -13
app.py CHANGED
@@ -56,12 +56,10 @@ def search_serphouse(query, country, page, num_result):
56
  error_msg += f"\nResponse content: {response.text}"
57
  return {"error": error_msg}
58
 
59
- def format_results(results):
60
- debug_info = f"Raw API Response:\n{json.dumps(results, indent=2, ensure_ascii=False)}\n\n"
61
-
62
  try:
63
  if isinstance(results, dict) and "error" in results:
64
- return "Error: " + results["error"], debug_info
65
 
66
  if not isinstance(results, dict):
67
  raise ValueError("๊ฒฐ๊ณผ๊ฐ€ ์‚ฌ์ „ ํ˜•์‹์ด ์•„๋‹™๋‹ˆ๋‹ค.")
@@ -80,7 +78,7 @@ def format_results(results):
80
  news_results = []
81
 
82
  if not news_results:
83
- return "๊ฒ€์ƒ‰ ๊ฒฐ๊ณผ๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค.", debug_info
84
 
85
  formatted_articles = ""
86
  for result in news_results:
@@ -107,17 +105,17 @@ def format_results(results):
107
  """
108
  formatted_articles += article_html
109
 
110
- return formatted_articles, debug_info
111
 
112
  except Exception as e:
113
- error_message = f"๊ฒฐ๊ณผ ์ฒ˜๋ฆฌ ์ค‘ ์˜ค๋ฅ˜ ๋ฐœ์ƒ: {str(e)}"
114
- debug_info += f"Error: {error_message}\n"
115
- return "Error: " + error_message, debug_info
116
 
117
  def serphouse_search(query, country, page, num_result):
118
  results = search_serphouse(query, country, page, num_result)
119
- formatted_articles, debug_info = format_results(results)
120
- return formatted_articles, debug_info
 
 
121
 
122
  css = """
123
  footer {
@@ -134,8 +132,8 @@ iface = gr.Interface(
134
  gr.Slider(1, 100, 10, label="๊ฒฐ๊ณผ ์ˆ˜")
135
  ],
136
  outputs=[
137
- gr.HTML(label="๋‰ด์Šค ๊ฒฐ๊ณผ"),
138
- gr.Textbox(label="๋””๋ฒ„๊ทธ ์ •๋ณด", lines=10)
139
  ],
140
  title="24์‹œ๊ฐ„ ์ด๋‚ด ๋‰ด์Šค ๊ฒ€์ƒ‰ ์ธํ„ฐํŽ˜์ด์Šค",
141
  description="๊ฒ€์ƒ‰์–ด๋ฅผ ์ž…๋ ฅํ•˜๊ณ  ๊ตญ๊ฐ€๋ฅผ ์„ ํƒํ•˜์—ฌ 24์‹œ๊ฐ„ ์ด๋‚ด์˜ ๋‰ด์Šค ๊ฒฐ๊ณผ๋ฅผ ๊ฐ€์ ธ์˜ต๋‹ˆ๋‹ค.",
 
56
  error_msg += f"\nResponse content: {response.text}"
57
  return {"error": error_msg}
58
 
59
+ def format_results_from_raw(results):
 
 
60
  try:
61
  if isinstance(results, dict) and "error" in results:
62
+ return "Error: " + results["error"]
63
 
64
  if not isinstance(results, dict):
65
  raise ValueError("๊ฒฐ๊ณผ๊ฐ€ ์‚ฌ์ „ ํ˜•์‹์ด ์•„๋‹™๋‹ˆ๋‹ค.")
 
78
  news_results = []
79
 
80
  if not news_results:
81
+ return "๊ฒ€์ƒ‰ ๊ฒฐ๊ณผ๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค."
82
 
83
  formatted_articles = ""
84
  for result in news_results:
 
105
  """
106
  formatted_articles += article_html
107
 
108
+ return formatted_articles
109
 
110
  except Exception as e:
111
+ return f"๊ฒฐ๊ณผ ์ฒ˜๋ฆฌ ์ค‘ ์˜ค๋ฅ˜ ๋ฐœ์ƒ: {str(e)}"
 
 
112
 
113
  def serphouse_search(query, country, page, num_result):
114
  results = search_serphouse(query, country, page, num_result)
115
+ # ๋””๋ฒ„๊ทธ ์ •๋ณด ์ƒ์„ฑ
116
+ debug_info = f"Raw API Response:\n{json.dumps(results, indent=2, ensure_ascii=False)}\n\n"
117
+ # Raw API Response์™€ ๋””๋ฒ„๊ทธ ์ •๋ณด ๋ฐ˜ํ™˜
118
+ return results, debug_info
119
 
120
  css = """
121
  footer {
 
132
  gr.Slider(1, 100, 10, label="๊ฒฐ๊ณผ ์ˆ˜")
133
  ],
134
  outputs=[
135
+ gr.HTML(label="๋‰ด์Šค ๊ฒฐ๊ณผ", value=lambda results, debug_info: format_results_from_raw(results)),
136
+ gr.Textbox(label="๋””๋ฒ„๊ทธ ์ •๋ณด", lines=10, value=lambda results, debug_info: debug_info)
137
  ],
138
  title="24์‹œ๊ฐ„ ์ด๋‚ด ๋‰ด์Šค ๊ฒ€์ƒ‰ ์ธํ„ฐํŽ˜์ด์Šค",
139
  description="๊ฒ€์ƒ‰์–ด๋ฅผ ์ž…๋ ฅํ•˜๊ณ  ๊ตญ๊ฐ€๋ฅผ ์„ ํƒํ•˜์—ฌ 24์‹œ๊ฐ„ ์ด๋‚ด์˜ ๋‰ด์Šค ๊ฒฐ๊ณผ๋ฅผ ๊ฐ€์ ธ์˜ต๋‹ˆ๋‹ค.",