mirror of
http://112.124.100.131/huang.ze/ebiz-dify-ai.git
synced 2025-12-09 02:46:52 +08:00
chore(lint): fix quotes for f-string formatting by bumping ruff to 0.9.x (#12702)
This commit is contained in:
@@ -127,7 +127,7 @@ class AIPPTGenerateToolAdapter:
|
||||
|
||||
response = response.json()
|
||||
if response.get("code") != 0:
|
||||
raise Exception(f'Failed to create task: {response.get("msg")}')
|
||||
raise Exception(f"Failed to create task: {response.get('msg')}")
|
||||
|
||||
return response.get("data", {}).get("id")
|
||||
|
||||
@@ -222,7 +222,7 @@ class AIPPTGenerateToolAdapter:
|
||||
elif model == "wenxin":
|
||||
response = response.json()
|
||||
if response.get("code") != 0:
|
||||
raise Exception(f'Failed to generate content: {response.get("msg")}')
|
||||
raise Exception(f"Failed to generate content: {response.get('msg')}")
|
||||
|
||||
return response.get("data", "")
|
||||
|
||||
@@ -254,7 +254,7 @@ class AIPPTGenerateToolAdapter:
|
||||
|
||||
response = response.json()
|
||||
if response.get("code") != 0:
|
||||
raise Exception(f'Failed to generate ppt: {response.get("msg")}')
|
||||
raise Exception(f"Failed to generate ppt: {response.get('msg')}")
|
||||
|
||||
id = response.get("data", {}).get("id")
|
||||
cover_url = response.get("data", {}).get("cover_url")
|
||||
@@ -270,7 +270,7 @@ class AIPPTGenerateToolAdapter:
|
||||
|
||||
response = response.json()
|
||||
if response.get("code") != 0:
|
||||
raise Exception(f'Failed to generate ppt: {response.get("msg")}')
|
||||
raise Exception(f"Failed to generate ppt: {response.get('msg')}")
|
||||
|
||||
export_code = response.get("data")
|
||||
if not export_code:
|
||||
@@ -290,7 +290,7 @@ class AIPPTGenerateToolAdapter:
|
||||
|
||||
response = response.json()
|
||||
if response.get("code") != 0:
|
||||
raise Exception(f'Failed to generate ppt: {response.get("msg")}')
|
||||
raise Exception(f"Failed to generate ppt: {response.get('msg')}")
|
||||
|
||||
if response.get("msg") == "导出中":
|
||||
current_iteration += 1
|
||||
@@ -343,7 +343,7 @@ class AIPPTGenerateToolAdapter:
|
||||
raise Exception(f"Failed to connect to aippt: {response.text}")
|
||||
response = response.json()
|
||||
if response.get("code") != 0:
|
||||
raise Exception(f'Failed to connect to aippt: {response.get("msg")}')
|
||||
raise Exception(f"Failed to connect to aippt: {response.get('msg')}")
|
||||
|
||||
token = response.get("data", {}).get("token")
|
||||
expire = response.get("data", {}).get("time_expire")
|
||||
@@ -379,7 +379,7 @@ class AIPPTGenerateToolAdapter:
|
||||
if cls._style_cache[key]["expire"] < now:
|
||||
del cls._style_cache[key]
|
||||
|
||||
key = f'{credentials["aippt_access_key"]}#@#{user_id}'
|
||||
key = f"{credentials['aippt_access_key']}#@#{user_id}"
|
||||
if key in cls._style_cache:
|
||||
return cls._style_cache[key]["colors"], cls._style_cache[key]["styles"]
|
||||
|
||||
@@ -396,11 +396,11 @@ class AIPPTGenerateToolAdapter:
|
||||
response = response.json()
|
||||
|
||||
if response.get("code") != 0:
|
||||
raise Exception(f'Failed to connect to aippt: {response.get("msg")}')
|
||||
raise Exception(f"Failed to connect to aippt: {response.get('msg')}")
|
||||
|
||||
colors = [
|
||||
{
|
||||
"id": f'id-{item.get("id")}',
|
||||
"id": f"id-{item.get('id')}",
|
||||
"name": item.get("name"),
|
||||
"en_name": item.get("en_name", item.get("name")),
|
||||
}
|
||||
@@ -408,7 +408,7 @@ class AIPPTGenerateToolAdapter:
|
||||
]
|
||||
styles = [
|
||||
{
|
||||
"id": f'id-{item.get("id")}',
|
||||
"id": f"id-{item.get('id')}",
|
||||
"name": item.get("title"),
|
||||
}
|
||||
for item in response.get("data", {}).get("suit_style") or []
|
||||
@@ -454,7 +454,7 @@ class AIPPTGenerateToolAdapter:
|
||||
response = response.json()
|
||||
|
||||
if response.get("code") != 0:
|
||||
raise Exception(f'Failed to connect to aippt: {response.get("msg")}')
|
||||
raise Exception(f"Failed to connect to aippt: {response.get('msg')}")
|
||||
|
||||
if len(response.get("data", {}).get("list") or []) > 0:
|
||||
return response.get("data", {}).get("list")[0].get("id")
|
||||
|
||||
@@ -229,8 +229,7 @@ class NovaReelTool(BuiltinTool):
|
||||
|
||||
if async_mode:
|
||||
return self.create_text_message(
|
||||
f"Video generation started.\nInvocation ARN: {invocation_arn}\n"
|
||||
f"Video will be available at: {video_uri}"
|
||||
f"Video generation started.\nInvocation ARN: {invocation_arn}\nVideo will be available at: {video_uri}"
|
||||
)
|
||||
|
||||
return self._wait_for_completion(bedrock, s3_client, invocation_arn)
|
||||
|
||||
@@ -65,7 +65,7 @@ class BaiduFieldTranslateTool(BuiltinTool, BaiduTranslateToolBase):
|
||||
if "trans_result" in result:
|
||||
result_text = result["trans_result"][0]["dst"]
|
||||
else:
|
||||
result_text = f'{result["error_code"]}: {result["error_msg"]}'
|
||||
result_text = f"{result['error_code']}: {result['error_msg']}"
|
||||
|
||||
return self.create_text_message(str(result_text))
|
||||
except requests.RequestException as e:
|
||||
|
||||
@@ -52,7 +52,7 @@ class BaiduLanguageTool(BuiltinTool, BaiduTranslateToolBase):
|
||||
|
||||
result_text = ""
|
||||
if result["error_code"] != 0:
|
||||
result_text = f'{result["error_code"]}: {result["error_msg"]}'
|
||||
result_text = f"{result['error_code']}: {result['error_msg']}"
|
||||
else:
|
||||
result_text = result["data"]["src"]
|
||||
result_text = self.mapping_result(description_language, result_text)
|
||||
|
||||
@@ -58,7 +58,7 @@ class BaiduTranslateTool(BuiltinTool, BaiduTranslateToolBase):
|
||||
if "trans_result" in result:
|
||||
result_text = result["trans_result"][0]["dst"]
|
||||
else:
|
||||
result_text = f'{result["error_code"]}: {result["error_msg"]}'
|
||||
result_text = f"{result['error_code']}: {result['error_msg']}"
|
||||
|
||||
return self.create_text_message(str(result_text))
|
||||
except requests.RequestException as e:
|
||||
|
||||
@@ -30,7 +30,7 @@ class BingSearchTool(BuiltinTool):
|
||||
headers = {"Ocp-Apim-Subscription-Key": subscription_key, "Accept-Language": accept_language}
|
||||
|
||||
query = quote(query)
|
||||
server_url = f'{server_url}?q={query}&mkt={market_code}&count={limit}&responseFilter={",".join(filters)}'
|
||||
server_url = f"{server_url}?q={query}&mkt={market_code}&count={limit}&responseFilter={','.join(filters)}"
|
||||
response = get(server_url, headers=headers)
|
||||
|
||||
if response.status_code != 200:
|
||||
@@ -47,23 +47,23 @@ class BingSearchTool(BuiltinTool):
|
||||
results = []
|
||||
if search_results:
|
||||
for result in search_results:
|
||||
url = f': {result["url"]}' if "url" in result else ""
|
||||
results.append(self.create_text_message(text=f'{result["name"]}{url}'))
|
||||
url = f": {result['url']}" if "url" in result else ""
|
||||
results.append(self.create_text_message(text=f"{result['name']}{url}"))
|
||||
|
||||
if entities:
|
||||
for entity in entities:
|
||||
url = f': {entity["url"]}' if "url" in entity else ""
|
||||
results.append(self.create_text_message(text=f'{entity.get("name", "")}{url}'))
|
||||
url = f": {entity['url']}" if "url" in entity else ""
|
||||
results.append(self.create_text_message(text=f"{entity.get('name', '')}{url}"))
|
||||
|
||||
if news:
|
||||
for news_item in news:
|
||||
url = f': {news_item["url"]}' if "url" in news_item else ""
|
||||
results.append(self.create_text_message(text=f'{news_item.get("name", "")}{url}'))
|
||||
url = f": {news_item['url']}" if "url" in news_item else ""
|
||||
results.append(self.create_text_message(text=f"{news_item.get('name', '')}{url}"))
|
||||
|
||||
if related_searches:
|
||||
for related in related_searches:
|
||||
url = f': {related["displayText"]}' if "displayText" in related else ""
|
||||
results.append(self.create_text_message(text=f'{related.get("displayText", "")}{url}'))
|
||||
url = f": {related['displayText']}" if "displayText" in related else ""
|
||||
results.append(self.create_text_message(text=f"{related.get('displayText', '')}{url}"))
|
||||
|
||||
return results
|
||||
elif result_type == "json":
|
||||
@@ -106,29 +106,29 @@ class BingSearchTool(BuiltinTool):
|
||||
text = ""
|
||||
if search_results:
|
||||
for i, result in enumerate(search_results):
|
||||
text += f'{i + 1}: {result.get("name", "")} - {result.get("snippet", "")}\n'
|
||||
text += f"{i + 1}: {result.get('name', '')} - {result.get('snippet', '')}\n"
|
||||
|
||||
if computation and "expression" in computation and "value" in computation:
|
||||
text += "\nComputation:\n"
|
||||
text += f'{computation["expression"]} = {computation["value"]}\n'
|
||||
text += f"{computation['expression']} = {computation['value']}\n"
|
||||
|
||||
if entities:
|
||||
text += "\nEntities:\n"
|
||||
for entity in entities:
|
||||
url = f'- {entity["url"]}' if "url" in entity else ""
|
||||
text += f'{entity.get("name", "")}{url}\n'
|
||||
url = f"- {entity['url']}" if "url" in entity else ""
|
||||
text += f"{entity.get('name', '')}{url}\n"
|
||||
|
||||
if news:
|
||||
text += "\nNews:\n"
|
||||
for news_item in news:
|
||||
url = f'- {news_item["url"]}' if "url" in news_item else ""
|
||||
text += f'{news_item.get("name", "")}{url}\n'
|
||||
url = f"- {news_item['url']}" if "url" in news_item else ""
|
||||
text += f"{news_item.get('name', '')}{url}\n"
|
||||
|
||||
if related_searches:
|
||||
text += "\n\nRelated Searches:\n"
|
||||
for related in related_searches:
|
||||
url = f'- {related["webSearchUrl"]}' if "webSearchUrl" in related else ""
|
||||
text += f'{related.get("displayText", "")}{url}\n'
|
||||
url = f"- {related['webSearchUrl']}" if "webSearchUrl" in related else ""
|
||||
text += f"{related.get('displayText', '')}{url}\n"
|
||||
|
||||
return self.create_text_message(text=self.summary(user_id=user_id, content=text))
|
||||
|
||||
|
||||
@@ -83,5 +83,5 @@ class DIDApp:
|
||||
if status["status"] == "done":
|
||||
return status
|
||||
elif status["status"] == "error" or status["status"] == "rejected":
|
||||
raise HTTPError(f'Talks {id} failed: {status["status"]} {status.get("error", {}).get("description")}')
|
||||
raise HTTPError(f"Talks {id} failed: {status['status']} {status.get('error', {}).get('description')}")
|
||||
time.sleep(poll_interval)
|
||||
|
||||
@@ -74,7 +74,7 @@ class FirecrawlApp:
|
||||
if response is None:
|
||||
raise HTTPError("Failed to initiate crawl after multiple retries")
|
||||
elif response.get("success") == False:
|
||||
raise HTTPError(f'Failed to crawl: {response.get("error")}')
|
||||
raise HTTPError(f"Failed to crawl: {response.get('error')}")
|
||||
job_id: str = response["id"]
|
||||
if wait:
|
||||
return self._monitor_job_status(job_id=job_id, poll_interval=poll_interval)
|
||||
@@ -100,7 +100,7 @@ class FirecrawlApp:
|
||||
if status["status"] == "completed":
|
||||
return status
|
||||
elif status["status"] == "failed":
|
||||
raise HTTPError(f'Job {job_id} failed: {status["error"]}')
|
||||
raise HTTPError(f"Job {job_id} failed: {status['error']}")
|
||||
time.sleep(poll_interval)
|
||||
|
||||
|
||||
|
||||
@@ -37,8 +37,9 @@ class GaodeRepositoriesTool(BuiltinTool):
|
||||
CityCode = City_data["districts"][0]["adcode"]
|
||||
weatherInfo_response = s.request(
|
||||
method="GET",
|
||||
url="{url}/weather/weatherInfo?city={citycode}&extensions=all&key={apikey}&output=json"
|
||||
"".format(url=api_domain, citycode=CityCode, apikey=self.runtime.credentials.get("api_key")),
|
||||
url="{url}/weather/weatherInfo?city={citycode}&extensions=all&key={apikey}&output=json".format(
|
||||
url=api_domain, citycode=CityCode, apikey=self.runtime.credentials.get("api_key")
|
||||
),
|
||||
)
|
||||
weatherInfo_data = weatherInfo_response.json()
|
||||
if weatherInfo_response.status_code == 200 and weatherInfo_data.get("info") == "OK":
|
||||
|
||||
@@ -110,7 +110,7 @@ class ListWorksheetRecordsTool(BuiltinTool):
|
||||
result["rows"].append(self.get_row_field_value(row, schema))
|
||||
return self.create_text_message(json.dumps(result, ensure_ascii=False))
|
||||
else:
|
||||
result_text = f"Found {result['total']} rows in worksheet \"{worksheet_name}\"."
|
||||
result_text = f'Found {result["total"]} rows in worksheet "{worksheet_name}".'
|
||||
if result["total"] > 0:
|
||||
result_text += (
|
||||
f" The following are {min(limit, result['total'])}"
|
||||
|
||||
@@ -28,4 +28,4 @@ class BaseStabilityAuthorization:
|
||||
"""
|
||||
This method is responsible for generating the authorization headers.
|
||||
"""
|
||||
return {"Authorization": f'Bearer {credentials.get("api_key", "")}'}
|
||||
return {"Authorization": f"Bearer {credentials.get('api_key', '')}"}
|
||||
|
||||
@@ -38,7 +38,7 @@ class VannaProvider(BuiltinToolProviderController):
|
||||
tool_parameters={
|
||||
"model": "chinook",
|
||||
"db_type": "SQLite",
|
||||
"url": f'{self._get_protocol_and_main_domain(credentials["base_url"])}/Chinook.sqlite',
|
||||
"url": f"{self._get_protocol_and_main_domain(credentials['base_url'])}/Chinook.sqlite",
|
||||
"query": "What are the top 10 customers by sales?",
|
||||
},
|
||||
)
|
||||
|
||||
@@ -84,9 +84,9 @@ class ApiTool(Tool):
|
||||
if "api_key_header_prefix" in credentials:
|
||||
api_key_header_prefix = credentials["api_key_header_prefix"]
|
||||
if api_key_header_prefix == "basic" and credentials["api_key_value"]:
|
||||
credentials["api_key_value"] = f'Basic {credentials["api_key_value"]}'
|
||||
credentials["api_key_value"] = f"Basic {credentials['api_key_value']}"
|
||||
elif api_key_header_prefix == "bearer" and credentials["api_key_value"]:
|
||||
credentials["api_key_value"] = f'Bearer {credentials["api_key_value"]}'
|
||||
credentials["api_key_value"] = f"Bearer {credentials['api_key_value']}"
|
||||
elif api_key_header_prefix == "custom":
|
||||
pass
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ class ToolFileMessageTransformer:
|
||||
user_id=user_id, tenant_id=tenant_id, conversation_id=conversation_id, file_url=message.message
|
||||
)
|
||||
|
||||
url = f'/files/tools/{file.id}{guess_extension(file.mimetype) or ".png"}'
|
||||
url = f"/files/tools/{file.id}{guess_extension(file.mimetype) or '.png'}"
|
||||
|
||||
result.append(
|
||||
ToolInvokeMessage(
|
||||
@@ -122,4 +122,4 @@ class ToolFileMessageTransformer:
|
||||
|
||||
@classmethod
|
||||
def get_tool_file_url(cls, tool_file_id: str, extension: Optional[str]) -> str:
|
||||
return f'/files/tools/{tool_file_id}{extension or ".bin"}'
|
||||
return f"/files/tools/{tool_file_id}{extension or '.bin'}"
|
||||
|
||||
@@ -149,7 +149,7 @@ class ApiBasedToolSchemaParser:
|
||||
if not path:
|
||||
path = str(uuid.uuid4())
|
||||
|
||||
interface["operation"]["operationId"] = f'{path}_{interface["method"]}'
|
||||
interface["operation"]["operationId"] = f"{path}_{interface['method']}"
|
||||
|
||||
bundles.append(
|
||||
ApiToolBundle(
|
||||
|
||||
Reference in New Issue
Block a user