Skip to content

Commit 140d81a

Browse files
authored
bug fixed for v3
1 parent fa4e6ba commit 140d81a

1 file changed

Lines changed: 24 additions & 12 deletions

File tree

my_module.py

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -291,15 +291,14 @@ def my_bing(q, n=5, key=bing_key):
291291
return results_list
292292

293293

294-
def my_search(q, n=5, engine="google", key=serpapi_key, serpapi_endpoint=serpapi_endpoint):
294+
def my_google(q, n=5, engine="google", key=serpapi_key, serpapi_endpoint=serpapi_endpoint):
295295
params = {
296296
"api_key": key,
297297
"engine": engine,
298298
"q": q,
299299
"num": n,
300300
"rn": n,
301301
"hl":zh-cn,
302-
"ct":2,
303302
}
304303
response = requests.get(serpapi_endpoint, params=params)
305304
response_json = response.json()
@@ -308,23 +307,36 @@ def my_search(q, n=5, engine="google", key=serpapi_key, serpapi_endpoint=serpapi
308307
for r in search_results:
309308
# print(r)
310309
try:
311-
if engine == "baidu":
312-
results_list.append(f"{r['title']} ({r['link']}). {r['snippet']}. 获取时间(Parsed time): {r['date']}")
313-
else:
314-
results_list.append(f"{r['title']} ({r['link']}). {r['snippet']}")
310+
results_list.append(f"{r['title']} ({r['link']}). {r['snippet']}")
315311
except Exception as e:
316312
print(e)
317313
continue
318314
print(f"{engine}: {len(results_list)}")
319315
return results_list
320316

321317

322-
def my_google(q, n=5):
323-
return my_search(q=q, engine="google", n=n)
324-
325-
326-
def my_baidu(q, n=5):
327-
return my_search(q=q, engine="baidu", n=n)
318+
def my_baidu(q, n=5, engine="google", key=serpapi_key, serpapi_endpoint=serpapi_endpoint):
319+
params = {
320+
"api_key": key,
321+
"engine": engine,
322+
"q": q,
323+
"num": n,
324+
"rn": n,
325+
"ct":2,
326+
}
327+
response = requests.get(serpapi_endpoint, params=params)
328+
response_json = response.json()
329+
search_results = response_json.get("organic_results", [])
330+
results_list = []
331+
for r in search_results:
332+
# print(r)
333+
try:
334+
results_list.append(f"{r['title']} ({r['link']}). {r['snippet']}. 获取时间(Parsed time): {r['date']}")
335+
except Exception as e:
336+
print(e)
337+
continue
338+
print(f"{engine}: {len(results_list)}")
339+
return results_list
328340

329341

330342
def replace_today(prompt):

0 commit comments

Comments
 (0)