chore: apply ruff's pyupgrade linter rules to modernize Python code with targeted version (#2419)

api/core/tools/utils/configuration.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -12,13 +12,13 @@ class ToolConfiguration(BaseModel):
     tenant_id: str
     provider_controller: ToolProviderController
 
-    def _deep_copy(self, credentials: Dict[str, str]) -> Dict[str, str]:
+    def _deep_copy(self, credentials: dict[str, str]) -> dict[str, str]:
         """
         deep copy credentials
         """
         return {key: value for key, value in credentials.items()}
     
-    def encrypt_tool_credentials(self, credentials: Dict[str, str]) -> Dict[str, str]:
+    def encrypt_tool_credentials(self, credentials: dict[str, str]) -> dict[str, str]:
         """
         encrypt tool credentials with tenant id
 
@@ -36,7 +36,7 @@ class ToolConfiguration(BaseModel):
         
         return credentials
     
-    def mask_tool_credentials(self, credentials: Dict[str, Any]) -> Dict[str, Any]:
+    def mask_tool_credentials(self, credentials: dict[str, Any]) -> dict[str, Any]:
         """
         mask tool credentials
 
@@ -59,7 +59,7 @@ class ToolConfiguration(BaseModel):
 
         return credentials
 
-    def decrypt_tool_credentials(self, credentials: Dict[str, str]) -> Dict[str, str]:
+    def decrypt_tool_credentials(self, credentials: dict[str, str]) -> dict[str, str]:
         """
         decrypt tool credentials with tenant id
 

api/core/tools/utils/encoder.py

@@ -1,11 +1,10 @@
-from typing import List
 
 from pydantic import BaseModel
 
 
-def serialize_base_model_array(l: List[BaseModel]) -> str:
+def serialize_base_model_array(l: list[BaseModel]) -> str:
     class _BaseModel(BaseModel):
-        __root__: List[BaseModel]
+        __root__: list[BaseModel]
 
     """
         {"__root__": [BaseModel, BaseModel, ...]}

api/core/tools/utils/parser.py

@@ -1,6 +1,5 @@
 
 from json import loads as json_loads
-from typing import List, Tuple
 
 from requests import get
 from yaml import FullLoader, load
@@ -13,7 +12,7 @@ from core.tools.errors import ToolApiSchemaError, ToolNotSupportedError, ToolPro
 
 class ApiBasedToolSchemaParser:
     @staticmethod
-    def parse_openapi_to_tool_bundle(openapi: dict, extra_info: dict = None, warning: dict = None) -> List[ApiBasedToolBundle]:
+    def parse_openapi_to_tool_bundle(openapi: dict, extra_info: dict = None, warning: dict = None) -> list[ApiBasedToolBundle]:
         warning = warning if warning is not None else {}
         extra_info = extra_info if extra_info is not None else {}
 
@@ -132,7 +131,7 @@ class ApiBasedToolSchemaParser:
         return bundles
         
     @staticmethod
-    def parse_openapi_yaml_to_tool_bundle(yaml: str, extra_info: dict = None, warning: dict = None) -> List[ApiBasedToolBundle]:
+    def parse_openapi_yaml_to_tool_bundle(yaml: str, extra_info: dict = None, warning: dict = None) -> list[ApiBasedToolBundle]:
         """
             parse openapi yaml to tool bundle
 
@@ -148,7 +147,7 @@ class ApiBasedToolSchemaParser:
         return ApiBasedToolSchemaParser.parse_openapi_to_tool_bundle(openapi, extra_info=extra_info, warning=warning)
     
     @staticmethod
-    def parse_openapi_json_to_tool_bundle(json: str, extra_info: dict = None, warning: dict = None) -> List[ApiBasedToolBundle]:
+    def parse_openapi_json_to_tool_bundle(json: str, extra_info: dict = None, warning: dict = None) -> list[ApiBasedToolBundle]:
         """
             parse openapi yaml to tool bundle
 
@@ -232,7 +231,7 @@ class ApiBasedToolSchemaParser:
         return openapi
 
     @staticmethod
-    def parse_swagger_yaml_to_tool_bundle(yaml: str, extra_info: dict = None, warning: dict = None) -> List[ApiBasedToolBundle]:
+    def parse_swagger_yaml_to_tool_bundle(yaml: str, extra_info: dict = None, warning: dict = None) -> list[ApiBasedToolBundle]:
         """
             parse swagger yaml to tool bundle
 
@@ -248,7 +247,7 @@ class ApiBasedToolSchemaParser:
         return ApiBasedToolSchemaParser.parse_openapi_to_tool_bundle(openapi, extra_info=extra_info, warning=warning)
 
     @staticmethod
-    def parse_swagger_json_to_tool_bundle(json: str, extra_info: dict = None, warning: dict = None) -> List[ApiBasedToolBundle]:
+    def parse_swagger_json_to_tool_bundle(json: str, extra_info: dict = None, warning: dict = None) -> list[ApiBasedToolBundle]:
         """
             parse swagger yaml to tool bundle
 
@@ -264,7 +263,7 @@ class ApiBasedToolSchemaParser:
         return ApiBasedToolSchemaParser.parse_openapi_to_tool_bundle(openapi, extra_info=extra_info, warning=warning)
 
     @staticmethod
-    def parse_openai_plugin_json_to_tool_bundle(json: str, extra_info: dict = None, warning: dict = None) -> List[ApiBasedToolBundle]:
+    def parse_openai_plugin_json_to_tool_bundle(json: str, extra_info: dict = None, warning: dict = None) -> list[ApiBasedToolBundle]:
         """
             parse openapi plugin yaml to tool bundle
 
@@ -296,7 +295,7 @@ class ApiBasedToolSchemaParser:
         return ApiBasedToolSchemaParser.parse_openapi_yaml_to_tool_bundle(response.text, extra_info=extra_info, warning=warning)
     
     @staticmethod
-    def auto_parse_to_tool_bundle(content: str, extra_info: dict = None, warning: dict = None) -> Tuple[List[ApiBasedToolBundle], str]:
+    def auto_parse_to_tool_bundle(content: str, extra_info: dict = None, warning: dict = None) -> tuple[list[ApiBasedToolBundle], str]:
         """
             auto parse to tool bundle
 

api/core/tools/utils/web_reader_tool.py

@@ -7,7 +7,7 @@ import subprocess
 import tempfile
 import unicodedata
 from contextlib import contextmanager
-from typing import Any, Type
+from typing import Any
 
 import requests
 from bs4 import BeautifulSoup, CData, Comment, NavigableString
@@ -56,7 +56,7 @@ class WebReaderTool(BaseTool):
     """Reader tool for getting website title and contents. Gives more control than SimpleReaderTool."""
 
     name: str = "web_reader"
-    args_schema: Type[BaseModel] = WebReaderToolInput
+    args_schema: type[BaseModel] = WebReaderToolInput
     description: str = "use this to read a website. " \
                        "If you can answer the question based on the information provided, " \
                        "there is no need to use."
@@ -211,7 +211,7 @@ def extract_using_readabilipy(html):
         subprocess.check_call(["node", "ExtractArticle.js", "-i", html_path, "-o", article_json_path])
 
     # Read output of call to Readability.parse() from JSON file and return as Python dictionary
-    with open(article_json_path, "r", encoding="utf-8") as json_file:
+    with open(article_json_path, encoding="utf-8") as json_file:
         input_json = json.loads(json_file.read())
 
     # Deleting files after processing