estel/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

13
api/core/tools/provider/builtin/openweather/openweather.py
View File

@@ -5,7 +5,6 @@ from core.tools.provider.builtin_tool_provider import BuiltinToolProviderControl
def query_weather(city="Beijing", units="metric", language="zh_cn", api_key=None):
url = "https://api.openweathermap.org/data/2.5/weather"
params = {"q": city, "appid": api_key, "units": units, "lang": language}
@@ -16,21 +15,15 @@ class OpenweatherProvider(BuiltinToolProviderController):
def _validate_credentials(self, credentials: dict) -> None:
try:
if "api_key" not in credentials or not credentials.get("api_key"):
raise ToolProviderCredentialValidationError(
"Open weather API key is required."
)
raise ToolProviderCredentialValidationError("Open weather API key is required.")
apikey = credentials.get("api_key")
try:
response = query_weather(api_key=apikey)
if response.status_code == 200:
pass
else:
raise ToolProviderCredentialValidationError(
(response.json()).get("info")
)
raise ToolProviderCredentialValidationError((response.json()).get("info"))
except Exception as e:
raise ToolProviderCredentialValidationError(
"Open weather API Key is invalid. {}".format(e)
)
raise ToolProviderCredentialValidationError("Open weather API Key is invalid. {}".format(e))
except Exception as e:
raise ToolProviderCredentialValidationError(str(e))

14
api/core/tools/provider/builtin/openweather/tools/weather.py
View File

@@ -17,10 +17,7 @@ class OpenweatherTool(BuiltinTool):
city = tool_parameters.get("city", "")
if not city:
return self.create_text_message("Please tell me your city")
if (
"api_key" not in self.runtime.credentials
or not self.runtime.credentials.get("api_key")
):
if "api_key" not in self.runtime.credentials or not self.runtime.credentials.get("api_key"):
return self.create_text_message("OpenWeather API key is required.")
units = tool_parameters.get("units", "metric")
@@ -39,12 +36,9 @@ class OpenweatherTool(BuiltinTool):
response = requests.get(url, params=params)
if response.status_code == 200:
data = response.json()
return self.create_text_message(
self.summary(
user_id=user_id, content=json.dumps(data, ensure_ascii=False)
)
self.summary(user_id=user_id, content=json.dumps(data, ensure_ascii=False))
)
else:
error_message = {
@@ -55,6 +49,4 @@ class OpenweatherTool(BuiltinTool):
return json.dumps(error_message)
except Exception as e:
return self.create_text_message(
"Openweather API Key is invalid. {}".format(e)
)
return self.create_text_message("Openweather API Key is invalid. {}".format(e))