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 to get_message_data (#37403) (#42753)

xuana068c47ea993
diff --git a/api/core/ops/ops_trace_manager.py b/api/core/ops/ops_trace_manager.py
index c7a1fcfb512..8011811295b 100644
--- a/api/core/ops/ops_trace_manager.py
+++ b/api/core/ops/ops_trace_manager.py
@@ -934,7 +934,7 @@ class TraceTask:
def message_trace(self, message_id: str | None, **kwargs):
if not message_id:
return {}
- message_data = get_message_data(message_id)
+ message_data = get_message_data(message_id, db.session)
if not message_data:
return {}
conversation_mode_stmt = select(Conversation.mode).where(Conversation.id == message_data.conversation_id)
@@ -1024,7 +1024,7 @@ class TraceTask:
if not moderation_result:
return {}
inputs = kwargs.get("inputs")
- message_data = get_message_data(message_id)
+ message_data = get_message_data(message_id, db.session)
if not message_data:
return {}
metadata = {
@@ -1062,7 +1062,7 @@ class TraceTask:
def suggested_question_trace(self, message_id, timer, **kwargs):
suggested_question = kwargs.get("suggested_question", [])
- message_data = get_message_data(message_id)
+ message_data = get_message_data(message_id, db.session)
if not message_data:
return {}
metadata = {
@@ -1113,7 +1113,7 @@ class TraceTask:
def dataset_retrieval_trace(self, message_id, timer, **kwargs):
documents = kwargs.get("documents")
- message_data = get_message_data(message_id)
+ message_data = get_message_data(message_id, db.session)
if not message_data:
return {}
@@ -1203,7 +1203,7 @@ class TraceTask:
tool_name = kwargs.get("tool_name", "")
tool_inputs = kwargs.get("tool_inputs", {})
tool_outputs = kwargs.get("tool_outputs", {})
- message_data = get_message_data(message_id)
+ message_data = get_message_data(message_id, db.session)
if not message_data:
return {}
tool_config = {}
diff --git a/api/core/ops/utils.py b/api/core/ops/utils.py
index da9eb3d8dbf..87e0f52a76d 100644
--- a/api/core/ops/utils.py
+++ b/api/core/ops/utils.py
@@ -5,8 +5,8 @@ from urllib.parse import urlparse
from pydantic import TypeAdapter
from sqlalchemy import select
+from sqlalchemy.orm import Session, scoped_session
-from models.engine import db
from models.model import Message
JSON_DICT_ADAPTER: TypeAdapter[dict[str, Any]] = TypeAdapter(dict[str, Any])
@@ -24,8 +24,8 @@ def filter_none_values(data: dict[str, Any]) -> dict[str, Any]:
return new_data
-def get_message_data(message_id: str):
- return db.session.scalar(select(Message).where(Message.id == message_id))
+def get_message_data(message_id: str, session: Session | scoped_session):
+ return session.scalar(select(Message).where(Message.id == message_id))
@contextmanager
diff --git a/api/tests/unit_tests/core/ops/test_trace_session_metadata.py b/api/tests/unit_tests/core/ops/test_trace_session_metadata.py
index 6360bc9a915..b89bf31fbd8 100644
--- a/api/tests/unit_tests/core/ops/test_trace_session_metadata.py
+++ b/api/tests/unit_tests/core/ops/test_trace_session_metadata.py
@@ -152,7 +152,7 @@ def test_message_trace_metadata_includes_trace_session_id(monkeypatch, sqlite_se
sqlite_session.add_all([app, conversation])
sqlite_session.commit()
- monkeypatch.setattr("core.ops.ops_trace_manager.get_message_data", lambda message_id: _make_message_data())
+ monkeypatch.setattr("core.ops.ops_trace_manager.get_message_data", lambda message_id, session: _make_message_data())
monkeypatch.setattr("core.telemetry.gateway.is_enterprise_telemetry_enabled", lambda: False)
task = TraceTask(
diff --git a/api/tests/unit_tests/core/ops/test_utils.py b/api/tests/unit_tests/core/ops/test_utils.py
index 34752b2a447..ee4f6518892 100644
--- a/api/tests/unit_tests/core/ops/test_utils.py
+++ b/api/tests/unit_tests/core/ops/test_utils.py
@@ -5,7 +5,6 @@ from decimal import Decimal
import pytest
from sqlalchemy.orm import Session
-import core.ops.utils as utils_module
from core.ops.utils import (
filter_none_values,
generate_dotted_order,
@@ -22,20 +21,9 @@ from models.model import Message
from tests.unit_tests.model_factories import make_message
-class _DatabaseBinding:
- """Expose the real SQLite session used by the message lookup helper."""
-
- session: Session
-
- def __init__(self, session: Session) -> None:
- self.session = session
-
-
@pytest.fixture
-def message_session(sqlite_session: Session, monkeypatch: pytest.MonkeyPatch) -> Session:
- """Bind the message lookup helper to the shared SQLite test session."""
-
- monkeypatch.setattr(utils_module, "db", _DatabaseBinding(sqlite_session))
+def message_session(sqlite_session: Session) -> Session:
+ """Provide the shared SQLite test session for message lookups."""
return sqlite_session
@@ -292,7 +280,7 @@ class TestGetMessageData:
message_session.add_all((target, unrelated))
message_session.commit()
- result = get_message_data("message-id")
+ result = get_message_data("message-id", message_session)
assert result is target
assert result.id == "message-id"