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

chore(api/core): apply ruff reformatting (#7624)

Browse Source
This commit is contained in:
Bowen Liang
2024-09-10 17:00:20 +08:00
committed by GitHub
parent 178730266d
commit 2cf1187b32
724 changed files with 21180 additions and 21123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
api/core/tools/provider/builtin/nominatim/nominatim.py
View File

@@ -8,16 +8,20 @@ from core.tools.provider.builtin_tool_provider import BuiltinToolProviderControl
class NominatimProvider(BuiltinToolProviderController):
def _validate_credentials(self, credentials: dict[str, Any]) -> None:
try:
result = NominatimSearchTool().fork_tool_runtime(
runtime={
"credentials": credentials,
}
).invoke(
user_id='',
tool_parameters={
'query': 'London',
'limit': 1,
},
result = (
NominatimSearchTool()
.fork_tool_runtime(
runtime={
"credentials": credentials,
}
)
.invoke(
user_id="",
tool_parameters={
"query": "London",
"limit": 1,
},
)
)
except Exception as e:
raise ToolProviderCredentialValidationError(str(e))

45
api/core/tools/provider/builtin/nominatim/tools/nominatim_lookup.py
View File

@@ -8,40 +8,33 @@ from core.tools.tool.builtin_tool import BuiltinTool
class NominatimLookupTool(BuiltinTool):
def _invoke(self, user_id: str, tool_parameters: dict[str, Any]) -> Union[ToolInvokeMessage, list[ToolInvokeMessage]]:
osm_ids = tool_parameters.get('osm_ids', '')
if not osm_ids:
return self.create_text_message('Please provide OSM IDs')
def _invoke(
self, user_id: str, tool_parameters: dict[str, Any]
) -> Union[ToolInvokeMessage, list[ToolInvokeMessage]]:
osm_ids = tool_parameters.get("osm_ids", "")
params = {
'osm_ids': osm_ids,
'format': 'json',
'addressdetails': 1
}
return self._make_request(user_id, 'lookup', params)
if not osm_ids:
return self.create_text_message("Please provide OSM IDs")
params = {"osm_ids": osm_ids, "format": "json", "addressdetails": 1}
return self._make_request(user_id, "lookup", params)
def _make_request(self, user_id: str, endpoint: str, params: dict) -> ToolInvokeMessage:
base_url = self.runtime.credentials.get('base_url', 'https://nominatim.openstreetmap.org')
base_url = self.runtime.credentials.get("base_url", "https://nominatim.openstreetmap.org")
try:
headers = {
"User-Agent": "DifyNominatimTool/1.0"
}
headers = {"User-Agent": "DifyNominatimTool/1.0"}
s = requests.session()
response = s.request(
method='GET',
headers=headers,
url=f"{base_url}/{endpoint}",
params=params
)
response = s.request(method="GET", headers=headers, url=f"{base_url}/{endpoint}", params=params)
response_data = response.json()
if response.status_code == 200:
s.close()
return self.create_text_message(self.summary(user_id=user_id, content=json.dumps(response_data, ensure_ascii=False)))
return self.create_text_message(
self.summary(user_id=user_id, content=json.dumps(response_data, ensure_ascii=False))
)
else:
return self.create_text_message(f"Error: {response.status_code} - {response.text}")
except Exception as e:
return self.create_text_message(f"An error occurred: {str(e)}")
return self.create_text_message(f"An error occurred: {str(e)}")

48
api/core/tools/provider/builtin/nominatim/tools/nominatim_reverse.py
View File

@@ -8,42 +8,34 @@ from core.tools.tool.builtin_tool import BuiltinTool
class NominatimReverseTool(BuiltinTool):
def _invoke(self, user_id: str, tool_parameters: dict[str, Any]) -> Union[ToolInvokeMessage, list[ToolInvokeMessage]]:
lat = tool_parameters.get('lat')
lon = tool_parameters.get('lon')
if lat is None or lon is None:
return self.create_text_message('Please provide both latitude and longitude')
def _invoke(
self, user_id: str, tool_parameters: dict[str, Any]
) -> Union[ToolInvokeMessage, list[ToolInvokeMessage]]:
lat = tool_parameters.get("lat")
lon = tool_parameters.get("lon")
params = {
'lat': lat,
'lon': lon,
'format': 'json',
'addressdetails': 1
}
return self._make_request(user_id, 'reverse', params)
if lat is None or lon is None:
return self.create_text_message("Please provide both latitude and longitude")
params = {"lat": lat, "lon": lon, "format": "json", "addressdetails": 1}
return self._make_request(user_id, "reverse", params)
def _make_request(self, user_id: str, endpoint: str, params: dict) -> ToolInvokeMessage:
base_url = self.runtime.credentials.get('base_url', 'https://nominatim.openstreetmap.org')
base_url = self.runtime.credentials.get("base_url", "https://nominatim.openstreetmap.org")
try:
headers = {
"User-Agent": "DifyNominatimTool/1.0"
}
headers = {"User-Agent": "DifyNominatimTool/1.0"}
s = requests.session()
response = s.request(
method='GET',
headers=headers,
url=f"{base_url}/{endpoint}",
params=params
)
response = s.request(method="GET", headers=headers, url=f"{base_url}/{endpoint}", params=params)
response_data = response.json()
if response.status_code == 200:
s.close()
return self.create_text_message(self.summary(user_id=user_id, content=json.dumps(response_data, ensure_ascii=False)))
return self.create_text_message(
self.summary(user_id=user_id, content=json.dumps(response_data, ensure_ascii=False))
)
else:
return self.create_text_message(f"Error: {response.status_code} - {response.text}")
except Exception as e:
return self.create_text_message(f"An error occurred: {str(e)}")
return self.create_text_message(f"An error occurred: {str(e)}")

48
api/core/tools/provider/builtin/nominatim/tools/nominatim_search.py
View File

@@ -8,42 +8,34 @@ from core.tools.tool.builtin_tool import BuiltinTool
class NominatimSearchTool(BuiltinTool):
def _invoke(self, user_id: str, tool_parameters: dict[str, Any]) -> Union[ToolInvokeMessage, list[ToolInvokeMessage]]:
query = tool_parameters.get('query', '')
limit = tool_parameters.get('limit', 10)
if not query:
return self.create_text_message('Please input a search query')
def _invoke(
self, user_id: str, tool_parameters: dict[str, Any]
) -> Union[ToolInvokeMessage, list[ToolInvokeMessage]]:
query = tool_parameters.get("query", "")
limit = tool_parameters.get("limit", 10)
params = {
'q': query,
'format': 'json',
'limit': limit,
'addressdetails': 1
}
return self._make_request(user_id, 'search', params)
if not query:
return self.create_text_message("Please input a search query")
params = {"q": query, "format": "json", "limit": limit, "addressdetails": 1}
return self._make_request(user_id, "search", params)
def _make_request(self, user_id: str, endpoint: str, params: dict) -> ToolInvokeMessage:
base_url = self.runtime.credentials.get('base_url', 'https://nominatim.openstreetmap.org')
base_url = self.runtime.credentials.get("base_url", "https://nominatim.openstreetmap.org")
try:
headers = {
"User-Agent": "DifyNominatimTool/1.0"
}
headers = {"User-Agent": "DifyNominatimTool/1.0"}
s = requests.session()
response = s.request(
method='GET',
headers=headers,
url=f"{base_url}/{endpoint}",
params=params
)
response = s.request(method="GET", headers=headers, url=f"{base_url}/{endpoint}", params=params)
response_data = response.json()
if response.status_code == 200:
s.close()
return self.create_text_message(self.summary(user_id=user_id, content=json.dumps(response_data, ensure_ascii=False)))
return self.create_text_message(
self.summary(user_id=user_id, content=json.dumps(response_data, ensure_ascii=False))
)
else:
return self.create_text_message(f"Error: {response.status_code} - {response.text}")
except Exception as e:
return self.create_text_message(f"An error occurred: {str(e)}")
return self.create_text_message(f"An error occurred: {str(e)}")