chore: improve usage of striping prefix or suffix of string with Ruff 0.6.5

api/core/model_runtime/model_providers/huggingface_tei/rerank/rerank.py

@@ -49,8 +49,7 @@ def _invoke(
             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)

api/core/model_runtime/model_providers/huggingface_tei/text_embedding/text_embedding.py

@@ -42,8 +42,7 @@ def _invoke(
         """
         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 @@ def get_num_tokens(self, model: str, credentials: dict, texts: list[str]) -> int
         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)

api/core/model_runtime/model_providers/jina/rerank/rerank.py

@@ -48,8 +48,7 @@ def _invoke(
             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(

api/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py

@@ -44,8 +44,7 @@ def _invoke(
             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"}

api/core/model_runtime/model_providers/siliconflow/rerank/rerank.py

@@ -30,8 +30,7 @@ def _invoke(
             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",

api/core/model_runtime/model_providers/xinference/llm/llm.py

@@ -459,8 +459,7 @@ def _generate(
         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"
 

api/core/model_runtime/model_providers/xinference/rerank/rerank.py

@@ -50,8 +50,7 @@ def _invoke(
         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 @@ def validate_credentials(self, model: str, credentials: dict) -> None:
             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(

api/core/model_runtime/model_providers/xinference/speech2text/speech2text.py

@@ -45,8 +45,7 @@ def validate_credentials(self, model: str, credentials: dict) -> None:
             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 @@ def _speech2text_invoke(
         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:

api/core/model_runtime/model_providers/xinference/text_embedding/text_embedding.py

@@ -45,8 +45,7 @@ def _invoke(
         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 @@ def validate_credentials(self, model: str, credentials: dict) -> None:
 
             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,

api/core/model_runtime/model_providers/xinference/tts/tts.py

@@ -73,8 +73,7 @@ def validate_credentials(self, model: str, credentials: dict) -> None:
             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 @@ def _tts_invoke_streaming(self, model: str, credentials: dict, content_text: str
         :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")

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_sse_client.py

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

api/core/tools/provider/builtin/hap/tools/add_worksheet_record.py

@@ -30,7 +30,7 @@ def _invoke(
         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"}

api/core/tools/provider/builtin/hap/tools/delete_worksheet_record.py

@@ -29,7 +29,7 @@ def _invoke(
         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"}

api/core/tools/provider/builtin/hap/tools/get_worksheet_fields.py

@@ -27,7 +27,7 @@ def _invoke(
         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"}

api/core/tools/provider/builtin/hap/tools/get_worksheet_pivot_data.py

@@ -38,7 +38,7 @@ def _invoke(
         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"}

api/core/tools/provider/builtin/hap/tools/list_worksheet_records.py

@@ -30,7 +30,7 @@ def _invoke(
         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"}

api/core/tools/provider/builtin/hap/tools/list_worksheets.py

@@ -24,7 +24,7 @@ def _invoke(
         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", "")

api/core/tools/provider/builtin/hap/tools/update_worksheet_record.py

@@ -33,7 +33,7 @@ def _invoke(
         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"}

api/pyproject.toml

@@ -283,4 +283,4 @@ optional = true
 
 [tool.poetry.group.lint.dependencies]
 dotenv-linter = "~0.5.0"
-ruff = "~0.6.4"
+ruff = "~0.6.5"