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
refactor(models): pass session into App.tenant (#42518)
JessYan5568aa0ea57d
diff --git a/api/controllers/web/human_input_form.py b/api/controllers/web/human_input_form.pyindex 745b68b7f2d..ed1d7914b05 100644--- a/api/controllers/web/human_input_form.py+++ b/api/controllers/web/human_input_form.py@@ -182,7 +182,7 @@ class HumanInputFormApi(Resource):service.ensure_form_active(form)app_model, site = _get_app_site_from_form(form)- tenant = app_model.tenant+ tenant = app_model.tenant(db.session)if tenant is None:raise Forbidden()inputs = service.resolve_form_inputs(form)@@ -276,7 +276,8 @@ def _get_app_site_from_form(form: Form) -> tuple[App, Site]:if site is None:raise Forbidden()- if app_model.tenant is None or app_model.tenant.status == TenantStatus.ARCHIVE:+ tenant = app_model.tenant(db.session)+ if tenant is None or tenant.status == TenantStatus.ARCHIVE:raise Forbidden()return app_model, sitediff --git a/api/models/model.py b/api/models/model.pyindex 0cd3c2e16eb..64319f976fb 100644--- a/api/models/model.py+++ b/api/models/model.py@@ -530,9 +530,8 @@ class App(Base):base = dify_config.SERVICE_API_URL or request.host_url.rstrip("/")return normalize_api_base_url(base)- @property- def tenant(self) -> Tenant | None:- return db.session.scalar(select(Tenant).where(Tenant.id == self.tenant_id))+ def tenant(self, session: Session | scoped_session) -> Tenant | None:+ return session.scalar(select(Tenant).where(Tenant.id == self.tenant_id))def is_agent_with_session(self, *, session: Session) -> bool:"""Detect legacy agent mode, committing the compatible app mode through the supplied session."""diff --git a/api/tests/unit_tests/controllers/web/test_human_input_form.py b/api/tests/unit_tests/controllers/web/test_human_input_form.pyindex d53ba7d60ca..7e10c48abbc 100644--- a/api/tests/unit_tests/controllers/web/test_human_input_form.py+++ b/api/tests/unit_tests/controllers/web/test_human_input_form.py@@ -18,6 +18,7 @@ from controllers.web.error import WebFormRateLimitExceededErrorfrom core.workflow.nodes.human_input.entities import ParagraphInputConfig, SelectInputConfig, StringListSourcefrom core.workflow.nodes.human_input.enums import ValueSourceTypefrom models import Tenant+from models.account import TenantStatusfrom models.enums import CustomizeTokenStrategyfrom models.human_input import RecipientTypefrom models.model import App, AppMode, IconType, Site@@ -439,6 +440,50 @@ def test_get_form_raises_forbidden_when_site_missing(limiter_mock.increment_rate_limit.assert_called_once_with("203.0.113.10")+def test_get_form_raises_forbidden_when_tenant_archived(+ monkeypatch: pytest.MonkeyPatch, app: Flask, database_session: Session+) -> None:+ """GET raises Forbidden when the app's tenant is archived."""++ expiration_time = datetime(2099, 1, 3, tzinfo=UTC)+ tenant, app_model, _ = _persist_app_site(database_session)+ tenant.status = TenantStatus.ARCHIVE+ database_session.commit()++ class _FakeDefinition:+ def model_dump(self, mode: str | None = None) -> dict[str, object]:+ return {+ "form_content": "Raw content",+ "rendered_content": "Rendered",+ "inputs": [],+ "default_values": {},+ "user_actions": [],+ }++ class _FakeForm:+ def __init__(self, expiration: datetime) -> None:+ self.workflow_run_id: str | None = None+ self.app_id: str = app_model.id+ self.tenant_id: str = app_model.tenant_id+ self.expiration_time: datetime = expiration++ def get_definition(self) -> _FakeDefinition:+ return _FakeDefinition()++ form = _FakeForm(expiration_time)+ limiter_mock = MagicMock()+ limiter_mock.is_rate_limited.return_value = False+ monkeypatch.setattr(human_input_module, "_FORM_ACCESS_RATE_LIMITER", limiter_mock)+ monkeypatch.setattr(human_input_module, "extract_remote_ip", lambda req: "203.0.113.10")+ service_mock = MagicMock()+ service_mock.get_form_by_token.return_value = form+ monkeypatch.setattr(human_input_module, "HumanInputService", lambda engine: service_mock)++ with app.test_request_context("/api/form/human_input/token-1", method="GET"):+ with pytest.raises(Forbidden):+ HumanInputFormApi().get("token-1")++def test_submit_form_accepts_backstage_token(monkeypatch: pytest.MonkeyPatch, app: Flask, sqlite_engine: Engine):"""POST forwards backstage submissions to the service."""diff --git a/api/tests/unit_tests/models/test_app_session_accessors.py b/api/tests/unit_tests/models/test_app_session_accessors.pynew file mode 100644index 00000000000..bf590e280d6--- /dev/null+++ b/api/tests/unit_tests/models/test_app_session_accessors.py@@ -0,0 +1,50 @@+"""Regression coverage for the ``@property``→session-parameter refactor on ``App.tenant``.++The legacy ``@property`` reached for the global ``db.session`` internally and has been converted+to a plain method taking an explicit ``session`` (per the pattern established in+#41830/#41831 for ``InstalledApp.tenant`` / ``ApiToolProvider.tenant``, tracked in #40372).+"""++from uuid import uuid4++from sqlalchemy.orm import Session++from models.account import Tenant+from models.model import App, AppMode+++def _persist_tenant(session: Session) -> Tenant:+ tenant = Tenant(name="Test Tenant")+ session.add(tenant)+ session.flush()+ return tenant+++def _persist_app(session: Session, *, tenant_id: str) -> App:+ app = App(+ tenant_id=tenant_id,+ name="Test App",+ mode=AppMode.CHAT,+ enable_site=True,+ enable_api=False,+ created_by=str(uuid4()),+ )+ session.add(app)+ session.flush()+ return app+++class TestAppTenant:+ def test_returns_the_matching_tenant(self, sqlite_session: Session) -> None:+ tenant = _persist_tenant(sqlite_session)+ app = _persist_app(sqlite_session, tenant_id=tenant.id)++ result = app.tenant(session=sqlite_session)++ assert result is not None+ assert result.id == tenant.id++ def test_returns_none_when_tenant_missing(self, sqlite_session: Session) -> None:+ app = _persist_app(sqlite_session, tenant_id=str(uuid4()))++ assert app.tenant(session=sqlite_session) is None