Spaces:
Running
on
Zero
Running
on
Zero
Update app.py
Browse files
app.py
CHANGED
@@ -103,29 +103,66 @@ def do_web_search(query: str) -> str:
|
|
103 |
max_results = min(20, len(organic))
|
104 |
limited_organic = organic[:max_results]
|
105 |
|
106 |
-
# ๊ฒฐ๊ณผ ํ์
|
107 |
summary_lines = []
|
108 |
for idx, item in enumerate(limited_organic, start=1):
|
109 |
title = item.get("title", "No title")
|
110 |
link = item.get("link", "#")
|
111 |
snippet = item.get("snippet", "No description")
|
|
|
112 |
|
113 |
-
#
|
114 |
summary_lines.append(
|
115 |
-
f"Result {idx}
|
116 |
-
f"
|
117 |
-
f"
|
118 |
-
f"
|
119 |
)
|
120 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
121 |
logger.info(f"๊ฒ์ ๊ฒฐ๊ณผ {len(limited_organic)}๊ฐ ์ฒ๋ฆฌ ์๋ฃ")
|
122 |
-
return
|
123 |
|
124 |
except Exception as e:
|
125 |
logger.error(f"Web search failed: {e}")
|
126 |
return f"Web search failed: {str(e)}"
|
127 |
|
128 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
129 |
##############################################################################
|
130 |
# ๋ชจ๋ธ/ํ๋ก์ธ์ ๋ก๋ฉ
|
131 |
##############################################################################
|
|
|
103 |
max_results = min(20, len(organic))
|
104 |
limited_organic = organic[:max_results]
|
105 |
|
106 |
+
# ๊ฒฐ๊ณผ ํ์ ๊ฐ์ - ๋งํฌ๋ค์ด ํ์์ผ๋ก ์ถ๋ ฅํ์ฌ ๊ฐ๋
์ฑ ํฅ์
|
107 |
summary_lines = []
|
108 |
for idx, item in enumerate(limited_organic, start=1):
|
109 |
title = item.get("title", "No title")
|
110 |
link = item.get("link", "#")
|
111 |
snippet = item.get("snippet", "No description")
|
112 |
+
displayed_link = item.get("displayed_link", link)
|
113 |
|
114 |
+
# ๋งํฌ๋ค์ด ํ์ (๋งํฌ ํด๋ฆญ ๊ฐ๋ฅ)
|
115 |
summary_lines.append(
|
116 |
+
f"### Result {idx}: {title}\n\n"
|
117 |
+
f"{snippet}\n\n"
|
118 |
+
f"**์ถ์ฒ**: [{displayed_link}]({link})\n\n"
|
119 |
+
f"---\n"
|
120 |
)
|
121 |
|
122 |
+
# ๋ชจ๋ธ์๊ฒ ๋ช
ํํ ์ง์นจ ์ถ๊ฐ
|
123 |
+
instructions = """
|
124 |
+
# ์น ๊ฒ์ ๊ฒฐ๊ณผ
|
125 |
+
|
126 |
+
์๋๋ ๊ฒ์ ๊ฒฐ๊ณผ์
๋๋ค. ์ง๋ฌธ์ ๋ต๋ณํ ๋ ์ด ์ ๋ณด๋ฅผ ํ์ฉํ์ธ์:
|
127 |
+
1. ๊ฐ ๊ฒฐ๊ณผ์ ์ ๋ชฉ, ๋ด์ฉ, ์ถ์ฒ ๋งํฌ๋ฅผ ์ฐธ๊ณ ํ์ธ์
|
128 |
+
2. ๋ต๋ณ์ ๊ด๋ จ ์ ๋ณด์ ์ถ์ฒ๋ฅผ ๋ช
์์ ์ผ๋ก ์ธ์ฉํ์ธ์ (์: "X ์ถ์ฒ์ ๋ฐ๋ฅด๋ฉด...")
|
129 |
+
3. ์๋ต์ ์ค์ ์ถ์ฒ ๋งํฌ๋ฅผ ํฌํจํ์ธ์
|
130 |
+
4. ์ฌ๋ฌ ์ถ์ฒ์ ์ ๋ณด๋ฅผ ์ข
ํฉํ์ฌ ๋ต๋ณํ์ธ์
|
131 |
+
|
132 |
+
"""
|
133 |
+
|
134 |
+
search_results = instructions + "\n".join(summary_lines)
|
135 |
logger.info(f"๊ฒ์ ๊ฒฐ๊ณผ {len(limited_organic)}๊ฐ ์ฒ๋ฆฌ ์๋ฃ")
|
136 |
+
return search_results
|
137 |
|
138 |
except Exception as e:
|
139 |
logger.error(f"Web search failed: {e}")
|
140 |
return f"Web search failed: {str(e)}"
|
141 |
|
142 |
|
143 |
+
##############################################################################
|
144 |
+
# ์์คํ
ํ๋กฌํํธ์ ์ถ๊ฐํ ๋ถ๋ถ (run ํจ์ ์์ )
|
145 |
+
##############################################################################
|
146 |
+
|
147 |
+
# run ํจ์์์ ์๋ ๋ถ๋ถ์ ์์ ํฉ๋๋ค:
|
148 |
+
"""
|
149 |
+
if use_web_search:
|
150 |
+
user_text = message["text"]
|
151 |
+
ws_query = extract_keywords(user_text, top_k=5)
|
152 |
+
if ws_query.strip():
|
153 |
+
logger.info(f"[Auto WebSearch Keyword] {ws_query!r}")
|
154 |
+
ws_result = do_web_search(ws_query)
|
155 |
+
combined_system_msg += f"[Search top-20 Full Items Based on user prompt]\n{ws_result}\n\n"
|
156 |
+
# ๊ฐํ๋ ์ง์์ฌํญ ์ถ๊ฐ
|
157 |
+
combined_system_msg += """
|
158 |
+
[์ค์ ์ง์์ฌํญ]
|
159 |
+
1. ๋ต๋ณ์ ๊ฒ์ ๊ฒฐ๊ณผ์์ ์ฐพ์ ์ ๋ณด์ ์ถ์ฒ๋ฅผ ๋ฐ๋์ ์ธ์ฉํ์ธ์.
|
160 |
+
2. ์ถ์ฒ ์ธ์ฉ ์ "[์ถ์ฒ ์ ๋ชฉ](๋งํฌ)" ํ์์ ๋งํฌ๋ค์ด ๋งํฌ๋ฅผ ์ฌ์ฉํ์ธ์.
|
161 |
+
3. ์ฌ๋ฌ ์ถ์ฒ์ ์ ๋ณด๋ฅผ ์ข
ํฉํ์ฌ ๋ต๋ณํ์ธ์.
|
162 |
+
4. ๋ต๋ณ ๋ง์ง๋ง์ "์ฐธ๊ณ ์๋ฃ:" ์น์
์ ์ถ๊ฐํ๊ณ ์ฌ์ฉํ ์ฃผ์ ์ถ์ฒ ๋งํฌ๋ฅผ ๋์ดํ์ธ์.
|
163 |
+
"""
|
164 |
+
|
165 |
+
|
166 |
##############################################################################
|
167 |
# ๋ชจ๋ธ/ํ๋ก์ธ์ ๋ก๋ฉ
|
168 |
##############################################################################
|