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 PipelineCustomizedTemplate.created_user_name (#41394)

chenshiyang654324c0d9fc
diff --git a/api/models/dataset.py b/api/models/dataset.py
index b82681e636c..ae54b5a8433 100644
--- a/api/models/dataset.py
+++ b/api/models/dataset.py
@@ -1711,9 +1711,8 @@ class PipelineCustomizedTemplate(TypeBase):
init=False,
)
- @property
- def created_user_name(self):
- account = db.session.scalar(select(Account).where(Account.id == self.created_by))
+ def created_user_name(self, session: Session) -> str:
+ account = session.scalar(select(Account).where(Account.id == self.created_by))
if account:
return account.name
return ""
diff --git a/api/services/rag_pipeline/pipeline_template/customized/customized_retrieval.py b/api/services/rag_pipeline/pipeline_template/customized/customized_retrieval.py
index 195d6d45001..2aa39cd5d4e 100644
--- a/api/services/rag_pipeline/pipeline_template/customized/customized_retrieval.py
+++ b/api/services/rag_pipeline/pipeline_template/customized/customized_retrieval.py
@@ -119,5 +119,5 @@ class CustomizedPipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
"chunk_structure": pipeline_template.chunk_structure,
"export_data": pipeline_template.yaml_content,
"graph": graph_data,
- "created_by": pipeline_template.created_user_name,
+ "created_by": pipeline_template.created_user_name(session=session),
}
diff --git a/api/tests/unit_tests/services/rag_pipeline/pipeline_template/test_customized_retrieval.py b/api/tests/unit_tests/services/rag_pipeline/pipeline_template/test_customized_retrieval.py
index d883a0ac07d..51c8e5bc94a 100644
--- a/api/tests/unit_tests/services/rag_pipeline/pipeline_template/test_customized_retrieval.py
+++ b/api/tests/unit_tests/services/rag_pipeline/pipeline_template/test_customized_retrieval.py
@@ -1,5 +1,3 @@
-from types import SimpleNamespace
-
import pytest
from sqlalchemy.orm import Session
@@ -73,12 +71,11 @@ def test_get_pipeline_templates(sqlite_session: Session) -> None:
@pytest.mark.parametrize("sqlite_session", [(Account, PipelineCustomizedTemplate)], indirect=True)
-def test_get_pipeline_template_detail_returns_detail(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session) -> None:
+def test_get_pipeline_template_detail_returns_detail(sqlite_session: Session) -> None:
creator = Account(name="creator", email="[email protected]")
creator.id = CREATOR_ID
sqlite_session.add_all([creator, _template()])
sqlite_session.commit()
- monkeypatch.setattr("models.dataset.db", SimpleNamespace(session=sqlite_session))
retrieval = CustomizedPipelineTemplateRetrieval()
detail = retrieval.get_pipeline_template_detail(TEMPLATE_ID, TENANT_ID, session=sqlite_session)