From 5d72003ebbc0c2d7233c6e744fdbc399327476eb Mon Sep 17 00:00:00 2001 From: Yongtao Huang Date: Fri, 11 Apr 2025 20:33:52 +0800 Subject: [PATCH] Remove dead code (#17899) --- api/controllers/console/datasets/external.py | 6 ------ api/controllers/console/datasets/metadata.py | 12 ------------ api/controllers/console/workspace/account.py | 2 -- api/controllers/service_api/dataset/metadata.py | 12 ------------ api/controllers/service_api/dataset/segment.py | 3 --- api/core/rag/datasource/vdb/oracle/oraclevector.py | 2 +- api/core/rag/datasource/vdb/relyt/relyt_vector.py | 2 -- .../rag/datasource/vdb/tidb_vector/tidb_vector.py | 1 - .../graph_engine/entities/next_graph_node.py | 13 ------------- .../knowledge_retrieval/knowledge_retrieval_node.py | 1 - ...te_provider_last_used_at_when_message_created.py | 1 - api/services/account_service.py | 4 ---- .../vdb/opengauss/test_opengauss.py | 2 ++ .../integration_tests/workflow/nodes/test_http.py | 2 +- .../unit_tests/core/workflow/nodes/test_retry.py | 7 ------- 15 files changed, 4 insertions(+), 66 deletions(-) delete mode 100644 api/core/workflow/graph_engine/entities/next_graph_node.py diff --git a/api/controllers/console/datasets/external.py b/api/controllers/console/datasets/external.py index 48f360dcd1..2c031172bf 100644 --- a/api/controllers/console/datasets/external.py +++ b/api/controllers/console/datasets/external.py @@ -21,12 +21,6 @@ def _validate_name(name): return name -def _validate_description_length(description): - if description and len(description) > 400: - raise ValueError("Description cannot exceed 400 characters.") - return description - - class ExternalApiTemplateListApi(Resource): @setup_required @login_required diff --git a/api/controllers/console/datasets/metadata.py b/api/controllers/console/datasets/metadata.py index 14183a1e67..fc9711169f 100644 --- a/api/controllers/console/datasets/metadata.py +++ b/api/controllers/console/datasets/metadata.py @@ -14,18 +14,6 @@ from services.entities.knowledge_entities.knowledge_entities import ( from services.metadata_service import MetadataService -def _validate_name(name): - if not name or len(name) < 1 or len(name) > 40: - raise ValueError("Name must be between 1 to 40 characters.") - return name - - -def _validate_description_length(description): - if len(description) > 400: - raise ValueError("Description cannot exceed 400 characters.") - return description - - class DatasetMetadataCreateApi(Resource): @setup_required @login_required diff --git a/api/controllers/console/workspace/account.py b/api/controllers/console/workspace/account.py index d2cc140489..e9c25e6c5b 100644 --- a/api/controllers/console/workspace/account.py +++ b/api/controllers/console/workspace/account.py @@ -286,8 +286,6 @@ class AccountDeleteApi(Resource): class AccountDeleteUpdateFeedbackApi(Resource): @setup_required def post(self): - account = current_user - parser = reqparse.RequestParser() parser.add_argument("email", type=str, required=True, location="json") parser.add_argument("feedback", type=str, required=True, location="json") diff --git a/api/controllers/service_api/dataset/metadata.py b/api/controllers/service_api/dataset/metadata.py index 9ba94bdbbf..298c8a8df8 100644 --- a/api/controllers/service_api/dataset/metadata.py +++ b/api/controllers/service_api/dataset/metadata.py @@ -13,18 +13,6 @@ from services.entities.knowledge_entities.knowledge_entities import ( from services.metadata_service import MetadataService -def _validate_name(name): - if not name or len(name) < 1 or len(name) > 40: - raise ValueError("Name must be between 1 to 40 characters.") - return name - - -def _validate_description_length(description): - if len(description) > 400: - raise ValueError("Description cannot exceed 400 characters.") - return description - - class DatasetMetadataCreateServiceApi(DatasetApiResource): def post(self, tenant_id, dataset_id): parser = reqparse.RequestParser() diff --git a/api/controllers/service_api/dataset/segment.py b/api/controllers/service_api/dataset/segment.py index 81bae2940d..3d5869c371 100644 --- a/api/controllers/service_api/dataset/segment.py +++ b/api/controllers/service_api/dataset/segment.py @@ -117,9 +117,6 @@ class SegmentApi(DatasetApiResource): parser.add_argument("keyword", type=str, default=None, location="args") args = parser.parse_args() - status_list = args["status"] - keyword = args["keyword"] - segments, total = SegmentService.get_segments( document_id=document_id, tenant_id=current_user.current_tenant_id, diff --git a/api/core/rag/datasource/vdb/oracle/oraclevector.py b/api/core/rag/datasource/vdb/oracle/oraclevector.py index 9e0360069f..4af2578197 100644 --- a/api/core/rag/datasource/vdb/oracle/oraclevector.py +++ b/api/core/rag/datasource/vdb/oracle/oraclevector.py @@ -228,7 +228,7 @@ class OracleVector(BaseVector): top_k = kwargs.get("top_k", 5) # just not implement fetch by score_threshold now, may be later - score_threshold = float(kwargs.get("score_threshold") or 0.0) + # score_threshold = float(kwargs.get("score_threshold") or 0.0) if len(query) > 0: # Check which language the query is in zh_pattern = re.compile("[\u4e00-\u9fa5]+") diff --git a/api/core/rag/datasource/vdb/relyt/relyt_vector.py b/api/core/rag/datasource/vdb/relyt/relyt_vector.py index a6c4baf4f8..0c0d6a463d 100644 --- a/api/core/rag/datasource/vdb/relyt/relyt_vector.py +++ b/api/core/rag/datasource/vdb/relyt/relyt_vector.py @@ -65,8 +65,6 @@ class RelytVector(BaseVector): return VectorType.RELYT def create(self, texts: list[Document], embeddings: list[list[float]], **kwargs) -> None: - index_params: dict[str, Any] = {} - metadatas = [d.metadata for d in texts] self.create_collection(len(embeddings[0])) self.embedding_dimension = len(embeddings[0]) self.add_texts(texts, embeddings) diff --git a/api/core/rag/datasource/vdb/tidb_vector/tidb_vector.py b/api/core/rag/datasource/vdb/tidb_vector/tidb_vector.py index efa68059e5..00229ce700 100644 --- a/api/core/rag/datasource/vdb/tidb_vector/tidb_vector.py +++ b/api/core/rag/datasource/vdb/tidb_vector/tidb_vector.py @@ -187,7 +187,6 @@ class TiDBVector(BaseVector): def search_by_vector(self, query_vector: list[float], **kwargs: Any) -> list[Document]: top_k = kwargs.get("top_k", 4) score_threshold = float(kwargs.get("score_threshold") or 0.0) - filter = kwargs.get("filter") distance = 1 - score_threshold query_vector_str = ", ".join(format(x) for x in query_vector) diff --git a/api/core/workflow/graph_engine/entities/next_graph_node.py b/api/core/workflow/graph_engine/entities/next_graph_node.py deleted file mode 100644 index 6aa4341ddf..0000000000 --- a/api/core/workflow/graph_engine/entities/next_graph_node.py +++ /dev/null @@ -1,13 +0,0 @@ -from typing import Optional - -from pydantic import BaseModel - -from core.workflow.graph_engine.entities.graph import GraphParallel - - -class NextGraphNode(BaseModel): - node_id: str - """next node id""" - - parallel: Optional[GraphParallel] = None - """parallel""" diff --git a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py index d1e6e5b67b..07a711cc4e 100644 --- a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py +++ b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py @@ -597,7 +597,6 @@ class KnowledgeRetrievalNode(LLMNode): def _get_prompt_template(self, node_data: KnowledgeRetrievalNodeData, metadata_fields: list, query: str): model_mode = ModelMode.value_of(node_data.metadata_model_config.mode) # type: ignore input_text = query - memory_str = "" prompt_messages: list[LLMNodeChatModelMessage] = [] if model_mode == ModelMode.CHAT: diff --git a/api/events/event_handlers/update_provider_last_used_at_when_message_created.py b/api/events/event_handlers/update_provider_last_used_at_when_message_created.py index f225ef8e88..59412cf87c 100644 --- a/api/events/event_handlers/update_provider_last_used_at_when_message_created.py +++ b/api/events/event_handlers/update_provider_last_used_at_when_message_created.py @@ -8,7 +8,6 @@ from models.provider import Provider @message_was_created.connect def handle(sender, **kwargs): - message = sender application_generate_entity = kwargs.get("application_generate_entity") if not isinstance(application_generate_entity, ChatAppGenerateEntity | AgentChatAppGenerateEntity): diff --git a/api/services/account_service.py b/api/services/account_service.py index 8329ef3645..ada8109067 100644 --- a/api/services/account_service.py +++ b/api/services/account_service.py @@ -571,10 +571,6 @@ class AccountService: return False -def _get_login_cache_key(*, account_id: str, token: str): - return f"account_login:{account_id}:{token}" - - class TenantService: @staticmethod def create_tenant(name: str, is_setup: Optional[bool] = False, is_from_dashboard: Optional[bool] = False) -> Tenant: diff --git a/api/tests/integration_tests/vdb/opengauss/test_opengauss.py b/api/tests/integration_tests/vdb/opengauss/test_opengauss.py index 5dbe97b35a..f2013848bf 100644 --- a/api/tests/integration_tests/vdb/opengauss/test_opengauss.py +++ b/api/tests/integration_tests/vdb/opengauss/test_opengauss.py @@ -1,5 +1,7 @@ import time +import psycopg2 # type: ignore + from core.rag.datasource.vdb.opengauss.opengauss import OpenGauss, OpenGaussConfig from tests.integration_tests.vdb.test_vector_store import ( AbstractVectorTest, diff --git a/api/tests/integration_tests/workflow/nodes/test_http.py b/api/tests/integration_tests/workflow/nodes/test_http.py index 0507fc7075..1ab0cc2451 100644 --- a/api/tests/integration_tests/workflow/nodes/test_http.py +++ b/api/tests/integration_tests/workflow/nodes/test_http.py @@ -425,8 +425,8 @@ def test_multi_colons_parse(setup_http_mock): result = node._run() assert result.process_data is not None assert result.outputs is not None - resp = result.outputs assert urlencode({"Redirect": "http://example2.com"}) in result.process_data.get("request", "") assert 'form-data; name="Redirect"\r\n\r\nhttp://example6.com' in result.process_data.get("request", "") + # resp = result.outputs # assert "http://example3.com" == resp.get("headers", {}).get("referer") diff --git a/api/tests/unit_tests/core/workflow/nodes/test_retry.py b/api/tests/unit_tests/core/workflow/nodes/test_retry.py index 4ac79d7acd..57d3b203b9 100644 --- a/api/tests/unit_tests/core/workflow/nodes/test_retry.py +++ b/api/tests/unit_tests/core/workflow/nodes/test_retry.py @@ -46,13 +46,6 @@ def test_retry_default_value_partial_success(): def test_retry_failed(): """retry failed with success status""" - error_code = """ - def main() -> dict: - return { - "result": 1 / 0, - } - """ - graph_config = { "edges": DEFAULT_VALUE_EDGE, "nodes": [