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.

test: migrate console dataset metadata sessions and ORM models to SQLite (#40520)

Asuka Minatoe7cfe142bcb3
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_external.py b/api/tests/unit_tests/controllers/console/datasets/test_external.py
index 73f773ce80a..2ebc0b2e9f8 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_external.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_external.py
@@ -1,7 +1,8 @@
import inspect
-from types import SimpleNamespace
+import json
+from datetime import datetime
from typing import Any
-from unittest.mock import ANY, MagicMock, PropertyMock, patch
+from unittest.mock import ANY, PropertyMock, patch
import pytest
from flask import Flask
@@ -21,7 +22,9 @@ from controllers.console.datasets.external import (
ExternalKnowledgeApiPayload,
ExternalKnowledgeHitTestingApi,
)
+from fields.dataset_fields import DatasetDetailResponse
from models.account import Account, TenantAccountRole
+from models.dataset import Dataset, ExternalKnowledgeApis, ExternalKnowledgeBindings
from services.dataset_service import DatasetService
from services.entities.external_knowledge_entities.external_knowledge_entities import ExternalDatasetCreatePayload
from services.external_knowledge_service import ExternalDatasetService
@@ -63,16 +66,34 @@ def _external_api_dict(api_id: str = "api-1") -> dict:
}
-def _external_api_object(api_id: str = "api-1") -> SimpleNamespace:
+def _external_api_object(session: Session, api_id: str = "api-1") -> ExternalKnowledgeApis:
payload = _external_api_dict(api_id)
- dataset_bindings = [SimpleNamespace(**binding) for binding in payload["dataset_bindings"]]
- return SimpleNamespace(
- **{
- **payload,
- "dataset_bindings": dataset_bindings,
- "get_dataset_bindings": MagicMock(return_value=dataset_bindings),
- }
+ api = ExternalKnowledgeApis(
+ name=payload["name"],
+ description=payload["description"],
+ tenant_id=payload["tenant_id"],
+ settings=json.dumps(payload["settings"]),
+ created_by=payload["created_by"],
+ updated_by=None,
+ )
+ api.id = api_id
+ api.created_at = datetime.fromisoformat(payload["created_at"])
+ bound_dataset = Dataset(
+ id=payload["dataset_bindings"][0]["id"],
+ tenant_id=payload["tenant_id"],
+ name=payload["dataset_bindings"][0]["name"],
+ created_by=payload["created_by"],
+ )
+ binding = ExternalKnowledgeBindings(
+ tenant_id=payload["tenant_id"],
+ external_knowledge_api_id=api_id,
+ dataset_id=bound_dataset.id,
+ external_knowledge_id=f"knowledge-{api_id}",
+ created_by=payload["created_by"],
)
+ session.add_all([api, bound_dataset, binding])
+ session.flush()
+ return api
def _expected_dataset_detail_payload() -> dict[str, Any]:
@@ -145,21 +166,25 @@ def _expected_dataset_detail_payload() -> dict[str, Any]:
}
-def _dataset_detail_object() -> SimpleNamespace:
+def _dataset() -> Dataset:
payload = _expected_dataset_detail_payload()
- return SimpleNamespace(
- **{
- **payload,
- "summary_index_setting": SimpleNamespace(**payload["summary_index_setting"]),
- "tags": [SimpleNamespace(**tag) for tag in payload["tags"]],
- "external_knowledge_info": SimpleNamespace(**payload["external_knowledge_info"]),
- "external_retrieval_model": SimpleNamespace(**payload["external_retrieval_model"]),
- "doc_metadata": [SimpleNamespace(**item) for item in payload["doc_metadata"]],
- "icon_info": SimpleNamespace(**payload["icon_info"]),
- }
+ return Dataset(
+ id=payload["id"],
+ tenant_id="tenant-1",
+ name=payload["name"],
+ description=payload["description"],
+ provider=payload["provider"],
+ permission=payload["permission"],
+ data_source_type=payload["data_source_type"],
+ indexing_technique=payload["indexing_technique"],
+ created_by=payload["created_by"],
)
+def _dataset_detail_response() -> DatasetDetailResponse:
+ return DatasetDetailResponse.model_validate(_expected_dataset_detail_payload())
+
+
class _UsesSQLiteSession:
session: Session
@@ -173,8 +198,8 @@ class TestExternalApiTemplateListApi(_UsesSQLiteSession):
api = ExternalApiTemplateListApi()
method = inspect.unwrap(api.get)
- api_item = _external_api_object("api-1")
session = self.session
+ api_item = _external_api_object(session, "api-1")
with (
app.test_request_context("/?page=2&limit=1&keyword=vector"),
@@ -196,7 +221,6 @@ class TestExternalApiTemplateListApi(_UsesSQLiteSession):
"total": 3,
"page": 2,
}
- api_item.get_dataset_bindings.assert_called_once_with(session=session)
get_external_knowledge_apis.assert_called_once_with(2, 1, "tenant-1", "vector", session=ANY)
def test_post_success_uses_validated_payload_and_returns_template(self, app: Flask, current_user: Account):
@@ -212,8 +236,8 @@ class TestExternalApiTemplateListApi(_UsesSQLiteSession):
"timeout": 30,
},
}
- created = _external_api_object("api-created")
session = self.session
+ created = _external_api_object(session, "api-created")
with (
app.test_request_context("/", json=payload),
@@ -231,7 +255,6 @@ class TestExternalApiTemplateListApi(_UsesSQLiteSession):
assert status == 201
assert resp == _external_api_dict("api-created")
- created.get_dataset_bindings.assert_called_once_with(session=session)
validate_api_list.assert_called_once_with(payload["settings"])
create_external_knowledge_api.assert_called_once_with(
tenant_id="tenant-1",
@@ -279,8 +302,8 @@ class TestExternalApiTemplateApi(_UsesSQLiteSession):
def test_get_success_returns_template_contract(self, app: Flask):
api = ExternalApiTemplateApi()
method = inspect.unwrap(api.get)
- template = _external_api_object("api-detail")
session = self.session
+ template = _external_api_object(session, "api-detail")
with (
app.test_request_context("/"),
@@ -294,7 +317,6 @@ class TestExternalApiTemplateApi(_UsesSQLiteSession):
assert status == 200
assert resp == _external_api_dict("api-detail")
- template.get_dataset_bindings.assert_called_once_with(session=session)
get_external_knowledge_api.assert_called_once_with(
external_knowledge_api_id="api-detail", tenant_id="tenant-1", session=session
)
@@ -326,8 +348,8 @@ class TestExternalApiTemplateApi(_UsesSQLiteSession):
"headers": {"X-Version": "2"},
},
}
- updated = _external_api_object("api-updated")
session = self.session
+ updated = _external_api_object(session, "api-updated")
with (
app.test_request_context("/", json=payload),
@@ -350,7 +372,6 @@ class TestExternalApiTemplateApi(_UsesSQLiteSession):
assert status == 200
assert resp == _external_api_dict("api-updated")
- updated.get_dataset_bindings.assert_called_once_with(session=session)
validate_api_list.assert_called_once_with(payload["settings"])
update_external_knowledge_api.assert_called_once_with(
tenant_id="tenant-1",
@@ -410,7 +431,7 @@ class TestExternalDatasetCreateApi(_UsesSQLiteSession):
},
}
- dataset = _dataset_detail_object()
+ dataset = _dataset()
with (
app.test_request_context("/", json=payload),
@@ -422,12 +443,15 @@ class TestExternalDatasetCreateApi(_UsesSQLiteSession):
) as create_external_dataset,
patch(
"controllers.console.datasets.external.dataset_detail_response_source",
- return_value=dataset,
+ return_value=_dataset_detail_response(),
) as dataset_response_source,
):
- session = MagicMock()
resp, status = method(
- api, ExternalDatasetCreatePayload.model_validate(payload), session, "tenant-1", current_user
+ api,
+ ExternalDatasetCreatePayload.model_validate(payload),
+ self.session,
+ "tenant-1",
+ current_user,
)
assert status == 201
@@ -436,9 +460,9 @@ class TestExternalDatasetCreateApi(_UsesSQLiteSession):
tenant_id="tenant-1",
user_id="user-1",
args=ExternalDatasetCreatePayload.model_validate(payload),
- session=session,
+ session=self.session,
)
- dataset_response_source.assert_called_once_with(dataset, session=session)
+ dataset_response_source.assert_called_once_with(dataset, session=self.session)
def test_create_forbidden(self, app: Flask, current_user: Account):
current_user.role = TenantAccountRole.NORMAL
@@ -494,7 +518,7 @@ class TestExternalKnowledgeHitTestingApi(_UsesSQLiteSession):
},
}
- dataset = MagicMock()
+ dataset = _dataset()
retrieve_response = {
"query": {"content": "hello"},
"records": [
@@ -559,7 +583,7 @@ class TestExternalApiTemplateListApiAdvanced(_UsesSQLiteSession):
api = ExternalApiTemplateListApi()
method = inspect.unwrap(api.get)
- templates = [_external_api_object(f"api-{i}") for i in range(3)]
+ templates = [_external_api_object(self.session, f"api-{i}") for i in range(3)]
with (
app.test_request_context("/?page=2&limit=3"),
@@ -629,7 +653,7 @@ class TestExternalKnowledgeHitTestingApiAdvanced(_UsesSQLiteSession):
api = ExternalKnowledgeHitTestingApi()
method = inspect.unwrap(api.post)
- dataset = MagicMock()
+ dataset = _dataset()
payload = {
"query": "test query",
"external_retrieval_model": {"type": "bm25"},
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_metadata.py b/api/tests/unit_tests/controllers/console/datasets/test_metadata.py
index 696e0223255..3c154ffd2ff 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_metadata.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_metadata.py
@@ -1,10 +1,11 @@
import uuid
from inspect import unwrap
-from unittest.mock import ANY, MagicMock, PropertyMock, patch
+from unittest.mock import PropertyMock, patch
import pytest
from flask import Flask
from pytest_mock import MockerFixture
+from sqlalchemy.orm import Session
from werkzeug.exceptions import Forbidden, NotFound
from controllers.common.controller_schemas import MetadataUpdatePayload
@@ -17,6 +18,7 @@ from controllers.console.datasets.metadata import (
DocumentMetadataEditApi,
)
from models.account import Account
+from models.dataset import Dataset
from services.dataset_service import DatasetService
from services.entities.knowledge_entities.knowledge_entities import MetadataArgs, MetadataOperationData
from services.errors.account import NoPermissionError
@@ -41,10 +43,8 @@ def current_user() -> Account:
@pytest.fixture
-def dataset():
- ds = MagicMock()
- ds.id = "dataset-1"
- return ds
+def dataset() -> Dataset:
+ return Dataset(id="dataset-1", tenant_id="tenant-1", name="Test Dataset", created_by="user-1")
@pytest.fixture
@@ -67,14 +67,18 @@ def bypass_decorators(mocker: MockerFixture):
class TestDatasetMetadataCreateApi:
- def test_create_metadata_success(self, app: Flask, current_user, dataset, dataset_id):
+ def test_create_metadata_success(self, app: Flask, current_user, dataset, dataset_id, sqlite_session: Session):
api = DatasetMetadataCreateApi()
method = unwrap(api.post)
payload = {"name": "author"}
with (
app.test_request_context("/"),
patch.object(type(console_ns), "payload", new_callable=PropertyMock, return_value=payload),
- patch.object(MetadataArgs, "model_validate", return_value=MagicMock()),
+ patch.object(
+ MetadataArgs,
+ "model_validate",
+ return_value=MetadataArgs(type="string", name="author"),
+ ),
patch.object(DatasetService, "get_dataset", return_value=dataset),
patch.object(DatasetService, "check_dataset_permission"),
patch.object(
@@ -82,30 +86,39 @@ class TestDatasetMetadataCreateApi:
),
):
result, status = method(
- api, MetadataArgs(type="string", name="author"), MagicMock(), "tenant-1", current_user, dataset_id
+ api, MetadataArgs(type="string", name="author"), sqlite_session, "tenant-1", current_user, dataset_id
)
assert status == 201
assert result["type"] == "string"
assert result["name"] == "author"
- def test_create_metadata_dataset_not_found(self, app: Flask, current_user, dataset_id):
+ def test_create_metadata_dataset_not_found(self, app: Flask, current_user, dataset_id, sqlite_session: Session):
api = DatasetMetadataCreateApi()
method = unwrap(api.post)
valid_payload = {"type": "string", "name": "author"}
with (
app.test_request_context("/"),
patch.object(type(console_ns), "payload", new_callable=PropertyMock, return_value=valid_payload),
- patch.object(MetadataArgs, "model_validate", return_value=MagicMock()),
+ patch.object(
+ MetadataArgs,
+ "model_validate",
+ return_value=MetadataArgs(type="string", name="author"),
+ ),
patch.object(DatasetService, "get_dataset", return_value=None),
):
with pytest.raises(NotFound, match="Dataset not found"):
method(
- api, MetadataArgs(type="string", name="author"), MagicMock(), "tenant-1", current_user, dataset_id
+ api,
+ MetadataArgs(type="string", name="author"),
+ sqlite_session,
+ "tenant-1",
+ current_user,
+ dataset_id,
)
class TestDatasetMetadataGetApi:
- def test_get_metadata_success(self, app: Flask, current_user, dataset, dataset_id):
+ def test_get_metadata_success(self, app: Flask, current_user, dataset, dataset_id, sqlite_session: Session):
api = DatasetMetadataCreateApi()
method = unwrap(api.get)
with (
@@ -121,18 +134,18 @@ class TestDatasetMetadataGetApi:
},
),
):
- session = MagicMock()
- result, status = method(api, session, "tenant-1", current_user, dataset_id)
+ result, status = method(api, sqlite_session, "tenant-1", current_user, dataset_id)
assert status == 200
assert result["doc_metadata"] == [{"id": "m1", "name": "author", "type": "string", "count": 0}]
assert result["built_in_field_enabled"] is False
- get_dataset.assert_called_once_with(str(dataset_id), "tenant-1", session=session)
- check_permission.assert_called_once_with(dataset, current_user, session)
+ get_dataset.assert_called_once_with(str(dataset_id), "tenant-1", session=sqlite_session)
+ check_permission.assert_called_once_with(dataset, current_user, sqlite_session)
- def test_get_metadata_rejects_foreign_tenant_before_read(self, app: Flask, current_user, dataset_id):
+ def test_get_metadata_rejects_foreign_tenant_before_read(
+ self, app: Flask, current_user, dataset_id, sqlite_session: Session
+ ):
api = DatasetMetadataCreateApi()
method = unwrap(api.get)
- session = MagicMock()
with (
app.test_request_context("/"),
patch.object(DatasetService, "get_dataset_for_tenant", return_value=None) as get_dataset,
@@ -140,13 +153,15 @@ class TestDatasetMetadataGetApi:
patch.object(MetadataService, "get_dataset_metadatas") as get_metadata,
):
with pytest.raises(NotFound):
- method(api, session, "tenant-1", current_user, dataset_id)
+ method(api, sqlite_session, "tenant-1", current_user, dataset_id)
- get_dataset.assert_called_once_with(str(dataset_id), "tenant-1", session=session)
+ get_dataset.assert_called_once_with(str(dataset_id), "tenant-1", session=sqlite_session)
check_permission.assert_not_called()
get_metadata.assert_not_called()
- def test_get_metadata_relies_on_rbac_in_rbac_mode(self, app: Flask, current_user, dataset, dataset_id):
+ def test_get_metadata_relies_on_rbac_in_rbac_mode(
+ self, app: Flask, current_user, dataset, dataset_id, sqlite_session: Session
+ ):
api = DatasetMetadataCreateApi()
method = unwrap(api.get)
with (
@@ -160,12 +175,14 @@ class TestDatasetMetadataGetApi:
return_value={"doc_metadata": [], "built_in_field_enabled": False},
),
):
- _, status = method(api, MagicMock(), "tenant-1", current_user, dataset_id)
+ _, status = method(api, sqlite_session, "tenant-1", current_user, dataset_id)
assert status == 200
check_permission.assert_not_called()
- def test_get_metadata_rejects_inaccessible_dataset(self, app: Flask, current_user, dataset, dataset_id):
+ def test_get_metadata_rejects_inaccessible_dataset(
+ self, app: Flask, current_user, dataset, dataset_id, sqlite_session: Session
+ ):
api = DatasetMetadataCreateApi()
method = unwrap(api.get)
with (
@@ -175,13 +192,15 @@ class TestDatasetMetadataGetApi:
patch.object(MetadataService, "get_dataset_metadatas") as get_metadata,
):
with pytest.raises(Forbidden):
- method(api, MagicMock(), "tenant-1", current_user, dataset_id)
+ method(api, sqlite_session, "tenant-1", current_user, dataset_id)
get_metadata.assert_not_called()
class TestDatasetMetadataApi:
- def test_update_metadata_success(self, app: Flask, current_user, dataset, dataset_id, metadata_id):
+ def test_update_metadata_success(
+ self, app: Flask, current_user, dataset, dataset_id, metadata_id, sqlite_session: Session
+ ):
api = DatasetMetadataApi()
method = unwrap(api.patch)
payload = {"name": "updated-name"}
@@ -199,7 +218,7 @@ class TestDatasetMetadataApi:
result, status = method(
api,
MetadataUpdatePayload(name="updated-name"),
- MagicMock(),
+ sqlite_session,
"tenant-1",
current_user,
dataset_id,
@@ -208,10 +227,14 @@ class TestDatasetMetadataApi:
assert status == 200
assert result["type"] == "string"
assert result["name"] == "updated-name"
- get_dataset.assert_called_once_with(str(dataset_id), "tenant-1", session=ANY)
- update_metadata.assert_called_once_with(dataset, str(metadata_id), "updated-name", current_user, session=ANY)
-
- def test_delete_metadata_success(self, app: Flask, current_user, dataset, dataset_id, metadata_id):
+ get_dataset.assert_called_once_with(str(dataset_id), "tenant-1", session=sqlite_session)
+ update_metadata.assert_called_once_with(
+ dataset, str(metadata_id), "updated-name", current_user, session=sqlite_session
+ )
+
+ def test_delete_metadata_success(
+ self, app: Flask, current_user, dataset, dataset_id, metadata_id, sqlite_session: Session
+ ):
api = DatasetMetadataApi()
method = unwrap(api.delete)
with (
@@ -220,11 +243,11 @@ class TestDatasetMetadataApi:
patch.object(DatasetService, "check_dataset_permission"),
patch.object(MetadataService, "delete_metadata") as delete_metadata,
):
- result, status = method(api, MagicMock(), "tenant-1", current_user, dataset_id, metadata_id)
+ result, status = method(api, sqlite_session, "tenant-1", current_user, dataset_id, metadata_id)
assert status == 204
assert result == ""
- get_dataset.assert_called_once_with(str(dataset_id), "tenant-1", session=ANY)
- delete_metadata.assert_called_once_with(dataset, str(metadata_id), ANY)
+ get_dataset.assert_called_once_with(str(dataset_id), "tenant-1", session=sqlite_session)
+ delete_metadata.assert_called_once_with(dataset, str(metadata_id), sqlite_session)
class TestDatasetMetadataBuiltInFieldApi:
@@ -245,7 +268,7 @@ class TestDatasetMetadataBuiltInFieldApi:
class TestDatasetMetadataBuiltInFieldActionApi:
- def test_enable_built_in_field(self, app: Flask, current_user, dataset, dataset_id):
+ def test_enable_built_in_field(self, app: Flask, current_user, dataset, dataset_id, sqlite_session: Session):
api = DatasetMetadataBuiltInFieldActionApi()
method = unwrap(api.post)
with (
@@ -254,13 +277,15 @@ class TestDatasetMetadataBuiltInFieldActionApi:
patch.object(DatasetService, "check_dataset_permission"),
patch.object(MetadataService, "enable_built_in_field"),
):
- result, status = method(api, MagicMock(), current_user, dataset_id, "enable")
+ result, status = method(api, sqlite_session, current_user, dataset_id, "enable")
assert status == 204
assert result == ""
class TestDocumentMetadataEditApi:
- def test_update_document_metadata_success(self, app: Flask, current_user, dataset, dataset_id):
+ def test_update_document_metadata_success(
+ self, app: Flask, current_user, dataset, dataset_id, sqlite_session: Session
+ ):
api = DocumentMetadataEditApi()
method = unwrap(api.post)
payload = {"operation": "add", "metadata": {}}
@@ -276,7 +301,7 @@ class TestDocumentMetadataEditApi:
MetadataOperationData(
operation_data=[{"document_id": "00000000-0000-0000-0000-000000000001", "metadata_list": []}]
),
- MagicMock(),
+ sqlite_session,
dataset.tenant_id,
current_user,
dataset_id,
@@ -284,7 +309,9 @@ class TestDocumentMetadataEditApi:
assert status == 204
assert result == ""
- def test_update_document_metadata_translates_missing_resource(self, app: Flask, current_user, dataset, dataset_id):
+ def test_update_document_metadata_translates_missing_resource(
+ self, app: Flask, current_user, dataset, dataset_id, sqlite_session: Session
+ ):
api = DocumentMetadataEditApi()
method = unwrap(api.post)
request = MetadataOperationData(operation_data=[])
@@ -299,6 +326,6 @@ class TestDocumentMetadataEditApi:
),
pytest.raises(NotFound) as exc_info,
):
- method(api, request, MagicMock(), dataset.tenant_id, current_user, dataset_id)
+ method(api, request, sqlite_session, dataset.tenant_id, current_user, dataset_id)
assert exc_info.value.description == "Metadata not found."
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_wraps.py b/api/tests/unit_tests/controllers/console/datasets/test_wraps.py
index 0469aebda7a..a06d58f4832 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_wraps.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_wraps.py
@@ -1,14 +1,34 @@
-from unittest.mock import Mock
+from collections.abc import Iterator
import pytest
from pytest_mock import MockerFixture
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, scoped_session, sessionmaker
from controllers.console.datasets.error import PipelineNotFoundError
from controllers.console.datasets.wraps import get_rag_pipeline, load_rag_pipeline
+from extensions.ext_database import db
+from models.account import Account
from models.dataset import Pipeline
+def database_session(
+ monkeypatch: pytest.MonkeyPatch, sqlite_session_factory: sessionmaker[Session]
+) -> Iterator[scoped_session[Session]]:
+ """Install a real scoped SQLite session for the legacy decorator entrypoint."""
+ session = scoped_session(sqlite_session_factory)
+ monkeypatch.setattr(db, "session", session)
+ yield session
+ session.remove()
+
+
+def current_account() -> Account:
+ account = Account(name="Test User", email="[email protected]")
+ account.id = "account-1"
+ return account
+
+
class TestGetRagPipeline:
def test_missing_pipeline_id(self):
@get_rag_pipeline
@@ -18,17 +38,21 @@ class TestGetRagPipeline:
with pytest.raises(ValueError, match="missing pipeline_id"):
dummy_view()
- def test_pipeline_not_found(self, mocker: MockerFixture):
+ def test_pipeline_not_found(
+ self,
+ mocker: MockerFixture,
+ database_session: scoped_session[Session],
+ current_account: Account,
+ ):
@get_rag_pipeline
def dummy_view(**kwargs):
return "ok"
mocker.patch(
"controllers.console.datasets.wraps.current_account_with_tenant",
- return_value=(Mock(), "tenant-1"),
+ return_value=(current_account, "tenant-1"),
)
- session_factory = mocker.patch("controllers.console.datasets.wraps.db.session")
get_pipeline_by_id = mocker.patch(
"controllers.console.datasets.wraps.RagPipelineService.get_pipeline_by_id",
return_value=None,
@@ -36,9 +60,14 @@ class TestGetRagPipeline:
with pytest.raises(PipelineNotFoundError):
dummy_view(pipeline_id="pipeline-1")
- get_pipeline_by_id.assert_called_once_with("pipeline-1", "tenant-1", session=session_factory.return_value)
-
- def test_pipeline_found_and_injected(self, mocker: MockerFixture):
+ get_pipeline_by_id.assert_called_once_with("pipeline-1", "tenant-1", session=database_session())
+
+ def test_pipeline_found_and_injected(
+ self,
+ mocker: MockerFixture,
+ database_session: scoped_session[Session],
+ current_account: Account,
+ ):
pipeline = Pipeline(
tenant_id="tenant-1",
name="Test Pipeline",
@@ -51,10 +80,9 @@ class TestGetRagPipeline:
mocker.patch(
"controllers.console.datasets.wraps.current_account_with_tenant",
- return_value=(Mock(), "tenant-1"),
+ return_value=(current_account, "tenant-1"),
)
- session_factory = mocker.patch("controllers.console.datasets.wraps.db.session")
get_pipeline_by_id = mocker.patch(
"controllers.console.datasets.wraps.RagPipelineService.get_pipeline_by_id",
return_value=pipeline,
@@ -63,14 +91,16 @@ class TestGetRagPipeline:
result = dummy_view(pipeline_id="pipeline-1")
assert result is pipeline
- get_pipeline_by_id.assert_called_once_with("pipeline-1", "tenant-1", session=session_factory.return_value)
+ get_pipeline_by_id.assert_called_once_with("pipeline-1", "tenant-1", session=database_session())
- def test_load_rag_pipeline_uses_provided_session(self, mocker: MockerFixture, sqlite_session: Session):
+ def test_load_rag_pipeline_uses_provided_session(
+ self, mocker: MockerFixture, sqlite_session: Session, current_account: Account
+ ):
pipeline = Pipeline(tenant_id="tenant-id", name="Test Pipeline")
mocker.patch(
"controllers.console.datasets.wraps.current_account_with_tenant",
- return_value=(Mock(), "tenant-1"),
+ return_value=(current_account, "tenant-1"),
)
get_pipeline_by_id = mocker.patch(
"controllers.console.datasets.wraps.RagPipelineService.get_pipeline_by_id",
@@ -82,7 +112,12 @@ class TestGetRagPipeline:
assert result is pipeline
get_pipeline_by_id.assert_called_once_with("pipeline-1", "tenant-1", session=sqlite_session)
- def test_pipeline_id_removed_from_kwargs(self, mocker: MockerFixture):
+ def test_pipeline_id_removed_from_kwargs(
+ self,
+ mocker: MockerFixture,
+ database_session: scoped_session[Session],
+ current_account: Account,
+ ):
pipeline = Pipeline(tenant_id="tenant-id", name="Test Pipeline")
@get_rag_pipeline
@@ -92,10 +127,9 @@ class TestGetRagPipeline:
mocker.patch(
"controllers.console.datasets.wraps.current_account_with_tenant",
- return_value=(Mock(), "tenant-1"),
+ return_value=(current_account, "tenant-1"),
)
- session_factory = mocker.patch("controllers.console.datasets.wraps.db.session")
mocker.patch(
"controllers.console.datasets.wraps.RagPipelineService.get_pipeline_by_id",
return_value=pipeline,
@@ -104,8 +138,14 @@ class TestGetRagPipeline:
result = dummy_view(pipeline_id="pipeline-1")
assert result == "ok"
-
- def test_pipeline_id_cast_to_string(self, mocker: MockerFixture):
+ assert db.session is database_session
+
+ def test_pipeline_id_cast_to_string(
+ self,
+ mocker: MockerFixture,
+ database_session: scoped_session[Session],
+ current_account: Account,
+ ):
pipeline = Pipeline(tenant_id="tenant-id", name="Test Pipeline")
@get_rag_pipeline
@@ -114,10 +154,9 @@ class TestGetRagPipeline:
mocker.patch(
"controllers.console.datasets.wraps.current_account_with_tenant",
- return_value=(Mock(), "tenant-1"),
+ return_value=(current_account, "tenant-1"),
)
- session_factory = mocker.patch("controllers.console.datasets.wraps.db.session")
get_pipeline_by_id = mocker.patch(
"controllers.console.datasets.wraps.RagPipelineService.get_pipeline_by_id",
return_value=pipeline,
@@ -126,4 +165,4 @@ class TestGetRagPipeline:
result = dummy_view(pipeline_id=123)
assert result is pipeline
- get_pipeline_by_id.assert_called_once_with("123", "tenant-1", session=session_factory.return_value)
+ get_pipeline_by_id.assert_called_once_with("123", "tenant-1", session=database_session())