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: pass db.session explicitly in instruction_modify_workflow (#37403) (#40827)

Weike Zhang02f9b3ca7c10
diff --git a/api/controllers/console/app/generator.py b/api/controllers/console/app/generator.py
index 6fba79cfcbb..d29f8a1911b 100644
--- a/api/controllers/console/app/generator.py
+++ b/api/controllers/console/app/generator.py
@@ -412,6 +412,7 @@ class InstructionGenerateApi(Resource):
model_config=req_data.model_config_data,
ideal_output=req_data.ideal_output,
workflow_service=WorkflowService(),
+ session=session,
)
return {"error": "incompatible parameters"}, 400
except ProviderTokenNotInitError as ex:
diff --git a/api/core/llm_generator/llm_generator.py b/api/core/llm_generator/llm_generator.py
index c6842b2b86c..03fc06f0d3f 100644
--- a/api/core/llm_generator/llm_generator.py
+++ b/api/core/llm_generator/llm_generator.py
@@ -841,9 +841,8 @@ class LLMGenerator:
model_config: ModelConfig,
ideal_output: str | None,
workflow_service: WorkflowServiceInterface,
+ session: Session,
):
- session = db.session()
-
app: App | None = session.scalar(select(App).where(App.id == flow_id, App.tenant_id == tenant_id).limit(1))
if not app:
raise ValueError("App not found.")
diff --git a/api/tests/unit_tests/core/llm_generator/test_llm_generator.py b/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
index 2efef0b8fff..003514450dc 100644
--- a/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
+++ b/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
@@ -649,6 +649,7 @@ class TestLLMGenerator:
model_config_entity,
"ideal",
workflow_service,
+ session=database,
)
def test_instruction_modify_workflow_rejects_app_from_another_tenant(
@@ -670,6 +671,7 @@ class TestLLMGenerator:
model_config_entity,
"ideal",
workflow_service,
+ session=database,
)
def test_instruction_modify_workflow_requires_draft_workflow(
@@ -691,6 +693,7 @@ class TestLLMGenerator:
model_config_entity,
"ideal",
workflow_service,
+ session=database,
)
def test_instruction_modify_workflow_uses_last_run(
@@ -720,6 +723,7 @@ class TestLLMGenerator:
model_config_entity,
"ideal",
workflow_service,
+ session=database,
)
assert result == {"modified": "workflow"}
@@ -748,6 +752,7 @@ class TestLLMGenerator:
model_config_entity,
"ideal",
workflow_service,
+ session=database,
)
assert result == {"modified": "workflow"}
@@ -783,6 +788,7 @@ class TestLLMGenerator:
model_config_entity,
"ideal",
workflow_service,
+ session=database,
)
assert result == {"modified": "fallback"}
@@ -807,6 +813,7 @@ class TestLLMGenerator:
model_config_entity,
"ideal",
workflow_service,
+ session=database,
)
assert result == {"modified": "workflow"}