openfree commited on
Commit
ebf139f
ยท
verified ยท
1 Parent(s): 293b107

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +19 -21
app.py CHANGED
@@ -569,9 +569,24 @@ def update_placeholder():
569
  def create_main_interface():
570
  """๋ฉ”์ธ ์ธํ„ฐํŽ˜์ด์Šค ์ƒ์„ฑ ํ•จ์ˆ˜"""
571
 
572
- #NEW - ๊ฒ€์ƒ‰ ๊ฒฐ๊ณผ๋ฅผ ํ†ตํ•ฉํ•œ ์‘๋‹ต ์ƒ์„ฑ ํ•จ์ˆ˜
 
 
 
 
 
 
 
 
 
 
 
 
 
 
573
  async def execute_search_and_generate(query, setting):
574
  try:
 
575
  # ๊ฒ€์ƒ‰ ์‹คํ–‰
576
  url = "https://api.serphouse.com/serp/live"
577
  payload = {
@@ -594,10 +609,12 @@ def create_main_interface():
594
  'Content-Type': 'application/json'
595
  }
596
 
 
597
  response = requests.post(url, headers=headers, json=payload)
598
  results = response.json()
 
599
 
600
- # ๊ฒ€์ƒ‰ ๊ฒฐ๊ณผ๋ฅผ HTML๋กœ ๋ณ€ํ™˜ - ์ˆ˜์ •๋œ ๋ถ€๋ถ„
601
  search_content = "<div class='search-summary'><h2>Search Results</h2>"
602
  if 'results' in results and isinstance(results['results'], list):
603
  search_results = results['results']
@@ -639,25 +656,6 @@ def create_main_interface():
639
  gr.update(active_key="error"),
640
  gr.update(open=False)
641
  ]
642
-
643
- async def handle_generation(query, setting, is_search):
644
- try:
645
- print(f"Mode: {'Web Search' if is_search else 'Generate'}") # ๋””๋ฒ„๊น…์šฉ
646
- if is_search:
647
- print("Executing search and generate...") # ๋””๋ฒ„๊น…์šฉ
648
-
649
- return await execute_search_and_generate(query, setting)
650
- else:
651
- print("Executing normal generation...") # ๋””๋ฒ„๊น…์šฉ
652
-
653
- async for result in demo_instance.generation_code(query, setting):
654
- final_result = result
655
- return final_result
656
- except Exception as e:
657
- print(f"Generation error: {str(e)}")
658
- return ["", None, gr.update(active_key="error"), gr.update(open=False)]
659
-
660
-
661
 
662
  def execute_code(query: str):
663
  if not query or query.strip() == '':
 
569
  def create_main_interface():
570
  """๋ฉ”์ธ ์ธํ„ฐํŽ˜์ด์Šค ์ƒ์„ฑ ํ•จ์ˆ˜"""
571
 
572
+ async def handle_generation(query, setting, is_search):
573
+ try:
574
+ print(f"Mode: {'Web Search' if is_search else 'Generate'}") # ๋””๋ฒ„๊น…์šฉ
575
+ if is_search:
576
+ print("Executing search and generate...") # ๋””๋ฒ„๊น…์šฉ
577
+ return await execute_search_and_generate(query, setting)
578
+ else:
579
+ print("Executing normal generation...") # ๋””๋ฒ„๊น…์šฉ
580
+ async for result in demo_instance.generation_code(query, setting):
581
+ final_result = result
582
+ return final_result
583
+ except Exception as e:
584
+ print(f"Generation error: {str(e)}")
585
+ return ["", None, gr.update(active_key="error"), gr.update(open=False)]
586
+
587
  async def execute_search_and_generate(query, setting):
588
  try:
589
+ print(f"Executing web search for query: {query}") # ๋””๋ฒ„๊น…์šฉ
590
  # ๊ฒ€์ƒ‰ ์‹คํ–‰
591
  url = "https://api.serphouse.com/serp/live"
592
  payload = {
 
609
  'Content-Type': 'application/json'
610
  }
611
 
612
+ print("Sending search request...") # ๋””๋ฒ„๊น…์šฉ
613
  response = requests.post(url, headers=headers, json=payload)
614
  results = response.json()
615
+ print(f"Search results received: {len(results.get('results', []))} items") # ๋””๋ฒ„๊น…์šฉ
616
 
617
+ # ๊ฒ€์ƒ‰ ๊ฒฐ๊ณผ๋ฅผ HTML๋กœ ๋ณ€ํ™˜
618
  search_content = "<div class='search-summary'><h2>Search Results</h2>"
619
  if 'results' in results and isinstance(results['results'], list):
620
  search_results = results['results']
 
656
  gr.update(active_key="error"),
657
  gr.update(open=False)
658
  ]
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
659
 
660
  def execute_code(query: str):
661
  if not query or query.strip() == '':