Fixes

- use "uuid" instead of "id" in graph node simple mode
- require namespace when GET node by name
- include additional links in campaign response header
- campaign post returns existing campaign on duplicate
- improve consistency in route parameter naming
- delegate more route typing to pydantic models
- use sorting in activity log route

Author: tcjennings

src/lsst/cmservice/common/graph.py

@@ -79,17 +79,17 @@ async def graph_from_edge_list_v2(
             # for the simple node view, the goal is to minimize the amount of
             # data attached to the node and ensure that this data is json-
             # serializable and otherwise appropriate for an API response
-            g.nodes[node]["id"] = str(db_node.id)
+            g.nodes[node]["uuid"] = str(db_node.id)
             g.nodes[node]["status"] = db_node.status.name
             g.nodes[node]["kind"] = db_node.kind.name
+            g.nodes[node]["version"] = db_node.version
             relabel_mapping[node] = db_node.name
         else:
             g.nodes[node]["model"] = db_node
 
     if relabel_mapping:
         g = nx.relabel_nodes(g, mapping=relabel_mapping, copy=False)
 
-    # TODO validate graph now raise exception, or leave it to the caller?
     return g
 
 

src/lsst/cmservice/db/campaigns_v2.py

@@ -1,10 +1,10 @@
 """ORM Models for v2 tables and objects."""
 
-from datetime import datetime
+from collections.abc import MutableSequence
 from typing import Any
 from uuid import NAMESPACE_DNS, UUID, uuid4, uuid5
 
-from pydantic import AliasChoices, ValidationInfo, model_validator
+from pydantic import AliasChoices, AwareDatetime, ValidationInfo, model_validator
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.ext.mutable import MutableDict, MutableList
 from sqlalchemy.types import PickleType
@@ -99,6 +99,20 @@ class CampaignUpdate(BaseSQLModel):
     status: StatusField | None = None
 
 
+class CampaignSummary(CampaignBase):
+    """Model for the response of a Campaign Summary route."""
+
+    node_summary: MutableSequence["NodeStatusSummary"]
+
+
+class NodeStatusSummary(BaseSQLModel):
+    """Model for a Node Status Summary."""
+
+    status: StatusField = Field(description="A state name")
+    count: int = Field(description="Count of nodes in this state")
+    mtime: AwareDatetime | None = Field(description="The most recent update time for nodes in this state")
+
+
 class NodeBase(BaseSQLModel):
     """nodes_v2 db table"""
 
@@ -212,17 +226,17 @@ class Task(BaseSQLModel, table=True):
     namespace: UUID = Field(foreign_key="campaigns_v2.id", description="The ID of a Campaign")
     node: UUID = Field(foreign_key="nodes_v2.id", description="The ID of the target node")
     priority: int | None = Field(default=None)
-    created_at: datetime = Field(
+    created_at: AwareDatetime = Field(
         description="The `datetime` (UTC) at which this Task was first added to the queue",
         default_factory=now_utc,
         sa_column=Column(DateTime(timezone=True)),
     )
-    submitted_at: datetime | None = Field(
+    submitted_at: AwareDatetime | None = Field(
         description="The `datetime` (UTC) at which this Task was first submitted as work to the event loop",
         default=None,
         sa_column=Column(DateTime(timezone=True)),
     )
-    finished_at: datetime | None = Field(
+    finished_at: AwareDatetime | None = Field(
         description=(
             "The `datetime` (UTC) at which this Task successfully finalized. "
             "A Task whose `finished_at` is not `None` is tombstoned and is subject to deletion."
@@ -251,12 +265,12 @@ class ActivityLogBase(BaseSQLModel):
     namespace: UUID = Field(foreign_key="campaigns_v2.id", description="The ID of a Campaign")
     node: UUID | None = Field(default=None, foreign_key="nodes_v2.id", description="The ID of a Node")
     operator: str = Field(description="The name of the operator or pilot who triggered the activity")
-    created_at: datetime = Field(
+    created_at: AwareDatetime = Field(
         description="The `datetime` in UTC at which this log entry was created.",
         default_factory=now_utc,
         sa_column=Column(DateTime(timezone=True)),
     )
-    finished_at: datetime | None = Field(
+    finished_at: AwareDatetime | None = Field(
         description="The `datetime` in UTC at which this log entry was finalized.",
         default=None,
         sa_column=Column(DateTime(timezone=True), nullable=True),

src/lsst/cmservice/db/manifests_v2.py

@@ -10,6 +10,7 @@
 from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ValidationInfo, model_validator
 
 from ..common.enums import DEFAULT_NAMESPACE, ManifestKind
+from ..common.timestamp import element_time
 from ..common.types import KindField
 
 
@@ -30,17 +31,6 @@ class Manifest[MetadataT, SpecT](BaseModel):
     )
 
 
-class ManifestMetadata(BaseModel):
-    """Generic metadata model for Manifests.
-
-    Conventionally denormalized fields are excluded from the model_dump when
-    serialized for ORM use.
-    """
-
-    name: str
-    namespace: str
-
-
 class ManifestSpec(BaseModel):
     """Generic spec model for Manifests.
 
@@ -55,18 +45,30 @@ class ManifestSpec(BaseModel):
     model_config = ConfigDict(extra="allow")
 
 
+class ManifestMetadata(BaseModel):
+    """Generic metadata model for Manifests.
+
+    Conventionally denormalized fields are excluded from the model_dump when
+    serialized for ORM use.
+    """
+
+    name: str = Field(exclude=True)
+    namespace: str = Field(exclude=True)
+    crtime: int = Field(default_factory=element_time)
+
+
 class VersionedMetadata(ManifestMetadata):
     """Metadata model for versioned Manifests."""
 
-    version: int = 0
+    version: int = Field(exclude=True, default=0)
 
 
 class ManifestModelMetadata(VersionedMetadata):
     """Manifest model for general Manifests. These manifests are versioned but
-    a namespace is optional.
+    a namespace is optional (defaultable).
     """
 
-    namespace: str = Field(default=str(DEFAULT_NAMESPACE))
+    namespace: str = Field(default=str(DEFAULT_NAMESPACE), exclude=True)
 
 
 class ManifestModel(Manifest[ManifestModelMetadata, ManifestSpec]):
@@ -81,16 +83,7 @@ def custom_model_validator(self, info: ValidationInfo) -> Self:
         return self
 
 
-class CampaignMetadata(BaseModel):
-    """Metadata model for a Campaign Manifest.
-
-    Campaign metadata does not require a namespace field.
-    """
-
-    name: str
-
-
-class CampaignManifest(Manifest[CampaignMetadata, ManifestSpec]):
+class CampaignManifest(Manifest[ManifestModelMetadata, ManifestSpec]):
     """validating model for campaigns"""
 
     @model_validator(mode="after")
@@ -108,14 +101,15 @@ class EdgeMetadata(ManifestMetadata):
     A default random alphanumeric 8-byte name is generated if no name provided.
     """
 
-    name: str = Field(default_factory=lambda: uuid4().hex[:8])
+    name: str = Field(default_factory=lambda: uuid4().hex[:8], exclude=True)
+    crtime: int = Field(default_factory=element_time)
 
 
 class EdgeSpec(ManifestSpec):
     """Spec model for an Edge Manifest."""
 
-    source: str
-    target: str
+    source: str = Field(exclude=True)
+    target: str = Field(exclude=True)
 
 
 class EdgeManifest(Manifest[EdgeMetadata, EdgeSpec]):

src/lsst/cmservice/machines/campaign.py

@@ -105,11 +105,6 @@ async def prepare_activity_log(self, event: EventData) -> None:
         if TYPE_CHECKING:
             assert self.db_model is not None
 
-        # TODO the activity log doesn't really support campaign-level entries
-        # because the node field has a FK constraint, so the convention intro-
-        # duced here is to use the mandatory and deterministic "START" node
-        # for these entries.
-
         if self.activity_log_entry is not None:
             return None
 

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

@@ -6,7 +6,7 @@
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, HTTPException, Query, Request, Response
-from sqlmodel import select
+from sqlmodel import col, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 from ...common.logging import LOGGER
@@ -56,7 +56,7 @@ async def read_activity_collection(
     if since is not None:
         statement = statement.where(ActivityLog.finished_at >= since)  # type: ignore[operator]
 
-    statement = statement.offset(offset).limit(limit)
+    statement = statement.order_by(col(ActivityLog.created_at).desc()).offset(offset).limit(limit)
     activity_logs = (await session.exec(statement)).all()
     return activity_logs
 
@@ -77,7 +77,7 @@ async def read_activity_resource(
     # set the response headers
     if activity_log is not None:
         response.headers["Campaign"] = str(
-            request.url_for("read_campaign_resource", campaign_name=activity_log.namespace)
+            request.url_for("read_campaign_resource", campaign_name_or_id=activity_log.namespace)
         )
         response.headers["Node"] = str(request.url_for("read_node_resource", node_name=activity_log.node))
         response.headers["Self"] = str(