feat(FN-004): merge fusion/fn-004

apps/api/app/models/__init__.py

@@ -0,0 +1,23 @@
+from app.models.access_route import AccessRoute
+from app.models.base import Base
+from app.models.config import Config
+from app.models.project import Project
+from app.models.repository import Repository
+from app.models.secret import Secret
+from app.models.tool_definition import ToolDefinition
+from app.models.tool_instance import ToolInstance
+from app.models.user import User
+from app.models.workspace import Workspace
+
+__all__ = [
+    "Base",
+    "AccessRoute",
+    "Config",
+    "Project",
+    "Repository",
+    "Secret",
+    "ToolDefinition",
+    "ToolInstance",
+    "User",
+    "Workspace",
+]

apps/api/app/models/access_route.py

@@ -0,0 +1,35 @@
+import uuid
+from typing import TYPE_CHECKING, Any
+
+from sqlalchemy import JSON, Boolean, ForeignKey, String, Text
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.models.base import Base, TimestampMixin, UUIDMixin
+
+if TYPE_CHECKING:
+    from app.models.tool_instance import ToolInstance
+
+
+class AccessRoute(Base, UUIDMixin, TimestampMixin):
+    __tablename__ = "access_route"
+
+    tool_instance_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("tool_instance.id"), index=True
+    )
+    domain: Mapped[str] = mapped_column(Text)
+    path_prefix: Mapped[str] = mapped_column(
+        String(255), default="/"
+    )
+    provider_type: Mapped[str] = mapped_column(
+        String(50), default="traefik"
+    )
+    provider_config: Mapped[dict[str, Any] | None] = mapped_column(
+        JSON, nullable=True
+    )
+    is_active: Mapped[bool] = mapped_column(
+        Boolean, default=True
+    )
+
+    tool_instance: Mapped["ToolInstance"] = relationship(
+        back_populates="access_routes"
+    )

apps/api/app/models/base.py

@@ -0,0 +1,26 @@
+import uuid
+from datetime import datetime
+
+from sqlalchemy import func
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
+
+
+class Base(DeclarativeBase):
+    pass
+
+
+class UUIDMixin:
+    id: Mapped[uuid.UUID] = mapped_column(
+        primary_key=True,
+        default=uuid.uuid4,
+    )
+
+
+class TimestampMixin:
+    created_at: Mapped[datetime] = mapped_column(
+        server_default=func.now(),
+    )
+    updated_at: Mapped[datetime] = mapped_column(
+        server_default=func.now(),
+        onupdate=func.now(),
+    )

apps/api/app/models/config.py

@@ -0,0 +1,22 @@
+import uuid
+from typing import Any
+
+from sqlalchemy import JSON, ForeignKey, String, UniqueConstraint
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.models.base import Base, TimestampMixin, UUIDMixin
+
+
+class Config(Base, UUIDMixin, TimestampMixin):
+    __tablename__ = "config"
+    __table_args__ = (
+        UniqueConstraint("scope_type", "scope_id", "tool_definition_id", "key"),
+    )
+
+    scope_type: Mapped[str] = mapped_column(String(50))
+    scope_id: Mapped[uuid.UUID] = mapped_column(index=True)
+    tool_definition_id: Mapped[uuid.UUID | None] = mapped_column(
+        ForeignKey("tool_definition.id"), nullable=True, index=True
+    )
+    key: Mapped[str] = mapped_column(String(255))
+    value: Mapped[dict[str, Any]] = mapped_column(JSON)

apps/api/app/models/project.py

@@ -0,0 +1,36 @@
+import uuid
+from typing import TYPE_CHECKING
+
+from sqlalchemy import ForeignKey, String, Text, UniqueConstraint
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.models.base import Base, TimestampMixin, UUIDMixin
+
+if TYPE_CHECKING:
+    from app.models.repository import Repository
+    from app.models.tool_instance import ToolInstance
+    from app.models.user import User
+    from app.models.workspace import Workspace
+
+
+class Project(Base, UUIDMixin, TimestampMixin):
+    __tablename__ = "project"
+    __table_args__ = (UniqueConstraint("owner_id", "slug"),)
+
+    owner_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("user.id"), index=True
+    )
+    name: Mapped[str] = mapped_column(String(255))
+    slug: Mapped[str] = mapped_column(String(255))
+    description: Mapped[str | None] = mapped_column(Text, nullable=True)
+
+    owner: Mapped["User"] = relationship(back_populates="projects")
+    repositories: Mapped[list["Repository"]] = relationship(
+        back_populates="project"
+    )
+    workspaces: Mapped[list["Workspace"]] = relationship(
+        back_populates="project"
+    )
+    tool_instances: Mapped[list["ToolInstance"]] = relationship(
+        back_populates="project"
+    )

apps/api/app/models/repository.py

@@ -0,0 +1,30 @@
+import uuid
+from typing import TYPE_CHECKING
+
+from sqlalchemy import ForeignKey, String, Text
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.models.base import Base, TimestampMixin, UUIDMixin
+
+if TYPE_CHECKING:
+    from app.models.project import Project
+
+
+class Repository(Base, UUIDMixin, TimestampMixin):
+    __tablename__ = "repository"
+
+    project_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("project.id"), index=True
+    )
+    name: Mapped[str] = mapped_column(String(255))
+    git_url: Mapped[str] = mapped_column(Text)
+    provider_type: Mapped[str] = mapped_column(
+        String(50), default="generic"
+    )
+    default_branch: Mapped[str] = mapped_column(
+        String(100), default="main"
+    )
+
+    project: Mapped["Project"] = relationship(
+        back_populates="repositories"
+    )

apps/api/app/models/secret.py

@@ -0,0 +1,18 @@
+import uuid
+
+from sqlalchemy import String, Text, UniqueConstraint
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.models.base import Base, TimestampMixin, UUIDMixin
+
+
+class Secret(Base, UUIDMixin, TimestampMixin):
+    __tablename__ = "secret"
+    __table_args__ = (
+        UniqueConstraint("scope_type", "scope_id", "key"),
+    )
+
+    scope_type: Mapped[str] = mapped_column(String(50))
+    scope_id: Mapped[uuid.UUID] = mapped_column(index=True)
+    key: Mapped[str] = mapped_column(String(255))
+    encrypted_value: Mapped[str] = mapped_column(Text)

apps/api/app/models/tool_definition.py

@@ -0,0 +1,32 @@
+from typing import TYPE_CHECKING, Any
+
+from sqlalchemy import JSON, String, Text
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.models.base import Base, TimestampMixin, UUIDMixin
+
+if TYPE_CHECKING:
+    from app.models.tool_instance import ToolInstance
+
+
+class ToolDefinition(Base, UUIDMixin, TimestampMixin):
+    __tablename__ = "tool_definition"
+
+    key: Mapped[str] = mapped_column(
+        String(100), unique=True, index=True
+    )
+    name: Mapped[str] = mapped_column(String(255))
+    version: Mapped[str] = mapped_column(
+        String(50), default="1.0.0"
+    )
+    description: Mapped[str | None] = mapped_column(
+        Text, nullable=True
+    )
+    image: Mapped[str] = mapped_column(Text)
+    manifest_data: Mapped[dict[str, Any] | None] = mapped_column(
+        JSON, nullable=True
+    )
+
+    instances: Mapped[list["ToolInstance"]] = relationship(
+        back_populates="tool_definition"
+    )

apps/api/app/models/tool_instance.py

@@ -0,0 +1,46 @@
+import uuid
+from typing import TYPE_CHECKING, Any
+
+from sqlalchemy import JSON, ForeignKey, String
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.models.base import Base, TimestampMixin, UUIDMixin
+
+if TYPE_CHECKING:
+    from app.models.access_route import AccessRoute
+    from app.models.project import Project
+    from app.models.tool_definition import ToolDefinition
+
+
+class ToolInstance(Base, UUIDMixin, TimestampMixin):
+    __tablename__ = "tool_instance"
+
+    project_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("project.id"), index=True
+    )
+    tool_definition_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("tool_definition.id"), index=True
+    )
+    name: Mapped[str] = mapped_column(String(255))
+    status: Mapped[str] = mapped_column(
+        String(50), default="pending"
+    )
+    container_id: Mapped[str | None] = mapped_column(
+        String(255), nullable=True
+    )
+    subdomain: Mapped[str | None] = mapped_column(
+        String(255), nullable=True, unique=True
+    )
+    config_override: Mapped[dict[str, Any] | None] = mapped_column(
+        JSON, nullable=True
+    )
+
+    project: Mapped["Project"] = relationship(
+        back_populates="tool_instances"
+    )
+    tool_definition: Mapped["ToolDefinition"] = relationship(
+        back_populates="instances"
+    )
+    access_routes: Mapped[list["AccessRoute"]] = relationship(
+        back_populates="tool_instance"
+    )

apps/api/app/models/user.py

@@ -0,0 +1,30 @@
+from typing import TYPE_CHECKING
+
+from sqlalchemy import Boolean, String
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.models.base import Base, TimestampMixin, UUIDMixin
+
+if TYPE_CHECKING:
+    from app.models.project import Project
+
+
+class User(Base, UUIDMixin, TimestampMixin):
+    __tablename__ = "user"
+
+    authentik_sub: Mapped[str] = mapped_column(
+        String(255), unique=True, index=True
+    )
+    email: Mapped[str] = mapped_column(
+        String(255), unique=True, index=True
+    )
+    display_name: Mapped[str | None] = mapped_column(
+        String(255), nullable=True
+    )
+    is_active: Mapped[bool] = mapped_column(
+        Boolean, default=True
+    )
+
+    projects: Mapped[list["Project"]] = relationship(
+        back_populates="owner"
+    )

apps/api/app/models/workspace.py

@@ -0,0 +1,24 @@
+import uuid
+from typing import TYPE_CHECKING
+
+from sqlalchemy import ForeignKey, String, Text
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.models.base import Base, TimestampMixin, UUIDMixin
+
+if TYPE_CHECKING:
+    from app.models.project import Project
+
+
+class Workspace(Base, UUIDMixin, TimestampMixin):
+    __tablename__ = "workspace"
+
+    project_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("project.id"), index=True
+    )
+    name: Mapped[str] = mapped_column(String(255))
+    mount_path: Mapped[str | None] = mapped_column(Text, nullable=True)
+
+    project: Mapped["Project"] = relationship(
+        back_populates="workspaces"
+    )