Update app.py
Browse files
app.py
CHANGED
@@ -32,7 +32,7 @@ def create_deepseek_interface():
|
|
32 |
"messages": [
|
33 |
{
|
34 |
"role": "system",
|
35 |
-
"content": "์ฌ์ฉ์์ ์ง๋ฌธ์์ ์น ๊ฒ์์ ํจ๊ณผ์ ์ธ ํต์ฌ ํค์๋
|
36 |
},
|
37 |
{
|
38 |
"role": "user",
|
@@ -55,7 +55,7 @@ def create_deepseek_interface():
|
|
55 |
keywords = result["choices"][0]["message"]["content"].strip()
|
56 |
|
57 |
# ํค์๋๊ฐ ๋๋ฌด ๊ธธ๊ฑฐ๋ ํ์์ด ์๋ชป๋ ๊ฒฝ์ฐ ์๋ณธ ์ฟผ๋ฆฌ ์ฌ์ฉ
|
58 |
-
if len(keywords) > 100
|
59 |
return f"์ถ์ถ๋ ํค์๋: {keywords}", query
|
60 |
|
61 |
return f"์ถ์ถ๋ ํค์๋: {keywords}", keywords
|
@@ -75,17 +75,22 @@ def create_deepseek_interface():
|
|
75 |
print(f"์๋ณธ ์ฟผ๋ฆฌ: {query}")
|
76 |
print(extraction_result)
|
77 |
|
|
|
|
|
|
|
|
|
|
|
78 |
# SerpHouse API ํธ์ถ ์คํ - GET ๋ฉ์๋ ์ฌ์ฉ
|
79 |
base_url = "https://api.serphouse.com/serp/live"
|
80 |
|
81 |
-
# ์ฟผ๋ฆฌ ํ๋ผ๋ฏธํฐ
|
82 |
params = {
|
83 |
-
"q": search_query,
|
84 |
"domain": "google.com",
|
85 |
-
"lang": "en",
|
86 |
"device": "desktop",
|
87 |
"serp_type": "web",
|
88 |
-
"loc":
|
89 |
"page": "1",
|
90 |
"num": "5" # ์์ 5๊ฐ ๊ฒฐ๊ณผ๋ง ๊ฐ์ ธ์ค๊ธฐ
|
91 |
}
|
@@ -94,8 +99,8 @@ def create_deepseek_interface():
|
|
94 |
"Authorization": f"Bearer {serphouse_api_key}"
|
95 |
}
|
96 |
|
97 |
-
print(f"SerpHouse API ํธ์ถ ์ค... ๊ฒ์์ด: {
|
98 |
-
print(f"์์ฒญ URL: {base_url}?q={
|
99 |
|
100 |
# GET ์์ฒญ ์ํ
|
101 |
response = requests.get(base_url, headers=headers, params=params)
|
@@ -104,10 +109,16 @@ def create_deepseek_interface():
|
|
104 |
print(f"SerpHouse API ์๋ต ์ํ ์ฝ๋: {response.status_code}")
|
105 |
search_results = response.json()
|
106 |
|
|
|
|
|
|
|
|
|
|
|
107 |
# ๊ฒ์ ๊ฒฐ๊ณผ ํ์ฑ ๋ฐ ํฌ๋งทํ
|
108 |
formatted_results = []
|
109 |
-
formatted_results.append(f"๊ฒ์์ด: {
|
110 |
|
|
|
111 |
if "results" in search_results and "organic" in search_results["results"] and len(search_results["results"]["organic"]) > 0:
|
112 |
for result in search_results["results"]["organic"][:5]: # ์์ 5๊ฐ ๊ฒฐ๊ณผ๋ง ์ฌ์ฉ
|
113 |
title = result.get("title", "์ ๋ชฉ ์์")
|
@@ -117,10 +128,20 @@ def create_deepseek_interface():
|
|
117 |
|
118 |
print(f"๊ฒ์ ๊ฒฐ๊ณผ {len(search_results['results']['organic'])}๊ฐ ์ฐพ์")
|
119 |
return "".join(formatted_results)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
120 |
else:
|
121 |
print("๊ฒ์ ๊ฒฐ๊ณผ ์์ ๋๋ ์๋ต ํ์ ๋ถ์ผ์น")
|
122 |
print(f"์๋ต ๋ด์ฉ ๋ฏธ๋ฆฌ๋ณด๊ธฐ: {str(search_results)[:300]}...")
|
123 |
-
return f"๊ฒ์์ด '{
|
124 |
|
125 |
except Exception as e:
|
126 |
error_msg = f"๊ฒ์ ์ค ์ค๋ฅ ๋ฐ์: {str(e)}"
|
|
|
32 |
"messages": [
|
33 |
{
|
34 |
"role": "system",
|
35 |
+
"content": "์ฌ์ฉ์์ ์ง๋ฌธ์์ ์น ๊ฒ์์ ํจ๊ณผ์ ์ธ ํต์ฌ ํค์๋๋ฅผ ์ถ์ถํ์ธ์. ํค์๋ ์ฌ์ด์ ์ผํ๋ ๊ณต๋ฐฑ์ ๋ฃ์ง ๋ง๊ณ ํ๋์ ๊ฒ์์ด์ฒ๋ผ ์์ ํด์ ์ ๊ณตํ์ธ์. ์๋ฅผ ๋ค์ด 'ํ๋์ ๊ตญ๋ฌด์ด๋ฆฌ ํํต ๊ฒฐ๊ณผ'์ฒ๋ผ ๊ณต๋ฐฑ์ผ๋ก๋ง ๊ตฌ๋ถํ์ธ์."
|
36 |
},
|
37 |
{
|
38 |
"role": "user",
|
|
|
55 |
keywords = result["choices"][0]["message"]["content"].strip()
|
56 |
|
57 |
# ํค์๋๊ฐ ๋๋ฌด ๊ธธ๊ฑฐ๋ ํ์์ด ์๋ชป๋ ๊ฒฝ์ฐ ์๋ณธ ์ฟผ๋ฆฌ ์ฌ์ฉ
|
58 |
+
if len(keywords) > 100:
|
59 |
return f"์ถ์ถ๋ ํค์๋: {keywords}", query
|
60 |
|
61 |
return f"์ถ์ถ๋ ํค์๋: {keywords}", keywords
|
|
|
75 |
print(f"์๋ณธ ์ฟผ๋ฆฌ: {query}")
|
76 |
print(extraction_result)
|
77 |
|
78 |
+
# ํ๊ธ ๊ฒ์์ด๋ loc ํ๋ผ๋ฏธํฐ๋ฅผ ๋ณ๊ฒฝํด์ผ ํ ์ ์์
|
79 |
+
# ํ๊ธ ์ฌ์ฉ ์ ํ๊ตญ(kr) ๋ก์ผ์ผ๋ก ๋ณ๊ฒฝ
|
80 |
+
is_korean = any('\uAC00' <= c <= '\uD7A3' for c in search_query)
|
81 |
+
locale = "kr" if is_korean else "us"
|
82 |
+
|
83 |
# SerpHouse API ํธ์ถ ์คํ - GET ๋ฉ์๋ ์ฌ์ฉ
|
84 |
base_url = "https://api.serphouse.com/serp/live"
|
85 |
|
86 |
+
# URL ์ธ์ฝ๋ฉ๋ ์ฟผ๋ฆฌ ํ๋ผ๋ฏธํฐ (๊ณต๋ฐฑ์ +๋ก ๋ณํ)
|
87 |
params = {
|
88 |
+
"q": search_query.replace(',', ' ').strip(), # ์ผํ ์ ๊ฑฐํ๊ณ ๊ณต๋ฐฑ์ผ๋ก ๋์ฒด
|
89 |
"domain": "google.com",
|
90 |
+
"lang": "ko" if is_korean else "en", # ํ๊ธ์ด๋ฉด ํ๊ตญ์ด ์ค์
|
91 |
"device": "desktop",
|
92 |
"serp_type": "web",
|
93 |
+
"loc": locale, # ์์น ์ฝ๋
|
94 |
"page": "1",
|
95 |
"num": "5" # ์์ 5๊ฐ ๊ฒฐ๊ณผ๋ง ๊ฐ์ ธ์ค๊ธฐ
|
96 |
}
|
|
|
99 |
"Authorization": f"Bearer {serphouse_api_key}"
|
100 |
}
|
101 |
|
102 |
+
print(f"SerpHouse API ํธ์ถ ์ค... ๊ฒ์์ด: {params['q']}")
|
103 |
+
print(f"์์ฒญ URL: {base_url}?q={params['q']}&domain=google.com&lang={params['lang']}&loc={locale}...")
|
104 |
|
105 |
# GET ์์ฒญ ์ํ
|
106 |
response = requests.get(base_url, headers=headers, params=params)
|
|
|
109 |
print(f"SerpHouse API ์๋ต ์ํ ์ฝ๋: {response.status_code}")
|
110 |
search_results = response.json()
|
111 |
|
112 |
+
# ์๋ต ๊ตฌ์กฐ ํ์ธ์ ์ํ ๋ก๊น
|
113 |
+
print(f"์๋ต ๊ตฌ์กฐ: {list(search_results.keys())}")
|
114 |
+
if "results" in search_results:
|
115 |
+
print(f"results ๊ตฌ์กฐ: {list(search_results['results'].keys()) if isinstance(search_results['results'], dict) else '๋ฆฌ์คํธ'}")
|
116 |
+
|
117 |
# ๊ฒ์ ๊ฒฐ๊ณผ ํ์ฑ ๋ฐ ํฌ๋งทํ
|
118 |
formatted_results = []
|
119 |
+
formatted_results.append(f"๊ฒ์์ด: {params['q']}\n\n")
|
120 |
|
121 |
+
# ์๋ต ๊ตฌ์กฐ์ ๋ฐ๋ผ ์ ์ ํ ํ์ฑ
|
122 |
if "results" in search_results and "organic" in search_results["results"] and len(search_results["results"]["organic"]) > 0:
|
123 |
for result in search_results["results"]["organic"][:5]: # ์์ 5๊ฐ ๊ฒฐ๊ณผ๋ง ์ฌ์ฉ
|
124 |
title = result.get("title", "์ ๋ชฉ ์์")
|
|
|
128 |
|
129 |
print(f"๊ฒ์ ๊ฒฐ๊ณผ {len(search_results['results']['organic'])}๊ฐ ์ฐพ์")
|
130 |
return "".join(formatted_results)
|
131 |
+
elif "organic" in search_results and len(search_results["organic"]) > 0:
|
132 |
+
# ๋ค๋ฅธ ๊ฐ๋ฅํ ๊ตฌ์กฐ
|
133 |
+
for result in search_results["organic"][:5]:
|
134 |
+
title = result.get("title", "์ ๋ชฉ ์์")
|
135 |
+
snippet = result.get("snippet", "๋ด์ฉ ์์")
|
136 |
+
link = result.get("link", "#")
|
137 |
+
formatted_results.append(f"์ ๋ชฉ: {title}\n๋ด์ฉ: {snippet}\n๋งํฌ: {link}\n\n")
|
138 |
+
|
139 |
+
print(f"๊ฒ์ ๊ฒฐ๊ณผ {len(search_results['organic'])}๊ฐ ๏ฟฝ๏ฟฝ๏ฟฝ์")
|
140 |
+
return "".join(formatted_results)
|
141 |
else:
|
142 |
print("๊ฒ์ ๊ฒฐ๊ณผ ์์ ๋๋ ์๋ต ํ์ ๋ถ์ผ์น")
|
143 |
print(f"์๋ต ๋ด์ฉ ๋ฏธ๋ฆฌ๋ณด๊ธฐ: {str(search_results)[:300]}...")
|
144 |
+
return f"๊ฒ์์ด '{params['q']}'์ ๋ํ ๊ฒ์ ๊ฒฐ๊ณผ๊ฐ ์๊ฑฐ๋ API ์๋ต ํ์์ด ์์๊ณผ ๋ค๋ฆ
๋๋ค."
|
145 |
|
146 |
except Exception as e:
|
147 |
error_msg = f"๊ฒ์ ์ค ์ค๋ฅ ๋ฐ์: {str(e)}"
|