Spaces:
Running
on
Zero
Running
on
Zero
Update app.py
Browse files
app.py
CHANGED
@@ -564,11 +564,28 @@ def get_random_placeholder():
|
|
564 |
def update_placeholder():
|
565 |
return gr.update(placeholder=get_random_placeholder())
|
566 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
567 |
def create_main_interface():
|
568 |
"""๋ฉ์ธ ์ธํฐํ์ด์ค ์์ฑ ํจ์"""
|
569 |
|
570 |
#NEW - ๊ฒ์ ๊ฒฐ๊ณผ๋ฅผ ํตํฉํ ์๋ต ์์ฑ ํจ์
|
571 |
-
def execute_search_and_generate(query, setting):
|
572 |
try:
|
573 |
# ๊ฒ์ ์คํ
|
574 |
url = "https://api.serphouse.com/serp/live"
|
@@ -615,7 +632,11 @@ def create_main_interface():
|
|
615 |
Create a comprehensive visual response that incorporates relevant information from the search results.
|
616 |
"""
|
617 |
|
618 |
-
|
|
|
|
|
|
|
|
|
619 |
except Exception as e:
|
620 |
print(f"Search error: {str(e)}")
|
621 |
return [
|
@@ -1004,20 +1025,11 @@ Use the "Generate" button for basic creation, "Enhance" button for prompt improv
|
|
1004 |
|
1005 |
# ์ฌ๊ธฐ์ ์ถ๊ฐ (๋ค์ฌ์ฐ๊ธฐ ๋ง์ถค)
|
1006 |
mode.change(
|
1007 |
-
fn=lambda x: x == "Web Search",
|
1008 |
inputs=[mode],
|
1009 |
outputs=[search_mode]
|
1010 |
)
|
1011 |
|
1012 |
-
async def handle_generation(query, setting, is_search):
|
1013 |
-
try:
|
1014 |
-
if is_search:
|
1015 |
-
return await execute_search_and_generate(query, setting)
|
1016 |
-
return await demo_instance.generation_code(query, setting)
|
1017 |
-
except Exception as e:
|
1018 |
-
print(f"Generation error: {str(e)}")
|
1019 |
-
return ["", None, gr.update(active_key="error"), gr.update(open=False)]
|
1020 |
-
|
1021 |
|
1022 |
btn.click(
|
1023 |
fn=handle_generation,
|
|
|
564 |
def update_placeholder():
|
565 |
return gr.update(placeholder=get_random_placeholder())
|
566 |
|
567 |
+
|
568 |
+
# ํจ์๋ฅผ ์์ ๋ ๋ฒจ๋ก ์ด๋ํ๊ณ ๋ค์ฌ์ฐ๊ธฐ ์์
|
569 |
+
async def handle_generation(query, setting, is_search):
|
570 |
+
try:
|
571 |
+
if is_search:
|
572 |
+
result = await execute_search_and_generate(query, setting) # await ์ถ๊ฐ
|
573 |
+
|
574 |
+
return await execute_search_and_generate(query, setting)
|
575 |
+
else:
|
576 |
+
async for result in demo_instance.generation_code(query, setting):
|
577 |
+
final_result = result
|
578 |
+
return final_result
|
579 |
+
except Exception as e:
|
580 |
+
print(f"Generation error: {str(e)}")
|
581 |
+
return ["", None, gr.update(active_key="error"), gr.update(open=False)]
|
582 |
+
|
583 |
+
|
584 |
def create_main_interface():
|
585 |
"""๋ฉ์ธ ์ธํฐํ์ด์ค ์์ฑ ํจ์"""
|
586 |
|
587 |
#NEW - ๊ฒ์ ๊ฒฐ๊ณผ๋ฅผ ํตํฉํ ์๋ต ์์ฑ ํจ์
|
588 |
+
async def execute_search_and_generate(query, setting):
|
589 |
try:
|
590 |
# ๊ฒ์ ์คํ
|
591 |
url = "https://api.serphouse.com/serp/live"
|
|
|
632 |
Create a comprehensive visual response that incorporates relevant information from the search results.
|
633 |
"""
|
634 |
|
635 |
+
# async generator๋ฅผ ์ฒ๋ฆฌํ๊ธฐ ์ํ ์์
|
636 |
+
async for result in demo_instance.generation_code(enhanced_prompt, setting):
|
637 |
+
final_result = result
|
638 |
+
return final_result
|
639 |
+
|
640 |
except Exception as e:
|
641 |
print(f"Search error: {str(e)}")
|
642 |
return [
|
|
|
1025 |
|
1026 |
# ์ฌ๊ธฐ์ ์ถ๊ฐ (๋ค์ฌ์ฐ๊ธฐ ๋ง์ถค)
|
1027 |
mode.change(
|
1028 |
+
fn=lambda x: x == "Generate + Web Search",
|
1029 |
inputs=[mode],
|
1030 |
outputs=[search_mode]
|
1031 |
)
|
1032 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1033 |
|
1034 |
btn.click(
|
1035 |
fn=handle_generation,
|