feat: Job式からsession式に変更

.github/workflows/check.yml

@@ -97,6 +97,13 @@ jobs:
     defaults:
       run:
         working-directory: backend
+    env:
+      ENVIRONMENT: development
+      POSTGRES_SERVER: localhost
+      POSTGRES_USER: test
+      POSTGRES_PASSWORD: test
+      POSTGRES_DB: test
+      POSTGRES_PORT: "5432"
     steps:
       - uses: actions/checkout@v4
       - uses: astral-sh/setup-uv@v5

backend/app/core/config.py

@@ -32,9 +32,17 @@ class Settings(BaseSettings):
     K8S_NAMESPACE: str = "default"
     K8S_IN_CLUSTER: bool = False
 
-    # Artifact保存先
+    # Artifact保存先 (legacy, Phase 6 cleanup)
     ARTIFACTS_DIR: str = "/tmp/ui-recommender-artifacts"
 
+    # S3 / MinIO設定
+    S3_BUCKET: str = "ui-recommender-artifacts"
+    S3_REGION: str = "us-east-1"
+    S3_ENDPOINT_URL: str = ""  # MinIO: http://minio:9000
+    S3_ENDPOINT_URL_K8S: str = ""  # K8sワーカー用。未設定時はS3_ENDPOINT_URLを使用
+    S3_ACCESS_KEY: str = "minioadmin"
+    S3_SECRET_KEY: str = "minioadmin"
+
     # Worker設定
     WORKER_IMAGE: str = "ui-recommender-worker:latest"
     WORKER_DEADLINE_SECONDS: int = 900

backend/app/di/container.py

@@ -3,8 +3,6 @@
 from sqlalchemy.orm import Session
 
 from app.repository.database import SessionLocal
-from app.repository.job_repository import JobRepository
-from app.repository.proposal_repository import ProposalRepository
 from app.repository.setting_repository import SettingRepository
 
 
@@ -20,14 +18,6 @@ def get_db() -> Generator[Session]:
         finally:
             db.close()
 
-    @staticmethod
-    def get_job_repository(db: Session) -> JobRepository:
-        return JobRepository(db)
-
-    @staticmethod
-    def get_proposal_repository(db: Session) -> ProposalRepository:
-        return ProposalRepository(db)
-
     @staticmethod
     def get_setting_repository(db: Session) -> SettingRepository:
         return SettingRepository(db)

backend/app/di/dependencies.py

@@ -4,28 +4,18 @@
 from sqlalchemy.orm import Session
 
 from app.di.container import DIContainer
-from app.repository.job_repository import JobRepository
-from app.repository.proposal_repository import ProposalRepository
 from app.repository.setting_repository import SettingRepository
-from app.service.artifact_service import ArtifactService
+from app.service.s3_service import S3Service
 
 
 def get_db() -> Generator[Session]:
     """データベースセッションを取得"""
     yield from DIContainer.get_db()
 
 
-def get_job_repository(db: Session = Depends(get_db)) -> JobRepository:
-    return DIContainer.get_job_repository(db)
-
-
-def get_proposal_repository(db: Session = Depends(get_db)) -> ProposalRepository:
-    return DIContainer.get_proposal_repository(db)
-
-
 def get_setting_repository(db: Session = Depends(get_db)) -> SettingRepository:
     return DIContainer.get_setting_repository(db)
 
 
-def get_artifact_service() -> ArtifactService:
-    return ArtifactService()
+def get_s3_service() -> S3Service:
+    return S3Service()

backend/app/main.py

@@ -1,18 +1,35 @@
+import logging
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
 from app.core.middleware import ErrorHandlerMiddleware, RequestLoggingMiddleware
 from app.router import router
-from app.router.jobs import router as jobs_router
+from app.router.sessions import router as sessions_router
 from app.router.settings import router as settings_router
 
+logger = logging.getLogger(__name__)
+
+
+@asynccontextmanager
+async def lifespan(app: FastAPI) -> AsyncIterator[None]:
+    """Startup / shutdown lifecycle."""
+    from app.usecase.session_usecase import recover_stuck_proposals
+
+    await recover_stuck_proposals()
+    yield
+
+
 # FastAPIのインスタンスを作成（Swagger UIのメタデータを設定）
 app = FastAPI(
     title="UI Recommender API",
     description="UI推薦システムのバックエンドAPI",
     version="0.1.0",
     docs_url="/docs",  # Swagger UI
     redoc_url="/redoc",  # ReDoc
+    lifespan=lifespan,
 )
 
 # ミドルウェア登録（後に追加したものが先に実行される）
@@ -30,5 +47,5 @@
 
 # API層のルーティングを読み込む
 app.include_router(router)
-app.include_router(jobs_router)
+app.include_router(sessions_router)
 app.include_router(settings_router)

backend/app/model/__init__.py

@@ -8,6 +8,22 @@
 #     - マイグレーション（Alembic）で使用
 #     - Repository層の実装で使用
 
-from .job import Job, JobStatus, Proposal, ProposalStatus, Setting
+from .session import (
+    Iteration,
+    IterationStatus,
+    Proposal,
+    ProposalStatus,
+    Session,
+    SessionStatus,
+    Setting,
+)
 
-__all__ = ["Job", "JobStatus", "Proposal", "ProposalStatus", "Setting"]
+__all__ = [
+    "Session",
+    "SessionStatus",
+    "Iteration",
+    "IterationStatus",
+    "Proposal",
+    "ProposalStatus",
+    "Setting",
+]

backend/app/model/base.py

@@ -1,17 +1,7 @@
-from typing import Any
+from sqlalchemy.orm import DeclarativeBase, declared_attr
 
-from sqlalchemy.ext.declarative import declared_attr
-from sqlalchemy.orm import as_declarative
 
-
-@as_declarative()
-class Base:
-    __allow_unmapped__ = True
-
-    id: Any
-    __name__: str
-
-    # Generate __tablename__ automatically
-    @declared_attr
+class Base(DeclarativeBase):
+    @declared_attr.directive
     def __tablename__(cls) -> str:
         return cls.__name__.lower()