Move method to domain. (open-edge-platform#915)

Author: michalad1

application/backend/app/api/error_handler.py

@@ -10,13 +10,13 @@
 from sqlalchemy.exc import IntegrityError
 
 from domain.errors import (
+    DatasetNotFoundError,
     ResourceAlreadyExistsError,
     ResourceInUseError,
     ResourceNotFoundError,
     ResourceUpdateConflictError,
 )
 from runtime.errors import (
-    DatasetNotFoundError,
     PipelineNotActiveError,
     PipelineProjectMismatchError,
     SinkConnectionError,

application/backend/app/dependencies.py

@@ -11,6 +11,7 @@
 
 from domain.db.engine import get_session
 from domain.dispatcher import ConfigChangeDispatcher
+from domain.errors import DatasetNotFoundError
 from domain.repositories.frame import FrameRepository
 from domain.repositories.processor import ProcessorRepository
 from domain.repositories.project import ProjectRepository
@@ -28,7 +29,6 @@
 from domain.services.schemas.dataset import DatasetsListSchema
 from domain.services.schemas.device import AvailableDeviceSchema
 from runtime.core.components.validators.sink_connection import SinkConnectionValidator
-from runtime.errors import DatasetNotFoundError
 from runtime.pipeline_manager import PipelineManager
 from runtime.services.frame import FrameService
 from runtime.services.license import LicenseService

application/backend/app/domain/errors.py

@@ -85,3 +85,7 @@ def __init__(self, resource_type: ResourceType, resource_id: str, field: str, me
         msg = message or f"{resource_type.value} with ID {resource_id} cannot change immutable field '{field}'."
         super().__init__(resource_type, resource_id, msg)
         self.field = field
+
+
+class DatasetNotFoundError(Exception):
+    """Exception raised when a dataset is not found."""

…pp/runtime/services/dataset_discovery.py …app/domain/services/dataset_discovery.pyapplication/backend/app/runtime/services/dataset_discovery.py renamed to application/backend/app/domain/services/dataset_discovery.py application/backend/app/runtime/services/dataset_discovery.py renamed to application/backend/app/domain/services/dataset_discovery.py

@@ -5,9 +5,9 @@
 from pathlib import Path
 from uuid import UUID, uuid5
 
+from domain.errors import DatasetNotFoundError
 from domain.services.schemas.base import Pagination
 from domain.services.schemas.dataset import DatasetSchema, DatasetsListSchema
-from runtime.errors import DatasetNotFoundError
 from runtime.services.image_thumbnail import generate_image_thumbnail
 from settings import get_settings
 

application/backend/app/main.py

@@ -25,13 +25,13 @@
 from dependencies import LicenseServiceDep
 from domain.db.engine import get_session_factory, run_db_migrations
 from domain.dispatcher import ConfigChangeDispatcher
+from domain.errors import DatasetNotFoundError
+from domain.services.dataset_discovery import scan_datasets
 from domain.services.schemas.base import Pagination
 from domain.services.schemas.dataset import DatasetsListSchema
 from domain.services.schemas.health import HealthCheckSchema, HealthStatus
 from runtime.components import DefaultComponentFactory
-from runtime.errors import DatasetNotFoundError
 from runtime.pipeline_manager import PipelineManager
-from runtime.services.dataset_discovery import scan_datasets
 from runtime.services.device import list_available_devices
 from runtime.webrtc.manager import WebRTCManager
 from runtime.webrtc.sdp_handler import SDPHandler

application/backend/app/runtime/core/components/factories/reader.py

@@ -3,6 +3,8 @@
 
 import logging
 
+from domain.errors import DatasetNotFoundError
+from domain.services.dataset_discovery import get_first_dataset_path, resolve_dataset_path
 from domain.services.schemas.reader import (
     ImagesFolderConfig,
     ReaderConfig,
@@ -16,8 +18,6 @@
 from runtime.core.components.readers.noop_reader import NoOpReader
 from runtime.core.components.readers.usb_camera_reader import UsbCameraReader
 from runtime.core.components.readers.video_file import VideoFileReader
-from runtime.errors import DatasetNotFoundError
-from runtime.services.dataset_discovery import get_first_dataset_path, resolve_dataset_path
 from settings import get_settings
 
 logger = logging.getLogger(__name__)

application/backend/app/runtime/errors.py

@@ -24,7 +24,3 @@ class SourceMismatchError(PipelineManagerError):
 
 class SinkConnectionError(Exception):
     """Exception raised when a resource fails connectivity validation."""
-
-
-class DatasetNotFoundError(Exception):
-    """Exception raised when a dataset is not found."""

application/backend/tests/unit/api/test_dependencies_dataset_path.py

@@ -7,7 +7,7 @@
 import pytest
 
 from dependencies import get_dataset_path_by_id
-from runtime.errors import DatasetNotFoundError
+from domain.errors import DatasetNotFoundError
 
 
 def test_get_dataset_path_by_id_returns_path() -> None:

…ntime/services/test_dataset_discovery.py …omain/services/test_dataset_discovery.pyapplication/backend/tests/unit/runtime/services/test_dataset_discovery.py renamed to application/backend/tests/unit/domain/services/test_dataset_discovery.py application/backend/tests/unit/runtime/services/test_dataset_discovery.py renamed to application/backend/tests/unit/domain/services/test_dataset_discovery.py

@@ -6,8 +6,8 @@
 
 import pytest
 
-from runtime.errors import DatasetNotFoundError
-from runtime.services.dataset_discovery import (
+from domain.errors import DatasetNotFoundError
+from domain.services.dataset_discovery import (
     DATASET_NS,
     _get_first_image,
     get_first_dataset_path,
@@ -71,7 +71,7 @@ def test_returns_none_when_template_dataset_path_is_missing(self, tmp_path: Path
 
 class TestGetFirstImage:
     def test_returns_first_supported_image_in_sorted_order(self, tmp_path: Path, monkeypatch) -> None:
-        monkeypatch.setattr("runtime.services.dataset_discovery.settings.supported_extensions", {".jpg", ".png"})
+        monkeypatch.setattr("domain.services.dataset_discovery.settings.supported_extensions", {".jpg", ".png"})
 
         (tmp_path / "z_image.png").touch()
         expected = tmp_path / "a_image.jpg"
@@ -83,7 +83,7 @@ def test_returns_first_supported_image_in_sorted_order(self, tmp_path: Path, mon
         assert first_image == expected
 
     def test_returns_none_when_no_supported_images_exist(self, tmp_path: Path, monkeypatch) -> None:
-        monkeypatch.setattr("runtime.services.dataset_discovery.settings.supported_extensions", {".jpg", ".png"})
+        monkeypatch.setattr("domain.services.dataset_discovery.settings.supported_extensions", {".jpg", ".png"})
         (tmp_path / "README.txt").touch()
 
         first_image = _get_first_image(tmp_path)
@@ -95,8 +95,8 @@ class TestScanDatasets:
     def test_builds_id_to_path_mapping_and_pagination(self, tmp_path: Path, monkeypatch) -> None:
         dataset_dir = tmp_path / "aquarium"
         dataset_dir.mkdir()
-        monkeypatch.setattr("runtime.services.dataset_discovery.generate_image_thumbnail", lambda _path: "thumb")
-        monkeypatch.setattr("runtime.services.dataset_discovery.settings.supported_extensions", {".jpg", ".png"})
+        monkeypatch.setattr("domain.services.dataset_discovery.generate_image_thumbnail", lambda _path: "thumb")
+        monkeypatch.setattr("domain.services.dataset_discovery.settings.supported_extensions", {".jpg", ".png"})
         (dataset_dir / "image.jpg").touch()
 
         datasets, dataset_paths = scan_datasets(tmp_path)
@@ -115,9 +115,9 @@ def test_sets_thumbnail_from_first_supported_image(self, tmp_path: Path, monkeyp
         (dataset_dir / "README.txt").write_text("info")
         first_image = dataset_dir / "0001.jpg"
         first_image.touch()
-        monkeypatch.setattr("runtime.services.dataset_discovery.settings.supported_extensions", {".jpg", ".png"})
+        monkeypatch.setattr("domain.services.dataset_discovery.settings.supported_extensions", {".jpg", ".png"})
         monkeypatch.setattr(
-            "runtime.services.dataset_discovery.generate_image_thumbnail",
+            "domain.services.dataset_discovery.generate_image_thumbnail",
             lambda image_path: f"thumb::{image_path.name}",
         )
 
@@ -130,7 +130,7 @@ def test_sets_thumbnail_none_when_no_supported_images(self, tmp_path: Path, monk
         dataset_dir = tmp_path / "aquarium"
         dataset_dir.mkdir()
         (dataset_dir / "README.txt").write_text("no images")
-        monkeypatch.setattr("runtime.services.dataset_discovery.settings.supported_extensions", {".jpg", ".png"})
+        monkeypatch.setattr("domain.services.dataset_discovery.settings.supported_extensions", {".jpg", ".png"})
 
         datasets, _ = scan_datasets(tmp_path)