openfree commited on
Commit
59770ec
ยท
verified ยท
1 Parent(s): 6c11133

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +8 -25
app.py CHANGED
@@ -140,29 +140,6 @@ def do_web_search(query: str) -> str:
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
  ##############################################################################
@@ -485,6 +462,13 @@ def run(
485
  combined_system_msg += f"[Search top-20 Full Items Based on user prompt]\n{ws_result}\n\n"
486
  # >>> ์ถ”๊ฐ€๋œ ์•ˆ๋‚ด ๋ฌธ๊ตฌ (๊ฒ€์ƒ‰ ๊ฒฐ๊ณผ์˜ link ๋“ฑ ์ถœ์ฒ˜๋ฅผ ํ™œ์šฉ)
487
  combined_system_msg += "[์ฐธ๊ณ : ์œ„ ๊ฒ€์ƒ‰๊ฒฐ๊ณผ ๋‚ด์šฉ๊ณผ link๋ฅผ ์ถœ์ฒ˜๋กœ ์ธ์šฉํ•˜์—ฌ ๋‹ต๋ณ€ํ•ด ์ฃผ์„ธ์š”.]\n\n"
 
 
 
 
 
 
 
488
  else:
489
  combined_system_msg += "[No valid keywords found, skipping WebSearch]\n\n"
490
 
@@ -793,5 +777,4 @@ with gr.Blocks(css=css, title="Gemma3-uncensored-R27B") as demo:
793
 
794
  if __name__ == "__main__":
795
  # ๋กœ์ปฌ์—์„œ๋งŒ ์‹คํ–‰ ์‹œ
796
- demo.launch()
797
-
 
140
  return f"Web search failed: {str(e)}"
141
 
142
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
143
  ##############################################################################
144
  # ๋ชจ๋ธ/ํ”„๋กœ์„ธ์„œ ๋กœ๋”ฉ
145
  ##############################################################################
 
462
  combined_system_msg += f"[Search top-20 Full Items Based on user prompt]\n{ws_result}\n\n"
463
  # >>> ์ถ”๊ฐ€๋œ ์•ˆ๋‚ด ๋ฌธ๊ตฌ (๊ฒ€์ƒ‰ ๊ฒฐ๊ณผ์˜ link ๋“ฑ ์ถœ์ฒ˜๋ฅผ ํ™œ์šฉ)
464
  combined_system_msg += "[์ฐธ๊ณ : ์œ„ ๊ฒ€์ƒ‰๊ฒฐ๊ณผ ๋‚ด์šฉ๊ณผ link๋ฅผ ์ถœ์ฒ˜๋กœ ์ธ์šฉํ•˜์—ฌ ๋‹ต๋ณ€ํ•ด ์ฃผ์„ธ์š”.]\n\n"
465
+ combined_system_msg += """
466
+ [์ค‘์š” ์ง€์‹œ์‚ฌํ•ญ]
467
+ 1. ๋‹ต๋ณ€์— ๊ฒ€์ƒ‰ ๊ฒฐ๊ณผ์—์„œ ์ฐพ์€ ์ •๋ณด์˜ ์ถœ์ฒ˜๋ฅผ ๋ฐ˜๋“œ์‹œ ์ธ์šฉํ•˜์„ธ์š”.
468
+ 2. ์ถœ์ฒ˜ ์ธ์šฉ ์‹œ "[์ถœ์ฒ˜ ์ œ๋ชฉ](๋งํฌ)" ํ˜•์‹์˜ ๋งˆํฌ๋‹ค์šด ๋งํฌ๋ฅผ ์‚ฌ์šฉํ•˜์„ธ์š”.
469
+ 3. ์—ฌ๋Ÿฌ ์ถœ์ฒ˜์˜ ์ •๋ณด๋ฅผ ์ข…ํ•ฉํ•˜์—ฌ ๋‹ต๋ณ€ํ•˜์„ธ์š”.
470
+ 4. ๋‹ต๋ณ€ ๋งˆ์ง€๋ง‰์— "์ฐธ๊ณ  ์ž๋ฃŒ:" ์„น์…˜์„ ์ถ”๊ฐ€ํ•˜๊ณ  ์‚ฌ์šฉํ•œ ์ฃผ์š” ์ถœ์ฒ˜ ๋งํฌ๋ฅผ ๋‚˜์—ดํ•˜์„ธ์š”.
471
+ """
472
  else:
473
  combined_system_msg += "[No valid keywords found, skipping WebSearch]\n\n"
474
 
 
777
 
778
  if __name__ == "__main__":
779
  # ๋กœ์ปฌ์—์„œ๋งŒ ์‹คํ–‰ ์‹œ
780
+ demo.launch()