youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-25 13:16:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: improve usage of striping prefix or suffix of string with Ruff 0.6.5 (#8392)

Browse Source
This commit is contained in:
Bowen Liang
2024-09-13 23:34:39 +08:00
committed by GitHub
parent aad6f340b3
commit 5b98acde2f
20 changed files with 44 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/core/model_runtime/model_providers/huggingface_tei/rerank/rerank.py
View File

@ -49,8 +49,7 @@ class HuggingfaceTeiRerankModel(RerankModel):
return RerankResult(model=model, docs=[])
server_url = credentials["server_url"]
if server_url.endswith("/"):
server_url = server_url[:-1]
server_url = server_url.removesuffix("/")
try:
results = TeiHelper.invoke_rerank(server_url, query, docs)

6
api/core/model_runtime/model_providers/huggingface_tei/text_embedding/text_embedding.py
View File

@ -42,8 +42,7 @@ class HuggingfaceTeiTextEmbeddingModel(TextEmbeddingModel):
"""
server_url = credentials["server_url"]
if server_url.endswith("/"):
server_url = server_url[:-1]
server_url = server_url.removesuffix("/")
# get model properties
context_size = self._get_context_size(model, credentials)
@ -119,8 +118,7 @@ class HuggingfaceTeiTextEmbeddingModel(TextEmbeddingModel):
num_tokens = 0
server_url = credentials["server_url"]
if server_url.endswith("/"):
server_url = server_url[:-1]
server_url = server_url.removesuffix("/")
batch_tokens = TeiHelper.invoke_tokenize(server_url, texts)
num_tokens = sum(len(tokens) for tokens in batch_tokens)

3
api/core/model_runtime/model_providers/jina/rerank/rerank.py
View File

@ -48,8 +48,7 @@ class JinaRerankModel(RerankModel):
return RerankResult(model=model, docs=[])
base_url = credentials.get("base_url", "https://api.jina.ai/v1")
if base_url.endswith("/"):
base_url = base_url[:-1]
base_url = base_url.removesuffix("/")
try:
response = httpx.post(

3
api/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py
View File

@ -44,8 +44,7 @@ class JinaTextEmbeddingModel(TextEmbeddingModel):
raise CredentialsValidateFailedError("api_key is required")
base_url = credentials.get("base_url", self.api_base)
if base_url.endswith("/"):
base_url = base_url[:-1]
base_url = base_url.removesuffix("/")
url = base_url + "/embeddings"
headers = {"Authorization": "Bearer " + api_key, "Content-Type": "application/json"}

3
api/core/model_runtime/model_providers/siliconflow/rerank/rerank.py
View File

@ -30,8 +30,7 @@ class SiliconflowRerankModel(RerankModel):
return RerankResult(model=model, docs=[])
base_url = credentials.get("base_url", "https://api.siliconflow.cn/v1")
if base_url.endswith("/"):
base_url = base_url[:-1]
base_url = base_url.removesuffix("/")
try:
response = httpx.post(
base_url + "/rerank",

3
api/core/model_runtime/model_providers/xinference/llm/llm.py
View File

@ -459,8 +459,7 @@ class XinferenceAILargeLanguageModel(LargeLanguageModel):
if "server_url" not in credentials:
raise CredentialsValidateFailedError("server_url is required in credentials")
if credentials["server_url"].endswith("/"):
credentials["server_url"] = credentials["server_url"][:-1]
credentials["server_url"] = credentials["server_url"].removesuffix("/")
api_key = credentials.get("api_key") or "abc"

6
api/core/model_runtime/model_providers/xinference/rerank/rerank.py
View File

@ -50,8 +50,7 @@ class XinferenceRerankModel(RerankModel):
server_url = credentials["server_url"]
model_uid = credentials["model_uid"]
api_key = credentials.get("api_key")
if server_url.endswith("/"):
server_url = server_url[:-1]
server_url = server_url.removesuffix("/")
auth_headers = {"Authorization": f"Bearer {api_key}"} if api_key else {}
params = {"documents": docs, "query": query, "top_n": top_n, "return_documents": True}
@ -98,8 +97,7 @@ class XinferenceRerankModel(RerankModel):
if "/" in credentials["model_uid"] or "?" in credentials["model_uid"] or "#" in credentials["model_uid"]:
raise CredentialsValidateFailedError("model_uid should not contain /, ?, or #")
if credentials["server_url"].endswith("/"):
credentials["server_url"] = credentials["server_url"][:-1]
credentials["server_url"] = credentials["server_url"].removesuffix("/")
# initialize client
client = Client(

6
api/core/model_runtime/model_providers/xinference/speech2text/speech2text.py
View File

@ -45,8 +45,7 @@ class XinferenceSpeech2TextModel(Speech2TextModel):
if "/" in credentials["model_uid"] or "?" in credentials["model_uid"] or "#" in credentials["model_uid"]:
raise CredentialsValidateFailedError("model_uid should not contain /, ?, or #")
if credentials["server_url"].endswith("/"):
credentials["server_url"] = credentials["server_url"][:-1]
credentials["server_url"] = credentials["server_url"].removesuffix("/")
# initialize client
client = Client(
@ -116,8 +115,7 @@ class XinferenceSpeech2TextModel(Speech2TextModel):
server_url = credentials["server_url"]
model_uid = credentials["model_uid"]
api_key = credentials.get("api_key")
if server_url.endswith("/"):
server_url = server_url[:-1]
server_url = server_url.removesuffix("/")
auth_headers = {"Authorization": f"Bearer {api_key}"} if api_key else {}
try:

6
api/core/model_runtime/model_providers/xinference/text_embedding/text_embedding.py
View File

@ -45,8 +45,7 @@ class XinferenceTextEmbeddingModel(TextEmbeddingModel):
server_url = credentials["server_url"]
model_uid = credentials["model_uid"]
api_key = credentials.get("api_key")
if server_url.endswith("/"):
server_url = server_url[:-1]
server_url = server_url.removesuffix("/")
auth_headers = {"Authorization": f"Bearer {api_key}"} if api_key else {}
try:
@ -118,8 +117,7 @@ class XinferenceTextEmbeddingModel(TextEmbeddingModel):
if extra_args.max_tokens:
credentials["max_tokens"] = extra_args.max_tokens
if server_url.endswith("/"):
server_url = server_url[:-1]
server_url = server_url.removesuffix("/")
client = Client(
base_url=server_url,

6
api/core/model_runtime/model_providers/xinference/tts/tts.py
View File

@ -73,8 +73,7 @@ class XinferenceText2SpeechModel(TTSModel):
if "/" in credentials["model_uid"] or "?" in credentials["model_uid"] or "#" in credentials["model_uid"]:
raise CredentialsValidateFailedError("model_uid should not contain /, ?, or #")
if credentials["server_url"].endswith("/"):
credentials["server_url"] = credentials["server_url"][:-1]
credentials["server_url"] = credentials["server_url"].removesuffix("/")
extra_param = XinferenceHelper.get_xinference_extra_parameter(
server_url=credentials["server_url"],
@ -189,8 +188,7 @@ class XinferenceText2SpeechModel(TTSModel):
:param voice: model timbre
:return: text translated to audio file
"""
if credentials["server_url"].endswith("/"):
credentials["server_url"] = credentials["server_url"][:-1]
credentials["server_url"] = credentials["server_url"].removesuffix("/")
try:
api_key = credentials.get("api_key")

3
api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_sse_client.py
View File

@ -127,8 +127,7 @@ class SSELineParser:
field, _p, value = line.partition(":")
if value.startswith(" "):
value = value[1:]
value = value.removeprefix(" ")
if field == "data":
self._data.append(value)
elif field == "event":

2
api/core/tools/provider/builtin/hap/tools/add_worksheet_record.py
View File

@ -30,7 +30,7 @@ class AddWorksheetRecordTool(BuiltinTool):
elif not host.startswith(("http://", "https://")):
return self.create_text_message("Invalid parameter Host Address")
else:
host = f"{host[:-1] if host.endswith('/') else host}/api"
host = f"{host.removesuffix('/')}/api"
url = f"{host}/v2/open/worksheet/addRow"
headers = {"Content-Type": "application/json"}

2
api/core/tools/provider/builtin/hap/tools/delete_worksheet_record.py
View File

@ -29,7 +29,7 @@ class DeleteWorksheetRecordTool(BuiltinTool):
elif not host.startswith(("http://", "https://")):
return self.create_text_message("Invalid parameter Host Address")
else:
host = f"{host[:-1] if host.endswith('/') else host}/api"
host = f"{host.removesuffix('/')}/api"
url = f"{host}/v2/open/worksheet/deleteRow"
headers = {"Content-Type": "application/json"}

2
api/core/tools/provider/builtin/hap/tools/get_worksheet_fields.py
View File

@ -27,7 +27,7 @@ class GetWorksheetFieldsTool(BuiltinTool):
elif not host.startswith(("http://", "https://")):
return self.create_text_message("Invalid parameter Host Address")
else:
host = f"{host[:-1] if host.endswith('/') else host}/api"
host = f"{host.removesuffix('/')}/api"
url = f"{host}/v2/open/worksheet/getWorksheetInfo"
headers = {"Content-Type": "application/json"}

2
api/core/tools/provider/builtin/hap/tools/get_worksheet_pivot_data.py
View File

@ -38,7 +38,7 @@ class GetWorksheetPivotDataTool(BuiltinTool):
elif not host.startswith(("http://", "https://")):
return self.create_text_message("Invalid parameter Host Address")
else:
host = f"{host[:-1] if host.endswith('/') else host}/api"
host = f"{host.removesuffix('/')}/api"
url = f"{host}/report/getPivotData"
headers = {"Content-Type": "application/json"}

2
api/core/tools/provider/builtin/hap/tools/list_worksheet_records.py
View File

@ -30,7 +30,7 @@ class ListWorksheetRecordsTool(BuiltinTool):
elif not (host.startswith("http://") or host.startswith("https://")):
return self.create_text_message("Invalid parameter Host Address")
else:
host = f"{host[:-1] if host.endswith('/') else host}/api"
host = f"{host.removesuffix('/')}/api"
url_fields = f"{host}/v2/open/worksheet/getWorksheetInfo"
headers = {"Content-Type": "application/json"}

2
api/core/tools/provider/builtin/hap/tools/list_worksheets.py
View File

@ -24,7 +24,7 @@ class ListWorksheetsTool(BuiltinTool):
elif not (host.startswith("http://") or host.startswith("https://")):
return self.create_text_message("Invalid parameter Host Address")
else:
host = f"{host[:-1] if host.endswith('/') else host}/api"
host = f"{host.removesuffix('/')}/api"
url = f"{host}/v1/open/app/get"
result_type = tool_parameters.get("result_type", "")

2
api/core/tools/provider/builtin/hap/tools/update_worksheet_record.py
View File

@ -33,7 +33,7 @@ class UpdateWorksheetRecordTool(BuiltinTool):
elif not host.startswith(("http://", "https://")):
return self.create_text_message("Invalid parameter Host Address")
else:
host = f"{host[:-1] if host.endswith('/') else host}/api"
host = f"{host.removesuffix('/')}/api"
url = f"{host}/v2/open/worksheet/editRow"
headers = {"Content-Type": "application/json"}