Skip to content

armgit / dify

Public Imported from GitHub
0

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.

refactor(models): pass session into AppAnnotationSetting.collection_binding_detail (#41885)

however-yir80f6f72e8c8c
diff --git a/api/models/model.py b/api/models/model.py
index 9883557099f..1a31ef63d73 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -57,6 +57,7 @@ from .types import EnumText, LongText, StringUUID
if TYPE_CHECKING:
from .agent import Agent
+ from .dataset import DatasetCollectionBinding
from .workflow import Workflow
@@ -2122,11 +2123,10 @@ class AppAnnotationSetting(TypeBase):
init=False,
)
- @property
- def collection_binding_detail(self):
+ def collection_binding_detail(self, session: Session) -> DatasetCollectionBinding | None:
from .dataset import DatasetCollectionBinding
- return db.session.scalar(
+ return session.scalar(
select(DatasetCollectionBinding).where(DatasetCollectionBinding.id == self.collection_binding_id)
)
diff --git a/api/tests/unit_tests/models/test_app_annotation_setting_session_accessors.py b/api/tests/unit_tests/models/test_app_annotation_setting_session_accessors.py
new file mode 100644
index 00000000000..23b86cd2c38
--- /dev/null
+++ b/api/tests/unit_tests/models/test_app_annotation_setting_session_accessors.py
@@ -0,0 +1,60 @@
+"""Regression coverage for the ``@property``→session-parameter refactor on
+``AppAnnotationSetting.collection_binding_detail``.
+
+The legacy ``@property`` reached for the global ``db.session`` internally and has been converted
+to a plain method taking an explicit ``session: Session`` (per the pattern established in
+#40370/#40797/#41394/#41830, tracked in #40372).
+
+The accessor is exercised against the real ``sqlite_session`` fixture (a genuine SQLAlchemy
+``Session`` bound to a pristine full-schema SQLite database) so the assertions cover actual query
+behaviour rather than a mock's recorded call.
+"""
+
+from uuid import uuid4
+
+from sqlalchemy.orm import Session
+
+from models.dataset import DatasetCollectionBinding
+from models.enums import CollectionBindingType
+from models.model import AppAnnotationSetting
+
+
+def _persist_collection_binding(session: Session) -> DatasetCollectionBinding:
+ binding = DatasetCollectionBinding(
+ collection_name="test_collection",
+ provider_name="test_provider",
+ model_name="test_model",
+ type=CollectionBindingType.DATASET,
+ )
+ session.add(binding)
+ session.flush()
+ return binding
+
+
+def _persist_setting(session: Session, *, collection_binding_id: str) -> AppAnnotationSetting:
+ setting = AppAnnotationSetting(
+ app_id=str(uuid4()),
+ score_threshold=0.8,
+ collection_binding_id=collection_binding_id,
+ created_user_id=str(uuid4()),
+ updated_user_id=str(uuid4()),
+ )
+ session.add(setting)
+ session.flush()
+ return setting
+
+
+class TestAppAnnotationSettingCollectionBindingDetail:
+ def test_returns_the_bound_collection_binding(self, sqlite_session: Session) -> None:
+ binding = _persist_collection_binding(sqlite_session)
+ setting = _persist_setting(sqlite_session, collection_binding_id=binding.id)
+
+ result = setting.collection_binding_detail(session=sqlite_session)
+
+ assert result is not None
+ assert result.id == binding.id
+
+ def test_returns_none_when_binding_missing(self, sqlite_session: Session) -> None:
+ setting = _persist_setting(sqlite_session, collection_binding_id=str(uuid4()))
+
+ assert setting.collection_binding_detail(session=sqlite_session) is None