remove bare list, dict, Sequence, None, Any (#25058)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>

api/core/rag/datasource/vdb/analyticdb/analyticdb_vector.py

@@ -46,10 +46,10 @@ class AnalyticdbVector(BaseVector):
     def text_exists(self, id: str) -> bool:
         return self.analyticdb_vector.text_exists(id)
 
-    def delete_by_ids(self, ids: list[str]) -> None:
+    def delete_by_ids(self, ids: list[str]):
         self.analyticdb_vector.delete_by_ids(ids)
 
-    def delete_by_metadata_field(self, key: str, value: str) -> None:
+    def delete_by_metadata_field(self, key: str, value: str):
         self.analyticdb_vector.delete_by_metadata_field(key, value)
 
     def search_by_vector(self, query_vector: list[float], **kwargs: Any) -> list[Document]:
@@ -58,7 +58,7 @@ class AnalyticdbVector(BaseVector):
     def search_by_full_text(self, query: str, **kwargs: Any) -> list[Document]:
         return self.analyticdb_vector.search_by_full_text(query, **kwargs)
 
-    def delete(self) -> None:
+    def delete(self):
         self.analyticdb_vector.delete()
 
 

api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_openapi.py

@@ -26,7 +26,7 @@ class AnalyticdbVectorOpenAPIConfig(BaseModel):
 
     @model_validator(mode="before")
     @classmethod
-    def validate_config(cls, values: dict) -> dict:
+    def validate_config(cls, values: dict):
         if not values["access_key_id"]:
             raise ValueError("config ANALYTICDB_KEY_ID is required")
         if not values["access_key_secret"]:
@@ -65,7 +65,7 @@ class AnalyticdbVectorOpenAPI:
         self._client = Client(self._client_config)
         self._initialize()
 
-    def _initialize(self) -> None:
+    def _initialize(self):
         cache_key = f"vector_initialize_{self.config.instance_id}"
         lock_name = f"{cache_key}_lock"
         with redis_client.lock(lock_name, timeout=20):
@@ -76,7 +76,7 @@ class AnalyticdbVectorOpenAPI:
             self._create_namespace_if_not_exists()
             redis_client.set(database_exist_cache_key, 1, ex=3600)
 
-    def _initialize_vector_database(self) -> None:
+    def _initialize_vector_database(self):
         from alibabacloud_gpdb20160503 import models as gpdb_20160503_models  # type: ignore
 
         request = gpdb_20160503_models.InitVectorDatabaseRequest(
@@ -87,7 +87,7 @@ class AnalyticdbVectorOpenAPI:
         )
         self._client.init_vector_database(request)
 
-    def _create_namespace_if_not_exists(self) -> None:
+    def _create_namespace_if_not_exists(self):
         from alibabacloud_gpdb20160503 import models as gpdb_20160503_models
         from Tea.exceptions import TeaException  # type: ignore
 
@@ -200,7 +200,7 @@ class AnalyticdbVectorOpenAPI:
         response = self._client.query_collection_data(request)
         return len(response.body.matches.match) > 0
 
-    def delete_by_ids(self, ids: list[str]) -> None:
+    def delete_by_ids(self, ids: list[str]):
         from alibabacloud_gpdb20160503 import models as gpdb_20160503_models
 
         ids_str = ",".join(f"'{id}'" for id in ids)
@@ -216,7 +216,7 @@ class AnalyticdbVectorOpenAPI:
         )
         self._client.delete_collection_data(request)
 
-    def delete_by_metadata_field(self, key: str, value: str) -> None:
+    def delete_by_metadata_field(self, key: str, value: str):
         from alibabacloud_gpdb20160503 import models as gpdb_20160503_models
 
         request = gpdb_20160503_models.DeleteCollectionDataRequest(
@@ -305,7 +305,7 @@ class AnalyticdbVectorOpenAPI:
         documents = sorted(documents, key=lambda x: x.metadata["score"] if x.metadata else 0, reverse=True)
         return documents
 
-    def delete(self) -> None:
+    def delete(self):
         try:
             from alibabacloud_gpdb20160503 import models as gpdb_20160503_models
 

api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_sql.py

@@ -23,7 +23,7 @@ class AnalyticdbVectorBySqlConfig(BaseModel):
 
     @model_validator(mode="before")
     @classmethod
-    def validate_config(cls, values: dict) -> dict:
+    def validate_config(cls, values: dict):
         if not values["host"]:
             raise ValueError("config ANALYTICDB_HOST is required")
         if not values["port"]:
@@ -52,7 +52,7 @@ class AnalyticdbVectorBySql:
         if not self.pool:
             self.pool = self._create_connection_pool()
 
-    def _initialize(self) -> None:
+    def _initialize(self):
         cache_key = f"vector_initialize_{self.config.host}"
         lock_name = f"{cache_key}_lock"
         with redis_client.lock(lock_name, timeout=20):
@@ -85,7 +85,7 @@ class AnalyticdbVectorBySql:
             conn.commit()
             self.pool.putconn(conn)
 
-    def _initialize_vector_database(self) -> None:
+    def _initialize_vector_database(self):
         conn = psycopg2.connect(
             host=self.config.host,
             port=self.config.port,
@@ -188,7 +188,7 @@ class AnalyticdbVectorBySql:
             cur.execute(f"SELECT id FROM {self.table_name} WHERE ref_doc_id = %s", (id,))
             return cur.fetchone() is not None
 
-    def delete_by_ids(self, ids: list[str]) -> None:
+    def delete_by_ids(self, ids: list[str]):
         if not ids:
             return
         with self._get_cursor() as cur:
@@ -198,7 +198,7 @@ class AnalyticdbVectorBySql:
                 if "does not exist" not in str(e):
                     raise e
 
-    def delete_by_metadata_field(self, key: str, value: str) -> None:
+    def delete_by_metadata_field(self, key: str, value: str):
         with self._get_cursor() as cur:
             try:
                 cur.execute(f"DELETE FROM {self.table_name} WHERE metadata_->>%s = %s", (key, value))
@@ -270,6 +270,6 @@ class AnalyticdbVectorBySql:
                 documents.append(doc)
         return documents
 
-    def delete(self) -> None:
+    def delete(self):
         with self._get_cursor() as cur:
             cur.execute(f"DROP TABLE IF EXISTS {self.table_name}")