feat(api): Add campaign_v2 and manifest_v2 routes

bugfix(manifests): correct manifest name determination

chore(tests): Implement tests for manifest routes

feat(api): Extend and update v2 manifest routes

Author: tcjennings

.github/workflows/ci.yaml

@@ -12,6 +12,7 @@ name: "CI"
 
 env:
   UV_FROZEN: "1"
+  TEST__LOCAL_DB: "1"  # signals test fixtures to not use testcontainers
 
 jobs:
   rebase-checker:

pyproject.toml

@@ -169,7 +169,7 @@ max-doc-length = 79
 convention = "numpy"
 
 [tool.pytest.ini_options]
-asyncio_mode = "strict"
+asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope="function"
 # The python_files setting is not for test detection (pytest will pick up any
 # test files named *_test.py without this setting) but to enable special

src/lsst/cmservice/db/__init__.py

@@ -1,5 +1,6 @@
 """Database table definitions and utility functions"""
 
+from . import campaigns_v2
 from .base import Base
 from .campaign import Campaign
 from .element import ElementMixin

src/lsst/cmservice/db/campaigns_v2.py

@@ -69,6 +69,10 @@ def jsonb_column(name: str, aliases: list[str] | None = None) -> Any:
 """
 
 
+type StatusField = Annotated[StatusEnum, StatusEnumValidator, EnumSerializer]
+type KindField = Annotated[ManifestKind, ManifestKindEnumValidator, EnumSerializer]
+
+
 class BaseSQLModel(SQLModel):
     __table_args__ = {"schema": config.db.table_schema}
 
@@ -80,7 +84,7 @@ class CampaignBase(BaseSQLModel):
     name: str
     namespace: UUID
     owner: str | None = Field(default=None)
-    status: Annotated[StatusEnum, StatusEnumValidator, EnumSerializer] | None = Field(
+    status: StatusField | None = Field(
         default=StatusEnum.waiting,
         sa_column=Column("status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)),
     )
@@ -115,18 +119,27 @@ class Campaign(CampaignModel, table=True):
     machine: UUID | None
 
 
+class CampaignUpdate(SQLModel):
+    """Model representing updatable fields for a PATCH operation on a Campaign
+    using RFC7396.
+    """
+
+    owner: str | None = None
+    status: StatusField | None = None
+
+
 class NodeBase(BaseSQLModel):
     """nodes_v2 db table"""
 
     id: UUID = Field(primary_key=True)
     name: str
     namespace: UUID
     version: int
-    kind: Annotated[ManifestKind, ManifestKindEnumValidator, EnumSerializer] = Field(
+    kind: KindField = Field(
         default=ManifestKind.other,
         sa_column=Column("kind", Enum(ManifestKind, length=20, native_enum=False, create_constraint=False)),
     )
-    status: Annotated[StatusEnum, StatusEnumValidator, EnumSerializer] | None = Field(
+    status: StatusField | None = Field(
         default=StatusEnum.waiting,
         sa_column=Column("status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)),
     )
@@ -209,7 +222,7 @@ class ManifestBase(BaseSQLModel):
     name: str
     version: int
     namespace: UUID
-    kind: Annotated[ManifestKind, EnumSerializer] = Field(
+    kind: KindField = Field(
         default=ManifestKind.other,
         sa_column=Column("kind", Enum(ManifestKind, length=20, native_enum=False, create_constraint=False)),
     )
@@ -270,8 +283,16 @@ class ActivityLogBase(BaseSQLModel):
     namespace: UUID
     node: UUID
     operator: str
-    from_status: Annotated[StatusEnum, EnumSerializer]
-    to_status: Annotated[StatusEnum, EnumSerializer]
+    to_status: StatusField = Field(
+        sa_column=Column(
+            "to_status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)
+        ),
+    )
+    from_status: StatusField = Field(
+        sa_column=Column(
+            "from_status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)
+        ),
+    )
     detail: dict = jsonb_column("detail")
 
 

src/lsst/cmservice/main.py

@@ -15,6 +15,7 @@
     index,
     tags_metadata,
     v1,
+    v2,
 )
 from .web_app import web_app
 
@@ -53,6 +54,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator:
 app.include_router(healthz.health_router, prefix="")
 app.include_router(index.router, prefix="")
 app.include_router(v1.router, prefix=config.asgi.prefix)
+app.include_router(v2.router, prefix=config.asgi.prefix)
 
 # Start the frontend web application.
 if config.asgi.enable_frontend:

src/lsst/cmservice/routers/v2/__init__.py

@@ -0,0 +1,13 @@
+from fastapi import APIRouter
+
+from . import (
+    campaigns,
+    manifests,
+)
+
+router = APIRouter(
+    prefix="/v2",
+)
+
+router.include_router(campaigns.router)
+router.include_router(manifests.router)