mirror of
https://github.com/langgenius/dify.git
synced 2026-08-30 17:11:50 +08:00
refactor(models): pass session into PipelineCustomizedTemplate.created_user_name (#41394)
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -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 ""
|
||||
|
||||
@@ -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),
|
||||
}
|
||||
|
||||
+1
-4
@@ -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="creator@example.com")
|
||||
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)
|
||||
|
||||
Reference in New Issue
Block a user