estel/dify
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: bing search response filter (#2519)

Browse Source
This commit is contained in:
Yeuoly
2024-02-22 13:06:55 +08:00
committed by GitHub
parent 1ecbd95adf
commit d8ab4474b4
6 changed files with 170 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/core/tools/entities/tool_entities.py
View File

@@ -113,7 +113,7 @@ class ToolParameter(BaseModel):
form: ToolParameterForm = Field(..., description="The form of the parameter, schema/form/llm")
llm_description: Optional[str] = None
required: Optional[bool] = False
default: Optional[str] = None
default: Optional[Union[bool, str, int]] = None
min: Optional[Union[float, int]] = None
max: Optional[Union[float, int]] = None
options: Optional[list[ToolParameterOption]] = None

82
api/core/tools/provider/builtin/bing/tools/bing_web_search.py
View File

@@ -1,4 +1,5 @@
from typing import Any, Union
from urllib.parse import quote
from requests import get
@@ -34,6 +35,18 @@ class BingSearchTool(BuiltinTool):
market = tool_parameters.get('market', 'US')
lang = tool_parameters.get('language', 'en')
filter = []
if tool_parameters.get('enable_computation', False):
filter.append('Computation')
if tool_parameters.get('enable_entities', False):
filter.append('Entities')
if tool_parameters.get('enable_news', False):
filter.append('News')
if tool_parameters.get('enable_related_search', False):
filter.append('RelatedSearches')
if tool_parameters.get('enable_webpages', False):
filter.append('WebPages')
market_code = f'{lang}-{market}'
accept_language = f'{lang},{market_code};q=0.9'
@@ -42,35 +55,72 @@ class BingSearchTool(BuiltinTool):
'Accept-Language': accept_language
}
params = {
'q': query,
'mkt': market_code
}
response = get(server_url, headers=headers, params=params)
query = quote(query)
server_url = f'{server_url}?q={query}&mkt={market_code}&count={limit}&responseFilter={",".join(filter)}'
response = get(server_url, headers=headers)
if response.status_code != 200:
raise Exception(f'Error {response.status_code}: {response.text}')
response = response.json()
search_results = response['webPages']['value'][:limit]
search_results = response['webPages']['value'][:limit] if 'webPages' in response else []
related_searches = response['relatedSearches']['value'] if 'relatedSearches' in response else []
entities = response['entities']['value'] if 'entities' in response else []
news = response['news']['value'] if 'news' in response else []
computation = response['computation']['value'] if 'computation' in response else None
if result_type == 'link':
results = []
for result in search_results:
results.append(self.create_text_message(
text=f'{result["name"]}: {result["url"]}'
))
if search_results:
for result in search_results:
results.append(self.create_text_message(
text=f'{result["name"]}: {result["url"]}'
))
if entities:
for entity in entities:
results.append(self.create_text_message(
text=f'{entity["name"]}: {entity["url"]}'
))
if news:
for news_item in news:
results.append(self.create_text_message(
text=f'{news_item["name"]}: {news_item["url"]}'
))
if related_searches:
for related in related_searches:
results.append(self.create_text_message(
text=f'{related["displayText"]}: {related["webSearchUrl"]}'
))
return results
else:
# construct text
text = ''
for i, result in enumerate(search_results):
text += f'{i+1}: {result["name"]} - {result["snippet"]}\n'
if search_results:
for i, result in enumerate(search_results):
text += f'{i+1}: {result["name"]} - {result["snippet"]}\n'
text += '\n\nRelated Searches:\n'
for related in response['relatedSearches']['value']:
text += f'{related["displayText"]} - {related["webSearchUrl"]}\n'
if computation and 'expression' in computation and 'value' in computation:
text += '\nComputation:\n'
text += f'{computation["expression"]} = {computation["value"]}\n'
if entities:
text += '\nEntities:\n'
for entity in entities:
text += f'{entity["name"]} - {entity["url"]}\n'
if news:
text += '\nNews:\n'
for news_item in news:
text += f'{news_item["name"]} - {news_item["url"]}\n'
if related_searches:
text += '\n\nRelated Searches:\n'
for related in related_searches:
text += f'{related["displayText"]} - {related["webSearchUrl"]}\n'
return self.create_text_message(text=self.summary(user_id=user_id, content=text))

69
api/core/tools/provider/builtin/bing/tools/bing_web_search.yaml
View File

@@ -25,9 +25,74 @@ parameters:
zh_Hans: 用于搜索网页内容
pt_BR: used for searching
llm_description: key words for searching
- name: enable_computation
type: boolean
required: false
form: form
label:
en_US: Enable computation
zh_Hans: 启用计算
pt_BR: Enable computation
human_description:
en_US: enable computation
zh_Hans: 启用计算
pt_BR: enable computation
default: false
- name: enable_entities
type: boolean
required: false
form: form
label:
en_US: Enable entities
zh_Hans: 启用实体搜索
pt_BR: Enable entities
human_description:
en_US: enable entities
zh_Hans: 启用实体搜索
pt_BR: enable entities
default: true
- name: enable_news
type: boolean
required: false
form: form
label:
en_US: Enable news
zh_Hans: 启用新闻搜索
pt_BR: Enable news
human_description:
en_US: enable news
zh_Hans: 启用新闻搜索
pt_BR: enable news
default: false
- name: enable_related_search
type: boolean
required: false
form: form
label:
en_US: Enable related search
zh_Hans: 启用相关搜索
pt_BR: Enable related search
human_description:
en_US: enable related search
zh_Hans: 启用相关搜索
pt_BR: enable related search
default: false
- name: enable_webpages
type: boolean
required: false
form: form
label:
en_US: Enable webpages search
zh_Hans: 启用网页搜索
pt_BR: Enable webpages search
human_description:
en_US: enable webpages search
zh_Hans: 启用网页搜索
pt_BR: enable webpages search
default: true
- name: limit
type: number
required: false
required: true
form: form
label:
en_US: Limit for results length
@@ -42,7 +107,7 @@ parameters:
default: 5
- name: result_type
type: select
required: false
required: true
label:
en_US: result type
zh_Hans: 结果类型