refactoring ok

app/api/routes.py

@@ -7,7 +7,7 @@ from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile
 from pydantic import ValidationError
 
 from app.api.dependencies import get_container
-from app.domain.models import ProcessRequestModel
+from app.domain.schemas import ProcessRequestModel
 from app.infrastructure.composition.dependencies import ServiceContainer
 
 router = APIRouter(tags=["Image Pipeline"])
@@ -21,16 +21,16 @@ PROCESS_RESPONSE_EXAMPLE = {
         "processed": True,
     },
     "metadata": {
-        "title": "Can ho Goldmark City",
-        "subject": "Hinh anh can ho Goldmark City",
-        "tags": ["Goldmark City", "chung cu Goldmark"],
-        "comments": "Anh duoc xu ly boi image pipeline",
+        "title": "Căn hộ Goldmark City",
+        "subject": "Hình ảnh căn hộ Goldmark City",
+        "tags": ["Goldmark City", "chung cư Goldmark"],
+        "comments": "Ảnh được xử lý bởi image pipeline",
         "rating": 5,
         "gpsLatitude": 21.042953,
         "gpsLongitude": 105.767916,
         "artist": "https://www.goldmark-city.com/",
         "copyright": "https://www.goldmark-city.com/",
-        "imageDescription": "Hinh anh can ho Goldmark City",
+        "imageDescription": "Hình ảnh căn hộ Goldmark City",
         "extraTags": {},
     },
     "watermark": {

app/application/services/orchestration/process_image.py

@@ -3,16 +3,9 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Any
 
-from app.domain.interfaces import (
-    DerivativeGenerator,
-    Enhancer,
-    JobWorkspaceFactory,
-    ManifestWriter,
-    MetadataPort,
-    ProcessingOptionsResolver,
-    WatermarkAssetResolver,
-)
-from app.domain.models import PipelineDefaultsModel, ProcessRequestModel
+from app.domain.ports.media import Enhancer, MetadataPort, WatermarkAssetResolver
+from app.domain.ports.pipeline import DerivativeGenerator, JobWorkspaceFactory, ManifestWriter, ProcessingOptionsResolver
+from app.domain.schemas import PipelineDefaultsModel, ProcessRequestModel
 
 
 class ProcessImageUseCase:

app/application/services/orchestration/process_remote_image.py

@@ -4,8 +4,8 @@ from typing import Any
 
 from app.application.services.orchestration.process_image import ProcessImageUseCase
 from app.application.services.orchestration.source_cleanup import process_fetched_source
-from app.domain.interfaces import RemoteSourceFetcher
-from app.domain.models import ProcessRequestModel
+from app.domain.ports.sources import RemoteSourceFetcher
+from app.domain.schemas import ProcessRequestModel
 
 
 class ProcessRemoteImageUseCase:

app/application/services/orchestration/process_upload_image.py

@@ -4,8 +4,8 @@ from typing import Any
 
 from app.application.services.orchestration.process_image import ProcessImageUseCase
 from app.application.services.orchestration.source_cleanup import process_fetched_source
-from app.domain.interfaces import UploadSourceStager
-from app.domain.models import ProcessRequestModel
+from app.domain.ports.sources import UploadSourceStager
+from app.domain.schemas import ProcessRequestModel
 
 
 class ProcessUploadedImageUseCase:

app/application/services/orchestration/source_cleanup.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 from typing import Any
 
 from app.application.services.orchestration.process_image import ProcessImageUseCase
-from app.domain.models import FetchedSource, ProcessRequestModel
+from app.domain.schemas import ProcessRequestModel
+from app.domain.types import FetchedSource
 
 
 def process_fetched_source(

app/application/services/outputs/derivative_generator.py

@@ -2,8 +2,11 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from app.domain.interfaces import AssetUploader, DerivativeEncoder, MetadataPort
-from app.domain.models import GeneratedDerivatives, JobWorkspace, OutputArtifact, OutputFormat, R2ConfigModel, ResolvedProcessRequest
+from app.domain.constants import OutputFormat
+from app.domain.ports.media import DerivativeEncoder, MetadataPort
+from app.domain.ports.sources import AssetUploader
+from app.domain.schemas import R2ConfigModel
+from app.domain.types import GeneratedDerivatives, JobWorkspace, OutputArtifact, ResolvedProcessRequest
 
 
 class DefaultDerivativeGenerator:

app/application/services/outputs/manifest_writer.py

@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any
 
-from app.domain.models import EnhancementResult, GeneratedDerivatives, JobWorkspace, ResolvedProcessRequest
+from app.domain.types import EnhancementResult, GeneratedDerivatives, JobWorkspace, ResolvedProcessRequest
 
 
 class JsonManifestWriter:

app/application/services/setup/job_workspace.py

@@ -6,7 +6,7 @@ import shutil
 from datetime import datetime, timezone
 from pathlib import Path
 
-from app.domain.models import JobWorkspace
+from app.domain.types import JobWorkspace
 
 
 class LocalJobWorkspaceFactory:

app/application/services/setup/request_options.py

@@ -2,15 +2,9 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.domain.models import (
-    MetadataModel,
-    OutputFormat,
-    PipelineDefaultsModel,
-    ProcessRequestModel,
-    ResolvedProcessRequest,
-    SUPPORTED_OUTPUT_FORMATS,
-    WatermarkModel,
-)
+from app.domain.constants import OutputFormat, SUPPORTED_OUTPUT_FORMATS
+from app.domain.schemas import MetadataModel, PipelineDefaultsModel, ProcessRequestModel, WatermarkModel
+from app.domain.types import ResolvedProcessRequest
 
 
 class DefaultProcessingOptionsResolver:

app/domain/constants.py

@@ -0,0 +1,6 @@
+from __future__ import annotations
+
+from typing import Literal
+
+SUPPORTED_OUTPUT_FORMATS = ("avif", "jpg")
+OutputFormat = Literal["avif", "jpg"]

app/domain/ports/__init__.py

@@ -0,0 +1 @@
+"""Domain port definitions."""

app/domain/ports/media.py

@@ -0,0 +1,44 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Protocol
+
+from app.domain.schemas import ImageSizeModel, MetadataModel, WatermarkModel
+from app.domain.types import EnhancementResult
+
+
+class Enhancer(Protocol):
+    def build_working_master(self, source_path: Path, target_path: Path) -> EnhancementResult:
+        ...
+
+
+class MetadataPort(Protocol):
+    def ensure_available(self) -> None:
+        ...
+
+    def write_metadata(self, file_path: Path, metadata: MetadataModel | None) -> None:
+        ...
+
+    def copy_all_metadata(self, source_path: Path, target_path: Path) -> None:
+        ...
+
+
+class DerivativeEncoder(Protocol):
+    def ensure_available(self) -> None:
+        ...
+
+    def encode(
+        self,
+        source_path: Path,
+        target_path: Path,
+        size: ImageSizeModel,
+        image_format: str,
+        watermark_png_path: Path | None,
+        watermark: WatermarkModel | None,
+    ) -> None:
+        ...
+
+
+class WatermarkAssetResolver(Protocol):
+    def resolve_png(self, watermark: WatermarkModel, job_dir: Path) -> Path:
+        ...

app/domain/{interfaces.py → ports/pipeline.py}

@@ -3,59 +3,8 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Any, Protocol
 
-from app.domain.models import (
-    EnhancementResult,
-    FetchedSource,
-    GeneratedDerivatives,
-    ImageSizeModel,
-    JobWorkspace,
-    MetadataModel,
-    ProcessRequestModel,
-    ResolvedProcessRequest,
-    WatermarkModel,
-)
-
-
-class Enhancer(Protocol):
-    def build_working_master(self, source_path: Path, target_path: Path) -> EnhancementResult:
-        ...
-
-
-class MetadataPort(Protocol):
-    def ensure_available(self) -> None:
-        ...
-
-    def write_metadata(self, file_path: Path, metadata: MetadataModel | None) -> None:
-        ...
-
-    def copy_all_metadata(self, source_path: Path, target_path: Path) -> None:
-        ...
-
-
-class DerivativeEncoder(Protocol):
-    def ensure_available(self) -> None:
-        ...
-
-    def encode(
-        self,
-        source_path: Path,
-        target_path: Path,
-        size: ImageSizeModel,
-        image_format: str,
-        watermark_png_path: Path | None,
-        watermark: WatermarkModel | None,
-    ) -> None:
-        ...
-
-
-class WatermarkAssetResolver(Protocol):
-    def resolve_png(self, watermark: WatermarkModel, job_dir: Path) -> Path:
-        ...
-
-
-class AssetUploader(Protocol):
-    def upload_file(self, file_path: Path, object_key: str, content_type: str) -> dict[str, str]:
-        ...
+from app.domain.schemas import ProcessRequestModel
+from app.domain.types import EnhancementResult, GeneratedDerivatives, JobWorkspace, ResolvedProcessRequest
 
 
 class ProcessingOptionsResolver(Protocol):
@@ -93,13 +42,3 @@ class ManifestWriter(Protocol):
         generated: GeneratedDerivatives,
     ) -> dict[str, Any]:
         ...
-
-
-class RemoteSourceFetcher(Protocol):
-    def download(self, source_url: str) -> FetchedSource:
-        ...
-
-
-class UploadSourceStager(Protocol):
-    def stage(self, file_name: str | None, content: bytes) -> FetchedSource:
-        ...

app/domain/ports/sources.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Protocol
+
+from app.domain.types import FetchedSource
+
+
+class AssetUploader(Protocol):
+    def upload_file(self, file_path: Path, object_key: str, content_type: str) -> dict[str, str]:
+        ...
+
+
+class RemoteSourceFetcher(Protocol):
+    def download(self, source_url: str) -> FetchedSource:
+        ...
+
+
+class UploadSourceStager(Protocol):
+    def stage(self, file_name: str | None, content: bytes) -> FetchedSource:
+        ...

app/domain/{models.py → schemas.py}

@@ -1,15 +1,13 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-from pathlib import Path
 from typing import Literal
 
 from pydantic import BaseModel, Field, model_validator
 
+from app.domain.constants import OutputFormat
+
 MetadataScalar = str | int | float | bool
 MetadataValue = MetadataScalar | list[MetadataScalar]
-SUPPORTED_OUTPUT_FORMATS = ("avif", "jpg")
-OutputFormat = Literal["avif", "jpg"]
 
 
 class ImageSizeModel(BaseModel):
@@ -185,67 +183,3 @@ class ProcessRequestModel(BaseModel):
             ]
         },
     }
-
-
-@dataclass(frozen=True)
-class RuntimeSettings:
-    host: str
-    port: int
-    output_dir: Path
-    device: str
-    max_input_side: int
-    restore_original_size: bool
-    jpeg_quality: int
-    brightness_skip_threshold: float
-    hvi_model_id: str
-    hvi_gamma: float
-    hvi_alpha_s: float
-    hvi_alpha_i: float
-    default_formats: tuple[str, ...]
-    config_path: Path
-    r2_config: R2ConfigModel | None
-
-
-@dataclass(frozen=True)
-class EnhancementResult:
-    path: Path
-    brightness: float
-    skipped: bool
-    strategy: str
-
-
-@dataclass(frozen=True)
-class ResolvedProcessRequest:
-    sizes: tuple[ImageSizeModel, ...]
-    formats: tuple[OutputFormat, ...]
-    metadata: MetadataModel | None
-    watermark: WatermarkModel | None
-    upload_to_r2: bool
-    r2_prefix: str | None
-
-
-@dataclass(frozen=True)
-class JobWorkspace:
-    job_id: str
-    job_dir: Path
-    staged_source_path: Path
-    working_master_path: Path
-
-
-@dataclass(frozen=True)
-class OutputArtifact:
-    image_format: str
-    size: ImageSizeModel
-    file_path: Path
-
-
-@dataclass(frozen=True)
-class GeneratedDerivatives:
-    outputs: tuple[OutputArtifact, ...]
-    r2_summary: dict[str, object] | None
-
-
-@dataclass(frozen=True)
-class FetchedSource:
-    temp_path: Path
-    display_name: str

app/domain/types.py

@@ -0,0 +1,71 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from pathlib import Path
+
+from app.domain.constants import OutputFormat
+from app.domain.schemas import ImageSizeModel, MetadataModel, R2ConfigModel, WatermarkModel
+
+
+@dataclass(frozen=True)
+class RuntimeSettings:
+    host: str
+    port: int
+    output_dir: Path
+    device: str
+    max_input_side: int
+    restore_original_size: bool
+    jpeg_quality: int
+    brightness_skip_threshold: float
+    hvi_model_id: str
+    hvi_gamma: float
+    hvi_alpha_s: float
+    hvi_alpha_i: float
+    default_formats: tuple[str, ...]
+    config_path: Path
+    r2_config: R2ConfigModel | None
+
+
+@dataclass(frozen=True)
+class EnhancementResult:
+    path: Path
+    brightness: float
+    skipped: bool
+    strategy: str
+
+
+@dataclass(frozen=True)
+class ResolvedProcessRequest:
+    sizes: tuple[ImageSizeModel, ...]
+    formats: tuple[OutputFormat, ...]
+    metadata: MetadataModel | None
+    watermark: WatermarkModel | None
+    upload_to_r2: bool
+    r2_prefix: str | None
+
+
+@dataclass(frozen=True)
+class JobWorkspace:
+    job_id: str
+    job_dir: Path
+    staged_source_path: Path
+    working_master_path: Path
+
+
+@dataclass(frozen=True)
+class OutputArtifact:
+    image_format: str
+    size: ImageSizeModel
+    file_path: Path
+
+
+@dataclass(frozen=True)
+class GeneratedDerivatives:
+    outputs: tuple[OutputArtifact, ...]
+    r2_summary: dict[str, object] | None
+
+
+@dataclass(frozen=True)
+class FetchedSource:
+    temp_path: Path
+    display_name: str

app/infrastructure/composition/dependencies.py

@@ -10,7 +10,8 @@ from app.application.services.outputs.derivative_generator import DefaultDerivat
 from app.application.services.outputs.manifest_writer import JsonManifestWriter
 from app.application.services.setup.job_workspace import LocalJobWorkspaceFactory
 from app.application.services.setup.request_options import DefaultProcessingOptionsResolver
-from app.domain.models import PipelineDefaultsModel, RuntimeSettings
+from app.domain.schemas import PipelineDefaultsModel
+from app.domain.types import RuntimeSettings
 from app.infrastructure.config.config_loader import load_pipeline_defaults, load_settings
 from app.infrastructure.media.command_runner import CommandRunner
 from app.infrastructure.media.encoder import ImageEncoder

app/infrastructure/config/config_loader.py

@@ -6,7 +6,8 @@ from pathlib import Path
 
 from dotenv import dotenv_values
 
-from app.domain.models import PipelineDefaultsModel, R2ConfigModel, RuntimeSettings
+from app.domain.schemas import PipelineDefaultsModel, R2ConfigModel
+from app.domain.types import RuntimeSettings
 
 
 def load_settings(project_root: Path) -> RuntimeSettings:

app/infrastructure/media/encoder.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from app.domain.models import ImageSizeModel, WatermarkModel
+from app.domain.schemas import ImageSizeModel, WatermarkModel
 from app.infrastructure.media.command_runner import CommandRunner
 
 

app/infrastructure/media/enhancer.py

@@ -7,7 +7,7 @@ from huggingface_hub import hf_hub_download
 from PIL import Image
 from safetensors.torch import load_file
 
-from app.domain.models import EnhancementResult, RuntimeSettings
+from app.domain.types import EnhancementResult, RuntimeSettings
 from app.infrastructure.media.image_ops import (
     estimate_brightness,
     load_image_as_tensor,

app/infrastructure/media/metadata_service.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import tempfile
 from pathlib import Path
 
-from app.domain.models import MetadataModel
+from app.domain.schemas import MetadataModel
 from app.infrastructure.media.command_runner import CommandRunner
 
 

app/infrastructure/media/watermark.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 from PIL import Image, ImageDraw, ImageFont
 
-from app.domain.models import WatermarkModel
+from app.domain.schemas import WatermarkModel
 
 
 class WatermarkAssetFactory:

app/infrastructure/sources/remote_source_fetcher.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from urllib.parse import urlparse
 from urllib.request import Request, urlopen
 
-from app.domain.models import FetchedSource
+from app.domain.types import FetchedSource
 
 
 class RemoteImageFetcher:

app/infrastructure/sources/upload_source_stager.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import tempfile
 from pathlib import Path
 
-from app.domain.models import FetchedSource
+from app.domain.types import FetchedSource
 
 
 class TemporaryUploadSourceStager:

app/infrastructure/storage/r2_uploader.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from app.domain.models import R2ConfigModel
+from app.domain.schemas import R2ConfigModel
 
 
 class R2Uploader:

tests/integration/api/support.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 from pathlib import Path
 from types import SimpleNamespace
 
-from app.domain.models import PipelineDefaultsModel, RuntimeSettings
+from app.domain.schemas import PipelineDefaultsModel
+from app.domain.types import RuntimeSettings
 
 
 class FakeProcessRemoteImage:

tests/integration/api/test_process_upload.py

@@ -13,6 +13,37 @@ from tests.integration.api.support import FakeProcessRemoteImage, FakeProcessUpl
 
 
 class ApiProcessUploadIntegrationTests(unittest.TestCase):
+    def test_process_upload_accepts_real_demo_image_file(self) -> None:
+        with tempfile.TemporaryDirectory() as temp_dir:
+            root = Path(temp_dir)
+            process_uploaded_image = FakeProcessUploadedImage()
+            app = create_app()
+            app.dependency_overrides[get_container] = lambda: make_container(
+                root,
+                process_remote_image=FakeProcessRemoteImage(),
+                process_uploaded_image=process_uploaded_image,
+            )
+            client = TestClient(app)
+            demo_path = Path(__file__).resolve().parents[2] / "demo.jpg"
+            expected_bytes = demo_path.read_bytes()
+            try:
+                with demo_path.open("rb") as image_file:
+                    response = client.post(
+                        "/process/upload",
+                        files={"file": ("demo.jpg", image_file, "image/jpeg")},
+                        data={"options": '{"formats":["jpg"]}'},
+                    )
+
+                self.assertEqual(status.HTTP_200_OK, response.status_code)
+                self.assertEqual("test-upload-job", response.json()["jobId"])
+                self.assertEqual(1, len(process_uploaded_image.calls))
+                self.assertEqual("demo.jpg", process_uploaded_image.calls[0][0])
+                self.assertEqual(expected_bytes, process_uploaded_image.calls[0][1])
+                self.assertEqual(["jpg"], process_uploaded_image.calls[0][2].formats)
+            finally:
+                client.close()
+                app.dependency_overrides.clear()
+
     def test_process_upload_returns_job_id_on_success(self) -> None:
         with tempfile.TemporaryDirectory() as temp_dir:
             root = Path(temp_dir)

tests/unit/application/services/orchestration/test_process_image.py

@@ -5,14 +5,8 @@ import unittest
 from pathlib import Path
 
 from app.application.services.orchestration.process_image import ProcessImageUseCase
-from app.domain.models import (
-    EnhancementResult,
-    JobWorkspace,
-    WatermarkModel,
-    PipelineDefaultsModel,
-    ProcessRequestModel,
-    ResolvedProcessRequest,
-)
+from app.domain.schemas import PipelineDefaultsModel, ProcessRequestModel, WatermarkModel
+from app.domain.types import EnhancementResult, JobWorkspace, ResolvedProcessRequest
 
 
 class _FakeOptionsResolver:

tests/unit/application/services/orchestration/test_process_sources.py

@@ -6,7 +6,8 @@ from pathlib import Path
 
 from app.application.services.orchestration.process_remote_image import ProcessRemoteImageUseCase
 from app.application.services.orchestration.process_upload_image import ProcessUploadedImageUseCase
-from app.domain.models import FetchedSource, ProcessRequestModel
+from app.domain.schemas import ProcessRequestModel
+from app.domain.types import FetchedSource
 
 
 class _FakeRemoteSourceFetcher:

tests/unit/application/services/outputs/test_derivative_generator.py

@@ -5,7 +5,8 @@ import unittest
 from pathlib import Path
 
 from app.application.services.outputs.derivative_generator import DefaultDerivativeGenerator
-from app.domain.models import GeneratedDerivatives, ImageSizeModel, JobWorkspace, R2ConfigModel, ResolvedProcessRequest
+from app.domain.schemas import ImageSizeModel, R2ConfigModel
+from app.domain.types import GeneratedDerivatives, JobWorkspace, ResolvedProcessRequest
 
 
 class _FakeEncoder:

tests/unit/application/services/outputs/test_manifest_writer.py

@@ -6,15 +6,13 @@ import unittest
 from pathlib import Path
 
 from app.application.services.outputs.manifest_writer import JsonManifestWriter
-from app.domain.models import (
+from app.domain.schemas import ImageSizeModel, MetadataModel, WatermarkModel
+from app.domain.types import (
     EnhancementResult,
     GeneratedDerivatives,
-    ImageSizeModel,
     JobWorkspace,
-    MetadataModel,
     OutputArtifact,
     ResolvedProcessRequest,
-    WatermarkModel,
 )
 
 

tests/unit/application/services/setup/test_request_options.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import unittest
 
 from app.application.services.setup.request_options import DefaultProcessingOptionsResolver
-from app.domain.models import (
+from app.domain.schemas import (
     ImageSizeModel,
     MetadataModel,
     PipelineDefaultsModel,

tests/unit/infrastructure/media/test_metadata_service.py

@@ -4,7 +4,7 @@ import tempfile
 import unittest
 from pathlib import Path
 
-from app.domain.models import MetadataModel
+from app.domain.schemas import MetadataModel
 from app.infrastructure.media.metadata_service import MetadataService
 
 

tests/unit/infrastructure/media/test_watermark.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 from PIL import Image
 
-from app.domain.models import WatermarkModel
+from app.domain.schemas import WatermarkModel
 from app.infrastructure.media.watermark import WatermarkAssetFactory