Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(vdb): narrow bare except in text_exists() to NotFoundError (#40424)
Valord39cf7f18476
diff --git a/api/providers/vdb/vdb-lindorm/src/dify_vdb_lindorm/lindorm_vector.py b/api/providers/vdb/vdb-lindorm/src/dify_vdb_lindorm/lindorm_vector.pyindex d4c645deb9f..aee000eb3cb 100644--- a/api/providers/vdb/vdb-lindorm/src/dify_vdb_lindorm/lindorm_vector.py+++ b/api/providers/vdb/vdb-lindorm/src/dify_vdb_lindorm/lindorm_vector.py@@ -3,7 +3,7 @@ import loggingimport timefrom typing import Any, override-from opensearchpy import OpenSearch, helpers+from opensearchpy import NotFoundError, OpenSearch, helpersfrom opensearchpy.helpers import BulkIndexErrorfrom pydantic import BaseModel, model_validatorfrom sqlalchemy.orm import Session@@ -248,7 +248,7 @@ class LindormVectorStore(BaseVector):params["routing"] = self._routingself._client.get(index=self._collection_name, id=id, params=params)return True- except Exception:+ except NotFoundError:return False@overridediff --git a/api/providers/vdb/vdb-lindorm/tests/unit_tests/src/dify_vdb_lindorm/test_lindorm_vector.py b/api/providers/vdb/vdb-lindorm/tests/unit_tests/src/dify_vdb_lindorm/test_lindorm_vector.pyindex 261f0668097..562e2170960 100644--- a/api/providers/vdb/vdb-lindorm/tests/unit_tests/src/dify_vdb_lindorm/test_lindorm_vector.py+++ b/api/providers/vdb/vdb-lindorm/tests/unit_tests/src/dify_vdb_lindorm/test_lindorm_vector.py@@ -16,12 +16,16 @@ from models.dataset import Datasetdef _build_fake_opensearch_modules():opensearchpy = types.ModuleType("opensearchpy")opensearch_helpers = types.ModuleType("opensearchpy.helpers")+ opensearch_exceptions = types.ModuleType("opensearchpy.exceptions")class BulkIndexError(Exception):def __init__(self, errors):super().__init__("bulk error")self.errors = errors+ class NotFoundError(Exception):+ pass+class OpenSearch:def __init__(self, **kwargs):self.kwargs = kwargs@@ -39,13 +43,16 @@ def _build_fake_opensearch_modules():opensearch_helpers.BulkIndexError = BulkIndexErroropensearch_helpers.bulk = MagicMock()+ opensearch_exceptions.NotFoundError = NotFoundErroropensearchpy.OpenSearch = OpenSearch+ opensearchpy.NotFoundError = NotFoundErroropensearchpy.helpers = opensearch_helpersreturn {"opensearchpy": opensearchpy,"opensearchpy.helpers": opensearch_helpers,+ "opensearchpy.exceptions": opensearch_exceptions,}@@ -233,8 +240,11 @@ def test_delete_and_text_exists(lindorm_module):vector._client.indices.delete.assert_not_called()assert vector.text_exists("id-1") is True- vector._client.get.side_effect = RuntimeError("missing")+ vector._client.get.side_effect = lindorm_module.NotFoundError("missing")assert vector.text_exists("id-1") is False+ vector._client.get.side_effect = ConnectionError("connection failed")+ with pytest.raises(ConnectionError, match="connection failed"):+ vector.text_exists("id-1")def test_search_by_vector_validation_and_success(lindorm_module):diff --git a/api/providers/vdb/vdb-opensearch/src/dify_vdb_opensearch/opensearch_vector.py b/api/providers/vdb/vdb-opensearch/src/dify_vdb_opensearch/opensearch_vector.pyindex 6bd3533b062..d453ee07858 100644--- a/api/providers/vdb/vdb-opensearch/src/dify_vdb_opensearch/opensearch_vector.py+++ b/api/providers/vdb/vdb-opensearch/src/dify_vdb_opensearch/opensearch_vector.py@@ -3,7 +3,7 @@ import loggingfrom typing import Any, overridefrom uuid import uuid4-from opensearchpy import OpenSearch, Urllib3AWSV4SignerAuth, Urllib3HttpConnection, helpers+from opensearchpy import NotFoundError, OpenSearch, Urllib3AWSV4SignerAuth, Urllib3HttpConnection, helpersfrom opensearchpy.helpers import BulkIndexErrorfrom pydantic import BaseModel, model_validatorfrom sqlalchemy.orm import Session@@ -192,7 +192,7 @@ class OpenSearchVector(BaseVector):try:self._client.get(index=self._collection_name.lower(), id=id)return True- except Exception:+ except NotFoundError:return False@overridediff --git a/api/providers/vdb/vdb-opensearch/tests/unit_tests/src/dify_vdb_opensearch/test_opensearch_vector.py b/api/providers/vdb/vdb-opensearch/tests/unit_tests/src/dify_vdb_opensearch/test_opensearch_vector.pyindex 264c2d4803f..6ec83da12d9 100644--- a/api/providers/vdb/vdb-opensearch/tests/unit_tests/src/dify_vdb_opensearch/test_opensearch_vector.py+++ b/api/providers/vdb/vdb-opensearch/tests/unit_tests/src/dify_vdb_opensearch/test_opensearch_vector.py@@ -25,6 +25,9 @@ def _opensearch_build_fake_opensearch_modules():super().__init__("bulk error")self.errors = errors+ class NotFoundError(Exception):+ pass+class Urllib3AWSV4SignerAuth:def __init__(self, credentials, region, service):self.credentials = credentials@@ -52,6 +55,7 @@ def _opensearch_build_fake_opensearch_modules():opensearchpy.OpenSearch = OpenSearchopensearchpy.Urllib3AWSV4SignerAuth = Urllib3AWSV4SignerAuthopensearchpy.Urllib3HttpConnection = Urllib3HttpConnection+ opensearchpy.NotFoundError = NotFoundErroropensearchpy.helpers = helpersopensearchpy_helpers.BulkIndexError = BulkIndexError@@ -339,12 +343,16 @@ class TestOpensearchCases:def _opensearch_vector_build_fake_opensearch_modules():opensearchpy = types.ModuleType("opensearchpy")opensearchpy_helpers = types.ModuleType("opensearchpy.helpers")+ opensearchpy_exceptions = types.ModuleType("opensearchpy.exceptions")class BulkIndexError(Exception):def __init__(self, errors):super().__init__("bulk error")self.errors = errors+ class NotFoundError(Exception):+ pass+class Urllib3AWSV4SignerAuth:def __init__(self, credentials, region, service):self.credentials = credentials@@ -372,12 +380,15 @@ def _opensearch_vector_build_fake_opensearch_modules():opensearchpy.OpenSearch = OpenSearchopensearchpy.Urllib3AWSV4SignerAuth = Urllib3AWSV4SignerAuthopensearchpy.Urllib3HttpConnection = Urllib3HttpConnection+ opensearchpy.NotFoundError = NotFoundErroropensearchpy.helpers = helpersopensearchpy_helpers.BulkIndexError = BulkIndexError+ opensearchpy_exceptions.NotFoundError = NotFoundErrorreturn {"opensearchpy": opensearchpy,"opensearchpy.helpers": opensearchpy_helpers,+ "opensearchpy.exceptions": opensearchpy_exceptions,}@@ -561,8 +572,11 @@ class TestOpensearchVectorCases:vector._client.get.return_value = {"_id": "id-1"}assert vector.text_exists("id-1") is True- vector._client.get.side_effect = RuntimeError("not found")+ vector._client.get.side_effect = opensearch_module.NotFoundError("not found")assert vector.text_exists("id-1") is False+ vector._client.get.side_effect = ConnectionError("connection failed")+ with pytest.raises(ConnectionError, match="connection failed"):+ vector.text_exists("id-1")@staticmethoddef test_search_by_vector_validates_and_builds_documents(opensearch_module):