From 81d1632485656855db70760467c3e0e3bd6cac7e Mon Sep 17 00:00:00 2001
From: Eman Ali <eali@swin.edu.au>
Date: Wed, 28 May 2025 18:17:55 +1000
Subject: [PATCH 01/37] DM-51979 don't group campaigns by production in
 campaigns page

show config dicts in collapsible panels to save space

display config dicts in tables for readability

campaign last updated is the newest of creation and modification dates. display it in campaign card

change how step name is retrieved and displayed in the step card

tidy campaign card layout

first attempt at adding a new entry to collections using htmx, just adding the new form inputs, not there yet

make saving new entries work better

allow adding new collections, editing the values of existing ones not the keys

some tweaks and ui improvements to edit collections dialog

allow adding new entries in edit data dialog

allow adding new entries in edit child config dialog

check for collection prefix based on element type

change how WMS task progress is calculated

add missing import

add token link

lint and mypy

remove unused template
---
 src/lsst/cmservice/web_app/app.py             | 147 ++++++++++++++++++
 .../cmservice/web_app/pages/group_details.py  |  25 +--
 .../cmservice/web_app/pages/job_details.py    |  25 +--
 .../cmservice/web_app/static/css/output.css   |  71 +++++++++
 .../web_app/templates/pages/base.html         |  10 +-
 .../web_app/templates/pages/campaigns.html    |   1 +
 .../web_app/templates/pages/step_details.html |   5 +-
 .../partials/child_config_collapsible.html    |   2 +-
 .../templates/partials/collections.html       |   2 +
 .../partials/collections_collapsible.html     |   1 -
 .../partials/edit_child_config_form.html      |  44 ++++++
 .../edit_child_config_form_inputs.html        |  17 +-
 .../partials/edit_child_config_modal.html     |  20 +--
 .../partials/edit_child_config_response.html  |   2 +
 .../partials/edit_collections_form.html       |  46 ++++++
 .../edit_collections_form_inputs.html         |  28 +++-
 .../partials/edit_collections_modal.html      |  20 +--
 .../partials/edit_collections_response.html   |   3 +
 .../partials/edit_data_dict_form.html         |  42 +++++
 .../partials/edit_data_dict_form_inputs.html  |  19 ++-
 .../partials/edit_data_dict_modal.html        |  20 +--
 .../partials/edit_data_dict_response.html     |   3 +
 .../web_app/templates/partials/new_field.html |  23 +++
 23 files changed, 476 insertions(+), 100 deletions(-)
 create mode 100644 src/lsst/cmservice/web_app/templates/partials/edit_child_config_form.html
 create mode 100644 src/lsst/cmservice/web_app/templates/partials/edit_collections_form.html
 create mode 100644 src/lsst/cmservice/web_app/templates/partials/edit_data_dict_form.html
 create mode 100644 src/lsst/cmservice/web_app/templates/partials/new_field.html

diff --git a/src/lsst/cmservice/web_app/app.py b/src/lsst/cmservice/web_app/app.py
index 485332a22..e36a8cd56 100644
--- a/src/lsst/cmservice/web_app/app.py
+++ b/src/lsst/cmservice/web_app/app.py
@@ -414,3 +414,150 @@ async def update_element_data_dict(
     except Exception as e:
         traceback.print_tb(e.__traceback__)
         raise HTTPException(status_code=500, detail=f"Error updating data dict: {e}")
+
+
+@web_app.post("/collections/{element_id}/{element_type}/update")
+async def update_collections_htmx(
+    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    element_id: int,
+    element_type: int,
+    request: Request,
+    keys: Annotated[list[str], Form()],
+    values: Annotated[list[str], Form()],
+    new_keys: Annotated[list[str], Form()] = [],
+    new_values: Annotated[list[str], Form()] = [],
+) -> HTMLResponse:
+    element = await get_element(session, element_id, element_type)
+    if element is None:
+        raise HTTPException(
+            status.HTTP_404_NOT_FOUND,
+            detail=f"Error updating data dict: {LevelEnum(element_type).name} {element_id} Not Found!!",
+        )
+
+    collection_dict = {}
+    for key, value in zip(keys, values):
+        key = key.strip()
+        if key:
+            collection_dict[key] = value
+
+    for key, value in zip(new_keys, new_values):
+        key = key.strip()
+        if key:
+            collection_dict[key] = value
+
+    updated_element = await update_collections(session=session, element=element, collections=collection_dict)
+
+    return templates.TemplateResponse(
+        name="partials/edit_collections_response.html",
+        request=request,
+        context={
+            "element": updated_element,
+        },
+    )
+
+
+@web_app.post("/collections/{element_id}/{element_type}/add-field")
+@web_app.post("/data-dict/{element_id}/{element_type}/add-field")
+@web_app.post("/child-config/{element_id}/{element_type}/add-field")
+async def add_collection_field(
+    element_id: int,
+    element_type: int,
+    request: Request,
+) -> HTMLResponse:
+    import uuid
+
+    field_id = str(uuid.uuid4())[:8]
+
+    return templates.TemplateResponse(
+        name="partials/new_field.html",
+        request=request,
+        context={"element_id": element_id, "field_id": field_id, "element_type": element_type},
+    )
+
+
+@web_app.post("/collections/{element_id}/{element_type}/remove-new-field/{field_id}")
+@web_app.post("/data-dict/{element_id}/{element_type}/remove-new-field/{field_id}")
+@web_app.post("/child-config/{element_id}/{element_type}/remove-new-field/{field_id}")
+async def remove_new_field(element_id: int, element_type: int, field_id: str) -> str:
+    # This just returns empty content to remove the field from DOM
+    return ""
+
+
+@web_app.post("/data-dict/{element_id}/{element_type}/update")
+async def update_data_dict_htmx(
+    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    element_id: int,
+    element_type: int,
+    request: Request,
+    keys: Annotated[list[str], Form()] = [],
+    values: Annotated[list[str], Form()] = [],
+    new_keys: Annotated[list[str], Form()] = [],
+    new_values: Annotated[list[str], Form()] = [],
+) -> HTMLResponse:
+    element = await get_element(session, element_id, element_type)
+    if element is None:
+        raise HTTPException(
+            status.HTTP_404_NOT_FOUND,
+            detail=f"Error updating data dict: {LevelEnum(element_type).name} {element_id} Not Found!!",
+        )
+
+    data_dict = {}
+    for key, value in zip(keys, values):
+        key = key.strip()
+        if key:
+            data_dict[key] = value
+
+    for key, value in zip(new_keys, new_values):
+        key = key.strip()
+        if key:
+            data_dict[key] = value
+
+    updated_element = await update_data_dict(session=session, element=element, data_dict=data_dict)
+
+    return templates.TemplateResponse(
+        name="partials/edit_data_dict_response.html",
+        request=request,
+        context={
+            "element": updated_element,
+        },
+    )
+
+
+@web_app.post("/child-config/{element_id}/{element_type}/update")
+async def update_child_config_htmx(
+    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    element_id: int,
+    element_type: int,
+    request: Request,
+    keys: Annotated[list[str], Form()] = [],
+    values: Annotated[list[str], Form()] = [],
+    new_keys: Annotated[list[str], Form()] = [],
+    new_values: Annotated[list[str], Form()] = [],
+) -> HTMLResponse:
+    element = await get_element(session, element_id, element_type)
+    if element is None:
+        raise HTTPException(
+            status.HTTP_404_NOT_FOUND,
+            detail=f"Error updating child config: {LevelEnum(element_type).name} {element_id} Not Found!!",
+        )
+
+    child_config = {}
+    for key, value in zip(keys, values):
+        key = key.strip()
+        if key:
+            child_config[key] = value
+
+    for key, value in zip(new_keys, new_values):
+        key = key.strip()
+        if key:
+            child_config[key] = value
+
+    updated_element = await update_child_config(session=session, element=element, child_config=child_config)
+
+    return templates.TemplateResponse(
+        name="partials/edit_child_config_response.html",
+        request=request,
+        context={
+            "element": updated_element,
+        },
+    )
diff --git a/src/lsst/cmservice/web_app/pages/group_details.py b/src/lsst/cmservice/web_app/pages/group_details.py
index 13a97f1b8..6c54b7c67 100644
--- a/src/lsst/cmservice/web_app/pages/group_details.py
+++ b/src/lsst/cmservice/web_app/pages/group_details.py
@@ -42,16 +42,21 @@ async def get_group_by_id(
 
             if len(wms_report) > 0:
                 aggregated_report_dict["succeeded"] = sum(task["n_succeeded"] for task in wms_report)
-                aggregated_report_dict["failed"] = wms_report[-1]["n_failed"]
-                aggregated_report_dict["running"] = wms_report[-1]["n_running"]
-                aggregated_report_dict["pending"] = wms_report[-1]["n_pending"] + wms_report[-1]["n_ready"]
-                aggregated_report_dict["other"] = (
-                    wms_report[-1]["n_unknown"]
-                    + wms_report[-1]["n_misfit"]
-                    + wms_report[-1]["n_unready"]
-                    + wms_report[-1]["n_deleted"]
-                    + wms_report[-1]["n_pruned"]
-                    + wms_report[-1]["n_held"]
+                aggregated_report_dict["failed"] = sum(task["n_failed"] for task in wms_report)
+                aggregated_report_dict["running"] = sum(task["n_running"] for task in wms_report)
+                aggregated_report_dict["pending"] = sum(
+                    (task["n_pending"] + task["n_ready"]) for task in wms_report
+                )
+                aggregated_report_dict["other"] = sum(
+                    (
+                        task["n_unknown"]
+                        + task["n_misfit"]
+                        + task["n_unready"]
+                        + task["n_deleted"]
+                        + task["n_pruned"]
+                        + task["n_held"]
+                    )
+                    for task in wms_report
                 )
 
                 aggregated_report_dict["expected"] = sum(aggregated_report_dict.values())
diff --git a/src/lsst/cmservice/web_app/pages/job_details.py b/src/lsst/cmservice/web_app/pages/job_details.py
index a55b88689..c42619a19 100644
--- a/src/lsst/cmservice/web_app/pages/job_details.py
+++ b/src/lsst/cmservice/web_app/pages/job_details.py
@@ -35,16 +35,21 @@ async def get_job_by_id(
 
             if len(wms_report) > 0:
                 aggregated_report_dict["succeeded"] = sum(task["n_succeeded"] for task in wms_report)
-                aggregated_report_dict["failed"] = wms_report[-1]["n_failed"]
-                aggregated_report_dict["running"] = wms_report[-1]["n_running"]
-                aggregated_report_dict["pending"] = wms_report[-1]["n_pending"] + wms_report[-1]["n_ready"]
-                aggregated_report_dict["other"] = (
-                    wms_report[-1]["n_unknown"]
-                    + wms_report[-1]["n_misfit"]
-                    + wms_report[-1]["n_unready"]
-                    + wms_report[-1]["n_deleted"]
-                    + wms_report[-1]["n_pruned"]
-                    + wms_report[-1]["n_held"]
+                aggregated_report_dict["failed"] = sum(task["n_failed"] for task in wms_report)
+                aggregated_report_dict["running"] = sum(task["n_running"] for task in wms_report)
+                aggregated_report_dict["pending"] = sum(
+                    task["n_pending"] + task["n_ready"] for task in wms_report
+                )
+                aggregated_report_dict["other"] = sum(
+                    (
+                        task["n_unknown"]
+                        + task["n_misfit"]
+                        + task["n_unready"]
+                        + task["n_deleted"]
+                        + task["n_pruned"]
+                        + task["n_held"]
+                    )
+                    for task in wms_report
                 )
 
                 aggregated_report_dict["expected"] = sum(aggregated_report_dict.values())
diff --git a/src/lsst/cmservice/web_app/static/css/output.css b/src/lsst/cmservice/web_app/static/css/output.css
index d7031ca3d..d9b782112 100644
--- a/src/lsst/cmservice/web_app/static/css/output.css
+++ b/src/lsst/cmservice/web_app/static/css/output.css
@@ -708,10 +708,18 @@ video {
   margin-top: -1px;
 }
 
+.mb-2 {
+  margin-bottom: 0.5rem;
+}
+
 .mb-3 {
   margin-bottom: 0.75rem;
 }
 
+.mb-4 {
+  margin-bottom: 1rem;
+}
+
 .ml-2 {
   margin-left: 0.5rem;
 }
@@ -799,6 +807,11 @@ video {
   height: 1.5rem;
 }
 
+.size-4 {
+  width: 1rem;
+  height: 1rem;
+}
+
 .h-10 {
   height: 2.5rem;
 }
@@ -989,6 +1002,10 @@ video {
   flex-direction: row;
 }
 
+.flex-col-reverse {
+  flex-direction: column-reverse;
+}
+
 .flex-wrap {
   flex-wrap: wrap;
 }
@@ -1013,6 +1030,10 @@ video {
   gap: 0.5rem;
 }
 
+.gap-3 {
+  gap: 0.75rem;
+}
+
 .gap-5 {
   gap: 1.25rem;
 }
@@ -1050,6 +1071,12 @@ video {
   margin-bottom: calc(0.25rem * var(--tw-space-y-reverse));
 }
 
+.space-x-1 > :not([hidden]) ~ :not([hidden]) {
+  --tw-space-x-reverse: 0;
+  margin-right: calc(0.25rem * var(--tw-space-x-reverse));
+  margin-left: calc(0.25rem * calc(1 - var(--tw-space-x-reverse)));
+}
+
 .divide-x > :not([hidden]) ~ :not([hidden]) {
   --tw-divide-x-reverse: 0;
   border-right-width: calc(1px * var(--tw-divide-x-reverse));
@@ -1180,6 +1207,11 @@ video {
   border-color: rgb(229 231 235 / var(--tw-border-opacity));
 }
 
+.border-gray-300 {
+  --tw-border-opacity: 1;
+  border-color: rgb(209 213 219 / var(--tw-border-opacity));
+}
+
 .border-gray-400 {
   --tw-border-opacity: 1;
   border-color: rgb(156 163 175 / var(--tw-border-opacity));
@@ -1243,6 +1275,11 @@ video {
   background-color: rgb(254 226 226 / var(--tw-bg-opacity));
 }
 
+.bg-red-500 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(239 68 68 / var(--tw-bg-opacity));
+}
+
 .bg-red-600 {
   --tw-bg-opacity: 1;
   background-color: rgb(220 38 38 / var(--tw-bg-opacity));
@@ -1447,6 +1484,11 @@ video {
   line-height: 1.5rem;
 }
 
+.text-lg {
+  font-size: 1.125rem;
+  line-height: 1.75rem;
+}
+
 .text-sm {
   font-size: 0.875rem;
   line-height: 1.25rem;
@@ -1870,6 +1912,11 @@ video {
   background-color: rgb(99 102 241 / var(--tw-bg-opacity));
 }
 
+.hover\:bg-red-600:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(220 38 38 / var(--tw-bg-opacity));
+}
+
 .hover\:bg-teal-50:hover {
   --tw-bg-opacity: 1;
   background-color: rgb(240 253 250 / var(--tw-bg-opacity));
@@ -1880,10 +1927,24 @@ video {
   background-color: rgb(20 184 166 / var(--tw-bg-opacity));
 }
 
+.hover\:bg-teal-600:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(13 148 136 / var(--tw-bg-opacity));
+}
+
 .hover\:font-bold:hover {
   font-weight: 700;
 }
 
+.hover\:font-semibold:hover {
+  font-weight: 600;
+}
+
+.hover\:text-gray-50:hover {
+  --tw-text-opacity: 1;
+  color: rgb(249 250 251 / var(--tw-text-opacity));
+}
+
 .hover\:text-gray-500:hover {
   --tw-text-opacity: 1;
   color: rgb(107 114 128 / var(--tw-text-opacity));
@@ -1940,6 +2001,16 @@ video {
   --tw-ring-inset: inset;
 }
 
+.focus\:ring-blue-500:focus {
+  --tw-ring-opacity: 1;
+  --tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
+}
+
+.focus\:ring-gray-500:focus {
+  --tw-ring-opacity: 1;
+  --tw-ring-color: rgb(107 114 128 / var(--tw-ring-opacity));
+}
+
 .focus\:ring-indigo-500:focus {
   --tw-ring-opacity: 1;
   --tw-ring-color: rgb(99 102 241 / var(--tw-ring-opacity));
diff --git a/src/lsst/cmservice/web_app/templates/pages/base.html b/src/lsst/cmservice/web_app/templates/pages/base.html
index b3c06908e..168576d73 100644
--- a/src/lsst/cmservice/web_app/templates/pages/base.html
+++ b/src/lsst/cmservice/web_app/templates/pages/base.html
@@ -10,10 +10,18 @@
 </head>
 <body class="h-full">
     <nav class="border-b border-gray-200 bg-teal-700">
-        <div class="px-4 sm:px-6 lg:px-8">
+        <div class="flex px-4 sm:px-6 lg:px-8 justify-center items-center">
             <div class="flex h-16 items-center">
                 <a href="{{ url_for('get_campaigns')}}"><img class="block h-10 w-auto lg:block" src="{{ url_for('static', path='/images/lsst_white_logo.png') }}" alt="Rubin"></a>
             </div>
+            <div class="ml-auto">
+                <a href="/auth/tokens/" class="hover:text-gray-50 font-normal text-white hover:font-semibold text-sm flex items-center space-x-1">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5">
+                      <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25a3 3 0 0 1 3 3m3 0a6 6 0 0 1-7.029 5.912c-.563-.097-1.159.026-1.563.43L10.5 17.25H8.25v2.25H6v2.25H2.25v-2.818c0-.597.237-1.17.659-1.591l6.499-6.499c.404-.404.527-1 .43-1.563A6 6 0 1 1 21.75 8.25Z" />
+                    </svg>
+                    <span>Security Tokens</span>
+                </a>
+            </div>
         </div>
     </nav>
     <div class="py-10">
diff --git a/src/lsst/cmservice/web_app/templates/pages/campaigns.html b/src/lsst/cmservice/web_app/templates/pages/campaigns.html
index 87d8b2e98..996e2f067 100644
--- a/src/lsst/cmservice/web_app/templates/pages/campaigns.html
+++ b/src/lsst/cmservice/web_app/templates/pages/campaigns.html
@@ -30,6 +30,7 @@ <h1 class="text-sm font-bold leading-tight tracking-tight text-gray-400 pb-3 fon
         <div class="px-4 sm:px-6 lg:px-8">
             <h1 class="text-sm font-bold leading-tight tracking-tight text-gray-400 pb-3 font-mono uppercase pt-8">Campaigns</h1>
         </div>
+
         <div class="mt-5 grid gap-5 lg:grid-cols-3 md:grid-cols-2 px-4 sm:px-6 lg:px-8">
         {% for campaign in all_campaigns %}
         {% include "partials/campaign_card.html" %}
diff --git a/src/lsst/cmservice/web_app/templates/pages/step_details.html b/src/lsst/cmservice/web_app/templates/pages/step_details.html
index c10cc4285..3a7ab5fe4 100644
--- a/src/lsst/cmservice/web_app/templates/pages/step_details.html
+++ b/src/lsst/cmservice/web_app/templates/pages/step_details.html
@@ -162,10 +162,7 @@
         document.querySelector("#editDataBtn").addEventListener("click", () => {
             let step_status = {{step.org_status.value}};
             // TODO: revisit status mapping between frontend and backend
-            if (Object.keys({{step.data}}).length === 0) {
-                errorMessage.innerText = "Data Config is empty!";
-                errorModal.showModal();
-            } else if(step_status < 2) {
+            if(step_status < 2) {
                 document.querySelector("#edit-data-dict-modal").showModal();
             } else {
                 errorMessage.innerText = "Cannot update data for a running step!";
diff --git a/src/lsst/cmservice/web_app/templates/partials/child_config_collapsible.html b/src/lsst/cmservice/web_app/templates/partials/child_config_collapsible.html
index 8b2d8b168..93557db56 100644
--- a/src/lsst/cmservice/web_app/templates/partials/child_config_collapsible.html
+++ b/src/lsst/cmservice/web_app/templates/partials/child_config_collapsible.html
@@ -28,7 +28,7 @@
         </svg>
       </button>
     </summary>
-    <div id="data-dict" class="px-4 py-3 bg-white border-t text-gray-700">
+    <div id="child-config" class="px-4 py-3 bg-white border-t text-gray-700">
         {% include "partials/child_config.html" %}
     </div>
   </details>
diff --git a/src/lsst/cmservice/web_app/templates/partials/collections.html b/src/lsst/cmservice/web_app/templates/partials/collections.html
index 5d9f1fd3c..30f5c169c 100644
--- a/src/lsst/cmservice/web_app/templates/partials/collections.html
+++ b/src/lsst/cmservice/web_app/templates/partials/collections.html
@@ -2,6 +2,7 @@
   <table class="table-auto w-full text-sm text-left text-gray-700">
     <tbody class="divide-y divide-gray-100">
       {% for key, value in element.collections|items %}
+      {% if key != "" and key.startswith("step_") %}  <!-- Skip empty keys used for new fields -->
       <tr class="hover:bg-gray-50 transition-colors">
         <th class="font-medium pr-4 py-2 text-gray-600 whitespace-nowrap align-top">
           {{ key }}
@@ -14,6 +15,7 @@
           {% endif %}
         </td>
       </tr>
+      {% endif %}
       {% endfor %}
     </tbody>
   </table>
diff --git a/src/lsst/cmservice/web_app/templates/partials/collections_collapsible.html b/src/lsst/cmservice/web_app/templates/partials/collections_collapsible.html
index bc8083175..17f148064 100644
--- a/src/lsst/cmservice/web_app/templates/partials/collections_collapsible.html
+++ b/src/lsst/cmservice/web_app/templates/partials/collections_collapsible.html
@@ -28,7 +28,6 @@
         </svg>
       </button>
     </summary>
-
     <div class="px-4 py-3 bg-white border-t text-gray-700" id="collections">
       {% include "partials/collections.html" %}
     </div>
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_child_config_form.html b/src/lsst/cmservice/web_app/templates/partials/edit_child_config_form.html
new file mode 100644
index 000000000..233b3da0d
--- /dev/null
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_child_config_form.html
@@ -0,0 +1,44 @@
+<!-- Main child config form -->
+<form id="update-child-config-form"
+      hx-post="/web_app/child-config/{{ element.id }}/{{ element.level }}/update"
+      hx-target="#child-config"
+      hx-swap="innerHTML">
+
+    <div id="child-config-container">
+        <div id="child-config-form-elements">
+            {% include "partials/edit_child_config_form_inputs.html" %}
+        </div>
+
+        <!-- New fields container -->
+        <div id="new-child-fields-container">
+            <!-- New fields will be added here -->
+        </div>
+
+        <div class="mt-5 sm:mt-6">
+            <div class="mb-4">
+                <button type="button"
+                        hx-post="/web_app/child-config/{{ element.id }}/{{ element.level }}/add-field"
+                        hx-target="#new-child-fields-container"
+                        hx-swap="beforeend"
+                        class="inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                    <svg class="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path>
+                    </svg>
+                    Add Field
+                </button>
+            </div>
+
+            <div class="flex flex-col-reverse sm:flex-row-reverse gap-3">
+                <button id="confirm-edit-child-config" type="submit"
+                        class="inline-flex justify-center rounded-md bg-teal-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-teal-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-teal-600">
+                    Confirm
+                </button>
+
+                <button id="cancel-edit-child-config" type="button"
+                        class="inline-flex justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500">
+                    Cancel
+                </button>
+            </div>
+        </div>
+    </div>
+</form>
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_child_config_form_inputs.html b/src/lsst/cmservice/web_app/templates/partials/edit_child_config_form_inputs.html
index 57618acd3..6b9b5690c 100644
--- a/src/lsst/cmservice/web_app/templates/partials/edit_child_config_form_inputs.html
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_child_config_form_inputs.html
@@ -1,12 +1,15 @@
 {% for key, value in element.child_config|items %}
-<div class="flex flex-row">
-    <div class="basis-1/3"><label class="pr-2 text-sm/6 font-medium text-gray-900">{{key}}</label></div>
+<div class="flex flex-row mb-2">
+    <div class="basis-1/3">
+        <label class="pr-2 text-sm/6 font-medium text-gray-900">{{key}}</label>
+        <input type="hidden" name="keys" value="{{key}}"/>
+    </div>
     <div class="basis-2/3">
-        <input
-                type="text"
-                name="{{key}}"
-                value="{{value}}"
-                class="text-xs font-normal text-gray-900 w-full border-2"/>
+        <input type="text"
+               name="values"
+               value="{{value}}"
+               class="text-xs font-normal text-gray-900 w-full border-2"
+               placeholder="Field value"/>
     </div>
 </div>
 {% endfor %}
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_child_config_modal.html b/src/lsst/cmservice/web_app/templates/partials/edit_child_config_modal.html
index 27d5dcc6d..257c29d89 100644
--- a/src/lsst/cmservice/web_app/templates/partials/edit_child_config_modal.html
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_child_config_modal.html
@@ -4,28 +4,14 @@
         role="dialog"
         aria-modal="true"
         class="rounded-lg w-1/2">
-
     <div class="relative transform overflow-hidden bg-white px-4 pb-4 pt-5 text-left">
-    <div>
         <div class="mt-3 text-center sm:mt-5">
             <h2 class="text-base font-semibold text-gray-900 pb-4">Edit Child Config</h2>
         </div>
         <div>
-            <form id="update-child_config-form"
-                  hx-post="{{ url_for('update_element_child_config', element_id=element.id, element_type=element.level)}}"
-                  hx-swap="innerHTML"
-                  hx-target="#child-config"
-                  method="POST">
-                <div id="child-config-form-elements">
-                    {% include "partials/edit_child_config_form_inputs.html" %}
-                </div>
-                <div class="mt-5 sm:mt-6 sm:flex sm:flex-row-reverse gap-x-3">
-                    <button id="confirm-edit-child-config" type="submit" class="inline-flex justify-center rounded bg-teal-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-teal-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-teal-600 sm:col-start-2">Confirm</button>
-                    <button id="cancel-edit-child-config" type="button" class="mt-3 inline-flex justify-center rounded bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:col-start-1 sm:mt-0">Cancel</button>
-                </div>
-            </form>
-
+            <div id="collections-form">
+                {% include "partials/edit_child_config_form.html" %}
+            </div>
         </div>
     </div>
-</div>
 </dialog>
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_child_config_response.html b/src/lsst/cmservice/web_app/templates/partials/edit_child_config_response.html
index a9b250381..090c41685 100644
--- a/src/lsst/cmservice/web_app/templates/partials/edit_child_config_response.html
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_child_config_response.html
@@ -3,3 +3,5 @@
 <div id="child-config-form-elements" hx-swap-oob="true">
     {% include "partials/edit_child_config_form_inputs.html" %}
 </div>
+<div id="new-child-fields-container" hx-swap-oob="true">
+</div>
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_collections_form.html b/src/lsst/cmservice/web_app/templates/partials/edit_collections_form.html
new file mode 100644
index 000000000..433b7a7f7
--- /dev/null
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_collections_form.html
@@ -0,0 +1,46 @@
+<!-- Main collections form -->
+<form id="update-collections-form"
+      hx-post="/web_app/collections/{{ element.id }}/{{ element.level }}/update"
+      hx-target="#collections"
+      hx-swap="innerHTML">
+
+    <div id="collections-container">
+        <div id="collections-form-elements">
+            {% include "partials/edit_collections_form_inputs.html" %}
+        </div>
+
+        <!-- New fields container -->
+        <div id="new-col-fields-container">
+            <!-- New fields will be added here -->
+        </div>
+
+        <div class="mt-5 sm:mt-6">
+            <div class="mb-4">
+                <button type="button"
+                        hx-post="/web_app/collections/{{ element.id }}/{{ element.level }}/add-field"
+                        hx-target="#new-col-fields-container"
+                        hx-swap="beforeend"
+                        class="inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                    <svg class="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path>
+                    </svg>
+                    Add Field
+                </button>
+            </div>
+
+            <div class="flex flex-col-reverse sm:flex-row-reverse gap-3">
+                <button id="confirm-edit-collections" type="submit"
+                        class="inline-flex justify-center rounded-md bg-teal-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-teal-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-teal-600">
+                    Confirm
+                </button>
+
+                <button id="cancel-edit-collections" type="button"
+                        class="inline-flex justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500">
+                    Cancel
+                </button>
+            </div>
+        </div>
+
+
+    </div>
+</form>
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_collections_form_inputs.html b/src/lsst/cmservice/web_app/templates/partials/edit_collections_form_inputs.html
index 77ef93633..3604b5b28 100644
--- a/src/lsst/cmservice/web_app/templates/partials/edit_collections_form_inputs.html
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_collections_form_inputs.html
@@ -1,12 +1,26 @@
+{% set prefix = "" %}
+{% if element.level == 2 %}
+    {% set prefix = "step_" %}
+{% elif element.level == 3 %}
+    {% set prefix = "group_" %}
+{% elif element.level == 4 %}
+    {% set prefix = "job_" %}
+{% endif %}
+
 {% for key, value in element.collections|items %}
-<div class="flex flex-row">
-    <div class="basis-1/3"><label class="pr-2 text-sm/6 font-medium text-gray-900">{{key}}</label></div>
+{% if key != "" and prefix != "" and key.startswith(prefix) %}  <!-- Skip empty keys used for new fields -->
+<div class="flex flex-row collection-row mb-2">
+    <div class="basis-1/3">
+        <label class="pr-2 text-sm/6 font-medium text-gray-900">{{key}}</label>
+        <input type="hidden" name="keys" value="{{key}}"/>
+    </div>
     <div class="basis-2/3">
-        <input
-                type="text"
-                name="{{key}}"
-                value="{{value}}"
-                class="text-xs font-normal text-gray-900 w-full border-2"/>
+        <input type="text"
+               name="values"
+               value="{{value}}"
+               class="text-xs font-normal text-gray-900 w-full border-2"
+               placeholder="Field value"/>
     </div>
 </div>
+{% endif %}
 {% endfor %}
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_collections_modal.html b/src/lsst/cmservice/web_app/templates/partials/edit_collections_modal.html
index 5c065a270..c6908597c 100644
--- a/src/lsst/cmservice/web_app/templates/partials/edit_collections_modal.html
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_collections_modal.html
@@ -4,28 +4,14 @@
         role="dialog"
         aria-modal="true"
         class="rounded-lg w-1/2">
-
     <div class="relative transform overflow-hidden bg-white px-4 pb-4 pt-5 text-left">
-    <div>
         <div class="mt-3 text-center sm:mt-5">
             <h2 class="text-base font-semibold text-gray-900 pb-4">Edit Collections</h2>
         </div>
         <div>
-            <form id="update-collections-form"
-                  hx-post="{{ url_for('update_element_collections', element_id=element.id, element_type=element.level)}}"
-                  hx-swap="innerHTML"
-                  hx-target="#collections"
-                  method="POST">
-                <div id="collections-form-elements">
-                    {% include "partials/edit_collections_form_inputs.html" %}
-                </div>
-                <div class="mt-5 sm:mt-6 sm:flex sm:flex-row-reverse gap-x-3">
-                    <button id="confirm-edit-collections" type="submit" class="inline-flex justify-center rounded bg-teal-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-teal-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-teal-600 sm:col-start-2">Confirm</button>
-                    <button id="cancel-edit-collections" type="button" class="mt-3 inline-flex justify-center rounded bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:col-start-1 sm:mt-0">Cancel</button>
-                </div>
-            </form>
-
+            <div id="collections-form">
+                {% include "partials/edit_collections_form.html" %}
+            </div>
         </div>
     </div>
-</div>
 </dialog>
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_collections_response.html b/src/lsst/cmservice/web_app/templates/partials/edit_collections_response.html
index 2f3bf73e3..c89467fb7 100644
--- a/src/lsst/cmservice/web_app/templates/partials/edit_collections_response.html
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_collections_response.html
@@ -3,3 +3,6 @@
 <div id="collections-form-elements" hx-swap-oob="true">
     {% include "partials/edit_collections_form_inputs.html" %}
 </div>
+
+<div id="new-col-fields-container" hx-swap-oob="true">
+</div>
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_form.html b/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_form.html
new file mode 100644
index 000000000..52cb2efe0
--- /dev/null
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_form.html
@@ -0,0 +1,42 @@
+<form id="update-data-dict-form"
+      hx-post="/web_app/data-dict/{{ element.id }}/{{ element.level }}/update"
+      hx-swap="innerHTML"
+      hx-target="#data-dict">
+    <div id="data-dict-container">
+        <div id="data-dict-form-elements">
+            {% include "partials/edit_data_dict_form_inputs.html" %}
+        </div>
+
+        <!-- New fields container -->
+        <div id="new-data-fields-container">
+            <!-- New fields will be added here -->
+        </div>
+
+        <div class="mt-5 sm:mt-6">
+            <div class="mb-4">
+                <button type="button"
+                        hx-post="/web_app/data-dict/{{ element.id }}/{{ element.level }}/add-field"
+                        hx-target="#new-data-fields-container"
+                        hx-swap="beforeend"
+                        class="inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                    <svg class="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path>
+                    </svg>
+                    Add Field
+                </button>
+            </div>
+
+            <div class="flex flex-col-reverse sm:flex-row-reverse gap-3">
+                <button id="confirm-edit-data-dict" type="submit"
+                        class="inline-flex justify-center rounded-md bg-teal-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-teal-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-teal-600">
+                    Confirm
+                </button>
+
+                <button id="cancel-edit-data-dict" type="button"
+                        class="inline-flex justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500">
+                    Cancel
+                </button>
+            </div>
+        </div>
+    </div>
+</form>
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_form_inputs.html b/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_form_inputs.html
index 3a796faef..407855f25 100644
--- a/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_form_inputs.html
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_form_inputs.html
@@ -1,12 +1,15 @@
 {% for key, value in element.data|items %}
-<div class="flex flex-row">
-    <div class="basis-1/3"><label class="pr-2 text-sm/6 font-medium text-gray-900">{{key}}</label></div>
-    <div class="basis-2/3">
-        <input
-                type="text"
-                name="{{key}}"
-                value="{{value}}"
-                class="text-xs font-normal text-gray-900 w-full border-2"/>
+<div class="flex flex-row data-row mb-2">
+    <div class="basis-1/3">
+        <label class="pr-2 text-sm/6 font-medium text-gray-900">{{key}}</label>
+        <input type="hidden" name="keys" value="{{key}}"/>
+    </div>
+     <div class="basis-2/3">
+        <input type="text"
+               name="values"
+               value="{{value}}"
+               class="text-xs font-normal text-gray-900 w-full border-2"
+               placeholder="Field value"/>
     </div>
 </div>
 {% endfor %}
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_modal.html b/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_modal.html
index ebb25765b..915bb74f8 100644
--- a/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_modal.html
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_modal.html
@@ -4,28 +4,14 @@
         role="dialog"
         aria-modal="true"
         class="rounded-lg w-1/2">
-
     <div class="relative transform overflow-hidden bg-white px-4 pb-4 pt-5 text-left">
-    <div>
         <div class="mt-3 text-center sm:mt-5">
             <h2 class="text-base font-semibold text-gray-900 pb-4">Edit Data</h2>
         </div>
         <div>
-            <form id="update-data-dict-form"
-                  hx-post="{{ url_for('update_element_data_dict', element_id=element.id, element_type=element.level)}}"
-                  hx-swap="innerHTML"
-                  hx-target="#data-dict"
-                  method="POST">
-                <div id="data-dict-form-elements">
-                    {% include "partials/edit_data_dict_form_inputs.html" %}
-                </div>
-                <div class="mt-5 sm:mt-6 sm:flex sm:flex-row-reverse gap-x-3">
-                    <button id="confirm-edit-data-dict" type="submit" class="inline-flex justify-center rounded bg-teal-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-teal-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-teal-600 sm:col-start-2">Confirm</button>
-                    <button id="cancel-edit-data-dict" type="button" class="mt-3 inline-flex justify-center rounded bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:col-start-1 sm:mt-0">Cancel</button>
-                </div>
-            </form>
-
+            <div id="data-dict-form">
+                {% include "partials/edit_data_dict_form.html" %}
+            </div>
         </div>
     </div>
-</div>
 </dialog>
diff --git a/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_response.html b/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_response.html
index 82589559a..24038d33f 100644
--- a/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_response.html
+++ b/src/lsst/cmservice/web_app/templates/partials/edit_data_dict_response.html
@@ -3,3 +3,6 @@
 <div id="data-dict-form-elements" hx-swap-oob="true">
     {% include "partials/edit_data_dict_form_inputs.html" %}
 </div>
+
+<div id="new-data-fields-container" hx-swap-oob="true">
+</div>
diff --git a/src/lsst/cmservice/web_app/templates/partials/new_field.html b/src/lsst/cmservice/web_app/templates/partials/new_field.html
new file mode 100644
index 000000000..cfb5739a9
--- /dev/null
+++ b/src/lsst/cmservice/web_app/templates/partials/new_field.html
@@ -0,0 +1,23 @@
+<div class="flex flex-row collection-row mb-2" id="new-field-{{ field_id }}">
+    <div class="basis-1/3">
+        <input type="text"
+               name="new_keys"
+               value=""
+               class="text-xs font-medium text-gray-900 w-full border-2 mr-2"
+               placeholder="Field name"/>
+    </div>
+    <div class="basis-2/3 flex">
+        <input type="text"
+               name="new_values"
+               value=""
+               class="text-xs font-normal text-gray-900 w-full border-2 mr-2"
+               placeholder="Field value"/>
+        <button type="button"
+                hx-post="/web_app/collections/{{ element_id }}/{{ element_type }}/remove-new-field/{{ field_id }}"
+                hx-target="#new-field-{{ field_id }}"
+                hx-swap="delete"
+                class="px-2 py-1 text-xs bg-red-500 text-white rounded hover:bg-red-600">
+            ×
+        </button>
+    </div>
+</div>

From 02d67abd0d9b9c0754c118c48fdd1209543e1151 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Mon, 16 Jun 2025 09:32:16 -0500
Subject: [PATCH 02/37] feat(test): add testcontainers dependency

---
 pyproject.toml |  1 +
 uv.lock        | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 0a7c1f213..ba5858cb9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -73,6 +73,7 @@ dev = [
     "types-pyyaml>=6.0.12.20240917",
     "types-tabulate>=0.9.0.20240106",
     "respx>=0.22.0",
+    "testcontainers[postgres]>=4.11.0",
 ]
 
 [project.scripts]
diff --git a/uv.lock b/uv.lock
index f91f7381d..57a3aa0ca 100644
--- a/uv.lock
+++ b/uv.lock
@@ -479,6 +479,20 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/91/a1/cf2472db20f7ce4a6be1253a81cfdf85ad9c7885ffbed7047fb72c24cf87/distlib-0.3.9-py2.py3-none-any.whl", hash = "sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87", size = 468973, upload-time = "2024-10-09T18:35:44.272Z" },
 ]
 
+[[package]]
+name = "docker"
+version = "7.1.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pywin32", marker = "sys_platform == 'win32'" },
+    { name = "requests" },
+    { name = "urllib3" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/91/9b/4a2ea29aeba62471211598dac5d96825bb49348fa07e906ea930394a83ce/docker-7.1.0.tar.gz", hash = "sha256:ad8c70e6e3f8926cb8a92619b832b4ea5299e2831c14284663184e200546fa6c", size = 117834, upload-time = "2024-05-23T11:13:57.216Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl", hash = "sha256:c96b93b7f0a746f9e77d325bcfb87422a3d8bd4f03136ae8a85b37f1898d5fc0", size = 147774, upload-time = "2024-05-23T11:13:55.01Z" },
+]
+
 [[package]]
 name = "docopt"
 version = "0.6.2"
@@ -929,6 +943,7 @@ dev = [
     { name = "respx" },
     { name = "ruff" },
     { name = "sqlalchemy", extra = ["mypy"] },
+    { name = "testcontainers" },
     { name = "types-pyyaml" },
     { name = "types-tabulate" },
 ]
@@ -984,6 +999,7 @@ dev = [
     { name = "respx", specifier = ">=0.22.0" },
     { name = "ruff", specifier = ">=0.8.0" },
     { name = "sqlalchemy", extras = ["mypy"], specifier = ">=2.0.36" },
+    { name = "testcontainers", extras = ["postgres"], specifier = ">=4.11.0" },
     { name = "types-pyyaml", specifier = ">=6.0.12.20240917" },
     { name = "types-tabulate", specifier = ">=0.9.0.20240106" },
 ]
@@ -1824,6 +1840,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a4/62/02da182e544a51a5c3ccf4b03ab79df279f9c60c5e82d5e8bec7ca26ac11/python_slugify-8.0.4-py2.py3-none-any.whl", hash = "sha256:276540b79961052b66b7d116620b36518847f52d5fd9e3a70164fc8c50faa6b8", size = 10051, upload-time = "2024-02-08T18:32:43.911Z" },
 ]
 
+[[package]]
+name = "pywin32"
+version = "310"
+source = { registry = "https://pypi.org/simple" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f7/b1/68aa2986129fb1011dabbe95f0136f44509afaf072b12b8f815905a39f33/pywin32-310-cp311-cp311-win32.whl", hash = "sha256:1e765f9564e83011a63321bb9d27ec456a0ed90d3732c4b2e312b855365ed8bd", size = 8784284, upload-time = "2025-03-17T00:55:53.124Z" },
+    { url = "https://files.pythonhosted.org/packages/b3/bd/d1592635992dd8db5bb8ace0551bc3a769de1ac8850200cfa517e72739fb/pywin32-310-cp311-cp311-win_amd64.whl", hash = "sha256:126298077a9d7c95c53823934f000599f66ec9296b09167810eb24875f32689c", size = 9520748, upload-time = "2025-03-17T00:55:55.203Z" },
+    { url = "https://files.pythonhosted.org/packages/90/b1/ac8b1ffce6603849eb45a91cf126c0fa5431f186c2e768bf56889c46f51c/pywin32-310-cp311-cp311-win_arm64.whl", hash = "sha256:19ec5fc9b1d51c4350be7bb00760ffce46e6c95eaf2f0b2f1150657b1a43c582", size = 8455941, upload-time = "2025-03-17T00:55:57.048Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/ec/4fdbe47932f671d6e348474ea35ed94227fb5df56a7c30cbbb42cd396ed0/pywin32-310-cp312-cp312-win32.whl", hash = "sha256:8a75a5cc3893e83a108c05d82198880704c44bbaee4d06e442e471d3c9ea4f3d", size = 8796239, upload-time = "2025-03-17T00:55:58.807Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/e5/b0627f8bb84e06991bea89ad8153a9e50ace40b2e1195d68e9dff6b03d0f/pywin32-310-cp312-cp312-win_amd64.whl", hash = "sha256:bf5c397c9a9a19a6f62f3fb821fbf36cac08f03770056711f765ec1503972060", size = 9503839, upload-time = "2025-03-17T00:56:00.8Z" },
+    { url = "https://files.pythonhosted.org/packages/1f/32/9ccf53748df72301a89713936645a664ec001abd35ecc8578beda593d37d/pywin32-310-cp312-cp312-win_arm64.whl", hash = "sha256:2349cc906eae872d0663d4d6290d13b90621eaf78964bb1578632ff20e152966", size = 8459470, upload-time = "2025-03-17T00:56:02.601Z" },
+]
+
 [[package]]
 name = "pyyaml"
 version = "6.0.2"
@@ -2182,6 +2211,22 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/40/44/4a5f08c96eb108af5cb50b41f76142f0afa346dfa99d5296fe7202a11854/tabulate-0.9.0-py3-none-any.whl", hash = "sha256:024ca478df22e9340661486f85298cff5f6dcdba14f3813e8830015b9ed1948f", size = 35252, upload-time = "2022-10-06T17:21:44.262Z" },
 ]
 
+[[package]]
+name = "testcontainers"
+version = "4.11.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "docker" },
+    { name = "python-dotenv" },
+    { name = "typing-extensions" },
+    { name = "urllib3" },
+    { name = "wrapt" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/94/ea/5e89a6ddc294a081907189e3ec1e565694d76864a552163527f708d3ced1/testcontainers-4.11.0.tar.gz", hash = "sha256:48faa72d0ba8d141495d5aec08f8cd5d244ed77c1c4089a4ce1df7b5e12caaf3", size = 64426, upload-time = "2025-06-16T10:59:57.965Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ea/e8/c54f0624f998f9210bff3df84f58ea47120b58412c4623a53277df4d1e75/testcontainers-4.11.0-py3-none-any.whl", hash = "sha256:36f0e1165ce2b504b1e8b8c9779ca738d3baad57d402e35c22ccf01a371fda0d", size = 108597, upload-time = "2025-06-16T10:59:56.153Z" },
+]
+
 [[package]]
 name = "text-unidecode"
 version = "1.3"

From f0c8dbc75fd5be9de5336174074a138e796b3883 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Thu, 12 Jun 2025 10:39:39 -0500
Subject: [PATCH 03/37] feat(python): Upgrade to python 3.12 - upgrade
 dependencies

---
 .github/workflows/ci.yaml |  10 +-
 .pre-commit-config.yaml   |   2 +-
 .python-version           |   2 +-
 Makefile                  |   1 +
 README.md                 |   3 +-
 alembic/README.md         |   2 -
 docker/Dockerfile         |   4 +-
 pyproject.toml            |  37 ++--
 uv.lock                   | 421 ++++++++------------------------------
 9 files changed, 120 insertions(+), 362 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fa4318e45..96d726f92 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
 
       - name: Run pre-commit
         uses: pre-commit/action@v3.0.1
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11"]
+        python-version: ["3.12"]
     needs:
       - rebase-checker
     steps:
@@ -49,7 +49,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
-          version: "0.6.x"
+          version: "0.7.x"
           enable-cache: true
           python-version: ${{ matrix.python-version }}
 
@@ -63,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11"]
+        python-version: ["3.12"]
     needs:
       - lint
       - mypy
@@ -75,7 +75,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
-          version: "0.6.x"
+          version: "0.7.x"
           enable-cache: true
           python-version: ${{ matrix.python-version }}
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index aecfc6aba..44c1c0ef0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.9.2
+    rev: v0.11.13
     hooks:
       - id: ruff
       - id: ruff
diff --git a/.python-version b/.python-version
index 2c0733315..e4fba2183 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.11
+3.12
diff --git a/Makefile b/Makefile
index d6d5066b8..055bc1c80 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,7 @@ update: update-deps init
 
 .PHONY: build
 build: export BUILDKIT_PROGRESS=plain
+build: export COMPOSE_BAKE=true
 build:
 	docker compose build cmservice
 	docker compose build cmworker
diff --git a/README.md b/README.md
index 89c3d54db..422aca9d4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # cm-service
+![Python](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Flsst-dm%2Fcm-service%2Frefs%2Fheads%2Fmain%2Fpyproject.toml)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
 
@@ -8,7 +9,7 @@ https://cm-service.lsst.io.
 
 ## Developer Quick Start
 
-You can build and run `cm-service` on any system which has Python 3.11 or greater, `uv`, `make`, and Docker w/ the
+You can build and run `cm-service` on any system which has Python 3.12 or greater, `uv`, `make`, and Docker w/ the
 Docker Compose V2 CLI plugin (this includes, in particular, recent MacOS with Docker Desktop).  Proceed as
 follows:
 
diff --git a/alembic/README.md b/alembic/README.md
index 8e57ac78d..04bf03826 100644
--- a/alembic/README.md
+++ b/alembic/README.md
@@ -3,8 +3,6 @@
 Database migrations and schema evolution are handled by `alembic`, a database tool
 that is part of the `sqlalchemy` toolkit ecosystem.
 
-Alembic is included in the project's dependency graph via the Safir package.
-
 ## Running Alembic
 
 The `alembic` tool establishes an execution environment via the `env.py` file which
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d92b48eb2..bba03da78 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG PYTHON_VERSION="3.11"
-ARG UV_VERSION="0.6"
+ARG PYTHON_VERSION="3.12"
+ARG UV_VERSION="0.7"
 ARG ASGI_PORT="8080"
 
 #==============================================================================
diff --git a/pyproject.toml b/pyproject.toml
index ba5858cb9..53d38a6d3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 # https://packaging.python.org/en/latest/specifications/declaring-project-metadata/
 name = "lsst-cm-service"
-description = "Rubin Observatory campaign management FastAPI service"
+description = "Rubin Observatory Campaign Management Service"
 license = { file = "LICENSE" }
 readme = "README.md"
 keywords = ["rubin", "lsst"]
@@ -11,13 +11,13 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Intended Audience :: Developers",
     "Natural Language :: English",
     "Operating System :: POSIX",
     "Typing :: Typed",
 ]
-requires-python = ">=3.11,<3.13"
+requires-python = ">=3.12,<3.13"
 dynamic = ["version"]
 
 dependencies = [
@@ -27,32 +27,33 @@ dependencies = [
     "click==8.1.*",
     "fastapi==0.115.*",
     "greenlet==3.1.*",
-    "htcondor==24.0.6; sys_platform == 'linux'",
+    "htcondor==24.0.7; sys_platform == 'linux'",
     "jinja2==3.1.*",
     "numpy==2.1.*",
     "psycopg2-binary==2.9.*",
-    "pydantic==2.10.*",
-    "pydantic-settings==2.7.*",
+    "pydantic==2.11.*",
+    "pydantic-settings==2.9.*",
     "python-multipart==0.0.*",
     "rich==13.9.*",
     "structlog==24.4.*",
     "tabulate==0.9.*",
     "sqlalchemy[asyncio]==2.0.*",
     "safir[db]==7.0.*",
-    "uvicorn[standard]==0.32.*",
+    "uvicorn[standard]==0.34.*",
     "panda-client>=1.5.82",
     "httpx>=0.27.2",
     "networkx>=3.5",
+    "sqlmodel>=0.0.24",
 ]
 
 [dependency-groups]
 lsst = [
-    "lsst-ctrl-bps>=29.2025.1500",
-    "lsst-ctrl-bps-htcondor>=29.2025.1500; sys_platform == 'linux'",
-    "lsst-ctrl-bps-panda>=29.2025.1500",
-    "lsst-daf-butler>=29.2025.1500",
-    "lsst-pipe-base>=29.2025.1500",
-    "lsst-utils>=29.2025.1500",
+    "lsst-ctrl-bps>=29.2025.2300",
+    "lsst-ctrl-bps-htcondor>=29.2025.2300; sys_platform == 'linux'",
+    "lsst-ctrl-bps-panda>=29.2025.2300",
+    "lsst-daf-butler>=29.2025.2300",
+    "lsst-pipe-base>=29.2025.2300",
+    "lsst-utils>=29.2025.2300",
 ]
 
 dev = [
@@ -60,8 +61,8 @@ dev = [
     "asgi-lifespan>=2.1.0",
     "coverage[toml]>=7.6.7",
     "greenlet>=3.1.1",
-    "mypy>=1.13.0",
-    "pre-commit>=4.0.1",
+    "mypy>=1.16.0",
+    "pre-commit>=4.2.0",
     "pytest>=8.3.3",
     "pytest-asyncio>=0.24.0",
     "pytest-cov>=6.0.0",
@@ -114,11 +115,7 @@ exclude_lines = [
     "def __repr__",
     "if self.debug:",
     "if settings.DEBUG",
-    "raise AssertionError",
     "raise NotImplementedError",
-    "except Exception as msg",
-    "except KeyError as msg",
-    "except IntegrityError as msg",
     "if 0:",
     "if __name__ == .__main__.:",
     "if TYPE_CHECKING:",
@@ -129,7 +126,7 @@ exclude = [
     "__init__.py",
 ]
 line-length = 110
-target-version = "py311"
+target-version = "py312"
 
 [tool.ruff.lint]
 ignore = [
diff --git a/uv.lock b/uv.lock
index 57a3aa0ca..34dffae90 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1,6 +1,6 @@
 version = 1
 revision = 2
-requires-python = ">=3.11, <3.13"
+requires-python = "==3.12.*"
 
 [[package]]
 name = "aiokafka"
@@ -13,12 +13,6 @@ dependencies = [
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/65/ca/42a962033e6a7926dcb789168bce81d0181ef4ddabce454d830b7e62370e/aiokafka-0.12.0.tar.gz", hash = "sha256:62423895b866f95b5ed8d88335295a37cc5403af64cb7cb0e234f88adc2dff94", size = 564955, upload-time = "2024-10-26T20:53:11.227Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b3/7b/8faf3ae26f43b2dcc66f45665bd243c9f736e71df04e45da5836bb7a7be4/aiokafka-0.12.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ddc5308c43d48af883667e2f950a0a9739ce2c9bfe69a0b55dc234f58b1b42d6", size = 375692, upload-time = "2024-10-26T20:52:27.739Z" },
-    { url = "https://files.pythonhosted.org/packages/fe/6c/c1ce38a225dfa04078f29d8734f13e483146cc2e30dbf6d13b75c2aa0724/aiokafka-0.12.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ff63689cafcd6dd642a15de75b7ae121071d6162cccba16d091bcb28b3886307", size = 372335, upload-time = "2024-10-26T20:52:29.955Z" },
-    { url = "https://files.pythonhosted.org/packages/7d/bc/c5d2315e2f04768f585e31e6bd0a1fb9ed054a54c124c17087fdff507a13/aiokafka-0.12.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:24633931e05a9dc80555a2f845572b6845d2dcb1af12de27837b8602b1b8bc74", size = 1141449, upload-time = "2024-10-26T20:52:33.094Z" },
-    { url = "https://files.pythonhosted.org/packages/dc/42/607caffc39b1fb2be288fa2c72e72b352872362699b6e7473189fee065b9/aiokafka-0.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42b2436c7c69384d210e9169fbfe339d9f49dbdcfddd8d51c79b9877de545e33", size = 1155398, upload-time = "2024-10-26T20:52:35.34Z" },
-    { url = "https://files.pythonhosted.org/packages/f9/4e/e7a4900180ff18f8468b1a1d6da821f67162409aa86eb53fdcb6bb1c5016/aiokafka-0.12.0-cp311-cp311-win32.whl", hash = "sha256:90511a2c4cf5f343fc2190575041fbc70171654ab0dae64b3bbabd012613bfa7", size = 348578, upload-time = "2024-10-26T20:52:36.63Z" },
-    { url = "https://files.pythonhosted.org/packages/12/e6/101e7b13e1a4bce745be927bcecf7d9dddd68c57bbd876e31697e60fdc8d/aiokafka-0.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:04c8ad27d04d6c53a1859687015a5f4e58b1eb221e8a7342d6c6b04430def53e", size = 368368, upload-time = "2024-10-26T20:52:38.438Z" },
     { url = "https://files.pythonhosted.org/packages/53/d4/baf1b2389995c6c312834792329a1993a303ff703ac023250ff977c5923b/aiokafka-0.12.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b01947553ff1120fa1cb1a05f2c3e5aa47a5378c720bafd09e6630ba18af02aa", size = 375031, upload-time = "2024-10-26T20:52:40.104Z" },
     { url = "https://files.pythonhosted.org/packages/54/ac/653070a4add8beea7aa8209ab396de87c7b4f9628fff15efcdbaea40e973/aiokafka-0.12.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:e3c8ec1c0606fa645462c7353dc3e4119cade20c4656efa2031682ffaad361c0", size = 370619, upload-time = "2024-10-26T20:52:41.877Z" },
     { url = "https://files.pythonhosted.org/packages/80/f2/0ddaaa11876ab78e0f3b30f272c62eea70870e1a52a5afe985c7c1d098e1/aiokafka-0.12.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:577c1c48b240e9eba57b3d2d806fb3d023a575334fc3953f063179170cc8964f", size = 1192363, upload-time = "2024-10-26T20:52:44.028Z" },
@@ -124,13 +118,6 @@ dependencies = [
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/83/91/124d020cea78e4e4b6db7ff726c2c2e4a5865293d0a4355d13b0312d99f1/astropy-7.1.0.tar.gz", hash = "sha256:c8f254322295b1b8cf24303d6f155bf7efdb6c1282882b966ce3040eff8c53c5", size = 6976116, upload-time = "2025-05-20T13:40:10.557Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/fe/0d/ed4d605f8dfa8ec236dd2c91489b24d223fa98f41f181437f6d15a98190d/astropy-7.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:8e2bc5cb91dc319bcf65ee08c68abea617c52b5d042d245542a4853b07269233", size = 6378504, upload-time = "2025-05-20T13:39:29.056Z" },
-    { url = "https://files.pythonhosted.org/packages/de/18/38e92baafca43f654704d7ca8cd0efdd626d9987d9918de08abe8a1cb297/astropy-7.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fba97e3d99ad48540b6eb7c6f7849e57dd6aaf9d9d48707b227bf39ac77c6368", size = 6303097, upload-time = "2025-05-20T13:39:31.586Z" },
-    { url = "https://files.pythonhosted.org/packages/f9/03/cca1b2259ab22dae67a7d7a7b22454206c0fb5384e99b00d2326663fbed6/astropy-7.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a58498f9549a0e94a1f2cd48ddb96c0bed7b0375a6362ee4025f19d6bd114f9a", size = 10080125, upload-time = "2025-05-20T13:39:33.034Z" },
-    { url = "https://files.pythonhosted.org/packages/80/a1/87254b4f8ec58308ad745574da66fd205ba59da74cdf7e8319d442bb3161/astropy-7.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7694e0b2ffc5fa60c47a55667bdfda98cbae8df736f60cc57afbe38bc5c98b41", size = 10087022, upload-time = "2025-05-20T13:39:35.315Z" },
-    { url = "https://files.pythonhosted.org/packages/d7/4d/96f3806e6cf50dd8bd08ccac668e54d3d66b43bf5574bf27bf5fbad4de74/astropy-7.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:83fe4c581bbdf1cbaeab1efc58891e4433d729412847f4d0788c870fee709432", size = 10120923, upload-time = "2025-05-20T13:39:39.781Z" },
-    { url = "https://files.pythonhosted.org/packages/a3/c2/0f089b4c387fc6a4b4ac9760b8a5ec3b3552af7ecf4d3a372963cd5d43e2/astropy-7.1.0-cp311-cp311-win32.whl", hash = "sha256:a2d277cf0d34748bfc23bb6b4d1974f058c8541ec92113cb00db06eebe5a2862", size = 6151431, upload-time = "2025-05-20T13:39:41.974Z" },
-    { url = "https://files.pythonhosted.org/packages/3f/7e/13b136c020e009daf8481163087f287c634cd44aad600becc6cdafa6c0b1/astropy-7.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:3b66b8dbb678fca9a811f24227a953a3c2f7b02c951c5b2dee3ab6853ac6e1b0", size = 6278397, upload-time = "2025-05-20T13:39:43.709Z" },
     { url = "https://files.pythonhosted.org/packages/cf/9a/ed2b35b55e28a6317471b61456d2feda7798b2dd3601e17859620e8eae4c/astropy-7.1.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:e0fec2f4b5265caab68020eaa320704e7ce9433ae8dbea75c300468fed695437", size = 6381273, upload-time = "2025-05-20T13:39:45.481Z" },
     { url = "https://files.pythonhosted.org/packages/5c/45/333bc1072f3b2ac31aec33063bb7122661405a97cb7fec702e95af707bd4/astropy-7.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:e4bb022f863cf13eefeb406692f58824c0d9bdb1aa36ae786e87c096d8ebdd07", size = 6301716, upload-time = "2025-05-20T13:39:47.339Z" },
     { url = "https://files.pythonhosted.org/packages/58/90/bfb7a1b5d9e3401967e351cf31add576cddf7466d2030cc6f4d1d841a18d/astropy-7.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c811a4aedd8fbf6d7611d64d40af1f0c1c1e6621e5992e7e1a7b5fec47dc1fa1", size = 10096600, upload-time = "2025-05-20T13:39:49.169Z" },
@@ -164,14 +151,6 @@ version = "0.30.0"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/2f/4c/7c991e080e106d854809030d8584e15b2e996e26f16aee6d757e387bc17d/asyncpg-0.30.0.tar.gz", hash = "sha256:c551e9928ab6707602f44811817f82ba3c446e018bfe1d3abecc8ba5f3eac851", size = 957746, upload-time = "2024-10-20T00:30:41.127Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/4c/0e/f5d708add0d0b97446c402db7e8dd4c4183c13edaabe8a8500b411e7b495/asyncpg-0.30.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5e0511ad3dec5f6b4f7a9e063591d407eee66b88c14e2ea636f187da1dcfff6a", size = 674506, upload-time = "2024-10-20T00:29:27.988Z" },
-    { url = "https://files.pythonhosted.org/packages/6a/a0/67ec9a75cb24a1d99f97b8437c8d56da40e6f6bd23b04e2f4ea5d5ad82ac/asyncpg-0.30.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:915aeb9f79316b43c3207363af12d0e6fd10776641a7de8a01212afd95bdf0ed", size = 645922, upload-time = "2024-10-20T00:29:29.391Z" },
-    { url = "https://files.pythonhosted.org/packages/5c/d9/a7584f24174bd86ff1053b14bb841f9e714380c672f61c906eb01d8ec433/asyncpg-0.30.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1c198a00cce9506fcd0bf219a799f38ac7a237745e1d27f0e1f66d3707c84a5a", size = 3079565, upload-time = "2024-10-20T00:29:30.832Z" },
-    { url = "https://files.pythonhosted.org/packages/a0/d7/a4c0f9660e333114bdb04d1a9ac70db690dd4ae003f34f691139a5cbdae3/asyncpg-0.30.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3326e6d7381799e9735ca2ec9fd7be4d5fef5dcbc3cb555d8a463d8460607956", size = 3109962, upload-time = "2024-10-20T00:29:33.114Z" },
-    { url = "https://files.pythonhosted.org/packages/3c/21/199fd16b5a981b1575923cbb5d9cf916fdc936b377e0423099f209e7e73d/asyncpg-0.30.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:51da377487e249e35bd0859661f6ee2b81db11ad1f4fc036194bc9cb2ead5056", size = 3064791, upload-time = "2024-10-20T00:29:34.677Z" },
-    { url = "https://files.pythonhosted.org/packages/77/52/0004809b3427534a0c9139c08c87b515f1c77a8376a50ae29f001e53962f/asyncpg-0.30.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:bc6d84136f9c4d24d358f3b02be4b6ba358abd09f80737d1ac7c444f36108454", size = 3188696, upload-time = "2024-10-20T00:29:36.389Z" },
-    { url = "https://files.pythonhosted.org/packages/52/cb/fbad941cd466117be58b774a3f1cc9ecc659af625f028b163b1e646a55fe/asyncpg-0.30.0-cp311-cp311-win32.whl", hash = "sha256:574156480df14f64c2d76450a3f3aaaf26105869cad3865041156b38459e935d", size = 567358, upload-time = "2024-10-20T00:29:37.915Z" },
-    { url = "https://files.pythonhosted.org/packages/3c/0a/0a32307cf166d50e1ad120d9b81a33a948a1a5463ebfa5a96cc5606c0863/asyncpg-0.30.0-cp311-cp311-win_amd64.whl", hash = "sha256:3356637f0bd830407b5597317b3cb3571387ae52ddc3bca6233682be88bbbc1f", size = 629375, upload-time = "2024-10-20T00:29:39.987Z" },
     { url = "https://files.pythonhosted.org/packages/4b/64/9d3e887bb7b01535fdbc45fbd5f0a8447539833b97ee69ecdbb7a79d0cb4/asyncpg-0.30.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:c902a60b52e506d38d7e80e0dd5399f657220f24635fee368117b8b5fce1142e", size = 673162, upload-time = "2024-10-20T00:29:41.88Z" },
     { url = "https://files.pythonhosted.org/packages/6e/eb/8b236663f06984f212a087b3e849731f917ab80f84450e943900e8ca4052/asyncpg-0.30.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:aca1548e43bbb9f0f627a04666fedaca23db0a31a84136ad1f868cb15deb6e3a", size = 637025, upload-time = "2024-10-20T00:29:43.352Z" },
     { url = "https://files.pythonhosted.org/packages/cc/57/2dc240bb263d58786cfaa60920779af6e8d32da63ab9ffc09f8312bd7a14/asyncpg-0.30.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c2a2ef565400234a633da0eafdce27e843836256d40705d83ab7ec42074efb3", size = 3496243, upload-time = "2024-10-20T00:29:44.922Z" },
@@ -255,18 +234,6 @@ dependencies = [
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz", hash = "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824", size = 516621, upload-time = "2024-09-04T20:45:21.852Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/6b/f4/927e3a8899e52a27fa57a48607ff7dc91a9ebe97399b357b85a0c7892e00/cffi-1.17.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401", size = 182264, upload-time = "2024-09-04T20:43:51.124Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/f5/6c3a8efe5f503175aaddcbea6ad0d2c96dad6f5abb205750d1b3df44ef29/cffi-1.17.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf", size = 178651, upload-time = "2024-09-04T20:43:52.872Z" },
-    { url = "https://files.pythonhosted.org/packages/94/dd/a3f0118e688d1b1a57553da23b16bdade96d2f9bcda4d32e7d2838047ff7/cffi-1.17.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4", size = 445259, upload-time = "2024-09-04T20:43:56.123Z" },
-    { url = "https://files.pythonhosted.org/packages/2e/ea/70ce63780f096e16ce8588efe039d3c4f91deb1dc01e9c73a287939c79a6/cffi-1.17.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41", size = 469200, upload-time = "2024-09-04T20:43:57.891Z" },
-    { url = "https://files.pythonhosted.org/packages/1c/a0/a4fa9f4f781bda074c3ddd57a572b060fa0df7655d2a4247bbe277200146/cffi-1.17.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1", size = 477235, upload-time = "2024-09-04T20:44:00.18Z" },
-    { url = "https://files.pythonhosted.org/packages/62/12/ce8710b5b8affbcdd5c6e367217c242524ad17a02fe5beec3ee339f69f85/cffi-1.17.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6", size = 459721, upload-time = "2024-09-04T20:44:01.585Z" },
-    { url = "https://files.pythonhosted.org/packages/ff/6b/d45873c5e0242196f042d555526f92aa9e0c32355a1be1ff8c27f077fd37/cffi-1.17.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d", size = 467242, upload-time = "2024-09-04T20:44:03.467Z" },
-    { url = "https://files.pythonhosted.org/packages/1a/52/d9a0e523a572fbccf2955f5abe883cfa8bcc570d7faeee06336fbd50c9fc/cffi-1.17.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6", size = 477999, upload-time = "2024-09-04T20:44:05.023Z" },
-    { url = "https://files.pythonhosted.org/packages/44/74/f2a2460684a1a2d00ca799ad880d54652841a780c4c97b87754f660c7603/cffi-1.17.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f", size = 454242, upload-time = "2024-09-04T20:44:06.444Z" },
-    { url = "https://files.pythonhosted.org/packages/f8/4a/34599cac7dfcd888ff54e801afe06a19c17787dfd94495ab0c8d35fe99fb/cffi-1.17.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b", size = 478604, upload-time = "2024-09-04T20:44:08.206Z" },
-    { url = "https://files.pythonhosted.org/packages/34/33/e1b8a1ba29025adbdcda5fb3a36f94c03d771c1b7b12f726ff7fef2ebe36/cffi-1.17.1-cp311-cp311-win32.whl", hash = "sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655", size = 171727, upload-time = "2024-09-04T20:44:09.481Z" },
-    { url = "https://files.pythonhosted.org/packages/3d/97/50228be003bb2802627d28ec0627837ac0bf35c90cf769812056f235b2d1/cffi-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0", size = 181400, upload-time = "2024-09-04T20:44:10.873Z" },
     { url = "https://files.pythonhosted.org/packages/5a/84/e94227139ee5fb4d600a7a4927f322e1d4aea6fdc50bd3fca8493caba23f/cffi-1.17.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4", size = 183178, upload-time = "2024-09-04T20:44:12.232Z" },
     { url = "https://files.pythonhosted.org/packages/da/ee/fb72c2b48656111c4ef27f0f91da355e130a923473bf5ee75c5643d00cca/cffi-1.17.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c", size = 178840, upload-time = "2024-09-04T20:44:13.739Z" },
     { url = "https://files.pythonhosted.org/packages/cc/b6/db007700f67d151abadf508cbfd6a1884f57eab90b1bb985c4c8c02b0f28/cffi-1.17.1-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36", size = 454803, upload-time = "2024-09-04T20:44:15.231Z" },
@@ -295,19 +262,6 @@ version = "3.4.2"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/e4/33/89c2ced2b67d1c2a61c19c6751aa8902d46ce3dacb23600a283619f5a12d/charset_normalizer-3.4.2.tar.gz", hash = "sha256:5baececa9ecba31eff645232d59845c07aa030f0c81ee70184a90d35099a0e63", size = 126367, upload-time = "2025-05-02T08:34:42.01Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/05/85/4c40d00dcc6284a1c1ad5de5e0996b06f39d8232f1031cd23c2f5c07ee86/charset_normalizer-3.4.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:be1e352acbe3c78727a16a455126d9ff83ea2dfdcbc83148d2982305a04714c2", size = 198794, upload-time = "2025-05-02T08:32:11.945Z" },
-    { url = "https://files.pythonhosted.org/packages/41/d9/7a6c0b9db952598e97e93cbdfcb91bacd89b9b88c7c983250a77c008703c/charset_normalizer-3.4.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aa88ca0b1932e93f2d961bf3addbb2db902198dca337d88c89e1559e066e7645", size = 142846, upload-time = "2025-05-02T08:32:13.946Z" },
-    { url = "https://files.pythonhosted.org/packages/66/82/a37989cda2ace7e37f36c1a8ed16c58cf48965a79c2142713244bf945c89/charset_normalizer-3.4.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d524ba3f1581b35c03cb42beebab4a13e6cdad7b36246bd22541fa585a56cccd", size = 153350, upload-time = "2025-05-02T08:32:15.873Z" },
-    { url = "https://files.pythonhosted.org/packages/df/68/a576b31b694d07b53807269d05ec3f6f1093e9545e8607121995ba7a8313/charset_normalizer-3.4.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28a1005facc94196e1fb3e82a3d442a9d9110b8434fc1ded7a24a2983c9888d8", size = 145657, upload-time = "2025-05-02T08:32:17.283Z" },
-    { url = "https://files.pythonhosted.org/packages/92/9b/ad67f03d74554bed3aefd56fe836e1623a50780f7c998d00ca128924a499/charset_normalizer-3.4.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fdb20a30fe1175ecabed17cbf7812f7b804b8a315a25f24678bcdf120a90077f", size = 147260, upload-time = "2025-05-02T08:32:18.807Z" },
-    { url = "https://files.pythonhosted.org/packages/a6/e6/8aebae25e328160b20e31a7e9929b1578bbdc7f42e66f46595a432f8539e/charset_normalizer-3.4.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0f5d9ed7f254402c9e7d35d2f5972c9bbea9040e99cd2861bd77dc68263277c7", size = 149164, upload-time = "2025-05-02T08:32:20.333Z" },
-    { url = "https://files.pythonhosted.org/packages/8b/f2/b3c2f07dbcc248805f10e67a0262c93308cfa149a4cd3d1fe01f593e5fd2/charset_normalizer-3.4.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:efd387a49825780ff861998cd959767800d54f8308936b21025326de4b5a42b9", size = 144571, upload-time = "2025-05-02T08:32:21.86Z" },
-    { url = "https://files.pythonhosted.org/packages/60/5b/c3f3a94bc345bc211622ea59b4bed9ae63c00920e2e8f11824aa5708e8b7/charset_normalizer-3.4.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:f0aa37f3c979cf2546b73e8222bbfa3dc07a641585340179d768068e3455e544", size = 151952, upload-time = "2025-05-02T08:32:23.434Z" },
-    { url = "https://files.pythonhosted.org/packages/e2/4d/ff460c8b474122334c2fa394a3f99a04cf11c646da895f81402ae54f5c42/charset_normalizer-3.4.2-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:e70e990b2137b29dc5564715de1e12701815dacc1d056308e2b17e9095372a82", size = 155959, upload-time = "2025-05-02T08:32:24.993Z" },
-    { url = "https://files.pythonhosted.org/packages/a2/2b/b964c6a2fda88611a1fe3d4c400d39c66a42d6c169c924818c848f922415/charset_normalizer-3.4.2-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:0c8c57f84ccfc871a48a47321cfa49ae1df56cd1d965a09abe84066f6853b9c0", size = 153030, upload-time = "2025-05-02T08:32:26.435Z" },
-    { url = "https://files.pythonhosted.org/packages/59/2e/d3b9811db26a5ebf444bc0fa4f4be5aa6d76fc6e1c0fd537b16c14e849b6/charset_normalizer-3.4.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:6b66f92b17849b85cad91259efc341dce9c1af48e2173bf38a85c6329f1033e5", size = 148015, upload-time = "2025-05-02T08:32:28.376Z" },
-    { url = "https://files.pythonhosted.org/packages/90/07/c5fd7c11eafd561bb51220d600a788f1c8d77c5eef37ee49454cc5c35575/charset_normalizer-3.4.2-cp311-cp311-win32.whl", hash = "sha256:daac4765328a919a805fa5e2720f3e94767abd632ae410a9062dff5412bae65a", size = 98106, upload-time = "2025-05-02T08:32:30.281Z" },
-    { url = "https://files.pythonhosted.org/packages/a8/05/5e33dbef7e2f773d672b6d79f10ec633d4a71cd96db6673625838a4fd532/charset_normalizer-3.4.2-cp311-cp311-win_amd64.whl", hash = "sha256:e53efc7c7cee4c1e70661e2e112ca46a575f90ed9ae3fef200f2a25e954f4b28", size = 105402, upload-time = "2025-05-02T08:32:32.191Z" },
     { url = "https://files.pythonhosted.org/packages/d7/a4/37f4d6035c89cac7930395a35cc0f1b872e652eaafb76a6075943754f095/charset_normalizer-3.4.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:0c29de6a1a95f24b9a1aa7aefd27d2487263f00dfd55a77719b530788f75cff7", size = 199936, upload-time = "2025-05-02T08:32:33.712Z" },
     { url = "https://files.pythonhosted.org/packages/ee/8a/1a5e33b73e0d9287274f899d967907cd0bf9c343e651755d9307e0dbf2b3/charset_normalizer-3.4.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cddf7bd982eaa998934a91f69d182aec997c6c468898efe6679af88283b498d3", size = 143790, upload-time = "2025-05-02T08:32:35.768Z" },
     { url = "https://files.pythonhosted.org/packages/66/52/59521f1d8e6ab1482164fa21409c5ef44da3e9f653c13ba71becdd98dec3/charset_normalizer-3.4.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fcbe676a55d7445b22c10967bceaaf0ee69407fbe0ece4d032b6eb8d4565982a", size = 153924, upload-time = "2025-05-02T08:32:37.284Z" },
@@ -363,17 +317,6 @@ version = "7.8.2"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/ba/07/998afa4a0ecdf9b1981ae05415dad2d4e7716e1b1f00abbd91691ac09ac9/coverage-7.8.2.tar.gz", hash = "sha256:a886d531373a1f6ff9fad2a2ba4a045b68467b779ae729ee0b3b10ac20033b27", size = 812759, upload-time = "2025-05-23T11:39:57.856Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/6a/4d/1ff618ee9f134d0de5cc1661582c21a65e06823f41caf801aadf18811a8e/coverage-7.8.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b99058eef42e6a8dcd135afb068b3d53aff3921ce699e127602efff9956457a9", size = 211692, upload-time = "2025-05-23T11:38:08.485Z" },
-    { url = "https://files.pythonhosted.org/packages/96/fa/c3c1b476de96f2bc7a8ca01a9f1fcb51c01c6b60a9d2c3e66194b2bdb4af/coverage-7.8.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5feb7f2c3e6ea94d3b877def0270dff0947b8d8c04cfa34a17be0a4dc1836879", size = 212115, upload-time = "2025-05-23T11:38:09.989Z" },
-    { url = "https://files.pythonhosted.org/packages/f7/c2/5414c5a1b286c0f3881ae5adb49be1854ac5b7e99011501f81c8c1453065/coverage-7.8.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:670a13249b957bb9050fab12d86acef7bf8f6a879b9d1a883799276e0d4c674a", size = 244740, upload-time = "2025-05-23T11:38:11.947Z" },
-    { url = "https://files.pythonhosted.org/packages/cd/46/1ae01912dfb06a642ef3dd9cf38ed4996fda8fe884dab8952da616f81a2b/coverage-7.8.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0bdc8bf760459a4a4187b452213e04d039990211f98644c7292adf1e471162b5", size = 242429, upload-time = "2025-05-23T11:38:13.955Z" },
-    { url = "https://files.pythonhosted.org/packages/06/58/38c676aec594bfe2a87c7683942e5a30224791d8df99bcc8439fde140377/coverage-7.8.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:07a989c867986c2a75f158f03fdb413128aad29aca9d4dbce5fc755672d96f11", size = 244218, upload-time = "2025-05-23T11:38:15.631Z" },
-    { url = "https://files.pythonhosted.org/packages/80/0c/95b1023e881ce45006d9abc250f76c6cdab7134a1c182d9713878dfefcb2/coverage-7.8.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2db10dedeb619a771ef0e2949ccba7b75e33905de959c2643a4607bef2f3fb3a", size = 243865, upload-time = "2025-05-23T11:38:17.622Z" },
-    { url = "https://files.pythonhosted.org/packages/57/37/0ae95989285a39e0839c959fe854a3ae46c06610439350d1ab860bf020ac/coverage-7.8.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e6ea7dba4e92926b7b5f0990634b78ea02f208d04af520c73a7c876d5a8d36cb", size = 242038, upload-time = "2025-05-23T11:38:19.966Z" },
-    { url = "https://files.pythonhosted.org/packages/4d/82/40e55f7c0eb5e97cc62cbd9d0746fd24e8caf57be5a408b87529416e0c70/coverage-7.8.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ef2f22795a7aca99fc3c84393a55a53dd18ab8c93fb431004e4d8f0774150f54", size = 242567, upload-time = "2025-05-23T11:38:21.912Z" },
-    { url = "https://files.pythonhosted.org/packages/f9/35/66a51adc273433a253989f0d9cc7aa6bcdb4855382cf0858200afe578861/coverage-7.8.2-cp311-cp311-win32.whl", hash = "sha256:641988828bc18a6368fe72355df5f1703e44411adbe49bba5644b941ce6f2e3a", size = 214194, upload-time = "2025-05-23T11:38:23.571Z" },
-    { url = "https://files.pythonhosted.org/packages/f6/8f/a543121f9f5f150eae092b08428cb4e6b6d2d134152c3357b77659d2a605/coverage-7.8.2-cp311-cp311-win_amd64.whl", hash = "sha256:8ab4a51cb39dc1933ba627e0875046d150e88478dbe22ce145a68393e9652975", size = 215109, upload-time = "2025-05-23T11:38:25.137Z" },
-    { url = "https://files.pythonhosted.org/packages/77/65/6cc84b68d4f35186463cd7ab1da1169e9abb59870c0f6a57ea6aba95f861/coverage-7.8.2-cp311-cp311-win_arm64.whl", hash = "sha256:8966a821e2083c74d88cca5b7dcccc0a3a888a596a04c0b9668a891de3a0cc53", size = 213521, upload-time = "2025-05-23T11:38:27.123Z" },
     { url = "https://files.pythonhosted.org/packages/8d/2a/1da1ada2e3044fcd4a3254fb3576e160b8fe5b36d705c8a31f793423f763/coverage-7.8.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:e2f6fe3654468d061942591aef56686131335b7a8325684eda85dacdf311356c", size = 211876, upload-time = "2025-05-23T11:38:29.01Z" },
     { url = "https://files.pythonhosted.org/packages/70/e9/3d715ffd5b6b17a8be80cd14a8917a002530a99943cc1939ad5bb2aa74b9/coverage-7.8.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:76090fab50610798cc05241bf83b603477c40ee87acd358b66196ab0ca44ffa1", size = 212130, upload-time = "2025-05-23T11:38:30.675Z" },
     { url = "https://files.pythonhosted.org/packages/a0/02/fdce62bb3c21649abfd91fbdcf041fb99be0d728ff00f3f9d54d97ed683e/coverage-7.8.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2bd0a0a5054be160777a7920b731a0570284db5142abaaf81bcbb282b8d99279", size = 246176, upload-time = "2025-05-23T11:38:32.395Z" },
@@ -385,15 +328,9 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/79/fa/f3e7ec7d220bff14aba7a4786ae47043770cbdceeea1803083059c878837/coverage-7.8.2-cp312-cp312-win32.whl", hash = "sha256:bf8111cddd0f2b54d34e96613e7fbdd59a673f0cf5574b61134ae75b6f5a33b8", size = 214366, upload-time = "2025-05-23T11:38:43.551Z" },
     { url = "https://files.pythonhosted.org/packages/54/aa/9cbeade19b7e8e853e7ffc261df885d66bf3a782c71cba06c17df271f9e6/coverage-7.8.2-cp312-cp312-win_amd64.whl", hash = "sha256:86a323a275e9e44cdf228af9b71c5030861d4d2610886ab920d9945672a81223", size = 215165, upload-time = "2025-05-23T11:38:45.148Z" },
     { url = "https://files.pythonhosted.org/packages/c4/73/e2528bf1237d2448f882bbebaec5c3500ef07301816c5c63464b9da4d88a/coverage-7.8.2-cp312-cp312-win_arm64.whl", hash = "sha256:820157de3a589e992689ffcda8639fbabb313b323d26388d02e154164c57b07f", size = 213548, upload-time = "2025-05-23T11:38:46.74Z" },
-    { url = "https://files.pythonhosted.org/packages/69/2f/572b29496d8234e4a7773200dd835a0d32d9e171f2d974f3fe04a9dbc271/coverage-7.8.2-pp39.pp310.pp311-none-any.whl", hash = "sha256:ec455eedf3ba0bbdf8f5a570012617eb305c63cb9f03428d39bf544cb2b94837", size = 203636, upload-time = "2025-05-23T11:39:52.002Z" },
     { url = "https://files.pythonhosted.org/packages/a0/1a/0b9c32220ad694d66062f571cc5cedfa9997b64a591e8a500bb63de1bd40/coverage-7.8.2-py3-none-any.whl", hash = "sha256:726f32ee3713f7359696331a18daf0c3b3a70bb0ae71141b9d3c52be7c595e32", size = 203623, upload-time = "2025-05-23T11:39:53.846Z" },
 ]
 
-[package.optional-dependencies]
-toml = [
-    { name = "tomli", marker = "python_full_version <= '3.11'" },
-]
-
 [[package]]
 name = "cryptography"
 version = "43.0.3"
@@ -554,12 +491,6 @@ version = "1.11.1"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/48/8f/32664a3245247b13702d13d2657ea534daf64e58a3f72a3a2d10598d6916/fastavro-1.11.1.tar.gz", hash = "sha256:bf6acde5ee633a29fb8dfd6dfea13b164722bc3adc05a0e055df080549c1c2f8", size = 1016250, upload-time = "2025-05-18T04:54:31.413Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/8e/63/f33d6fd50d8711f305f07ad8c7b4a25f2092288f376f484c979dcf277b07/fastavro-1.11.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:3573340e4564e8962e22f814ac937ffe0d4be5eabbd2250f77738dc47e3c8fe9", size = 957526, upload-time = "2025-05-18T04:54:47.701Z" },
-    { url = "https://files.pythonhosted.org/packages/f4/09/a57ad9d8cb9b8affb2e43c29d8fb8cbdc0f1156f8496067a0712c944bacc/fastavro-1.11.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7291cf47735b8bd6ff5d9b33120e6e0974f52fd5dff90cd24151b22018e7fd29", size = 3322808, upload-time = "2025-05-18T04:54:50.419Z" },
-    { url = "https://files.pythonhosted.org/packages/86/70/d6df59309d3754d6d4b0c7beca45b9b1a957d6725aed8da3aca247db3475/fastavro-1.11.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf3bb065d657d5bac8b2cb39945194aa086a9b3354f2da7f89c30e4dc20e08e2", size = 3330870, upload-time = "2025-05-18T04:54:52.406Z" },
-    { url = "https://files.pythonhosted.org/packages/ad/ea/122315154d2a799a2787058435ef0d4d289c0e8e575245419436e9b702ca/fastavro-1.11.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8758317c85296b848698132efb13bc44a4fbd6017431cc0f26eaeb0d6fa13d35", size = 3343369, upload-time = "2025-05-18T04:54:54.652Z" },
-    { url = "https://files.pythonhosted.org/packages/62/12/7800de5fec36d55a818adf3db3b085b1a033c4edd60323cf6ca0754cf8cb/fastavro-1.11.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ad99d57228f83bf3e2214d183fbf6e2fda97fd649b2bdaf8e9110c36cbb02624", size = 3430629, upload-time = "2025-05-18T04:54:56.513Z" },
-    { url = "https://files.pythonhosted.org/packages/48/65/2b74ccfeba9dcc3f7dbe64907307386b4a0af3f71d2846f63254df0f1e1d/fastavro-1.11.1-cp311-cp311-win_amd64.whl", hash = "sha256:9134090178bdbf9eefd467717ced3dc151e27a7e7bfc728260ce512697efe5a4", size = 451621, upload-time = "2025-05-18T04:54:58.156Z" },
     { url = "https://files.pythonhosted.org/packages/99/58/8e789b0a2f532b22e2d090c20d27c88f26a5faadcba4c445c6958ae566cf/fastavro-1.11.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:e8bc238f2637cd5d15238adbe8fb8c58d2e6f1870e0fb28d89508584670bae4b", size = 939583, upload-time = "2025-05-18T04:54:59.853Z" },
     { url = "https://files.pythonhosted.org/packages/34/3f/02ed44742b1224fe23c9fc9b9b037fc61769df716c083cf80b59a02b9785/fastavro-1.11.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b403933081c83fc4d8a012ee64b86e560a024b1280e3711ee74f2abc904886e8", size = 3257734, upload-time = "2025-05-18T04:55:02.366Z" },
     { url = "https://files.pythonhosted.org/packages/cc/bc/9cc8b19eeee9039dd49719f8b4020771e805def262435f823fa8f27ddeea/fastavro-1.11.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f6ecb4b5f77aa756d973b7dd1c2fb4e4c95b4832a3c98b059aa96c61870c709", size = 3318218, upload-time = "2025-05-18T04:55:04.352Z" },
@@ -644,15 +575,6 @@ version = "3.1.1"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/2f/ff/df5fede753cc10f6a5be0931204ea30c35fa2f2ea7a35b25bdaf4fe40e46/greenlet-3.1.1.tar.gz", hash = "sha256:4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467", size = 186022, upload-time = "2024-09-20T18:21:04.506Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/28/62/1c2665558618553c42922ed47a4e6d6527e2fa3516a8256c2f431c5d0441/greenlet-3.1.1-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:e4d333e558953648ca09d64f13e6d8f0523fa705f51cae3f03b5983489958c70", size = 272479, upload-time = "2024-09-20T17:07:22.332Z" },
-    { url = "https://files.pythonhosted.org/packages/76/9d/421e2d5f07285b6e4e3a676b016ca781f63cfe4a0cd8eaecf3fd6f7a71ae/greenlet-3.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:09fc016b73c94e98e29af67ab7b9a879c307c6731a2c9da0db5a7d9b7edd1159", size = 640404, upload-time = "2024-09-20T17:36:45.588Z" },
-    { url = "https://files.pythonhosted.org/packages/e5/de/6e05f5c59262a584e502dd3d261bbdd2c97ab5416cc9c0b91ea38932a901/greenlet-3.1.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d5e975ca70269d66d17dd995dafc06f1b06e8cb1ec1e9ed54c1d1e4a7c4cf26e", size = 652813, upload-time = "2024-09-20T17:39:19.052Z" },
-    { url = "https://files.pythonhosted.org/packages/49/93/d5f93c84241acdea15a8fd329362c2c71c79e1a507c3f142a5d67ea435ae/greenlet-3.1.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3b2813dc3de8c1ee3f924e4d4227999285fd335d1bcc0d2be6dc3f1f6a318ec1", size = 648517, upload-time = "2024-09-20T17:44:24.101Z" },
-    { url = "https://files.pythonhosted.org/packages/15/85/72f77fc02d00470c86a5c982b8daafdf65d38aefbbe441cebff3bf7037fc/greenlet-3.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e347b3bfcf985a05e8c0b7d462ba6f15b1ee1c909e2dcad795e49e91b152c383", size = 647831, upload-time = "2024-09-20T17:08:40.577Z" },
-    { url = "https://files.pythonhosted.org/packages/f7/4b/1c9695aa24f808e156c8f4813f685d975ca73c000c2a5056c514c64980f6/greenlet-3.1.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9e8f8c9cb53cdac7ba9793c276acd90168f416b9ce36799b9b885790f8ad6c0a", size = 602413, upload-time = "2024-09-20T17:08:31.728Z" },
-    { url = "https://files.pythonhosted.org/packages/76/70/ad6e5b31ef330f03b12559d19fda2606a522d3849cde46b24f223d6d1619/greenlet-3.1.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:62ee94988d6b4722ce0028644418d93a52429e977d742ca2ccbe1c4f4a792511", size = 1129619, upload-time = "2024-09-20T17:44:14.222Z" },
-    { url = "https://files.pythonhosted.org/packages/f4/fb/201e1b932e584066e0f0658b538e73c459b34d44b4bd4034f682423bc801/greenlet-3.1.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1776fd7f989fc6b8d8c8cb8da1f6b82c5814957264d1f6cf818d475ec2bf6395", size = 1155198, upload-time = "2024-09-20T17:09:23.903Z" },
-    { url = "https://files.pythonhosted.org/packages/12/da/b9ed5e310bb8b89661b80cbcd4db5a067903bbcd7fc854923f5ebb4144f0/greenlet-3.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:48ca08c771c268a768087b408658e216133aecd835c0ded47ce955381105ba39", size = 298930, upload-time = "2024-09-20T17:25:18.656Z" },
     { url = "https://files.pythonhosted.org/packages/7d/ec/bad1ac26764d26aa1353216fcbfa4670050f66d445448aafa227f8b16e80/greenlet-3.1.1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:4afe7ea89de619adc868e087b4d2359282058479d7cfb94970adf4b55284574d", size = 274260, upload-time = "2024-09-20T17:08:07.301Z" },
     { url = "https://files.pythonhosted.org/packages/66/d4/c8c04958870f482459ab5956c2942c4ec35cac7fe245527f1039837c17a9/greenlet-3.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f406b22b7c9a9b4f8aa9d2ab13d6ae0ac3e85c9a809bd590ad53fed2bf70dc79", size = 649064, upload-time = "2024-09-20T17:36:47.628Z" },
     { url = "https://files.pythonhosted.org/packages/51/41/467b12a8c7c1303d20abcca145db2be4e6cd50a951fa30af48b6ec607581/greenlet-3.1.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c3a701fe5a9695b238503ce5bbe8218e03c3bcccf7e204e455e7462d770268aa", size = 663420, upload-time = "2024-09-20T17:39:21.258Z" },
@@ -682,10 +604,6 @@ dependencies = [
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/a1/7b/4b5d38f4774477a1af3d3a2e200f54e7ebe6a7405e220d2bc46006b8c07f/hpgeom-1.4.0.tar.gz", hash = "sha256:95f7b355a4ca9e923e7b37f13f14c828670435645c51fb41e92223894532a26e", size = 147819, upload-time = "2024-10-07T20:53:57.73Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/79/51/827a48bbe613b5216cf84eb69281c098eee02c9bc324116eef11c8037c17/hpgeom-1.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5650f5be65f3aecf9b86fce8fe4b22895e0b3480fb3ecfa2ffc3b7fa1138a4e9", size = 66781, upload-time = "2024-10-07T20:53:42.612Z" },
-    { url = "https://files.pythonhosted.org/packages/8b/70/ab872cea239c4934fc90e2ea9da5f34a1a9f7bd6b640cda16c5f7ac67a5a/hpgeom-1.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1429d101db6342febc40fca5eb5d407603fe2af4cda3b3bf9ddb6173b0c058fd", size = 63061, upload-time = "2024-10-07T20:53:43.824Z" },
-    { url = "https://files.pythonhosted.org/packages/ba/22/13c4bf82b11cd7bf4afa6c70fdefaaefab99117f59ef0924f8352432f7c5/hpgeom-1.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:91abaf5841215dc8bcccd194f0d7351f7bd7163ec6ff69449abfb20a76250506", size = 154082, upload-time = "2024-10-07T20:53:45.137Z" },
-    { url = "https://files.pythonhosted.org/packages/fc/1c/1d2ee336410ca257fcef31952cb0d8d3791c92affc1af05f5b209987cb38/hpgeom-1.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:8f3af4974d86e8d922dd5b81badb93e2d9dcc068538bd93eab002a23ebd9f7f2", size = 65698, upload-time = "2024-10-07T20:53:46.238Z" },
     { url = "https://files.pythonhosted.org/packages/dc/36/415c1a8483f827360bad8fb111c10244970b3e9c5845e2fdb78ea0dd4091/hpgeom-1.4.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:e70c81bf01c6b2bbe417a4b164d0effb349259b9ddcaed81a14b02a57a3a13b6", size = 66463, upload-time = "2024-10-07T20:53:47.626Z" },
     { url = "https://files.pythonhosted.org/packages/8e/09/5b96961f4d48156685b1a998c6c243cfad562d9304344f70b9ddd82b92b7/hpgeom-1.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8c73de4b08abf736b2dadeca4a6428b514df0c9387bc560e7428ef7a2ae5b723", size = 62918, upload-time = "2024-10-07T20:53:48.977Z" },
     { url = "https://files.pythonhosted.org/packages/ac/0c/ef330cf846111482179af71f5af311cd381c58a40b7a787017947017a73c/hpgeom-1.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:adc5e9a27c5da2219c1ef76c6ddf2ed4f74ea217e3a639d430e84a567de6ec0c", size = 156454, upload-time = "2024-10-07T20:53:50.043Z" },
@@ -694,13 +612,11 @@ wheels = [
 
 [[package]]
 name = "htcondor"
-version = "24.0.6"
+version = "24.0.7"
 source = { registry = "https://pypi.org/simple" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/8d/ee/2ec7969795e9a86cc8c3f5a405aea9bf11bb273fe14138c9383312198668/htcondor-24.0.6-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:e693c3e03c98f56ecf14a952272b559964b3eb4cc7b012a8bd9b36be3aac6738", size = 59109403, upload-time = "2025-04-01T13:56:24.687Z" },
-    { url = "https://files.pythonhosted.org/packages/fe/fb/2367d905d587a499c74b343043cbe4afbca62fe707dd4ce212cf7a53ff68/htcondor-24.0.6-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:27e70cd412fa520f79c0142d2d492894e9b8d1b5857abd9584ddf5b340d85748", size = 60465800, upload-time = "2025-04-01T13:56:29.015Z" },
-    { url = "https://files.pythonhosted.org/packages/f6/5d/5e74fe73e88c53adbd846e2c22c0b3d0fe68f382eee833114b8e2a938eb4/htcondor-24.0.6-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:64bbe60839b1bc607fbc62d4bc177f287ec931933e6ba14f15e3719e0219dbb2", size = 59163697, upload-time = "2025-04-01T13:56:35.288Z" },
-    { url = "https://files.pythonhosted.org/packages/8a/03/f3ab909506a3fdfaa19381084a647a574d88c786766b49f6349cd6c85e43/htcondor-24.0.6-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:8b2804748e716847a6b13ef68c10e03a705ab49cd468b5a2f1438e3cd51caa41", size = 60565439, upload-time = "2025-04-01T13:56:39.323Z" },
+    { url = "https://files.pythonhosted.org/packages/e0/15/51ab83d2154ea41f781a3d332ad6193e3398d3b874d9c67334482da1770a/htcondor-24.0.7-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:3123b1a8de0cca85f5669f3515fca0bb0ec57089274f86764d7aea1abb04f767", size = 59170652, upload-time = "2025-04-22T13:41:50.553Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/2e/60053f15322f81b15b0edefc4aefa6a5a2bedf5ab83f4272a51065c57683/htcondor-24.0.7-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:3587519f8f0cff6ac952c869a62548789f608939f67f29816f02d6bece3e5164", size = 60569772, upload-time = "2025-04-22T13:41:54.901Z" },
 ]
 
 [[package]]
@@ -722,13 +638,6 @@ version = "0.6.4"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/a7/9a/ce5e1f7e131522e6d3426e8e7a490b3a01f39a6696602e1c4f33f9e94277/httptools-0.6.4.tar.gz", hash = "sha256:4e93eee4add6493b59a5c514da98c939b244fce4a0d8879cd3f466562f4b7d5c", size = 240639, upload-time = "2024-10-16T19:45:08.902Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/7b/26/bb526d4d14c2774fe07113ca1db7255737ffbb119315839af2065abfdac3/httptools-0.6.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:f47f8ed67cc0ff862b84a1189831d1d33c963fb3ce1ee0c65d3b0cbe7b711069", size = 199029, upload-time = "2024-10-16T19:44:18.427Z" },
-    { url = "https://files.pythonhosted.org/packages/a6/17/3e0d3e9b901c732987a45f4f94d4e2c62b89a041d93db89eafb262afd8d5/httptools-0.6.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0614154d5454c21b6410fdf5262b4a3ddb0f53f1e1721cfd59d55f32138c578a", size = 103492, upload-time = "2024-10-16T19:44:19.515Z" },
-    { url = "https://files.pythonhosted.org/packages/b7/24/0fe235d7b69c42423c7698d086d4db96475f9b50b6ad26a718ef27a0bce6/httptools-0.6.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f8787367fbdfccae38e35abf7641dafc5310310a5987b689f4c32cc8cc3ee975", size = 462891, upload-time = "2024-10-16T19:44:21.067Z" },
-    { url = "https://files.pythonhosted.org/packages/b1/2f/205d1f2a190b72da6ffb5f41a3736c26d6fa7871101212b15e9b5cd8f61d/httptools-0.6.4-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40b0f7fe4fd38e6a507bdb751db0379df1e99120c65fbdc8ee6c1d044897a636", size = 459788, upload-time = "2024-10-16T19:44:22.958Z" },
-    { url = "https://files.pythonhosted.org/packages/6e/4c/d09ce0eff09057a206a74575ae8f1e1e2f0364d20e2442224f9e6612c8b9/httptools-0.6.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:40a5ec98d3f49904b9fe36827dcf1aadfef3b89e2bd05b0e35e94f97c2b14721", size = 433214, upload-time = "2024-10-16T19:44:24.513Z" },
-    { url = "https://files.pythonhosted.org/packages/3e/d2/84c9e23edbccc4a4c6f96a1b8d99dfd2350289e94f00e9ccc7aadde26fb5/httptools-0.6.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:dacdd3d10ea1b4ca9df97a0a303cbacafc04b5cd375fa98732678151643d4988", size = 434120, upload-time = "2024-10-16T19:44:26.295Z" },
-    { url = "https://files.pythonhosted.org/packages/d0/46/4d8e7ba9581416de1c425b8264e2cadd201eb709ec1584c381f3e98f51c1/httptools-0.6.4-cp311-cp311-win_amd64.whl", hash = "sha256:288cd628406cc53f9a541cfaf06041b4c71d751856bab45e3702191f931ccd17", size = 88565, upload-time = "2024-10-16T19:44:29.188Z" },
     { url = "https://files.pythonhosted.org/packages/bb/0e/d0b71465c66b9185f90a091ab36389a7352985fe857e352801c39d6127c8/httptools-0.6.4-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:df017d6c780287d5c80601dafa31f17bddb170232d85c066604d8558683711a2", size = 200683, upload-time = "2024-10-16T19:44:30.175Z" },
     { url = "https://files.pythonhosted.org/packages/e2/b8/412a9bb28d0a8988de3296e01efa0bd62068b33856cdda47fe1b5e890954/httptools-0.6.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:85071a1e8c2d051b507161f6c3e26155b5c790e4e28d7f236422dbacc2a9cc44", size = 104337, upload-time = "2024-10-16T19:44:31.786Z" },
     { url = "https://files.pythonhosted.org/packages/9b/01/6fb20be3196ffdc8eeec4e653bc2a275eca7f36634c86302242c4fbb2760/httptools-0.6.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69422b7f458c5af875922cdb5bd586cc1f1033295aa9ff63ee196a87519ac8e1", size = 508796, upload-time = "2024-10-16T19:44:32.825Z" },
@@ -921,6 +830,7 @@ dependencies = [
     { name = "rich" },
     { name = "safir", extra = ["db"] },
     { name = "sqlalchemy", extra = ["asyncio"] },
+    { name = "sqlmodel" },
     { name = "structlog" },
     { name = "tabulate" },
     { name = "uvicorn", extra = ["standard"] },
@@ -930,7 +840,7 @@ dependencies = [
 dev = [
     { name = "aiosqlite" },
     { name = "asgi-lifespan" },
-    { name = "coverage", extra = ["toml"] },
+    { name = "coverage" },
     { name = "greenlet" },
     { name = "mypy" },
     { name = "pre-commit" },
@@ -964,22 +874,23 @@ requires-dist = [
     { name = "click", specifier = "==8.1.*" },
     { name = "fastapi", specifier = "==0.115.*" },
     { name = "greenlet", specifier = "==3.1.*" },
-    { name = "htcondor", marker = "sys_platform == 'linux'", specifier = "==24.0.6" },
+    { name = "htcondor", marker = "sys_platform == 'linux'", specifier = "==24.0.7" },
     { name = "httpx", specifier = ">=0.27.2" },
     { name = "jinja2", specifier = "==3.1.*" },
     { name = "networkx", specifier = ">=3.5" },
     { name = "numpy", specifier = "==2.1.*" },
     { name = "panda-client", specifier = ">=1.5.82" },
     { name = "psycopg2-binary", specifier = "==2.9.*" },
-    { name = "pydantic", specifier = "==2.10.*" },
-    { name = "pydantic-settings", specifier = "==2.7.*" },
+    { name = "pydantic", specifier = "==2.11.*" },
+    { name = "pydantic-settings", specifier = "==2.9.*" },
     { name = "python-multipart", specifier = "==0.0.*" },
     { name = "rich", specifier = "==13.9.*" },
     { name = "safir", extras = ["db"], specifier = "==7.0.*" },
     { name = "sqlalchemy", extras = ["asyncio"], specifier = "==2.0.*" },
+    { name = "sqlmodel", specifier = ">=0.0.24" },
     { name = "structlog", specifier = "==24.4.*" },
     { name = "tabulate", specifier = "==0.9.*" },
-    { name = "uvicorn", extras = ["standard"], specifier = "==0.32.*" },
+    { name = "uvicorn", extras = ["standard"], specifier = "==0.34.*" },
 ]
 
 [package.metadata.requires-dev]
@@ -988,8 +899,8 @@ dev = [
     { name = "asgi-lifespan", specifier = ">=2.1.0" },
     { name = "coverage", extras = ["toml"], specifier = ">=7.6.7" },
     { name = "greenlet", specifier = ">=3.1.1" },
-    { name = "mypy", specifier = ">=1.13.0" },
-    { name = "pre-commit", specifier = ">=4.0.1" },
+    { name = "mypy", specifier = ">=1.16.0" },
+    { name = "pre-commit", specifier = ">=4.2.0" },
     { name = "pytest", specifier = ">=8.3.3" },
     { name = "pytest-asyncio", specifier = ">=0.24.0" },
     { name = "pytest-cov", specifier = ">=6.0.0" },
@@ -1004,17 +915,17 @@ dev = [
     { name = "types-tabulate", specifier = ">=0.9.0.20240106" },
 ]
 lsst = [
-    { name = "lsst-ctrl-bps", specifier = ">=29.2025.1500" },
-    { name = "lsst-ctrl-bps-htcondor", marker = "sys_platform == 'linux'", specifier = ">=29.2025.1500" },
-    { name = "lsst-ctrl-bps-panda", specifier = ">=29.2025.1500" },
-    { name = "lsst-daf-butler", specifier = ">=29.2025.1500" },
-    { name = "lsst-pipe-base", specifier = ">=29.2025.1500" },
-    { name = "lsst-utils", specifier = ">=29.2025.1500" },
+    { name = "lsst-ctrl-bps", specifier = ">=29.2025.2300" },
+    { name = "lsst-ctrl-bps-htcondor", marker = "sys_platform == 'linux'", specifier = ">=29.2025.2300" },
+    { name = "lsst-ctrl-bps-panda", specifier = ">=29.2025.2300" },
+    { name = "lsst-daf-butler", specifier = ">=29.2025.2300" },
+    { name = "lsst-pipe-base", specifier = ">=29.2025.2300" },
+    { name = "lsst-utils", specifier = ">=29.2025.2300" },
 ]
 
 [[package]]
 name = "lsst-ctrl-bps"
-version = "29.2025.2200"
+version = "29.2025.2400"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "astropy" },
@@ -1027,14 +938,14 @@ dependencies = [
     { name = "networkx" },
     { name = "pyyaml" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/b5/8a/67bc88d17cd2a629ba009207128bf8fb0eadded52dc10aed065d19fc6fc3/lsst_ctrl_bps-29.2025.2200.tar.gz", hash = "sha256:559106d7f8ead51e82bc1bc7aa32b88829eadf470f3cf9ad897be7d8eded84d2", size = 136684, upload-time = "2025-05-29T09:14:57.553Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/42/55/709e97410c5c0a161f304c09df09a617359b1719371ebf45103380f489fd/lsst_ctrl_bps-29.2025.2400.tar.gz", hash = "sha256:d668ff38067c5cd50e1a8e7f6e260ae4aa53f86e11d8b62096274594e803d505", size = 136707, upload-time = "2025-06-12T10:08:35.573Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ba/48/dcba14d085fb27054c6d5e64a7423ad81f3faf12f36b152dd24165591316/lsst_ctrl_bps-29.2025.2200-py3-none-any.whl", hash = "sha256:fc4574fc26563c7fd2b53e9a1a37192364dc81943d47838e284e73d553c1436e", size = 115251, upload-time = "2025-05-29T09:14:56.259Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/c0/1e6c42e59acee2a52ad689a00d0128e33c9c2bfbff8ed3ff2d65e7afb6ff/lsst_ctrl_bps-29.2025.2400-py3-none-any.whl", hash = "sha256:c1c34c95415442a6633af1a1ca15980ac8ef22b6b9a13f5d8bb9a78ea368d939", size = 115251, upload-time = "2025-06-12T10:08:34.097Z" },
 ]
 
 [[package]]
 name = "lsst-ctrl-bps-htcondor"
-version = "29.2025.2200"
+version = "29.2025.2400"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "htcondor" },
@@ -1042,14 +953,14 @@ dependencies = [
     { name = "lsst-daf-butler" },
     { name = "lsst-utils" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/22/cc/1f3b822ae15ddcd2d59cd9a28055a3e7a257fa731f33dc5e81d41c797074/lsst_ctrl_bps_htcondor-29.2025.2200.tar.gz", hash = "sha256:39e7aa4f23232e63390243eac9b0bcb18cc1f8689559d08bbe82781a08c901a6", size = 94355, upload-time = "2025-05-29T09:14:48.478Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e1/92/6e78fb6e3855546d994606ac22cb7abe8c323819bab9a655a1dcca7e224c/lsst_ctrl_bps_htcondor-29.2025.2400.tar.gz", hash = "sha256:ea0e2230a637e4598c57eff2cb1e4cc22739c73c04d81b7704a139797bda7846", size = 94905, upload-time = "2025-06-12T10:08:28.724Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/52/d8/72d0247c9bf9ff08e015b34e8b51fa2eedb5c2737caed59530093f14c086/lsst_ctrl_bps_htcondor-29.2025.2200-py3-none-any.whl", hash = "sha256:85bf3e163da6bbc898fced1c2ac2d6ed07b9b4527ea499ff94122697ab6009ec", size = 68134, upload-time = "2025-05-29T09:14:47.08Z" },
+    { url = "https://files.pythonhosted.org/packages/66/90/5e7f668368cd8618ac0daf10625cf6cdd3ab18011f5bae9e1ad98cd08014/lsst_ctrl_bps_htcondor-29.2025.2400-py3-none-any.whl", hash = "sha256:bf9a0306855e8e6eda7e75f99647817538062e70c451a55c59d7c7b34d5eb6f0", size = 68132, upload-time = "2025-06-12T10:08:27.172Z" },
 ]
 
 [[package]]
 name = "lsst-ctrl-bps-panda"
-version = "29.2025.2200"
+version = "29.2025.2400"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "click" },
@@ -1064,9 +975,9 @@ dependencies = [
     { name = "panda-client" },
     { name = "pyyaml" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/54/be/d0bef2c8fded218e6218f1ebbd9b9af04b9b3df22df52830c39b8949c047/lsst_ctrl_bps_panda-29.2025.2200.tar.gz", hash = "sha256:bfb041d627f2fa7a994e7f95d569fdf13864bb16c0b264e86e835ad482bf7819", size = 45808, upload-time = "2025-05-29T09:15:03.255Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/cb/3d/9e2531637efd705ffcaa793fc943e08f37ae44482a13b7b45645ea2bb2b8/lsst_ctrl_bps_panda-29.2025.2400.tar.gz", hash = "sha256:2d3b9e3b6ba0d8967a9983b00a1c24cec169b4fefa148169aa5da4131a3d9e0d", size = 45825, upload-time = "2025-06-12T10:08:37.661Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/89/46/37245d7b6d92d5deea8e48a40fab1e3a9b0825b759df3aa7b299ade3eee8/lsst_ctrl_bps_panda-29.2025.2200-py3-none-any.whl", hash = "sha256:c5de2c175973e0b27d4d2b6232c72dbb0e20bfc5334983f8aa10041e2d7db3fb", size = 54672, upload-time = "2025-05-29T09:15:02.107Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/86/b76eae078cd368c694a9a28949ee99e9306a8d30049400da4d9fd9ed907c/lsst_ctrl_bps_panda-29.2025.2400-py3-none-any.whl", hash = "sha256:1ac055d6aac368f4bed5a4b16f524bf00b45d597b6e620dd1d12f3d71848fa71", size = 54673, upload-time = "2025-06-12T10:08:36.203Z" },
 ]
 
 [[package]]
@@ -1091,7 +1002,7 @@ wheels = [
 
 [[package]]
 name = "lsst-daf-butler"
-version = "29.2025.2100"
+version = "29.2025.2400"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "astropy" },
@@ -1107,9 +1018,9 @@ dependencies = [
     { name = "pyyaml" },
     { name = "sqlalchemy" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/9c/97/54d290ed0e9dd50bc7a4c4ca6d5d4e25110a7c9c8f14b1c262261f85335e/lsst_daf_butler-29.2025.2100.tar.gz", hash = "sha256:12fed854432b6dceadc26026fda80ecc17e6ab0ca6d8daaa26898dd881b67558", size = 1297120, upload-time = "2025-05-22T09:33:00.999Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/da/1d/3903b3a724a118960cd41692d8915f4a4225ea8f76d9b492fde38bba2137/lsst_daf_butler-29.2025.2400.tar.gz", hash = "sha256:c51d1698cd817fa93807f61747e77635286631cf3f94588657a9f7ba719ac874", size = 1302541, upload-time = "2025-06-12T10:23:11.709Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f2/b7/fa7ae7ed1a89213fec1a83791a67d91d5bc4200a5f6a0ef20c72462922f4/lsst_daf_butler-29.2025.2100-py3-none-any.whl", hash = "sha256:870f87d8a10afdb0b3972b37b4ea57f468d577acc2642db436e4bda8dd4b371b", size = 1400845, upload-time = "2025-05-22T09:32:59.388Z" },
+    { url = "https://files.pythonhosted.org/packages/88/e5/77fe839a573f320f89549ef4ba574a0b29545a6352400f43b88a3e12b48f/lsst_daf_butler-29.2025.2400-py3-none-any.whl", hash = "sha256:7fd6ef9dab6f8530092990b4fa17385cde28edd9c0d07357e4e8c5e9fcd6eec6", size = 1409162, upload-time = "2025-06-12T10:23:09.686Z" },
 ]
 
 [[package]]
@@ -1142,7 +1053,7 @@ wheels = [
 
 [[package]]
 name = "lsst-pipe-base"
-version = "29.2025.2100"
+version = "29.2025.2400"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "astropy" },
@@ -1157,9 +1068,9 @@ dependencies = [
     { name = "pyyaml" },
     { name = "wcwidth" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/1f/0d/1e9fc34b2f00e492afebd08ce46d8c3439d583b8374fe7521bb3e5887469/lsst_pipe_base-29.2025.2100.tar.gz", hash = "sha256:2169d5fef2f0d932277129350c517c5301feb7ac69eeb366819257323d5cfcff", size = 427504, upload-time = "2025-05-22T09:22:27.265Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/dd/80/7dee458b479bf85df7c8a064e96788ee6ff7df7f9bde65ac4e8c5b1f576b/lsst_pipe_base-29.2025.2400.tar.gz", hash = "sha256:38c98a0bd121f0a5abe0d57c78f94c4f3accea52168bec3e2d5faaf4b7191472", size = 428447, upload-time = "2025-06-12T10:12:36.227Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/43/9e/71006a02463dd3fb9a5d89022c2a6c78bf269694f149b861e3d855d3f05c/lsst_pipe_base-29.2025.2100-py3-none-any.whl", hash = "sha256:89eef4d8a8540e7f9672ada5ae36a8a0bb7868ccb49b110c295285a0a9bec79c", size = 397894, upload-time = "2025-05-22T09:22:25.719Z" },
+    { url = "https://files.pythonhosted.org/packages/ab/9e/724d6e28712fa1e7fd79c0fed9d9a6049fae984be2bc2d77d092f042d89f/lsst_pipe_base-29.2025.2400-py3-none-any.whl", hash = "sha256:3aea896b370049ec33c7ee77efbd3224f2698accb46856a1e26f4b16e0355e70", size = 398644, upload-time = "2025-06-12T10:12:34.54Z" },
 ]
 
 [[package]]
@@ -1190,10 +1101,6 @@ dependencies = [
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/d8/e4/b4db75732e5fcdf48011a29615cce666043a330de0d2711492906f5ff3b6/lsst_sphgeom-29.2025.1600.tar.gz", hash = "sha256:0a15d3da8e3e13633662eca094398e5e09069e6f5df77002ddf33b03d2102890", size = 161055, upload-time = "2025-04-17T09:23:06.509Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/3c/82/9248f48efb83a27d8a14a6f952f1d460b47f0242d0db3c2fe3b50c14c787/lsst_sphgeom-29.2025.1600-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ca6617be1beeddcb991c2fdf8d7c9fae314a3a3ba6ec23db8cac4616a8d20c91", size = 576871, upload-time = "2025-04-17T09:22:50.16Z" },
-    { url = "https://files.pythonhosted.org/packages/dd/77/0c2ab7d131bc9bfa44005f7a4eee649181f1312f7df442e1c6136f8aa1e6/lsst_sphgeom-29.2025.1600-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f85de4ec1cafe6fb0f5109fad73340624b692a764d556b5ee88d4e90433b8a64", size = 553020, upload-time = "2025-04-17T09:22:51.691Z" },
-    { url = "https://files.pythonhosted.org/packages/00/25/3d59c1203690ff1af8700c1831bc8490943e0251600509af686739d3de77/lsst_sphgeom-29.2025.1600-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:84d84faf0553805feb84107293852de9da32c7040ee58c16d45b3a5cfc55ad84", size = 703582, upload-time = "2025-04-17T09:22:53.273Z" },
-    { url = "https://files.pythonhosted.org/packages/65/9e/22b16d61695bbe47eb3e4c92c5524ff0fb24b139bb6c36f9bc78b8159373/lsst_sphgeom-29.2025.1600-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f937f6385f0ce41efa141e579b0d3b039a9041e72a069068bfcceda7f7694d44", size = 758359, upload-time = "2025-04-17T09:22:54.966Z" },
     { url = "https://files.pythonhosted.org/packages/21/93/68141319f816785b784ea3a059f3877fe475a9a7d097a8c9e809a150a8a8/lsst_sphgeom-29.2025.1600-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:9b148ec4345d171060e42326acf9443f9a294d75405eba2944b60ef026e69ce2", size = 589382, upload-time = "2025-04-17T09:22:56.098Z" },
     { url = "https://files.pythonhosted.org/packages/37/d0/58cbb495b527e46f793e4e08679135e59aa1d60aa42578ef4fed59f17ac6/lsst_sphgeom-29.2025.1600-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:9d5b631a8bcd184c13173cfb836155212e7ce9d63b01f263c6fa4d2af8d6e907", size = 562716, upload-time = "2025-04-17T09:22:57.237Z" },
     { url = "https://files.pythonhosted.org/packages/32/54/56a5bfff88f28098bf5dfd82df2d5f760db3e15273120b7d666f8da35bbf/lsst_sphgeom-29.2025.1600-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d07bb22da075fdac9f5c87edb110af382c2f8dd3990fd0b812cb4675a7dd7b2c", size = 694419, upload-time = "2025-04-17T09:22:58.856Z" },
@@ -1202,7 +1109,7 @@ wheels = [
 
 [[package]]
 name = "lsst-utils"
-version = "29.2025.2100"
+version = "29.2025.2300"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "astropy" },
@@ -1212,9 +1119,9 @@ dependencies = [
     { name = "pyyaml" },
     { name = "threadpoolctl" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/4c/f3/ae2a16d8419c903e709cf385464cbd039319061d7b900b198554e0f5ad0c/lsst_utils-29.2025.2100.tar.gz", hash = "sha256:01d23c814871a8c46bc7b8fab7c309909774d6f2e1529f250c8b64624400a779", size = 89615, upload-time = "2025-05-22T09:23:40.109Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/cd/da/9818c34d51e9900098a1d7c405c56adbc5306a7a071dd6aae766fb66ebcd/lsst_utils-29.2025.2300.tar.gz", hash = "sha256:ecb94c444424eb31cc160957c7fe62cca07e70b837d6546fa68eebdfa59d6dd7", size = 89620, upload-time = "2025-06-05T09:58:31.714Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/7e/d6/cf65b4b1260364dcf1d3b211be151a17fc15d0dbe3bac43561c350ba88de/lsst_utils-29.2025.2100-py3-none-any.whl", hash = "sha256:1b4953746f1b9bffae9d8a42844cba85040a6764cdd137a623e566918bbaf328", size = 72858, upload-time = "2025-05-22T09:23:39.009Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/a8/bcb9752cd3c7f7ace826f02ad33d2614542182a1ef64185280fb7df1080f/lsst_utils-29.2025.2300-py3-none-any.whl", hash = "sha256:9df9a3ed24a9ec54ccaee48937f3fb32ced9253f69f0fbf9369ab7916ff8fa5d", size = 72858, upload-time = "2025-06-05T09:58:30.656Z" },
 ]
 
 [[package]]
@@ -1247,16 +1154,6 @@ version = "3.0.2"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/b2/97/5d42485e71dfc078108a86d6de8fa46db44a1a9295e89c5d6d4a06e23a62/markupsafe-3.0.2.tar.gz", hash = "sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0", size = 20537, upload-time = "2024-10-18T15:21:54.129Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/6b/28/bbf83e3f76936960b850435576dd5e67034e200469571be53f69174a2dfd/MarkupSafe-3.0.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9025b4018f3a1314059769c7bf15441064b2207cb3f065e6ea1e7359cb46db9d", size = 14353, upload-time = "2024-10-18T15:21:02.187Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/30/316d194b093cde57d448a4c3209f22e3046c5bb2fb0820b118292b334be7/MarkupSafe-3.0.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:93335ca3812df2f366e80509ae119189886b0f3c2b81325d39efdb84a1e2ae93", size = 12392, upload-time = "2024-10-18T15:21:02.941Z" },
-    { url = "https://files.pythonhosted.org/packages/f2/96/9cdafba8445d3a53cae530aaf83c38ec64c4d5427d975c974084af5bc5d2/MarkupSafe-3.0.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2cb8438c3cbb25e220c2ab33bb226559e7afb3baec11c4f218ffa7308603c832", size = 23984, upload-time = "2024-10-18T15:21:03.953Z" },
-    { url = "https://files.pythonhosted.org/packages/f1/a4/aefb044a2cd8d7334c8a47d3fb2c9f328ac48cb349468cc31c20b539305f/MarkupSafe-3.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a123e330ef0853c6e822384873bef7507557d8e4a082961e1defa947aa59ba84", size = 23120, upload-time = "2024-10-18T15:21:06.495Z" },
-    { url = "https://files.pythonhosted.org/packages/8d/21/5e4851379f88f3fad1de30361db501300d4f07bcad047d3cb0449fc51f8c/MarkupSafe-3.0.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e084f686b92e5b83186b07e8a17fc09e38fff551f3602b249881fec658d3eca", size = 23032, upload-time = "2024-10-18T15:21:07.295Z" },
-    { url = "https://files.pythonhosted.org/packages/00/7b/e92c64e079b2d0d7ddf69899c98842f3f9a60a1ae72657c89ce2655c999d/MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d8213e09c917a951de9d09ecee036d5c7d36cb6cb7dbaece4c71a60d79fb9798", size = 24057, upload-time = "2024-10-18T15:21:08.073Z" },
-    { url = "https://files.pythonhosted.org/packages/f9/ac/46f960ca323037caa0a10662ef97d0a4728e890334fc156b9f9e52bcc4ca/MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:5b02fb34468b6aaa40dfc198d813a641e3a63b98c2b05a16b9f80b7ec314185e", size = 23359, upload-time = "2024-10-18T15:21:09.318Z" },
-    { url = "https://files.pythonhosted.org/packages/69/84/83439e16197337b8b14b6a5b9c2105fff81d42c2a7c5b58ac7b62ee2c3b1/MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4", size = 23306, upload-time = "2024-10-18T15:21:10.185Z" },
-    { url = "https://files.pythonhosted.org/packages/9a/34/a15aa69f01e2181ed8d2b685c0d2f6655d5cca2c4db0ddea775e631918cd/MarkupSafe-3.0.2-cp311-cp311-win32.whl", hash = "sha256:6c89876f41da747c8d3677a2b540fb32ef5715f97b66eeb0c6b66f5e3ef6f59d", size = 15094, upload-time = "2024-10-18T15:21:11.005Z" },
-    { url = "https://files.pythonhosted.org/packages/da/b8/3a3bd761922d416f3dc5d00bfbed11f66b1ab89a0c2b6e887240a30b0f6b/MarkupSafe-3.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:70a87b411535ccad5ef2f1df5136506a10775d267e197e4cf531ced10537bd6b", size = 15521, upload-time = "2024-10-18T15:21:12.911Z" },
     { url = "https://files.pythonhosted.org/packages/22/09/d1f21434c97fc42f09d290cbb6350d44eb12f09cc62c9476effdb33a18aa/MarkupSafe-3.0.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:9778bd8ab0a994ebf6f84c2b949e65736d5575320a17ae8984a77fab08db94cf", size = 14274, upload-time = "2024-10-18T15:21:13.777Z" },
     { url = "https://files.pythonhosted.org/packages/6b/b0/18f76bba336fa5aecf79d45dcd6c806c280ec44538b3c13671d49099fdd0/MarkupSafe-3.0.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:846ade7b71e3536c4e56b386c2a47adf5741d2d8b94ec9dc3e92e5e1ee1e2225", size = 12348, upload-time = "2024-10-18T15:21:14.822Z" },
     { url = "https://files.pythonhosted.org/packages/e0/25/dd5c0f6ac1311e9b40f4af06c78efde0f3b5cbf02502f8ef9501294c425b/MarkupSafe-3.0.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1c99d261bd2d5f6b59325c92c73df481e05e57f19837bdca8413b9eac4bd8028", size = 24149, upload-time = "2024-10-18T15:21:15.642Z" },
@@ -1289,12 +1186,6 @@ dependencies = [
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/d4/38/13c2f1abae94d5ea0354e146b95a1be9b2137a0d506728e0da037c4276f6/mypy-1.16.0.tar.gz", hash = "sha256:84b94283f817e2aa6350a14b4a8fb2a35a53c286f97c9d30f53b63620e7af8ab", size = 3323139, upload-time = "2025-05-29T13:46:12.532Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/24/c4/ff2f79db7075c274fe85b5fff8797d29c6b61b8854c39e3b7feb556aa377/mypy-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9f826aaa7ff8443bac6a494cf743f591488ea940dd360e7dd330e30dd772a5ab", size = 10884498, upload-time = "2025-05-29T13:18:54.066Z" },
-    { url = "https://files.pythonhosted.org/packages/02/07/12198e83006235f10f6a7808917376b5d6240a2fd5dce740fe5d2ebf3247/mypy-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:82d056e6faa508501af333a6af192c700b33e15865bda49611e3d7d8358ebea2", size = 10011755, upload-time = "2025-05-29T13:34:00.851Z" },
-    { url = "https://files.pythonhosted.org/packages/f1/9b/5fd5801a72b5d6fb6ec0105ea1d0e01ab2d4971893076e558d4b6d6b5f80/mypy-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:089bedc02307c2548eb51f426e085546db1fa7dd87fbb7c9fa561575cf6eb1ff", size = 11800138, upload-time = "2025-05-29T13:32:55.082Z" },
-    { url = "https://files.pythonhosted.org/packages/2e/81/a117441ea5dfc3746431e51d78a4aca569c677aa225bca2cc05a7c239b61/mypy-1.16.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6a2322896003ba66bbd1318c10d3afdfe24e78ef12ea10e2acd985e9d684a666", size = 12533156, upload-time = "2025-05-29T13:19:12.963Z" },
-    { url = "https://files.pythonhosted.org/packages/3f/38/88ec57c6c86014d3f06251e00f397b5a7daa6888884d0abf187e4f5f587f/mypy-1.16.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:021a68568082c5b36e977d54e8f1de978baf401a33884ffcea09bd8e88a98f4c", size = 12742426, upload-time = "2025-05-29T13:20:22.72Z" },
-    { url = "https://files.pythonhosted.org/packages/bd/53/7e9d528433d56e6f6f77ccf24af6ce570986c2d98a5839e4c2009ef47283/mypy-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:54066fed302d83bf5128632d05b4ec68412e1f03ef2c300434057d66866cea4b", size = 9478319, upload-time = "2025-05-29T13:21:17.582Z" },
     { url = "https://files.pythonhosted.org/packages/70/cf/158e5055e60ca2be23aec54a3010f89dcffd788732634b344fc9cb1e85a0/mypy-1.16.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:c5436d11e89a3ad16ce8afe752f0f373ae9620841c50883dc96f8b8805620b13", size = 11062927, upload-time = "2025-05-29T13:35:52.328Z" },
     { url = "https://files.pythonhosted.org/packages/94/34/cfff7a56be1609f5d10ef386342ce3494158e4d506516890142007e6472c/mypy-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f2622af30bf01d8fc36466231bdd203d120d7a599a6d88fb22bdcb9dbff84090", size = 10083082, upload-time = "2025-05-29T13:35:33.378Z" },
     { url = "https://files.pythonhosted.org/packages/b3/7f/7242062ec6288c33d8ad89574df87c3903d394870e5e6ba1699317a65075/mypy-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d045d33c284e10a038f5e29faca055b90eee87da3fc63b8889085744ebabb5a1", size = 11828306, upload-time = "2025-05-29T13:21:02.164Z" },
@@ -1337,16 +1228,6 @@ version = "2.1.3"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/25/ca/1166b75c21abd1da445b97bf1fa2f14f423c6cfb4fc7c4ef31dccf9f6a94/numpy-2.1.3.tar.gz", hash = "sha256:aa08e04e08aaf974d4458def539dece0d28146d866a39da5639596f4921fd761", size = 20166090, upload-time = "2024-11-02T17:48:55.832Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ad/81/c8167192eba5247593cd9d305ac236847c2912ff39e11402e72ae28a4985/numpy-2.1.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4d1167c53b93f1f5d8a139a742b3c6f4d429b54e74e6b57d0eff40045187b15d", size = 21156252, upload-time = "2024-11-02T17:34:01.372Z" },
-    { url = "https://files.pythonhosted.org/packages/da/74/5a60003fc3d8a718d830b08b654d0eea2d2db0806bab8f3c2aca7e18e010/numpy-2.1.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c80e4a09b3d95b4e1cac08643f1152fa71a0a821a2d4277334c88d54b2219a41", size = 13784119, upload-time = "2024-11-02T17:34:23.809Z" },
-    { url = "https://files.pythonhosted.org/packages/47/7c/864cb966b96fce5e63fcf25e1e4d957fe5725a635e5f11fe03f39dd9d6b5/numpy-2.1.3-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:576a1c1d25e9e02ed7fa5477f30a127fe56debd53b8d2c89d5578f9857d03ca9", size = 5352978, upload-time = "2024-11-02T17:34:34.001Z" },
-    { url = "https://files.pythonhosted.org/packages/09/ac/61d07930a4993dd9691a6432de16d93bbe6aa4b1c12a5e573d468eefc1ca/numpy-2.1.3-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:973faafebaae4c0aaa1a1ca1ce02434554d67e628b8d805e61f874b84e136b09", size = 6892570, upload-time = "2024-11-02T17:34:45.401Z" },
-    { url = "https://files.pythonhosted.org/packages/27/2f/21b94664f23af2bb52030653697c685022119e0dc93d6097c3cb45bce5f9/numpy-2.1.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:762479be47a4863e261a840e8e01608d124ee1361e48b96916f38b119cfda04a", size = 13896715, upload-time = "2024-11-02T17:35:06.564Z" },
-    { url = "https://files.pythonhosted.org/packages/7a/f0/80811e836484262b236c684a75dfc4ba0424bc670e765afaa911468d9f39/numpy-2.1.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc6f24b3d1ecc1eebfbf5d6051faa49af40b03be1aaa781ebdadcbc090b4539b", size = 16339644, upload-time = "2024-11-02T17:35:30.888Z" },
-    { url = "https://files.pythonhosted.org/packages/fa/81/ce213159a1ed8eb7d88a2a6ef4fbdb9e4ffd0c76b866c350eb4e3c37e640/numpy-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:17ee83a1f4fef3c94d16dc1802b998668b5419362c8a4f4e8a491de1b41cc3ee", size = 16712217, upload-time = "2024-11-02T17:35:56.703Z" },
-    { url = "https://files.pythonhosted.org/packages/7d/84/4de0b87d5a72f45556b2a8ee9fc8801e8518ec867fc68260c1f5dcb3903f/numpy-2.1.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:15cb89f39fa6d0bdfb600ea24b250e5f1a3df23f901f51c8debaa6a5d122b2f0", size = 14399053, upload-time = "2024-11-02T17:36:22.3Z" },
-    { url = "https://files.pythonhosted.org/packages/7e/1c/e5fabb9ad849f9d798b44458fd12a318d27592d4bc1448e269dec070ff04/numpy-2.1.3-cp311-cp311-win32.whl", hash = "sha256:d9beb777a78c331580705326d2367488d5bc473b49a9bc3036c154832520aca9", size = 6534741, upload-time = "2024-11-02T17:36:33.552Z" },
-    { url = "https://files.pythonhosted.org/packages/1e/48/a9a4b538e28f854bfb62e1dea3c8fea12e90216a276c7777ae5345ff29a7/numpy-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:d89dd2b6da69c4fff5e39c28a382199ddedc3a5be5390115608345dec660b9e2", size = 12869487, upload-time = "2024-11-02T17:36:52.909Z" },
     { url = "https://files.pythonhosted.org/packages/8a/f0/385eb9970309643cbca4fc6eebc8bb16e560de129c91258dfaa18498da8b/numpy-2.1.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f55ba01150f52b1027829b50d70ef1dafd9821ea82905b63936668403c3b471e", size = 20849658, upload-time = "2024-11-02T17:37:23.919Z" },
     { url = "https://files.pythonhosted.org/packages/54/4a/765b4607f0fecbb239638d610d04ec0a0ded9b4951c56dc68cef79026abf/numpy-2.1.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:13138eadd4f4da03074851a698ffa7e405f41a0845a6b1ad135b81596e4e9958", size = 13492258, upload-time = "2024-11-02T17:37:45.252Z" },
     { url = "https://files.pythonhosted.org/packages/bd/a7/2332679479c70b68dccbf4a8eb9c9b5ee383164b161bee9284ac141fbd33/numpy-2.1.3-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:a6b46587b14b888e95e4a24d7b13ae91fa22386c199ee7b418f449032b2fa3b8", size = 5090249, upload-time = "2024-11-02T17:37:54.252Z" },
@@ -1486,18 +1367,6 @@ version = "2.9.10"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/cb/0e/bdc8274dc0585090b4e3432267d7be4dfbfd8971c0fa59167c711105a6bf/psycopg2-binary-2.9.10.tar.gz", hash = "sha256:4b3df0e6990aa98acda57d983942eff13d824135fe2250e6522edaa782a06de2", size = 385764, upload-time = "2024-10-16T11:24:58.126Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/9c/8f/9feb01291d0d7a0a4c6a6bab24094135c2b59c6a81943752f632c75896d6/psycopg2_binary-2.9.10-cp311-cp311-macosx_12_0_x86_64.whl", hash = "sha256:04392983d0bb89a8717772a193cfaac58871321e3ec69514e1c4e0d4957b5aff", size = 3043397, upload-time = "2024-10-16T11:19:40.033Z" },
-    { url = "https://files.pythonhosted.org/packages/15/30/346e4683532011561cd9c8dfeac6a8153dd96452fee0b12666058ab7893c/psycopg2_binary-2.9.10-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:1a6784f0ce3fec4edc64e985865c17778514325074adf5ad8f80636cd029ef7c", size = 3274806, upload-time = "2024-10-16T11:19:43.5Z" },
-    { url = "https://files.pythonhosted.org/packages/66/6e/4efebe76f76aee7ec99166b6c023ff8abdc4e183f7b70913d7c047701b79/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5f86c56eeb91dc3135b3fd8a95dc7ae14c538a2f3ad77a19645cf55bab1799c", size = 2851370, upload-time = "2024-10-16T11:19:46.986Z" },
-    { url = "https://files.pythonhosted.org/packages/7f/fd/ff83313f86b50f7ca089b161b8e0a22bb3c319974096093cd50680433fdb/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2b3d2491d4d78b6b14f76881905c7a8a8abcf974aad4a8a0b065273a0ed7a2cb", size = 3080780, upload-time = "2024-10-16T11:19:50.242Z" },
-    { url = "https://files.pythonhosted.org/packages/e6/c4/bfadd202dcda8333a7ccafdc51c541dbdfce7c2c7cda89fa2374455d795f/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2286791ececda3a723d1910441c793be44625d86d1a4e79942751197f4d30341", size = 3264583, upload-time = "2024-10-16T11:19:54.424Z" },
-    { url = "https://files.pythonhosted.org/packages/5d/f1/09f45ac25e704ac954862581f9f9ae21303cc5ded3d0b775532b407f0e90/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:512d29bb12608891e349af6a0cccedce51677725a921c07dba6342beaf576f9a", size = 3019831, upload-time = "2024-10-16T11:19:57.762Z" },
-    { url = "https://files.pythonhosted.org/packages/9e/2e/9beaea078095cc558f215e38f647c7114987d9febfc25cb2beed7c3582a5/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:5a507320c58903967ef7384355a4da7ff3f28132d679aeb23572753cbf2ec10b", size = 2871822, upload-time = "2024-10-16T11:20:04.693Z" },
-    { url = "https://files.pythonhosted.org/packages/01/9e/ef93c5d93f3dc9fc92786ffab39e323b9aed066ba59fdc34cf85e2722271/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:6d4fa1079cab9018f4d0bd2db307beaa612b0d13ba73b5c6304b9fe2fb441ff7", size = 2820975, upload-time = "2024-10-16T11:20:11.401Z" },
-    { url = "https://files.pythonhosted.org/packages/a5/f0/049e9631e3268fe4c5a387f6fc27e267ebe199acf1bc1bc9cbde4bd6916c/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:851485a42dbb0bdc1edcdabdb8557c09c9655dfa2ca0460ff210522e073e319e", size = 2919320, upload-time = "2024-10-16T11:20:17.959Z" },
-    { url = "https://files.pythonhosted.org/packages/dc/9a/bcb8773b88e45fb5a5ea8339e2104d82c863a3b8558fbb2aadfe66df86b3/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:35958ec9e46432d9076286dda67942ed6d968b9c3a6a2fd62b48939d1d78bf68", size = 2957617, upload-time = "2024-10-16T11:20:24.711Z" },
-    { url = "https://files.pythonhosted.org/packages/e2/6b/144336a9bf08a67d217b3af3246abb1d027095dab726f0687f01f43e8c03/psycopg2_binary-2.9.10-cp311-cp311-win32.whl", hash = "sha256:ecced182e935529727401b24d76634a357c71c9275b356efafd8a2a91ec07392", size = 1024618, upload-time = "2024-10-16T11:20:27.718Z" },
-    { url = "https://files.pythonhosted.org/packages/61/69/3b3d7bd583c6d3cbe5100802efa5beacaacc86e37b653fc708bf3d6853b8/psycopg2_binary-2.9.10-cp311-cp311-win_amd64.whl", hash = "sha256:ee0e8c683a7ff25d23b55b11161c2663d4b099770f6085ff0a20d4505778d6b4", size = 1163816, upload-time = "2024-10-16T11:20:30.777Z" },
     { url = "https://files.pythonhosted.org/packages/49/7d/465cc9795cf76f6d329efdafca74693714556ea3891813701ac1fee87545/psycopg2_binary-2.9.10-cp312-cp312-macosx_12_0_x86_64.whl", hash = "sha256:880845dfe1f85d9d5f7c412efea7a08946a46894537e4e5d091732eb1d34d9a0", size = 3044771, upload-time = "2024-10-16T11:20:35.234Z" },
     { url = "https://files.pythonhosted.org/packages/8b/31/6d225b7b641a1a2148e3ed65e1aa74fc86ba3fee850545e27be9e1de893d/psycopg2_binary-2.9.10-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:9440fa522a79356aaa482aa4ba500b65f28e5d0e63b801abf6aa152a29bd842a", size = 3275336, upload-time = "2024-10-16T11:20:38.742Z" },
     { url = "https://files.pythonhosted.org/packages/30/b7/a68c2b4bff1cbb1728e3ec864b2d92327c77ad52edcd27922535a8366f68/psycopg2_binary-2.9.10-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e3923c1d9870c49a2d44f795df0c889a22380d36ef92440ff618ec315757e539", size = 2851637, upload-time = "2024-10-16T11:20:42.145Z" },
@@ -1518,15 +1387,6 @@ version = "20.0.0"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/a2/ee/a7810cb9f3d6e9238e61d312076a9859bf3668fd21c69744de9532383912/pyarrow-20.0.0.tar.gz", hash = "sha256:febc4a913592573c8d5805091a6c2b5064c8bd6e002131f01061797d91c783c1", size = 1125187, upload-time = "2025-04-27T12:34:23.264Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/47/a2/b7930824181ceadd0c63c1042d01fa4ef63eee233934826a7a2a9af6e463/pyarrow-20.0.0-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:24ca380585444cb2a31324c546a9a56abbe87e26069189e14bdba19c86c049f0", size = 30856035, upload-time = "2025-04-27T12:28:40.78Z" },
-    { url = "https://files.pythonhosted.org/packages/9b/18/c765770227d7f5bdfa8a69f64b49194352325c66a5c3bb5e332dfd5867d9/pyarrow-20.0.0-cp311-cp311-macosx_12_0_x86_64.whl", hash = "sha256:95b330059ddfdc591a3225f2d272123be26c8fa76e8c9ee1a77aad507361cfdb", size = 32309552, upload-time = "2025-04-27T12:28:47.051Z" },
-    { url = "https://files.pythonhosted.org/packages/44/fb/dfb2dfdd3e488bb14f822d7335653092dde150cffc2da97de6e7500681f9/pyarrow-20.0.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f0fb1041267e9968c6d0d2ce3ff92e3928b243e2b6d11eeb84d9ac547308232", size = 41334704, upload-time = "2025-04-27T12:28:55.064Z" },
-    { url = "https://files.pythonhosted.org/packages/58/0d/08a95878d38808051a953e887332d4a76bc06c6ee04351918ee1155407eb/pyarrow-20.0.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8ff87cc837601532cc8242d2f7e09b4e02404de1b797aee747dd4ba4bd6313f", size = 42399836, upload-time = "2025-04-27T12:29:02.13Z" },
-    { url = "https://files.pythonhosted.org/packages/f3/cd/efa271234dfe38f0271561086eedcad7bc0f2ddd1efba423916ff0883684/pyarrow-20.0.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:7a3a5dcf54286e6141d5114522cf31dd67a9e7c9133d150799f30ee302a7a1ab", size = 40711789, upload-time = "2025-04-27T12:29:09.951Z" },
-    { url = "https://files.pythonhosted.org/packages/46/1f/7f02009bc7fc8955c391defee5348f510e589a020e4b40ca05edcb847854/pyarrow-20.0.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:a6ad3e7758ecf559900261a4df985662df54fb7fdb55e8e3b3aa99b23d526b62", size = 42301124, upload-time = "2025-04-27T12:29:17.187Z" },
-    { url = "https://files.pythonhosted.org/packages/4f/92/692c562be4504c262089e86757a9048739fe1acb4024f92d39615e7bab3f/pyarrow-20.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6bb830757103a6cb300a04610e08d9636f0cd223d32f388418ea893a3e655f1c", size = 42916060, upload-time = "2025-04-27T12:29:24.253Z" },
-    { url = "https://files.pythonhosted.org/packages/a4/ec/9f5c7e7c828d8e0a3c7ef50ee62eca38a7de2fa6eb1b8fa43685c9414fef/pyarrow-20.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:96e37f0766ecb4514a899d9a3554fadda770fb57ddf42b63d80f14bc20aa7db3", size = 44547640, upload-time = "2025-04-27T12:29:32.782Z" },
-    { url = "https://files.pythonhosted.org/packages/54/96/46613131b4727f10fd2ffa6d0d6f02efcc09a0e7374eff3b5771548aa95b/pyarrow-20.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:3346babb516f4b6fd790da99b98bed9708e3f02e734c84971faccb20736848dc", size = 25781491, upload-time = "2025-04-27T12:29:38.464Z" },
     { url = "https://files.pythonhosted.org/packages/a1/d6/0c10e0d54f6c13eb464ee9b67a68b8c71bcf2f67760ef5b6fbcddd2ab05f/pyarrow-20.0.0-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:75a51a5b0eef32727a247707d4755322cb970be7e935172b6a3a9f9ae98404ba", size = 30815067, upload-time = "2025-04-27T12:29:44.384Z" },
     { url = "https://files.pythonhosted.org/packages/7e/e2/04e9874abe4094a06fd8b0cbb0f1312d8dd7d707f144c2ec1e5e8f452ffa/pyarrow-20.0.0-cp312-cp312-macosx_12_0_x86_64.whl", hash = "sha256:211d5e84cecc640c7a3ab900f930aaff5cd2702177e0d562d426fb7c4f737781", size = 32297128, upload-time = "2025-04-27T12:29:52.038Z" },
     { url = "https://files.pythonhosted.org/packages/31/fd/c565e5dcc906a3b471a83273039cb75cb79aad4a2d4a12f76cc5ae90a4b8/pyarrow-20.0.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ba3cf4182828be7a896cbd232aa8dd6a31bd1f9e32776cc3796c012855e1199", size = 41334890, upload-time = "2025-04-27T12:29:59.452Z" },
@@ -1549,68 +1409,56 @@ wheels = [
 
 [[package]]
 name = "pydantic"
-version = "2.10.6"
+version = "2.11.5"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "annotated-types" },
     { name = "pydantic-core" },
     { name = "typing-extensions" },
+    { name = "typing-inspection" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/b7/ae/d5220c5c52b158b1de7ca89fc5edb72f304a70a4c540c84c8844bf4008de/pydantic-2.10.6.tar.gz", hash = "sha256:ca5daa827cce33de7a42be142548b0096bf05a7e7b365aebfa5f8eeec7128236", size = 761681, upload-time = "2025-01-24T01:42:12.693Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f0/86/8ce9040065e8f924d642c58e4a344e33163a07f6b57f836d0d734e0ad3fb/pydantic-2.11.5.tar.gz", hash = "sha256:7f853db3d0ce78ce8bbb148c401c2cdd6431b3473c0cdff2755c7690952a7b7a", size = 787102, upload-time = "2025-05-22T21:18:08.761Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f4/3c/8cc1cc84deffa6e25d2d0c688ebb80635dfdbf1dbea3e30c541c8cf4d860/pydantic-2.10.6-py3-none-any.whl", hash = "sha256:427d664bf0b8a2b34ff5dd0f5a18df00591adcee7198fbd71981054cef37b584", size = 431696, upload-time = "2025-01-24T01:42:10.371Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/69/831ed22b38ff9b4b64b66569f0e5b7b97cf3638346eb95a2147fdb49ad5f/pydantic-2.11.5-py3-none-any.whl", hash = "sha256:f9c26ba06f9747749ca1e5c94d6a85cb84254577553c8785576fd38fa64dc0f7", size = 444229, upload-time = "2025-05-22T21:18:06.329Z" },
 ]
 
 [[package]]
 name = "pydantic-core"
-version = "2.27.2"
+version = "2.33.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/fc/01/f3e5ac5e7c25833db5eb555f7b7ab24cd6f8c322d3a3ad2d67a952dc0abc/pydantic_core-2.27.2.tar.gz", hash = "sha256:eb026e5a4c1fee05726072337ff51d1efb6f59090b7da90d30ea58625b1ffb39", size = 413443, upload-time = "2024-12-18T11:31:54.917Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/c2/89/f3450af9d09d44eea1f2c369f49e8f181d742f28220f88cc4dfaae91ea6e/pydantic_core-2.27.2-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:8e10c99ef58cfdf2a66fc15d66b16c4a04f62bca39db589ae8cba08bc55331bc", size = 1893421, upload-time = "2024-12-18T11:27:55.409Z" },
-    { url = "https://files.pythonhosted.org/packages/9e/e3/71fe85af2021f3f386da42d291412e5baf6ce7716bd7101ea49c810eda90/pydantic_core-2.27.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:26f32e0adf166a84d0cb63be85c562ca8a6fa8de28e5f0d92250c6b7e9e2aff7", size = 1814998, upload-time = "2024-12-18T11:27:57.252Z" },
-    { url = "https://files.pythonhosted.org/packages/a6/3c/724039e0d848fd69dbf5806894e26479577316c6f0f112bacaf67aa889ac/pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c19d1ea0673cd13cc2f872f6c9ab42acc4e4f492a7ca9d3795ce2b112dd7e15", size = 1826167, upload-time = "2024-12-18T11:27:59.146Z" },
-    { url = "https://files.pythonhosted.org/packages/2b/5b/1b29e8c1fb5f3199a9a57c1452004ff39f494bbe9bdbe9a81e18172e40d3/pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5e68c4446fe0810e959cdff46ab0a41ce2f2c86d227d96dc3847af0ba7def306", size = 1865071, upload-time = "2024-12-18T11:28:02.625Z" },
-    { url = "https://files.pythonhosted.org/packages/89/6c/3985203863d76bb7d7266e36970d7e3b6385148c18a68cc8915fd8c84d57/pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d9640b0059ff4f14d1f37321b94061c6db164fbe49b334b31643e0528d100d99", size = 2036244, upload-time = "2024-12-18T11:28:04.442Z" },
-    { url = "https://files.pythonhosted.org/packages/0e/41/f15316858a246b5d723f7d7f599f79e37493b2e84bfc789e58d88c209f8a/pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:40d02e7d45c9f8af700f3452f329ead92da4c5f4317ca9b896de7ce7199ea459", size = 2737470, upload-time = "2024-12-18T11:28:07.679Z" },
-    { url = "https://files.pythonhosted.org/packages/a8/7c/b860618c25678bbd6d1d99dbdfdf0510ccb50790099b963ff78a124b754f/pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c1fd185014191700554795c99b347d64f2bb637966c4cfc16998a0ca700d048", size = 1992291, upload-time = "2024-12-18T11:28:10.297Z" },
-    { url = "https://files.pythonhosted.org/packages/bf/73/42c3742a391eccbeab39f15213ecda3104ae8682ba3c0c28069fbcb8c10d/pydantic_core-2.27.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d81d2068e1c1228a565af076598f9e7451712700b673de8f502f0334f281387d", size = 1994613, upload-time = "2024-12-18T11:28:13.362Z" },
-    { url = "https://files.pythonhosted.org/packages/94/7a/941e89096d1175d56f59340f3a8ebaf20762fef222c298ea96d36a6328c5/pydantic_core-2.27.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:1a4207639fb02ec2dbb76227d7c751a20b1a6b4bc52850568e52260cae64ca3b", size = 2002355, upload-time = "2024-12-18T11:28:16.587Z" },
-    { url = "https://files.pythonhosted.org/packages/6e/95/2359937a73d49e336a5a19848713555605d4d8d6940c3ec6c6c0ca4dcf25/pydantic_core-2.27.2-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:3de3ce3c9ddc8bbd88f6e0e304dea0e66d843ec9de1b0042b0911c1663ffd474", size = 2126661, upload-time = "2024-12-18T11:28:18.407Z" },
-    { url = "https://files.pythonhosted.org/packages/2b/4c/ca02b7bdb6012a1adef21a50625b14f43ed4d11f1fc237f9d7490aa5078c/pydantic_core-2.27.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:30c5f68ded0c36466acede341551106821043e9afaad516adfb6e8fa80a4e6a6", size = 2153261, upload-time = "2024-12-18T11:28:21.471Z" },
-    { url = "https://files.pythonhosted.org/packages/72/9d/a241db83f973049a1092a079272ffe2e3e82e98561ef6214ab53fe53b1c7/pydantic_core-2.27.2-cp311-cp311-win32.whl", hash = "sha256:c70c26d2c99f78b125a3459f8afe1aed4d9687c24fd677c6a4436bc042e50d6c", size = 1812361, upload-time = "2024-12-18T11:28:23.53Z" },
-    { url = "https://files.pythonhosted.org/packages/e8/ef/013f07248041b74abd48a385e2110aa3a9bbfef0fbd97d4e6d07d2f5b89a/pydantic_core-2.27.2-cp311-cp311-win_amd64.whl", hash = "sha256:08e125dbdc505fa69ca7d9c499639ab6407cfa909214d500897d02afb816e7cc", size = 1982484, upload-time = "2024-12-18T11:28:25.391Z" },
-    { url = "https://files.pythonhosted.org/packages/10/1c/16b3a3e3398fd29dca77cea0a1d998d6bde3902fa2706985191e2313cc76/pydantic_core-2.27.2-cp311-cp311-win_arm64.whl", hash = "sha256:26f0d68d4b235a2bae0c3fc585c585b4ecc51382db0e3ba402a22cbc440915e4", size = 1867102, upload-time = "2024-12-18T11:28:28.593Z" },
-    { url = "https://files.pythonhosted.org/packages/d6/74/51c8a5482ca447871c93e142d9d4a92ead74de6c8dc5e66733e22c9bba89/pydantic_core-2.27.2-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:9e0c8cfefa0ef83b4da9588448b6d8d2a2bf1a53c3f1ae5fca39eb3061e2f0b0", size = 1893127, upload-time = "2024-12-18T11:28:30.346Z" },
-    { url = "https://files.pythonhosted.org/packages/d3/f3/c97e80721735868313c58b89d2de85fa80fe8dfeeed84dc51598b92a135e/pydantic_core-2.27.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:83097677b8e3bd7eaa6775720ec8e0405f1575015a463285a92bfdfe254529ef", size = 1811340, upload-time = "2024-12-18T11:28:32.521Z" },
-    { url = "https://files.pythonhosted.org/packages/9e/91/840ec1375e686dbae1bd80a9e46c26a1e0083e1186abc610efa3d9a36180/pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:172fce187655fece0c90d90a678424b013f8fbb0ca8b036ac266749c09438cb7", size = 1822900, upload-time = "2024-12-18T11:28:34.507Z" },
-    { url = "https://files.pythonhosted.org/packages/f6/31/4240bc96025035500c18adc149aa6ffdf1a0062a4b525c932065ceb4d868/pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:519f29f5213271eeeeb3093f662ba2fd512b91c5f188f3bb7b27bc5973816934", size = 1869177, upload-time = "2024-12-18T11:28:36.488Z" },
-    { url = "https://files.pythonhosted.org/packages/fa/20/02fbaadb7808be578317015c462655c317a77a7c8f0ef274bc016a784c54/pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:05e3a55d124407fffba0dd6b0c0cd056d10e983ceb4e5dbd10dda135c31071d6", size = 2038046, upload-time = "2024-12-18T11:28:39.409Z" },
-    { url = "https://files.pythonhosted.org/packages/06/86/7f306b904e6c9eccf0668248b3f272090e49c275bc488a7b88b0823444a4/pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c3ed807c7b91de05e63930188f19e921d1fe90de6b4f5cd43ee7fcc3525cb8c", size = 2685386, upload-time = "2024-12-18T11:28:41.221Z" },
-    { url = "https://files.pythonhosted.org/packages/8d/f0/49129b27c43396581a635d8710dae54a791b17dfc50c70164866bbf865e3/pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6fb4aadc0b9a0c063206846d603b92030eb6f03069151a625667f982887153e2", size = 1997060, upload-time = "2024-12-18T11:28:44.709Z" },
-    { url = "https://files.pythonhosted.org/packages/0d/0f/943b4af7cd416c477fd40b187036c4f89b416a33d3cc0ab7b82708a667aa/pydantic_core-2.27.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:28ccb213807e037460326424ceb8b5245acb88f32f3d2777427476e1b32c48c4", size = 2004870, upload-time = "2024-12-18T11:28:46.839Z" },
-    { url = "https://files.pythonhosted.org/packages/35/40/aea70b5b1a63911c53a4c8117c0a828d6790483f858041f47bab0b779f44/pydantic_core-2.27.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:de3cd1899e2c279b140adde9357c4495ed9d47131b4a4eaff9052f23398076b3", size = 1999822, upload-time = "2024-12-18T11:28:48.896Z" },
-    { url = "https://files.pythonhosted.org/packages/f2/b3/807b94fd337d58effc5498fd1a7a4d9d59af4133e83e32ae39a96fddec9d/pydantic_core-2.27.2-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:220f892729375e2d736b97d0e51466252ad84c51857d4d15f5e9692f9ef12be4", size = 2130364, upload-time = "2024-12-18T11:28:50.755Z" },
-    { url = "https://files.pythonhosted.org/packages/fc/df/791c827cd4ee6efd59248dca9369fb35e80a9484462c33c6649a8d02b565/pydantic_core-2.27.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a0fcd29cd6b4e74fe8ddd2c90330fd8edf2e30cb52acda47f06dd615ae72da57", size = 2158303, upload-time = "2024-12-18T11:28:54.122Z" },
-    { url = "https://files.pythonhosted.org/packages/9b/67/4e197c300976af185b7cef4c02203e175fb127e414125916bf1128b639a9/pydantic_core-2.27.2-cp312-cp312-win32.whl", hash = "sha256:1e2cb691ed9834cd6a8be61228471d0a503731abfb42f82458ff27be7b2186fc", size = 1834064, upload-time = "2024-12-18T11:28:56.074Z" },
-    { url = "https://files.pythonhosted.org/packages/1f/ea/cd7209a889163b8dcca139fe32b9687dd05249161a3edda62860430457a5/pydantic_core-2.27.2-cp312-cp312-win_amd64.whl", hash = "sha256:cc3f1a99a4f4f9dd1de4fe0312c114e740b5ddead65bb4102884b384c15d8bc9", size = 1989046, upload-time = "2024-12-18T11:28:58.107Z" },
-    { url = "https://files.pythonhosted.org/packages/bc/49/c54baab2f4658c26ac633d798dab66b4c3a9bbf47cff5284e9c182f4137a/pydantic_core-2.27.2-cp312-cp312-win_arm64.whl", hash = "sha256:3911ac9284cd8a1792d3cb26a2da18f3ca26c6908cc434a18f730dc0db7bfa3b", size = 1885092, upload-time = "2024-12-18T11:29:01.335Z" },
+sdist = { url = "https://files.pythonhosted.org/packages/ad/88/5f2260bdfae97aabf98f1778d43f69574390ad787afb646292a638c923d4/pydantic_core-2.33.2.tar.gz", hash = "sha256:7cb8bc3605c29176e1b105350d2e6474142d7c1bd1d9327c4a9bdb46bf827acc", size = 435195, upload-time = "2025-04-23T18:33:52.104Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/18/8a/2b41c97f554ec8c71f2a8a5f85cb56a8b0956addfe8b0efb5b3d77e8bdc3/pydantic_core-2.33.2-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:a7ec89dc587667f22b6a0b6579c249fca9026ce7c333fc142ba42411fa243cdc", size = 2009000, upload-time = "2025-04-23T18:31:25.863Z" },
+    { url = "https://files.pythonhosted.org/packages/a1/02/6224312aacb3c8ecbaa959897af57181fb6cf3a3d7917fd44d0f2917e6f2/pydantic_core-2.33.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3c6db6e52c6d70aa0d00d45cdb9b40f0433b96380071ea80b09277dba021ddf7", size = 1847996, upload-time = "2025-04-23T18:31:27.341Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/46/6dcdf084a523dbe0a0be59d054734b86a981726f221f4562aed313dbcb49/pydantic_core-2.33.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e61206137cbc65e6d5256e1166f88331d3b6238e082d9f74613b9b765fb9025", size = 1880957, upload-time = "2025-04-23T18:31:28.956Z" },
+    { url = "https://files.pythonhosted.org/packages/ec/6b/1ec2c03837ac00886ba8160ce041ce4e325b41d06a034adbef11339ae422/pydantic_core-2.33.2-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:eb8c529b2819c37140eb51b914153063d27ed88e3bdc31b71198a198e921e011", size = 1964199, upload-time = "2025-04-23T18:31:31.025Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/1d/6bf34d6adb9debd9136bd197ca72642203ce9aaaa85cfcbfcf20f9696e83/pydantic_core-2.33.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c52b02ad8b4e2cf14ca7b3d918f3eb0ee91e63b3167c32591e57c4317e134f8f", size = 2120296, upload-time = "2025-04-23T18:31:32.514Z" },
+    { url = "https://files.pythonhosted.org/packages/e0/94/2bd0aaf5a591e974b32a9f7123f16637776c304471a0ab33cf263cf5591a/pydantic_core-2.33.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:96081f1605125ba0855dfda83f6f3df5ec90c61195421ba72223de35ccfb2f88", size = 2676109, upload-time = "2025-04-23T18:31:33.958Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/41/4b043778cf9c4285d59742281a769eac371b9e47e35f98ad321349cc5d61/pydantic_core-2.33.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f57a69461af2a5fa6e6bbd7a5f60d3b7e6cebb687f55106933188e79ad155c1", size = 2002028, upload-time = "2025-04-23T18:31:39.095Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/d5/7bb781bf2748ce3d03af04d5c969fa1308880e1dca35a9bd94e1a96a922e/pydantic_core-2.33.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:572c7e6c8bb4774d2ac88929e3d1f12bc45714ae5ee6d9a788a9fb35e60bb04b", size = 2100044, upload-time = "2025-04-23T18:31:41.034Z" },
+    { url = "https://files.pythonhosted.org/packages/fe/36/def5e53e1eb0ad896785702a5bbfd25eed546cdcf4087ad285021a90ed53/pydantic_core-2.33.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:db4b41f9bd95fbe5acd76d89920336ba96f03e149097365afe1cb092fceb89a1", size = 2058881, upload-time = "2025-04-23T18:31:42.757Z" },
+    { url = "https://files.pythonhosted.org/packages/01/6c/57f8d70b2ee57fc3dc8b9610315949837fa8c11d86927b9bb044f8705419/pydantic_core-2.33.2-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:fa854f5cf7e33842a892e5c73f45327760bc7bc516339fda888c75ae60edaeb6", size = 2227034, upload-time = "2025-04-23T18:31:44.304Z" },
+    { url = "https://files.pythonhosted.org/packages/27/b9/9c17f0396a82b3d5cbea4c24d742083422639e7bb1d5bf600e12cb176a13/pydantic_core-2.33.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:5f483cfb75ff703095c59e365360cb73e00185e01aaea067cd19acffd2ab20ea", size = 2234187, upload-time = "2025-04-23T18:31:45.891Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/6a/adf5734ffd52bf86d865093ad70b2ce543415e0e356f6cacabbc0d9ad910/pydantic_core-2.33.2-cp312-cp312-win32.whl", hash = "sha256:9cb1da0f5a471435a7bc7e439b8a728e8b61e59784b2af70d7c169f8dd8ae290", size = 1892628, upload-time = "2025-04-23T18:31:47.819Z" },
+    { url = "https://files.pythonhosted.org/packages/43/e4/5479fecb3606c1368d496a825d8411e126133c41224c1e7238be58b87d7e/pydantic_core-2.33.2-cp312-cp312-win_amd64.whl", hash = "sha256:f941635f2a3d96b2973e867144fde513665c87f13fe0e193c158ac51bfaaa7b2", size = 1955866, upload-time = "2025-04-23T18:31:49.635Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/24/8b11e8b3e2be9dd82df4b11408a67c61bb4dc4f8e11b5b0fc888b38118b5/pydantic_core-2.33.2-cp312-cp312-win_arm64.whl", hash = "sha256:cca3868ddfaccfbc4bfb1d608e2ccaaebe0ae628e1416aeb9c4d88c001bb45ab", size = 1888894, upload-time = "2025-04-23T18:31:51.609Z" },
 ]
 
 [[package]]
 name = "pydantic-settings"
-version = "2.7.1"
+version = "2.9.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pydantic" },
     { name = "python-dotenv" },
+    { name = "typing-inspection" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/73/7b/c58a586cd7d9ac66d2ee4ba60ca2d241fa837c02bca9bea80a9a8c3d22a9/pydantic_settings-2.7.1.tar.gz", hash = "sha256:10c9caad35e64bfb3c2fbf70a078c0e25cc92499782e5200747f942a065dec93", size = 79920, upload-time = "2024-12-31T11:27:44.632Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/67/1d/42628a2c33e93f8e9acbde0d5d735fa0850f3e6a2f8cb1eb6c40b9a732ac/pydantic_settings-2.9.1.tar.gz", hash = "sha256:c509bf79d27563add44e8446233359004ed85066cd096d8b510f715e6ef5d268", size = 163234, upload-time = "2025-04-18T16:44:48.265Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b4/46/93416fdae86d40879714f72956ac14df9c7b76f7d41a4d68aa9f71a0028b/pydantic_settings-2.7.1-py3-none-any.whl", hash = "sha256:590be9e6e24d06db33a4262829edef682500ef008565a969c73d39d5f8bfb3fd", size = 29718, upload-time = "2024-12-31T11:27:43.201Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/5f/d6d641b490fd3ec2c4c13b4244d68deea3a1b970a97be64f34fb5504ff72/pydantic_settings-2.9.1-py3-none-any.whl", hash = "sha256:59b4f431b1defb26fe620c71a7d3968a710d719f5f4cdbbdb7926edeb770f6ef", size = 44356, upload-time = "2025-04-18T16:44:46.617Z" },
 ]
 
 [[package]]
@@ -1712,7 +1560,7 @@ name = "pytest-cov"
 version = "6.1.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "coverage", extra = ["toml"] },
+    { name = "coverage" },
     { name = "pytest" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/25/69/5f1e57f6c5a39f81411b550027bf72842c4567ff5fd572bed1edc9e4b5d9/pytest_cov-6.1.1.tar.gz", hash = "sha256:46935f7aaefba760e716c2ebfbe1c216240b9592966e7da99ea8292d4d3e2a0a", size = 66857, upload-time = "2025-04-05T14:07:51.592Z" }
@@ -1859,15 +1707,6 @@ version = "6.0.2"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17/pyyaml-6.0.2.tar.gz", hash = "sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e", size = 130631, upload-time = "2024-08-06T20:33:50.674Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f8/aa/7af4e81f7acba21a4c6be026da38fd2b872ca46226673c89a758ebdc4fd2/PyYAML-6.0.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774", size = 184612, upload-time = "2024-08-06T20:32:03.408Z" },
-    { url = "https://files.pythonhosted.org/packages/8b/62/b9faa998fd185f65c1371643678e4d58254add437edb764a08c5a98fb986/PyYAML-6.0.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee", size = 172040, upload-time = "2024-08-06T20:32:04.926Z" },
-    { url = "https://files.pythonhosted.org/packages/ad/0c/c804f5f922a9a6563bab712d8dcc70251e8af811fce4524d57c2c0fd49a4/PyYAML-6.0.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c", size = 736829, upload-time = "2024-08-06T20:32:06.459Z" },
-    { url = "https://files.pythonhosted.org/packages/51/16/6af8d6a6b210c8e54f1406a6b9481febf9c64a3109c541567e35a49aa2e7/PyYAML-6.0.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317", size = 764167, upload-time = "2024-08-06T20:32:08.338Z" },
-    { url = "https://files.pythonhosted.org/packages/75/e4/2c27590dfc9992f73aabbeb9241ae20220bd9452df27483b6e56d3975cc5/PyYAML-6.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85", size = 762952, upload-time = "2024-08-06T20:32:14.124Z" },
-    { url = "https://files.pythonhosted.org/packages/9b/97/ecc1abf4a823f5ac61941a9c00fe501b02ac3ab0e373c3857f7d4b83e2b6/PyYAML-6.0.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4", size = 735301, upload-time = "2024-08-06T20:32:16.17Z" },
-    { url = "https://files.pythonhosted.org/packages/45/73/0f49dacd6e82c9430e46f4a027baa4ca205e8b0a9dce1397f44edc23559d/PyYAML-6.0.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e", size = 756638, upload-time = "2024-08-06T20:32:18.555Z" },
-    { url = "https://files.pythonhosted.org/packages/22/5f/956f0f9fc65223a58fbc14459bf34b4cc48dec52e00535c79b8db361aabd/PyYAML-6.0.2-cp311-cp311-win32.whl", hash = "sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5", size = 143850, upload-time = "2024-08-06T20:32:19.889Z" },
-    { url = "https://files.pythonhosted.org/packages/ed/23/8da0bbe2ab9dcdd11f4f4557ccaf95c10b9811b13ecced089d43ce59c3c8/PyYAML-6.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44", size = 161980, upload-time = "2024-08-06T20:32:21.273Z" },
     { url = "https://files.pythonhosted.org/packages/86/0c/c581167fc46d6d6d7ddcfb8c843a4de25bdd27e4466938109ca68492292c/PyYAML-6.0.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab", size = 183873, upload-time = "2024-08-06T20:32:25.131Z" },
     { url = "https://files.pythonhosted.org/packages/a8/0c/38374f5bb272c051e2a69281d71cba6fdb983413e6758b84482905e29a5d/PyYAML-6.0.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725", size = 173302, upload-time = "2024-08-06T20:32:26.511Z" },
     { url = "https://files.pythonhosted.org/packages/c3/93/9916574aa8c00aa06bbac729972eb1071d002b8e158bd0e83a3b9a20a1f7/PyYAML-6.0.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5", size = 739154, upload-time = "2024-08-06T20:32:28.363Z" },
@@ -1951,20 +1790,6 @@ version = "0.25.1"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/8c/a6/60184b7fc00dd3ca80ac635dd5b8577d444c57e8e8742cecabfacb829921/rpds_py-0.25.1.tar.gz", hash = "sha256:8960b6dac09b62dac26e75d7e2c4a22efb835d827a7278c34f72b2b84fa160e3", size = 27304, upload-time = "2025-05-21T12:46:12.502Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/95/e1/df13fe3ddbbea43567e07437f097863b20c99318ae1f58a0fe389f763738/rpds_py-0.25.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:5f048bbf18b1f9120685c6d6bb70cc1a52c8cc11bdd04e643d28d3be0baf666d", size = 373341, upload-time = "2025-05-21T12:43:02.978Z" },
-    { url = "https://files.pythonhosted.org/packages/7a/58/deef4d30fcbcbfef3b6d82d17c64490d5c94585a2310544ce8e2d3024f83/rpds_py-0.25.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4fbb0dbba559959fcb5d0735a0f87cdbca9e95dac87982e9b95c0f8f7ad10255", size = 359111, upload-time = "2025-05-21T12:43:05.128Z" },
-    { url = "https://files.pythonhosted.org/packages/bb/7e/39f1f4431b03e96ebaf159e29a0f82a77259d8f38b2dd474721eb3a8ac9b/rpds_py-0.25.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4ca54b9cf9d80b4016a67a0193ebe0bcf29f6b0a96f09db942087e294d3d4c2", size = 386112, upload-time = "2025-05-21T12:43:07.13Z" },
-    { url = "https://files.pythonhosted.org/packages/db/e7/847068a48d63aec2ae695a1646089620b3b03f8ccf9f02c122ebaf778f3c/rpds_py-0.25.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1ee3e26eb83d39b886d2cb6e06ea701bba82ef30a0de044d34626ede51ec98b0", size = 400362, upload-time = "2025-05-21T12:43:08.693Z" },
-    { url = "https://files.pythonhosted.org/packages/3b/3d/9441d5db4343d0cee759a7ab4d67420a476cebb032081763de934719727b/rpds_py-0.25.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:89706d0683c73a26f76a5315d893c051324d771196ae8b13e6ffa1ffaf5e574f", size = 522214, upload-time = "2025-05-21T12:43:10.694Z" },
-    { url = "https://files.pythonhosted.org/packages/a2/ec/2cc5b30d95f9f1a432c79c7a2f65d85e52812a8f6cbf8768724571710786/rpds_py-0.25.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c2013ee878c76269c7b557a9a9c042335d732e89d482606990b70a839635feb7", size = 411491, upload-time = "2025-05-21T12:43:12.739Z" },
-    { url = "https://files.pythonhosted.org/packages/dc/6c/44695c1f035077a017dd472b6a3253553780837af2fac9b6ac25f6a5cb4d/rpds_py-0.25.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45e484db65e5380804afbec784522de84fa95e6bb92ef1bd3325d33d13efaebd", size = 386978, upload-time = "2025-05-21T12:43:14.25Z" },
-    { url = "https://files.pythonhosted.org/packages/b1/74/b4357090bb1096db5392157b4e7ed8bb2417dc7799200fcbaee633a032c9/rpds_py-0.25.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:48d64155d02127c249695abb87d39f0faf410733428d499867606be138161d65", size = 420662, upload-time = "2025-05-21T12:43:15.8Z" },
-    { url = "https://files.pythonhosted.org/packages/26/dd/8cadbebf47b96e59dfe8b35868e5c38a42272699324e95ed522da09d3a40/rpds_py-0.25.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:048893e902132fd6548a2e661fb38bf4896a89eea95ac5816cf443524a85556f", size = 563385, upload-time = "2025-05-21T12:43:17.78Z" },
-    { url = "https://files.pythonhosted.org/packages/c3/ea/92960bb7f0e7a57a5ab233662f12152085c7dc0d5468534c65991a3d48c9/rpds_py-0.25.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:0317177b1e8691ab5879f4f33f4b6dc55ad3b344399e23df2e499de7b10a548d", size = 592047, upload-time = "2025-05-21T12:43:19.457Z" },
-    { url = "https://files.pythonhosted.org/packages/61/ad/71aabc93df0d05dabcb4b0c749277881f8e74548582d96aa1bf24379493a/rpds_py-0.25.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:bffcf57826d77a4151962bf1701374e0fc87f536e56ec46f1abdd6a903354042", size = 557863, upload-time = "2025-05-21T12:43:21.69Z" },
-    { url = "https://files.pythonhosted.org/packages/93/0f/89df0067c41f122b90b76f3660028a466eb287cbe38efec3ea70e637ca78/rpds_py-0.25.1-cp311-cp311-win32.whl", hash = "sha256:cda776f1967cb304816173b30994faaf2fd5bcb37e73118a47964a02c348e1bc", size = 219627, upload-time = "2025-05-21T12:43:23.311Z" },
-    { url = "https://files.pythonhosted.org/packages/7c/8d/93b1a4c1baa903d0229374d9e7aa3466d751f1d65e268c52e6039c6e338e/rpds_py-0.25.1-cp311-cp311-win_amd64.whl", hash = "sha256:dc3c1ff0abc91444cd20ec643d0f805df9a3661fcacf9c95000329f3ddf268a4", size = 231603, upload-time = "2025-05-21T12:43:25.145Z" },
-    { url = "https://files.pythonhosted.org/packages/cb/11/392605e5247bead2f23e6888e77229fbd714ac241ebbebb39a1e822c8815/rpds_py-0.25.1-cp311-cp311-win_arm64.whl", hash = "sha256:5a3ddb74b0985c4387719fc536faced33cadf2172769540c62e2a94b7b9be1c4", size = 223967, upload-time = "2025-05-21T12:43:26.566Z" },
     { url = "https://files.pythonhosted.org/packages/7f/81/28ab0408391b1dc57393653b6a0cf2014cc282cc2909e4615e63e58262be/rpds_py-0.25.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:b5ffe453cde61f73fea9430223c81d29e2fbf412a6073951102146c84e19e34c", size = 364647, upload-time = "2025-05-21T12:43:28.559Z" },
     { url = "https://files.pythonhosted.org/packages/2c/9a/7797f04cad0d5e56310e1238434f71fc6939d0bc517192a18bb99a72a95f/rpds_py-0.25.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:115874ae5e2fdcfc16b2aedc95b5eef4aebe91b28e7e21951eda8a5dc0d3461b", size = 350454, upload-time = "2025-05-21T12:43:30.615Z" },
     { url = "https://files.pythonhosted.org/packages/69/3c/93d2ef941b04898011e5d6eaa56a1acf46a3b4c9f4b3ad1bbcbafa0bee1f/rpds_py-0.25.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a714bf6e5e81b0e570d01f56e0c89c6375101b8463999ead3a93a5d2a4af91fa", size = 389665, upload-time = "2025-05-21T12:43:32.629Z" },
@@ -1979,17 +1804,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ab/aa/dc3620dd8db84454aaf9374bd318f1aa02578bba5e567f5bf6b79492aca4/rpds_py-0.25.1-cp312-cp312-win32.whl", hash = "sha256:e5e2f7280d8d0d3ef06f3ec1b4fd598d386cc6f0721e54f09109a8132182fbfe", size = 222713, upload-time = "2025-05-21T12:43:49.897Z" },
     { url = "https://files.pythonhosted.org/packages/a3/7f/7cef485269a50ed5b4e9bae145f512d2a111ca638ae70cc101f661b4defd/rpds_py-0.25.1-cp312-cp312-win_amd64.whl", hash = "sha256:db58483f71c5db67d643857404da360dce3573031586034b7d59f245144cc192", size = 235280, upload-time = "2025-05-21T12:43:51.893Z" },
     { url = "https://files.pythonhosted.org/packages/99/f2/c2d64f6564f32af913bf5f3f7ae41c7c263c5ae4c4e8f1a17af8af66cd46/rpds_py-0.25.1-cp312-cp312-win_arm64.whl", hash = "sha256:6d50841c425d16faf3206ddbba44c21aa3310a0cebc3c1cdfc3e3f4f9f6f5728", size = 225399, upload-time = "2025-05-21T12:43:53.351Z" },
-    { url = "https://files.pythonhosted.org/packages/49/74/48f3df0715a585cbf5d34919c9c757a4c92c1a9eba059f2d334e72471f70/rpds_py-0.25.1-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:ee86d81551ec68a5c25373c5643d343150cc54672b5e9a0cafc93c1870a53954", size = 374208, upload-time = "2025-05-21T12:45:26.306Z" },
-    { url = "https://files.pythonhosted.org/packages/55/b0/9b01bb11ce01ec03d05e627249cc2c06039d6aa24ea5a22a39c312167c10/rpds_py-0.25.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:89c24300cd4a8e4a51e55c31a8ff3918e6651b241ee8876a42cc2b2a078533ba", size = 359262, upload-time = "2025-05-21T12:45:28.322Z" },
-    { url = "https://files.pythonhosted.org/packages/a9/eb/5395621618f723ebd5116c53282052943a726dba111b49cd2071f785b665/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:771c16060ff4e79584dc48902a91ba79fd93eade3aa3a12d6d2a4aadaf7d542b", size = 387366, upload-time = "2025-05-21T12:45:30.42Z" },
-    { url = "https://files.pythonhosted.org/packages/68/73/3d51442bdb246db619d75039a50ea1cf8b5b4ee250c3e5cd5c3af5981cd4/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:785ffacd0ee61c3e60bdfde93baa6d7c10d86f15655bd706c89da08068dc5038", size = 400759, upload-time = "2025-05-21T12:45:32.516Z" },
-    { url = "https://files.pythonhosted.org/packages/b7/4c/3a32d5955d7e6cb117314597bc0f2224efc798428318b13073efe306512a/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2a40046a529cc15cef88ac5ab589f83f739e2d332cb4d7399072242400ed68c9", size = 523128, upload-time = "2025-05-21T12:45:34.396Z" },
-    { url = "https://files.pythonhosted.org/packages/be/95/1ffccd3b0bb901ae60b1dd4b1be2ab98bb4eb834cd9b15199888f5702f7b/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:85fc223d9c76cabe5d0bff82214459189720dc135db45f9f66aa7cffbf9ff6c1", size = 411597, upload-time = "2025-05-21T12:45:36.164Z" },
-    { url = "https://files.pythonhosted.org/packages/ef/6d/6e6cd310180689db8b0d2de7f7d1eabf3fb013f239e156ae0d5a1a85c27f/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b0be9965f93c222fb9b4cc254235b3b2b215796c03ef5ee64f995b1b69af0762", size = 388053, upload-time = "2025-05-21T12:45:38.45Z" },
-    { url = "https://files.pythonhosted.org/packages/4a/87/ec4186b1fe6365ced6fa470960e68fc7804bafbe7c0cf5a36237aa240efa/rpds_py-0.25.1-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8378fa4a940f3fb509c081e06cb7f7f2adae8cf46ef258b0e0ed7519facd573e", size = 421821, upload-time = "2025-05-21T12:45:40.732Z" },
-    { url = "https://files.pythonhosted.org/packages/7a/60/84f821f6bf4e0e710acc5039d91f8f594fae0d93fc368704920d8971680d/rpds_py-0.25.1-pp311-pypy311_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:33358883a4490287e67a2c391dfaea4d9359860281db3292b6886bf0be3d8692", size = 564534, upload-time = "2025-05-21T12:45:42.672Z" },
-    { url = "https://files.pythonhosted.org/packages/41/3a/bc654eb15d3b38f9330fe0f545016ba154d89cdabc6177b0295910cd0ebe/rpds_py-0.25.1-pp311-pypy311_pp73-musllinux_1_2_i686.whl", hash = "sha256:1d1fadd539298e70cac2f2cb36f5b8a65f742b9b9f1014dd4ea1f7785e2470bf", size = 592674, upload-time = "2025-05-21T12:45:44.533Z" },
-    { url = "https://files.pythonhosted.org/packages/2e/ba/31239736f29e4dfc7a58a45955c5db852864c306131fd6320aea214d5437/rpds_py-0.25.1-pp311-pypy311_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:9a46c2fb2545e21181445515960006e85d22025bd2fe6db23e76daec6eb689fe", size = 558781, upload-time = "2025-05-21T12:45:46.281Z" },
 ]
 
 [[package]]
@@ -2129,14 +1943,6 @@ dependencies = [
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/63/66/45b165c595ec89aa7dcc2c1cd222ab269bc753f1fc7a1e68f8481bd957bf/sqlalchemy-2.0.41.tar.gz", hash = "sha256:edba70118c4be3c2b1f90754d308d0b79c6fe2c0fdc52d8ddf603916f83f4db9", size = 9689424, upload-time = "2025-05-14T17:10:32.339Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/37/4e/b00e3ffae32b74b5180e15d2ab4040531ee1bef4c19755fe7926622dc958/sqlalchemy-2.0.41-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6375cd674fe82d7aa9816d1cb96ec592bac1726c11e0cafbf40eeee9a4516b5f", size = 2121232, upload-time = "2025-05-14T17:48:20.444Z" },
-    { url = "https://files.pythonhosted.org/packages/ef/30/6547ebb10875302074a37e1970a5dce7985240665778cfdee2323709f749/sqlalchemy-2.0.41-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9f8c9fdd15a55d9465e590a402f42082705d66b05afc3ffd2d2eb3c6ba919560", size = 2110897, upload-time = "2025-05-14T17:48:21.634Z" },
-    { url = "https://files.pythonhosted.org/packages/9e/21/59df2b41b0f6c62da55cd64798232d7349a9378befa7f1bb18cf1dfd510a/sqlalchemy-2.0.41-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:32f9dc8c44acdee06c8fc6440db9eae8b4af8b01e4b1aee7bdd7241c22edff4f", size = 3273313, upload-time = "2025-05-14T17:51:56.205Z" },
-    { url = "https://files.pythonhosted.org/packages/62/e4/b9a7a0e5c6f79d49bcd6efb6e90d7536dc604dab64582a9dec220dab54b6/sqlalchemy-2.0.41-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90c11ceb9a1f482c752a71f203a81858625d8df5746d787a4786bca4ffdf71c6", size = 3273807, upload-time = "2025-05-14T17:55:26.928Z" },
-    { url = "https://files.pythonhosted.org/packages/39/d8/79f2427251b44ddee18676c04eab038d043cff0e764d2d8bb08261d6135d/sqlalchemy-2.0.41-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:911cc493ebd60de5f285bcae0491a60b4f2a9f0f5c270edd1c4dbaef7a38fc04", size = 3209632, upload-time = "2025-05-14T17:51:59.384Z" },
-    { url = "https://files.pythonhosted.org/packages/d4/16/730a82dda30765f63e0454918c982fb7193f6b398b31d63c7c3bd3652ae5/sqlalchemy-2.0.41-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:03968a349db483936c249f4d9cd14ff2c296adfa1290b660ba6516f973139582", size = 3233642, upload-time = "2025-05-14T17:55:29.901Z" },
-    { url = "https://files.pythonhosted.org/packages/04/61/c0d4607f7799efa8b8ea3c49b4621e861c8f5c41fd4b5b636c534fcb7d73/sqlalchemy-2.0.41-cp311-cp311-win32.whl", hash = "sha256:293cd444d82b18da48c9f71cd7005844dbbd06ca19be1ccf6779154439eec0b8", size = 2086475, upload-time = "2025-05-14T17:56:02.095Z" },
-    { url = "https://files.pythonhosted.org/packages/9d/8e/8344f8ae1cb6a479d0741c02cd4f666925b2bf02e2468ddaf5ce44111f30/sqlalchemy-2.0.41-cp311-cp311-win_amd64.whl", hash = "sha256:3d3549fc3e40667ec7199033a4e40a2f669898a00a7b18a931d3efb4c7900504", size = 2110903, upload-time = "2025-05-14T17:56:03.499Z" },
     { url = "https://files.pythonhosted.org/packages/3e/2a/f1f4e068b371154740dd10fb81afb5240d5af4aa0087b88d8b308b5429c2/sqlalchemy-2.0.41-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:81f413674d85cfd0dfcd6512e10e0f33c19c21860342a4890c3a2b59479929f9", size = 2119645, upload-time = "2025-05-14T17:55:24.854Z" },
     { url = "https://files.pythonhosted.org/packages/9b/e8/c664a7e73d36fbfc4730f8cf2bf930444ea87270f2825efbe17bf808b998/sqlalchemy-2.0.41-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:598d9ebc1e796431bbd068e41e4de4dc34312b7aa3292571bb3674a0cb415dd1", size = 2107399, upload-time = "2025-05-14T17:55:28.097Z" },
     { url = "https://files.pythonhosted.org/packages/5c/78/8a9cf6c5e7135540cb682128d091d6afa1b9e48bd049b0d691bf54114f70/sqlalchemy-2.0.41-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a104c5694dfd2d864a6f91b0956eb5d5883234119cb40010115fd45a16da5e70", size = 3293269, upload-time = "2025-05-14T17:50:38.227Z" },
@@ -2156,6 +1962,19 @@ mypy = [
     { name = "mypy" },
 ]
 
+[[package]]
+name = "sqlmodel"
+version = "0.0.24"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pydantic" },
+    { name = "sqlalchemy" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/86/4b/c2ad0496f5bdc6073d9b4cef52be9c04f2b37a5773441cc6600b1857648b/sqlmodel-0.0.24.tar.gz", hash = "sha256:cc5c7613c1a5533c9c7867e1aab2fd489a76c9e8a061984da11b4e613c182423", size = 116780, upload-time = "2025-03-07T05:43:32.887Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/16/91/484cd2d05569892b7fef7f5ceab3bc89fb0f8a8c0cde1030d383dbc5449c/sqlmodel-0.0.24-py3-none-any.whl", hash = "sha256:6778852f09370908985b667d6a3ab92910d0d5ec88adcaf23dbc242715ff7193", size = 28622, upload-time = "2025-03-07T05:43:30.37Z" },
+]
+
 [[package]]
 name = "starlette"
 version = "0.46.2"
@@ -2245,35 +2064,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/32/d5/f9a850d79b0851d1d4ef6456097579a9005b31fea68726a4ae5f2d82ddd9/threadpoolctl-3.6.0-py3-none-any.whl", hash = "sha256:43a0b8fd5a2928500110039e43a5eed8480b918967083ea48dc3ab9f13c4a7fb", size = 18638, upload-time = "2025-03-13T13:49:21.846Z" },
 ]
 
-[[package]]
-name = "tomli"
-version = "2.2.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/18/87/302344fed471e44a87289cf4967697d07e532f2421fdaf868a303cbae4ff/tomli-2.2.1.tar.gz", hash = "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff", size = 17175, upload-time = "2024-11-27T22:38:36.873Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/43/ca/75707e6efa2b37c77dadb324ae7d9571cb424e61ea73fad7c56c2d14527f/tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249", size = 131077, upload-time = "2024-11-27T22:37:54.956Z" },
-    { url = "https://files.pythonhosted.org/packages/c7/16/51ae563a8615d472fdbffc43a3f3d46588c264ac4f024f63f01283becfbb/tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6", size = 123429, upload-time = "2024-11-27T22:37:56.698Z" },
-    { url = "https://files.pythonhosted.org/packages/f1/dd/4f6cd1e7b160041db83c694abc78e100473c15d54620083dbd5aae7b990e/tomli-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a", size = 226067, upload-time = "2024-11-27T22:37:57.63Z" },
-    { url = "https://files.pythonhosted.org/packages/a9/6b/c54ede5dc70d648cc6361eaf429304b02f2871a345bbdd51e993d6cdf550/tomli-2.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee", size = 236030, upload-time = "2024-11-27T22:37:59.344Z" },
-    { url = "https://files.pythonhosted.org/packages/1f/47/999514fa49cfaf7a92c805a86c3c43f4215621855d151b61c602abb38091/tomli-2.2.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e", size = 240898, upload-time = "2024-11-27T22:38:00.429Z" },
-    { url = "https://files.pythonhosted.org/packages/73/41/0a01279a7ae09ee1573b423318e7934674ce06eb33f50936655071d81a24/tomli-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4", size = 229894, upload-time = "2024-11-27T22:38:02.094Z" },
-    { url = "https://files.pythonhosted.org/packages/55/18/5d8bc5b0a0362311ce4d18830a5d28943667599a60d20118074ea1b01bb7/tomli-2.2.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106", size = 245319, upload-time = "2024-11-27T22:38:03.206Z" },
-    { url = "https://files.pythonhosted.org/packages/92/a3/7ade0576d17f3cdf5ff44d61390d4b3febb8a9fc2b480c75c47ea048c646/tomli-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8", size = 238273, upload-time = "2024-11-27T22:38:04.217Z" },
-    { url = "https://files.pythonhosted.org/packages/72/6f/fa64ef058ac1446a1e51110c375339b3ec6be245af9d14c87c4a6412dd32/tomli-2.2.1-cp311-cp311-win32.whl", hash = "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff", size = 98310, upload-time = "2024-11-27T22:38:05.908Z" },
-    { url = "https://files.pythonhosted.org/packages/6a/1c/4a2dcde4a51b81be3530565e92eda625d94dafb46dbeb15069df4caffc34/tomli-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b", size = 108309, upload-time = "2024-11-27T22:38:06.812Z" },
-    { url = "https://files.pythonhosted.org/packages/52/e1/f8af4c2fcde17500422858155aeb0d7e93477a0d59a98e56cbfe75070fd0/tomli-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea", size = 132762, upload-time = "2024-11-27T22:38:07.731Z" },
-    { url = "https://files.pythonhosted.org/packages/03/b8/152c68bb84fc00396b83e7bbddd5ec0bd3dd409db4195e2a9b3e398ad2e3/tomli-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8", size = 123453, upload-time = "2024-11-27T22:38:09.384Z" },
-    { url = "https://files.pythonhosted.org/packages/c8/d6/fc9267af9166f79ac528ff7e8c55c8181ded34eb4b0e93daa767b8841573/tomli-2.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192", size = 233486, upload-time = "2024-11-27T22:38:10.329Z" },
-    { url = "https://files.pythonhosted.org/packages/5c/51/51c3f2884d7bab89af25f678447ea7d297b53b5a3b5730a7cb2ef6069f07/tomli-2.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222", size = 242349, upload-time = "2024-11-27T22:38:11.443Z" },
-    { url = "https://files.pythonhosted.org/packages/ab/df/bfa89627d13a5cc22402e441e8a931ef2108403db390ff3345c05253935e/tomli-2.2.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77", size = 252159, upload-time = "2024-11-27T22:38:13.099Z" },
-    { url = "https://files.pythonhosted.org/packages/9e/6e/fa2b916dced65763a5168c6ccb91066f7639bdc88b48adda990db10c8c0b/tomli-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6", size = 237243, upload-time = "2024-11-27T22:38:14.766Z" },
-    { url = "https://files.pythonhosted.org/packages/b4/04/885d3b1f650e1153cbb93a6a9782c58a972b94ea4483ae4ac5cedd5e4a09/tomli-2.2.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd", size = 259645, upload-time = "2024-11-27T22:38:15.843Z" },
-    { url = "https://files.pythonhosted.org/packages/9c/de/6b432d66e986e501586da298e28ebeefd3edc2c780f3ad73d22566034239/tomli-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e", size = 244584, upload-time = "2024-11-27T22:38:17.645Z" },
-    { url = "https://files.pythonhosted.org/packages/1c/9a/47c0449b98e6e7d1be6cbac02f93dd79003234ddc4aaab6ba07a9a7482e2/tomli-2.2.1-cp312-cp312-win32.whl", hash = "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98", size = 98875, upload-time = "2024-11-27T22:38:19.159Z" },
-    { url = "https://files.pythonhosted.org/packages/ef/60/9b9638f081c6f1261e2688bd487625cd1e660d0a85bd469e91d8db969734/tomli-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4", size = 109418, upload-time = "2024-11-27T22:38:20.064Z" },
-    { url = "https://files.pythonhosted.org/packages/6e/c2/61d3e0f47e2b74ef40a68b9e6ad5984f6241a942f7cd3bbfbdbd03861ea9/tomli-2.2.1-py3-none-any.whl", hash = "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc", size = 14257, upload-time = "2024-11-27T22:38:35.385Z" },
-]
-
 [[package]]
 name = "tomlkit"
 version = "0.13.2"
@@ -2310,6 +2100,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/69/e0/552843e0d356fbb5256d21449fa957fa4eff3bbc135a74a691ee70c7c5da/typing_extensions-4.14.0-py3-none-any.whl", hash = "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af", size = 43839, upload-time = "2025-06-02T14:52:10.026Z" },
 ]
 
+[[package]]
+name = "typing-inspection"
+version = "0.4.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/f8/b1/0c11f5058406b3af7609f121aaa6b609744687f1d158b3c3a5bf4cc94238/typing_inspection-0.4.1.tar.gz", hash = "sha256:6ae134cc0203c33377d43188d4064e9b357dba58cff3185f22924610e70a9d28", size = 75726, upload-time = "2025-05-21T18:55:23.885Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/17/69/cd203477f944c353c31bade965f880aa1061fd6bf05ded0726ca845b6ff7/typing_inspection-0.4.1-py3-none-any.whl", hash = "sha256:389055682238f53b04f7badcb49b989835495a96700ced5dab2d8feae4b26f51", size = 14552, upload-time = "2025-05-21T18:55:22.152Z" },
+]
+
 [[package]]
 name = "tzdata"
 version = "2025.2"
@@ -2339,15 +2141,15 @@ wheels = [
 
 [[package]]
 name = "uvicorn"
-version = "0.32.1"
+version = "0.34.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "click" },
     { name = "h11" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/6a/3c/21dba3e7d76138725ef307e3d7ddd29b763119b3aa459d02cc05fefcff75/uvicorn-0.32.1.tar.gz", hash = "sha256:ee9519c246a72b1c084cea8d3b44ed6026e78a4a309cbedae9c37e4cb9fbb175", size = 77630, upload-time = "2024-11-20T19:41:13.341Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/de/ad/713be230bcda622eaa35c28f0d328c3675c371238470abdea52417f17a8e/uvicorn-0.34.3.tar.gz", hash = "sha256:35919a9a979d7a59334b6b10e05d77c1d0d574c50e0fc98b8b1a0f165708b55a", size = 76631, upload-time = "2025-06-01T07:48:17.531Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/50/c1/2d27b0a15826c2b71dcf6e2f5402181ef85acf439617bb2f1453125ce1f3/uvicorn-0.32.1-py3-none-any.whl", hash = "sha256:82ad92fd58da0d12af7482ecdb5f2470a04c9c9a53ced65b9bbb4a205377602e", size = 63828, upload-time = "2024-11-20T19:41:11.244Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/0d/8adfeaa62945f90d19ddc461c55f4a50c258af7662d34b6a3d5d1f8646f6/uvicorn-0.34.3-py3-none-any.whl", hash = "sha256:16246631db62bdfbf069b0645177d6e8a77ba950cfedbfd093acef9444e4d885", size = 62431, upload-time = "2025-06-01T07:48:15.664Z" },
 ]
 
 [package.optional-dependencies]
@@ -2367,12 +2169,6 @@ version = "0.21.0"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/af/c0/854216d09d33c543f12a44b393c402e89a920b1a0a7dc634c42de91b9cf6/uvloop-0.21.0.tar.gz", hash = "sha256:3bf12b0fda68447806a7ad847bfa591613177275d35b6724b1ee573faa3704e3", size = 2492741, upload-time = "2024-10-14T23:38:35.489Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/57/a7/4cf0334105c1160dd6819f3297f8700fda7fc30ab4f61fbf3e725acbc7cc/uvloop-0.21.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:c0f3fa6200b3108919f8bdabb9a7f87f20e7097ea3c543754cabc7d717d95cf8", size = 1447410, upload-time = "2024-10-14T23:37:33.612Z" },
-    { url = "https://files.pythonhosted.org/packages/8c/7c/1517b0bbc2dbe784b563d6ab54f2ef88c890fdad77232c98ed490aa07132/uvloop-0.21.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0878c2640cf341b269b7e128b1a5fed890adc4455513ca710d77d5e93aa6d6a0", size = 805476, upload-time = "2024-10-14T23:37:36.11Z" },
-    { url = "https://files.pythonhosted.org/packages/ee/ea/0bfae1aceb82a503f358d8d2fa126ca9dbdb2ba9c7866974faec1cb5875c/uvloop-0.21.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9fb766bb57b7388745d8bcc53a359b116b8a04c83a2288069809d2b3466c37e", size = 3960855, upload-time = "2024-10-14T23:37:37.683Z" },
-    { url = "https://files.pythonhosted.org/packages/8a/ca/0864176a649838b838f36d44bf31c451597ab363b60dc9e09c9630619d41/uvloop-0.21.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a375441696e2eda1c43c44ccb66e04d61ceeffcd76e4929e527b7fa401b90fb", size = 3973185, upload-time = "2024-10-14T23:37:40.226Z" },
-    { url = "https://files.pythonhosted.org/packages/30/bf/08ad29979a936d63787ba47a540de2132169f140d54aa25bc8c3df3e67f4/uvloop-0.21.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:baa0e6291d91649c6ba4ed4b2f982f9fa165b5bbd50a9e203c416a2797bab3c6", size = 3820256, upload-time = "2024-10-14T23:37:42.839Z" },
-    { url = "https://files.pythonhosted.org/packages/da/e2/5cf6ef37e3daf2f06e651aae5ea108ad30df3cb269102678b61ebf1fdf42/uvloop-0.21.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4509360fcc4c3bd2c70d87573ad472de40c13387f5fda8cb58350a1d7475e58d", size = 3937323, upload-time = "2024-10-14T23:37:45.337Z" },
     { url = "https://files.pythonhosted.org/packages/8c/4c/03f93178830dc7ce8b4cdee1d36770d2f5ebb6f3d37d354e061eefc73545/uvloop-0.21.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:359ec2c888397b9e592a889c4d72ba3d6befba8b2bb01743f72fffbde663b59c", size = 1471284, upload-time = "2024-10-14T23:37:47.833Z" },
     { url = "https://files.pythonhosted.org/packages/43/3e/92c03f4d05e50f09251bd8b2b2b584a2a7f8fe600008bcc4523337abe676/uvloop-0.21.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f7089d2dc73179ce5ac255bdf37c236a9f914b264825fdaacaded6990a7fb4c2", size = 821349, upload-time = "2024-10-14T23:37:50.149Z" },
     { url = "https://files.pythonhosted.org/packages/a6/ef/a02ec5da49909dbbfb1fd205a9a1ac4e88ea92dcae885e7c961847cd51e2/uvloop-0.21.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:baa4dcdbd9ae0a372f2167a207cd98c9f9a1ea1188a8a526431eef2f8116cc8d", size = 4580089, upload-time = "2024-10-14T23:37:51.703Z" },
@@ -2404,19 +2200,6 @@ dependencies = [
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/03/e2/8ed598c42057de7aa5d97c472254af4906ff0a59a66699d426fc9ef795d7/watchfiles-1.0.5.tar.gz", hash = "sha256:b7529b5dcc114679d43827d8c35a07c493ad6f083633d573d81c660abc5979e9", size = 94537, upload-time = "2025-04-08T10:36:26.722Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/39/f4/41b591f59021786ef517e1cdc3b510383551846703e03f204827854a96f8/watchfiles-1.0.5-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:237f9be419e977a0f8f6b2e7b0475ababe78ff1ab06822df95d914a945eac827", size = 405336, upload-time = "2025-04-08T10:34:59.359Z" },
-    { url = "https://files.pythonhosted.org/packages/ae/06/93789c135be4d6d0e4f63e96eea56dc54050b243eacc28439a26482b5235/watchfiles-1.0.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e0da39ff917af8b27a4bdc5a97ac577552a38aac0d260a859c1517ea3dc1a7c4", size = 395977, upload-time = "2025-04-08T10:35:00.522Z" },
-    { url = "https://files.pythonhosted.org/packages/d2/db/1cd89bd83728ca37054512d4d35ab69b5f12b8aa2ac9be3b0276b3bf06cc/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2cfcb3952350e95603f232a7a15f6c5f86c5375e46f0bd4ae70d43e3e063c13d", size = 455232, upload-time = "2025-04-08T10:35:01.698Z" },
-    { url = "https://files.pythonhosted.org/packages/40/90/d8a4d44ffe960517e487c9c04f77b06b8abf05eb680bed71c82b5f2cad62/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:68b2dddba7a4e6151384e252a5632efcaa9bc5d1c4b567f3cb621306b2ca9f63", size = 459151, upload-time = "2025-04-08T10:35:03.358Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/da/267a1546f26465dead1719caaba3ce660657f83c9d9c052ba98fb8856e13/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:95cf944fcfc394c5f9de794ce581914900f82ff1f855326f25ebcf24d5397418", size = 489054, upload-time = "2025-04-08T10:35:04.561Z" },
-    { url = "https://files.pythonhosted.org/packages/b1/31/33850dfd5c6efb6f27d2465cc4c6b27c5a6f5ed53c6fa63b7263cf5f60f6/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ecf6cd9f83d7c023b1aba15d13f705ca7b7d38675c121f3cc4a6e25bd0857ee9", size = 523955, upload-time = "2025-04-08T10:35:05.786Z" },
-    { url = "https://files.pythonhosted.org/packages/09/84/b7d7b67856efb183a421f1416b44ca975cb2ea6c4544827955dfb01f7dc2/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:852de68acd6212cd6d33edf21e6f9e56e5d98c6add46f48244bd479d97c967c6", size = 502234, upload-time = "2025-04-08T10:35:07.187Z" },
-    { url = "https://files.pythonhosted.org/packages/71/87/6dc5ec6882a2254cfdd8b0718b684504e737273903b65d7338efaba08b52/watchfiles-1.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5730f3aa35e646103b53389d5bc77edfbf578ab6dab2e005142b5b80a35ef25", size = 454750, upload-time = "2025-04-08T10:35:08.859Z" },
-    { url = "https://files.pythonhosted.org/packages/3d/6c/3786c50213451a0ad15170d091570d4a6554976cf0df19878002fc96075a/watchfiles-1.0.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:18b3bd29954bc4abeeb4e9d9cf0b30227f0f206c86657674f544cb032296acd5", size = 631591, upload-time = "2025-04-08T10:35:10.64Z" },
-    { url = "https://files.pythonhosted.org/packages/1b/b3/1427425ade4e359a0deacce01a47a26024b2ccdb53098f9d64d497f6684c/watchfiles-1.0.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ba5552a1b07c8edbf197055bc9d518b8f0d98a1c6a73a293bc0726dce068ed01", size = 625370, upload-time = "2025-04-08T10:35:12.412Z" },
-    { url = "https://files.pythonhosted.org/packages/15/ba/f60e053b0b5b8145d682672024aa91370a29c5c921a88977eb565de34086/watchfiles-1.0.5-cp311-cp311-win32.whl", hash = "sha256:2f1fefb2e90e89959447bc0420fddd1e76f625784340d64a2f7d5983ef9ad246", size = 277791, upload-time = "2025-04-08T10:35:13.719Z" },
-    { url = "https://files.pythonhosted.org/packages/50/ed/7603c4e164225c12c0d4e8700b64bb00e01a6c4eeea372292a3856be33a4/watchfiles-1.0.5-cp311-cp311-win_amd64.whl", hash = "sha256:b6e76ceb1dd18c8e29c73f47d41866972e891fc4cc7ba014f487def72c1cf096", size = 291622, upload-time = "2025-04-08T10:35:15.071Z" },
-    { url = "https://files.pythonhosted.org/packages/a2/c2/99bb7c96b4450e36877fde33690ded286ff555b5a5c1d925855d556968a1/watchfiles-1.0.5-cp311-cp311-win_arm64.whl", hash = "sha256:266710eb6fddc1f5e51843c70e3bebfb0f5e77cf4f27129278c70554104d19ed", size = 283699, upload-time = "2025-04-08T10:35:16.732Z" },
     { url = "https://files.pythonhosted.org/packages/2a/8c/4f0b9bdb75a1bfbd9c78fad7d8854369283f74fe7cf03eb16be77054536d/watchfiles-1.0.5-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:b5eb568c2aa6018e26da9e6c86f3ec3fd958cee7f0311b35c2630fa4217d17f2", size = 401511, upload-time = "2025-04-08T10:35:17.956Z" },
     { url = "https://files.pythonhosted.org/packages/dc/4e/7e15825def77f8bd359b6d3f379f0c9dac4eb09dd4ddd58fd7d14127179c/watchfiles-1.0.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0a04059f4923ce4e856b4b4e5e783a70f49d9663d22a4c3b3298165996d1377f", size = 392715, upload-time = "2025-04-08T10:35:19.202Z" },
     { url = "https://files.pythonhosted.org/packages/58/65/b72fb817518728e08de5840d5d38571466c1b4a3f724d190cec909ee6f3f/watchfiles-1.0.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e380c89983ce6e6fe2dd1e1921b9952fb4e6da882931abd1824c092ed495dec", size = 454138, upload-time = "2025-04-08T10:35:20.586Z" },
@@ -2456,17 +2239,6 @@ version = "15.0.1"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/21/e6/26d09fab466b7ca9c7737474c52be4f76a40301b08362eb2dbc19dcc16c1/websockets-15.0.1.tar.gz", hash = "sha256:82544de02076bafba038ce055ee6412d68da13ab47f0c60cab827346de828dee", size = 177016, upload-time = "2025-03-05T20:03:41.606Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/9f/32/18fcd5919c293a398db67443acd33fde142f283853076049824fc58e6f75/websockets-15.0.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:823c248b690b2fd9303ba00c4f66cd5e2d8c3ba4aa968b2779be9532a4dad431", size = 175423, upload-time = "2025-03-05T20:01:56.276Z" },
-    { url = "https://files.pythonhosted.org/packages/76/70/ba1ad96b07869275ef42e2ce21f07a5b0148936688c2baf7e4a1f60d5058/websockets-15.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678999709e68425ae2593acf2e3ebcbcf2e69885a5ee78f9eb80e6e371f1bf57", size = 173082, upload-time = "2025-03-05T20:01:57.563Z" },
-    { url = "https://files.pythonhosted.org/packages/86/f2/10b55821dd40eb696ce4704a87d57774696f9451108cff0d2824c97e0f97/websockets-15.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d50fd1ee42388dcfb2b3676132c78116490976f1300da28eb629272d5d93e905", size = 173330, upload-time = "2025-03-05T20:01:59.063Z" },
-    { url = "https://files.pythonhosted.org/packages/a5/90/1c37ae8b8a113d3daf1065222b6af61cc44102da95388ac0018fcb7d93d9/websockets-15.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d99e5546bf73dbad5bf3547174cd6cb8ba7273062a23808ffea025ecb1cf8562", size = 182878, upload-time = "2025-03-05T20:02:00.305Z" },
-    { url = "https://files.pythonhosted.org/packages/8e/8d/96e8e288b2a41dffafb78e8904ea7367ee4f891dafc2ab8d87e2124cb3d3/websockets-15.0.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:66dd88c918e3287efc22409d426c8f729688d89a0c587c88971a0faa2c2f3792", size = 181883, upload-time = "2025-03-05T20:02:03.148Z" },
-    { url = "https://files.pythonhosted.org/packages/93/1f/5d6dbf551766308f6f50f8baf8e9860be6182911e8106da7a7f73785f4c4/websockets-15.0.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8dd8327c795b3e3f219760fa603dcae1dcc148172290a8ab15158cf85a953413", size = 182252, upload-time = "2025-03-05T20:02:05.29Z" },
-    { url = "https://files.pythonhosted.org/packages/d4/78/2d4fed9123e6620cbf1706c0de8a1632e1a28e7774d94346d7de1bba2ca3/websockets-15.0.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8fdc51055e6ff4adeb88d58a11042ec9a5eae317a0a53d12c062c8a8865909e8", size = 182521, upload-time = "2025-03-05T20:02:07.458Z" },
-    { url = "https://files.pythonhosted.org/packages/e7/3b/66d4c1b444dd1a9823c4a81f50231b921bab54eee2f69e70319b4e21f1ca/websockets-15.0.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:693f0192126df6c2327cce3baa7c06f2a117575e32ab2308f7f8216c29d9e2e3", size = 181958, upload-time = "2025-03-05T20:02:09.842Z" },
-    { url = "https://files.pythonhosted.org/packages/08/ff/e9eed2ee5fed6f76fdd6032ca5cd38c57ca9661430bb3d5fb2872dc8703c/websockets-15.0.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:54479983bd5fb469c38f2f5c7e3a24f9a4e70594cd68cd1fa6b9340dadaff7cf", size = 181918, upload-time = "2025-03-05T20:02:11.968Z" },
-    { url = "https://files.pythonhosted.org/packages/d8/75/994634a49b7e12532be6a42103597b71098fd25900f7437d6055ed39930a/websockets-15.0.1-cp311-cp311-win32.whl", hash = "sha256:16b6c1b3e57799b9d38427dda63edcbe4926352c47cf88588c0be4ace18dac85", size = 176388, upload-time = "2025-03-05T20:02:13.32Z" },
-    { url = "https://files.pythonhosted.org/packages/98/93/e36c73f78400a65f5e236cd376713c34182e6663f6889cd45a4a04d8f203/websockets-15.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:27ccee0071a0e75d22cb35849b1db43f2ecd3e161041ac1ee9d2352ddf72f065", size = 176828, upload-time = "2025-03-05T20:02:14.585Z" },
     { url = "https://files.pythonhosted.org/packages/51/6b/4545a0d843594f5d0771e86463606a3988b5a09ca5123136f8a76580dd63/websockets-15.0.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:3e90baa811a5d73f3ca0bcbf32064d663ed81318ab225ee4f427ad4e26e5aff3", size = 175437, upload-time = "2025-03-05T20:02:16.706Z" },
     { url = "https://files.pythonhosted.org/packages/f4/71/809a0f5f6a06522af902e0f2ea2757f71ead94610010cf570ab5c98e99ed/websockets-15.0.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:592f1a9fe869c778694f0aa806ba0374e97648ab57936f092fd9d87f8bc03665", size = 173096, upload-time = "2025-03-05T20:02:18.832Z" },
     { url = "https://files.pythonhosted.org/packages/3d/69/1a681dd6f02180916f116894181eab8b2e25b31e484c5d0eae637ec01f7c/websockets-15.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0701bc3cfcb9164d04a14b149fd74be7347a530ad3bbf15ab2c678a2cd3dd9a2", size = 173332, upload-time = "2025-03-05T20:02:20.187Z" },
@@ -2487,17 +2259,6 @@ version = "1.17.2"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/c3/fc/e91cc220803d7bc4db93fb02facd8461c37364151b8494762cc88b0fbcef/wrapt-1.17.2.tar.gz", hash = "sha256:41388e9d4d1522446fe79d3213196bd9e3b301a336965b9e27ca2788ebd122f3", size = 55531, upload-time = "2025-01-14T10:35:45.465Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/cd/f7/a2aab2cbc7a665efab072344a8949a71081eed1d2f451f7f7d2b966594a2/wrapt-1.17.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ff04ef6eec3eee8a5efef2401495967a916feaa353643defcc03fc74fe213b58", size = 53308, upload-time = "2025-01-14T10:33:33.992Z" },
-    { url = "https://files.pythonhosted.org/packages/50/ff/149aba8365fdacef52b31a258c4dc1c57c79759c335eff0b3316a2664a64/wrapt-1.17.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4db983e7bca53819efdbd64590ee96c9213894272c776966ca6306b73e4affda", size = 38488, upload-time = "2025-01-14T10:33:35.264Z" },
-    { url = "https://files.pythonhosted.org/packages/65/46/5a917ce85b5c3b490d35c02bf71aedaa9f2f63f2d15d9949cc4ba56e8ba9/wrapt-1.17.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9abc77a4ce4c6f2a3168ff34b1da9b0f311a8f1cfd694ec96b0603dff1c79438", size = 38776, upload-time = "2025-01-14T10:33:38.28Z" },
-    { url = "https://files.pythonhosted.org/packages/ca/74/336c918d2915a4943501c77566db41d1bd6e9f4dbc317f356b9a244dfe83/wrapt-1.17.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b929ac182f5ace000d459c59c2c9c33047e20e935f8e39371fa6e3b85d56f4a", size = 83776, upload-time = "2025-01-14T10:33:40.678Z" },
-    { url = "https://files.pythonhosted.org/packages/09/99/c0c844a5ccde0fe5761d4305485297f91d67cf2a1a824c5f282e661ec7ff/wrapt-1.17.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f09b286faeff3c750a879d336fb6d8713206fc97af3adc14def0cdd349df6000", size = 75420, upload-time = "2025-01-14T10:33:41.868Z" },
-    { url = "https://files.pythonhosted.org/packages/b4/b0/9fc566b0fe08b282c850063591a756057c3247b2362b9286429ec5bf1721/wrapt-1.17.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1a7ed2d9d039bd41e889f6fb9364554052ca21ce823580f6a07c4ec245c1f5d6", size = 83199, upload-time = "2025-01-14T10:33:43.598Z" },
-    { url = "https://files.pythonhosted.org/packages/9d/4b/71996e62d543b0a0bd95dda485219856def3347e3e9380cc0d6cf10cfb2f/wrapt-1.17.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:129a150f5c445165ff941fc02ee27df65940fcb8a22a61828b1853c98763a64b", size = 82307, upload-time = "2025-01-14T10:33:48.499Z" },
-    { url = "https://files.pythonhosted.org/packages/39/35/0282c0d8789c0dc9bcc738911776c762a701f95cfe113fb8f0b40e45c2b9/wrapt-1.17.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1fb5699e4464afe5c7e65fa51d4f99e0b2eadcc176e4aa33600a3df7801d6662", size = 75025, upload-time = "2025-01-14T10:33:51.191Z" },
-    { url = "https://files.pythonhosted.org/packages/4f/6d/90c9fd2c3c6fee181feecb620d95105370198b6b98a0770cba090441a828/wrapt-1.17.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9a2bce789a5ea90e51a02dfcc39e31b7f1e662bc3317979aa7e5538e3a034f72", size = 81879, upload-time = "2025-01-14T10:33:52.328Z" },
-    { url = "https://files.pythonhosted.org/packages/8f/fa/9fb6e594f2ce03ef03eddbdb5f4f90acb1452221a5351116c7c4708ac865/wrapt-1.17.2-cp311-cp311-win32.whl", hash = "sha256:4afd5814270fdf6380616b321fd31435a462019d834f83c8611a0ce7484c7317", size = 36419, upload-time = "2025-01-14T10:33:53.551Z" },
-    { url = "https://files.pythonhosted.org/packages/47/f8/fb1773491a253cbc123c5d5dc15c86041f746ed30416535f2a8df1f4a392/wrapt-1.17.2-cp311-cp311-win_amd64.whl", hash = "sha256:acc130bc0375999da18e3d19e5a86403667ac0c4042a094fefb7eec8ebac7cf3", size = 38773, upload-time = "2025-01-14T10:33:56.323Z" },
     { url = "https://files.pythonhosted.org/packages/a1/bd/ab55f849fd1f9a58ed7ea47f5559ff09741b25f00c191231f9f059c83949/wrapt-1.17.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:d5e2439eecc762cd85e7bd37161d4714aa03a33c5ba884e26c81559817ca0925", size = 53799, upload-time = "2025-01-14T10:33:57.4Z" },
     { url = "https://files.pythonhosted.org/packages/53/18/75ddc64c3f63988f5a1d7e10fb204ffe5762bc663f8023f18ecaf31a332e/wrapt-1.17.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:3fc7cb4c1c744f8c05cd5f9438a3caa6ab94ce8344e952d7c45a8ed59dd88392", size = 38821, upload-time = "2025-01-14T10:33:59.334Z" },
     { url = "https://files.pythonhosted.org/packages/48/2a/97928387d6ed1c1ebbfd4efc4133a0633546bec8481a2dd5ec961313a1c7/wrapt-1.17.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8fdbdb757d5390f7c675e558fd3186d590973244fab0c5fe63d373ade3e99d40", size = 38919, upload-time = "2025-01-14T10:34:04.093Z" },

From b699bf0b5d1074bbf4e9312bf1ce27b19fb31518 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Thu, 12 Jun 2025 16:16:55 -0500
Subject: [PATCH 04/37] feat(type): Refactor db session typing - use py3.12
 generic type for AnyAsynSession - apply consistent type to uses of
 AsyncSession - refactor typevar and typealias

---
 src/lsst/cmservice/cli/wrappers.py            | 53 +++++-----
 .../cmservice/client/script_dependencies.py   |  5 -
 .../cmservice/client/step_dependencies.py     |  5 -
 src/lsst/cmservice/common/daemon.py           |  6 +-
 src/lsst/cmservice/common/errors.py           |  6 +-
 src/lsst/cmservice/common/graph.py            | 11 ++-
 src/lsst/cmservice/common/types.py            |  6 ++
 src/lsst/cmservice/daemon.py                  | 35 +++----
 src/lsst/cmservice/db/campaign.py             | 14 +--
 src/lsst/cmservice/db/element.py              | 39 ++++----
 src/lsst/cmservice/db/group.py                | 22 ++---
 src/lsst/cmservice/db/handler.py              | 27 +++---
 src/lsst/cmservice/db/job.py                  | 24 ++---
 src/lsst/cmservice/db/node.py                 | 96 +++++++++----------
 src/lsst/cmservice/db/queue.py                | 21 ++--
 src/lsst/cmservice/db/row.py                  | 68 +++++++------
 src/lsst/cmservice/db/script.py               | 20 ++--
 src/lsst/cmservice/db/script_dependency.py    |  6 +-
 src/lsst/cmservice/db/session.py              | 92 +++++++++++++++++-
 src/lsst/cmservice/db/spec_block.py           | 10 +-
 src/lsst/cmservice/db/specification.py        | 10 +-
 src/lsst/cmservice/db/step.py                 | 16 ++--
 src/lsst/cmservice/db/step_dependency.py      |  6 +-
 .../cmservice/handlers/element_handler.py     | 49 +++++-----
 src/lsst/cmservice/handlers/elements.py       | 29 +++---
 src/lsst/cmservice/handlers/functions.py      | 50 +++++-----
 src/lsst/cmservice/handlers/interface.py      | 66 ++++++-------
 src/lsst/cmservice/handlers/job_handler.py    |  5 +-
 src/lsst/cmservice/handlers/jobs.py           | 37 +++----
 src/lsst/cmservice/handlers/script_handler.py | 79 +++++++--------
 src/lsst/cmservice/handlers/scripts.py        | 49 +++++-----
 src/lsst/cmservice/main.py                    |  7 +-
 src/lsst/cmservice/routers/actions.py         | 14 +--
 src/lsst/cmservice/routers/campaigns.py       | 10 +-
 src/lsst/cmservice/routers/groups.py          |  8 +-
 src/lsst/cmservice/routers/jobs.py            |  8 +-
 src/lsst/cmservice/routers/loaders.py         | 22 ++---
 src/lsst/cmservice/routers/queues.py          | 16 ++--
 src/lsst/cmservice/routers/scripts.py         | 10 +-
 src/lsst/cmservice/routers/wrappers.py        | 72 +++++++-------
 src/lsst/cmservice/web_app/app.py             | 31 +++---
 src/lsst/cmservice/web_app/pages/campaigns.py | 10 +-
 .../cmservice/web_app/pages/group_details.py  | 10 +-
 .../cmservice/web_app/pages/job_details.py    |  8 +-
 .../cmservice/web_app/pages/script_details.py | 12 +--
 .../cmservice/web_app/pages/step_details.py   | 11 +--
 src/lsst/cmservice/web_app/pages/steps.py     |  8 +-
 src/lsst/cmservice/web_app/utils/utils.py     | 15 +--
 tests/db/test_handlers.py                     |  7 +-
 tests/db/util_functions.py                    | 33 +++----
 50 files changed, 681 insertions(+), 593 deletions(-)
 create mode 100644 src/lsst/cmservice/common/types.py

diff --git a/src/lsst/cmservice/cli/wrappers.py b/src/lsst/cmservice/cli/wrappers.py
index 7b23e112b..99e751c97 100644
--- a/src/lsst/cmservice/cli/wrappers.py
+++ b/src/lsst/cmservice/cli/wrappers.py
@@ -11,7 +11,7 @@
 import json
 from collections.abc import Callable, Sequence
 from enum import Enum
-from typing import Any, TypeAlias
+from typing import Any
 
 import click
 import yaml
@@ -20,7 +20,7 @@
 
 from ..client.client import CMClient
 from ..common.enums import StatusEnum
-from ..db import Job, Script, SpecBlock, Specification
+from ..db import ElementMixin, Job, RowMixin, Script, SpecBlock, Specification
 from . import options
 
 
@@ -127,7 +127,7 @@ def output_dict(
 def get_list_command(
     group_command: Callable,
     sub_client_name: str,
-    db_class: TypeAlias,
+    db_class: type[RowMixin],
 ) -> Callable:
     """Return a function that gets all the rows from a table
     and attaches that function to the cli.
@@ -143,7 +143,7 @@ def get_list_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: type
         Underlying database class
 
     Returns
@@ -170,7 +170,7 @@ def get_rows(
 def get_row_command(
     group_command: Callable,
     sub_client_name: str,
-    db_class: TypeAlias,
+    db_class: type[RowMixin],
 ) -> Callable:
     """Return a function that gets a row from a table
     and attaches that function to the cli.
@@ -183,7 +183,7 @@ def get_row_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: type
         Underlying database class
 
     Returns
@@ -212,7 +212,7 @@ def get_row(
 def get_row_by_name_command(
     group_command: Callable,
     sub_client_name: str,
-    db_class: TypeAlias,
+    db_class: type[RowMixin],
 ) -> Callable:
     """Return a function that gets a row from a table
     and attaches that function to the cli.
@@ -225,7 +225,7 @@ def get_row_by_name_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: type
         Underlying database class
 
     Returns
@@ -254,7 +254,7 @@ def get_row_by_name(
 def get_row_by_fullname_command(
     group_command: Callable,
     sub_client_name: str,
-    db_class: TypeAlias,
+    db_class: type[RowMixin],
 ) -> Callable:
     """Return a function that gets a row from a table
     and attaches that function to the cli.
@@ -267,7 +267,7 @@ def get_row_by_fullname_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: type
         Underlying database class
 
     Returns
@@ -296,7 +296,7 @@ def get_row_by_fullname(
 def get_create_command(
     group_command: Callable,
     sub_client_name: str,
-    db_class: TypeAlias,
+    db_class: type[RowMixin],
     create_options: list[Callable],
 ) -> Callable:
     """Return a function that creates a new row in the table
@@ -310,7 +310,7 @@ def get_create_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: type
         Underlying database class
 
     create_options: list[Callable]
@@ -342,7 +342,7 @@ def create(
 def get_update_command(
     group_command: Callable,
     sub_client_name: str,
-    db_class: TypeAlias,
+    db_class: type[RowMixin],
     update_options: list[Callable],
 ) -> Callable:
     """Return a function that updates a row in the table
@@ -356,7 +356,7 @@ def get_update_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: type
         Underlying database class
 
     update_options: list[Callable]
@@ -512,7 +512,7 @@ def get_resolved_collections_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: type
         Underlying database class
 
     Returns
@@ -693,7 +693,7 @@ def get_spec_aliases(
 def get_update_status_command(
     group_command: Callable,
     sub_client_name: str,
-    db_class: TypeAlias,
+    db_class: type[RowMixin],
 ) -> Callable:
     """Return a function that updates the status
     of row in the table and attaches that function to the cli.
@@ -706,7 +706,7 @@ def get_update_status_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: type
         Underlying database class
 
     Returns
@@ -967,9 +967,6 @@ def get_action_run_check_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
-        Underlying database class
-
     Returns
     -------
     the_function: Callable
@@ -996,7 +993,7 @@ def run_check(
 def get_action_accept_command(
     group_command: Callable,
     sub_client_name: str,
-    db_class: TypeAlias,
+    db_class: type[RowMixin],
 ) -> Callable:
     """Return a function that marks a row in the table as accepted
     and attaches that function to the cli.
@@ -1009,7 +1006,7 @@ def get_action_accept_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: type
         Underlying database class
 
     Returns
@@ -1038,7 +1035,7 @@ def accept(
 def get_action_reject_command(
     group_command: Callable,
     sub_client_name: str,
-    db_class: TypeAlias,
+    db_class: type[RowMixin],
 ) -> Callable:
     """Return a function that marks a row in the table as rejected
     and attaches that function to the cli.
@@ -1051,7 +1048,7 @@ def get_action_reject_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: type
         Underlying database class
 
     Returns
@@ -1080,7 +1077,7 @@ def reject(
 def get_action_reset_command(
     group_command: Callable,
     sub_client_name: str,
-    db_class: TypeAlias,
+    db_class: type[RowMixin],
 ) -> Callable:
     """Return a function that resets the status of a row in the table
     and attaches that function to the cli.
@@ -1093,7 +1090,7 @@ def get_action_reset_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: type
         Underlying database class
 
     Returns
@@ -1125,7 +1122,7 @@ def reset(
 def get_element_parent_command(
     group_command: Callable,
     sub_client_name: str,
-    db_parent_class: TypeAlias,
+    db_parent_class: type[ElementMixin],
 ) -> Callable:
     """Return a function that gets the parent of an element
 
@@ -1137,7 +1134,7 @@ def get_element_parent_command(
     sub_client_name: str
         Name of python API sub-client to use
 
-    db_parent_class: TypeAlias = db.RowMixin
+    db_parent_class: type
         Underlying parent database class
 
     Returns
diff --git a/src/lsst/cmservice/client/script_dependencies.py b/src/lsst/cmservice/client/script_dependencies.py
index 95c2b75e1..1f66e3df0 100644
--- a/src/lsst/cmservice/client/script_dependencies.py
+++ b/src/lsst/cmservice/client/script_dependencies.py
@@ -50,9 +50,4 @@ def client(self) -> httpx.Client:
         f"{router_string}/create",
     )
 
-    update = wrappers.update_row_function(
-        ResponseModelClass,
-        f"{router_string}/update",
-    )
-
     delete = wrappers.delete_row_function(f"{router_string}/delete")
diff --git a/src/lsst/cmservice/client/step_dependencies.py b/src/lsst/cmservice/client/step_dependencies.py
index 39e74fc72..eb73bfdf3 100644
--- a/src/lsst/cmservice/client/step_dependencies.py
+++ b/src/lsst/cmservice/client/step_dependencies.py
@@ -50,9 +50,4 @@ def client(self) -> httpx.Client:
         f"{router_string}/create",
     )
 
-    update = wrappers.update_row_function(
-        ResponseModelClass,
-        f"{router_string}/update",
-    )
-
     delete = wrappers.delete_row_function(f"{router_string}/delete")
diff --git a/src/lsst/cmservice/common/daemon.py b/src/lsst/cmservice/common/daemon.py
index 0a8cb5855..81089f78c 100644
--- a/src/lsst/cmservice/common/daemon.py
+++ b/src/lsst/cmservice/common/daemon.py
@@ -1,10 +1,10 @@
 from datetime import datetime, timedelta
 
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.future import select
 
 from ..common import notification, timestamp
 from ..common.enums import StatusEnum
+from ..common.types import AnyAsyncSession
 from ..config import config
 from ..db.node import NodeMixin
 from ..db.queue import Queue
@@ -15,7 +15,7 @@
 logger = LOGGER.bind(module=__name__)
 
 
-async def check_due_date(session: async_scoped_session, node: NodeMixin, time_next_check: datetime) -> None:
+async def check_due_date(session: AnyAsyncSession, node: NodeMixin, time_next_check: datetime) -> None:
     """For a provided due date, check if the queue entry is overdue"""
 
     due_date = node.metadata_.get("due_date", None)
@@ -27,7 +27,7 @@ async def check_due_date(session: async_scoped_session, node: NodeMixin, time_ne
         await notification.send_notification(for_status=StatusEnum.overdue, for_campaign=campaign)
 
 
-async def daemon_iteration(session: async_scoped_session) -> None:
+async def daemon_iteration(session: AnyAsyncSession) -> None:
     iteration_start = timestamp.now_utc()
     processed_nodes = 0
     queue_entries = await session.execute(
diff --git a/src/lsst/cmservice/common/errors.py b/src/lsst/cmservice/common/errors.py
index a52489f88..d4b6c6662 100644
--- a/src/lsst/cmservice/common/errors.py
+++ b/src/lsst/cmservice/common/errors.py
@@ -1,11 +1,9 @@
 """cm-service specific error types"""
 
-from typing import Any, TypeVar
+from typing import Any
 
 from sqlalchemy.exc import IntegrityError
 
-T = TypeVar("T")
-
 
 class CMCheckError(KeyError):
     """Raised when script checking fails"""
@@ -123,7 +121,7 @@ class CMYamlParseError(KeyError):
     """Raised when parsing a yaml file fails"""
 
 
-def test_type_and_raise(object: Any, expected_type: type[T], var_name: str) -> T:
+def test_type_and_raise[T](object: Any, expected_type: type[T], var_name: str) -> T:
     if not isinstance(object, expected_type):
         raise CMBadParameterTypeError(f"{var_name} expected type {expected_type} got {type(object)}")
     return object
diff --git a/src/lsst/cmservice/common/graph.py b/src/lsst/cmservice/common/graph.py
index c994d60ba..f2a1e71e8 100644
--- a/src/lsst/cmservice/common/graph.py
+++ b/src/lsst/cmservice/common/graph.py
@@ -1,18 +1,19 @@
 from collections.abc import Mapping, Sequence
-from typing import TypeVar
 
 import networkx as nx
-from sqlalchemy.ext.asyncio import AsyncSession, async_scoped_session
 
 from ..db import Script, ScriptDependency, Step, StepDependency
 from ..parsing.string import parse_element_fullname
+from .types import AnyAsyncSession
 
-A = TypeVar("A", async_scoped_session, AsyncSession)
-N = TypeVar("N", type[Step], type[Script])
+type AnyGraphEdge = StepDependency | ScriptDependency
+type AnyGraphNode = Step | Script
 
 
 async def graph_from_edge_list(
-    edges: Sequence[StepDependency | ScriptDependency], node_type: N, session: A
+    edges: Sequence[AnyGraphEdge],
+    node_type: type[AnyGraphNode],
+    session: AnyAsyncSession,
 ) -> nx.DiGraph:
     """Given a sequence of edge-tuples, create a directed graph for these
     edges with nodes derived from database lookups of the related objects.
diff --git a/src/lsst/cmservice/common/types.py b/src/lsst/cmservice/common/types.py
new file mode 100644
index 000000000..7f8ef633d
--- /dev/null
+++ b/src/lsst/cmservice/common/types.py
@@ -0,0 +1,6 @@
+from sqlalchemy.ext.asyncio import AsyncSession as AsyncSessionSA
+from sqlalchemy.ext.asyncio import async_scoped_session
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+type AnyAsyncSession = AsyncSession | AsyncSessionSA | async_scoped_session
+"""A type union of async database sessions the application may use"""
diff --git a/src/lsst/cmservice/daemon.py b/src/lsst/cmservice/daemon.py
index 3c242cd3f..4d226ad97 100644
--- a/src/lsst/cmservice/daemon.py
+++ b/src/lsst/cmservice/daemon.py
@@ -6,7 +6,6 @@
 import uvicorn
 from anyio import current_time, sleep_until
 from fastapi import FastAPI
-from safir.database import create_async_session, create_database_engine
 from safir.logging import configure_uvicorn_logging
 
 from . import __version__
@@ -15,6 +14,7 @@
 from .common.logging import LOGGER
 from .common.panda import get_panda_token
 from .config import config
+from .db.session import db_session_dependency
 from .routers.healthz import health_router
 
 configure_uvicorn_logging(config.logging.level)
@@ -31,10 +31,14 @@ async def lifespan(app: FastAPI) -> AsyncGenerator:
     os.environ |= config.panda.model_dump(by_alias=True, exclude_none=True)
     os.environ |= config.htcondor.model_dump(by_alias=True, exclude_none=True)
     app.state.tasks = set()
+    # Dependency inits before app starts running
+    await db_session_dependency.initialize()
+    assert db_session_dependency.engine is not None
     daemon = create_task(main_loop(app=app), name="daemon")
     app.state.tasks.add(daemon)
     yield
     # stop
+    await db_session_dependency.aclose()
 
 
 async def main_loop(app: FastAPI) -> None:
@@ -43,24 +47,21 @@ async def main_loop(app: FastAPI) -> None:
     With a database session, perform a single daemon interation and then sleep
     until the next daemon appointment.
     """
-    engine = create_database_engine(config.db.url, config.db.password)
-
     sleep_time = config.daemon.processing_interval
 
-    async with engine.begin():
-        session = await create_async_session(engine, logger)
-        logger.info("Daemon starting.")
-        _iteration_count = 0
-
-        while True:
-            _iteration_count += 1
-            logger.info("Daemon starting iteration.")
-            await daemon_iteration(session)
-            _iteration_time = current_time()
-            logger.info(f"Daemon completed {_iteration_count} iterations at {_iteration_time}.")
-            _next_wakeup = _iteration_time + sleep_time
-            logger.info(f"Daemon next iteration at {_next_wakeup}.")
-            await sleep_until(_next_wakeup)
+    session = await anext(db_session_dependency())
+    logger.info("Daemon starting.")
+    _iteration_count = 0
+
+    while True:
+        _iteration_count += 1
+        logger.info("Daemon starting iteration.")
+        await daemon_iteration(session)
+        _iteration_time = current_time()
+        logger.info(f"Daemon completed {_iteration_count} iterations at {_iteration_time}.")
+        _next_wakeup = _iteration_time + sleep_time
+        logger.info(f"Daemon next iteration at {_next_wakeup}.")
+        await sleep_until(_next_wakeup)
 
 
 def main() -> None:
diff --git a/src/lsst/cmservice/db/campaign.py b/src/lsst/cmservice/db/campaign.py
index 559f3a471..0c7d299da 100644
--- a/src/lsst/cmservice/db/campaign.py
+++ b/src/lsst/cmservice/db/campaign.py
@@ -5,7 +5,6 @@
 
 from sqlalchemy import JSON
 from sqlalchemy.dialects.postgresql import JSONB
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.ext.mutable import MutableDict
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.schema import ForeignKey
@@ -22,6 +21,7 @@
 from .specification import Specification
 
 if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
     from .job import Job
     from .script import Script
     from .step import Step
@@ -94,7 +94,7 @@ def level(self) -> LevelEnum:
 
     async def get_campaign(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Campaign:
         """Maps self to self.get_campaign() for consistency"""
         assert session  # For mypy
@@ -105,7 +105,7 @@ def __repr__(self) -> str:
 
     async def children(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Iterable:
         """Maps self.s_ to self.children() for consistency"""
         await session.refresh(self, attribute_names=["s_"])
@@ -113,7 +113,7 @@ async def children(
 
     async def get_wms_reports(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedWmsTaskReportDict:
         the_dict = MergedWmsTaskReportDict(reports={})
@@ -125,7 +125,7 @@ async def get_wms_reports(
 
     async def get_tasks(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedTaskSetDict:
         the_dict = MergedTaskSetDict(reports={})
@@ -136,7 +136,7 @@ async def get_tasks(
 
     async def get_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedProductSetDict:
         the_dict = MergedProductSetDict(reports={})
@@ -148,7 +148,7 @@ async def get_products(
     @classmethod
     async def get_create_kwargs(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> dict:
         name = kwargs["name"]
diff --git a/src/lsst/cmservice/db/element.py b/src/lsst/cmservice/db/element.py
index d96c6b7b7..6e9d82d5c 100644
--- a/src/lsst/cmservice/db/element.py
+++ b/src/lsst/cmservice/db/element.py
@@ -3,8 +3,6 @@
 from collections.abc import Iterable
 from typing import TYPE_CHECKING, Any
 
-from sqlalchemy.ext.asyncio import async_scoped_session
-
 from ..common.enums import LevelEnum, NodeTypeEnum, StatusEnum
 from ..common.errors import CMBadStateTransitionError, CMTooManyActiveScriptsError
 from ..config import config
@@ -14,6 +12,7 @@
 from .node import NodeMixin
 
 if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
     from .job import Job
     from .script import Script
 
@@ -37,7 +36,7 @@ def node_type(self) -> NodeTypeEnum:
 
     async def get_scripts(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script_name: str | None = None,
         *,
         remaining_only: bool = False,
@@ -47,7 +46,7 @@ async def get_scripts(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         script_name: str | None
@@ -78,7 +77,7 @@ async def get_scripts(
 
     async def get_jobs(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         *,
         remaining_only: bool = False,
         skip_superseded: bool = True,
@@ -87,7 +86,7 @@ async def get_jobs(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         remaining_only: bool
@@ -113,7 +112,7 @@ async def get_jobs(
 
     async def get_all_scripts(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         *,
         remaining_only: bool = False,
         skip_superseded: bool = True,
@@ -122,7 +121,7 @@ async def get_all_scripts(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         remaining_only: bool
@@ -153,7 +152,7 @@ async def get_all_scripts(
 
     async def children(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Iterable:
         """Maps to [] for consistency"""
         assert session  # for mypy
@@ -161,7 +160,7 @@ async def children(
 
     async def retry_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script_name: str,
         *,
         fake_reset: bool = True,
@@ -170,7 +169,7 @@ async def retry_script(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         script_name: str
@@ -198,7 +197,7 @@ async def retry_script(
 
     async def estimate_sleep_time(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         minimum_sleep_time: int = 10,
     ) -> int:
         """Estimate how long to sleep before calling process again.
@@ -208,7 +207,7 @@ async def estimate_sleep_time(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -234,14 +233,14 @@ async def estimate_sleep_time(
 
     async def get_wms_reports(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedWmsTaskReportDict:
         """Get the WmwTaskReports associated to this element
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -253,7 +252,7 @@ async def get_wms_reports(
 
     async def get_tasks(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedTaskSetDict:
         """Get the TaskSet associated to this element
@@ -270,14 +269,14 @@ async def get_tasks(
 
     async def get_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedProductSetDict:
         """Get the ProductSet associated to this element
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -289,7 +288,7 @@ async def get_products(
 
     async def review(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> StatusEnum:
         """Run review() function on this Element
@@ -298,7 +297,7 @@ async def review(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
diff --git a/src/lsst/cmservice/db/group.py b/src/lsst/cmservice/db/group.py
index eca383bd7..30780d1c2 100644
--- a/src/lsst/cmservice/db/group.py
+++ b/src/lsst/cmservice/db/group.py
@@ -4,7 +4,6 @@
 from sqlalchemy import JSON
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.ext.mutable import MutableDict
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.schema import ForeignKey, UniqueConstraint
@@ -18,6 +17,7 @@
     CMTooFewAcceptedJobsError,
     CMTooManyActiveScriptsError,
 )
+from ..common.types import AnyAsyncSession
 from ..models.merged_product_set import MergedProductSetDict
 from ..models.merged_task_set import MergedTaskSetDict
 from ..models.merged_wms_task_report import MergedWmsTaskReportDict
@@ -85,7 +85,7 @@ def level(self) -> LevelEnum:
 
     async def get_campaign(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> "Campaign":
         """Maps self.c_ to self.get_campaign() for consistency"""
         await session.refresh(self, attribute_names=["c_"])
@@ -96,7 +96,7 @@ def __repr__(self) -> str:
 
     async def children(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Iterable:
         """Maps self.g_ to self.children() for consistency"""
         await session.refresh(self, attribute_names=["jobs_"])
@@ -104,7 +104,7 @@ async def children(
 
     async def get_wms_reports(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedWmsTaskReportDict:
         the_dict = MergedWmsTaskReportDict(reports={})
@@ -116,7 +116,7 @@ async def get_wms_reports(
 
     async def get_tasks(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedTaskSetDict:
         the_dict = MergedTaskSetDict(reports={})
@@ -127,7 +127,7 @@ async def get_tasks(
 
     async def get_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedProductSetDict:
         the_dict = MergedProductSetDict(reports={})
@@ -139,7 +139,7 @@ async def get_products(
     @classmethod
     async def get_create_kwargs(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> dict:
         try:
@@ -175,7 +175,7 @@ async def get_create_kwargs(
 
     async def rescue_job(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> "Job":
         """Create a rescue `Job`
 
@@ -183,7 +183,7 @@ async def rescue_job(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -208,13 +208,13 @@ async def rescue_job(
 
     async def mark_job_rescued(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> list["Job"]:
         """Mark jobs as `rescued` once one of their siblings is `accepted`
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
diff --git a/src/lsst/cmservice/db/handler.py b/src/lsst/cmservice/db/handler.py
index 1a213ded0..9753df891 100644
--- a/src/lsst/cmservice/db/handler.py
+++ b/src/lsst/cmservice/db/handler.py
@@ -3,8 +3,6 @@
 import types
 from typing import TYPE_CHECKING, Any, ClassVar
 
-from sqlalchemy.ext.asyncio import async_scoped_session
-
 from lsst.utils import doImport
 from lsst.utils.introspection import get_full_type_name
 
@@ -13,6 +11,7 @@
 from ..common.logging import LOGGER
 
 if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
     from .element import ElementMixin
     from .node import NodeMixin
     from .script import Script
@@ -93,7 +92,7 @@ def get_handler_class_name(self) -> str:
 
     async def process(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         node: NodeMixin,
         **kwargs: Any,
     ) -> tuple[bool, StatusEnum]:
@@ -101,7 +100,7 @@ async def process(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         node: NodeMixin
@@ -121,7 +120,7 @@ async def process(
 
     async def run_check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         node: NodeMixin,
         **kwargs: Any,
     ) -> tuple[bool, StatusEnum]:
@@ -129,7 +128,7 @@ async def run_check(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         node: NodeMixin
@@ -149,7 +148,7 @@ async def run_check(
 
     async def reset(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         node: NodeMixin,
         to_status: StatusEnum,
         *,
@@ -159,7 +158,7 @@ async def reset(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         node: NodeMixin
@@ -180,7 +179,7 @@ async def reset(
 
     async def reset_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         node: NodeMixin,
         to_status: StatusEnum,
         *,
@@ -190,7 +189,7 @@ async def reset_script(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         node: NodeMixin
@@ -211,7 +210,7 @@ async def reset_script(
 
     async def review(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         element: ElementMixin,
         **kwargs: Any,
     ) -> StatusEnum:
@@ -219,7 +218,7 @@ async def review(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         element: ElementMixin
@@ -234,7 +233,7 @@ async def review(
 
     async def review_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -243,7 +242,7 @@ async def review_script(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         script: Script
diff --git a/src/lsst/cmservice/db/job.py b/src/lsst/cmservice/db/job.py
index 45a6ab523..53ba44c66 100644
--- a/src/lsst/cmservice/db/job.py
+++ b/src/lsst/cmservice/db/job.py
@@ -6,7 +6,6 @@
 from sqlalchemy import JSON, and_, select
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.ext.mutable import MutableDict
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.schema import ForeignKey
@@ -27,6 +26,7 @@
 from .step import Step
 
 if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
     from .campaign import Campaign
     from .pipetask_error import PipetaskError
     from .product_set import ProductSet
@@ -118,7 +118,7 @@ def level(self) -> LevelEnum:
 
     async def get_campaign(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Campaign:
         """Maps self.c_ to self.get_campaign() for consistency"""
         await session.refresh(self, attribute_names=["c_"])
@@ -126,13 +126,13 @@ async def get_campaign(
 
     async def get_siblings(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Sequence[Job]:
         """Get the sibling Jobs
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -152,7 +152,7 @@ async def get_siblings(
 
     async def get_wms_reports(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedWmsTaskReportDict:
         await session.refresh(self, attribute_names=["wms_reports_"])
@@ -163,7 +163,7 @@ async def get_wms_reports(
 
     async def get_tasks(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedTaskSetDict:
         await session.refresh(self, attribute_names=["tasks_"])
@@ -172,7 +172,7 @@ async def get_tasks(
 
     async def get_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedProductSetDict:
         await session.refresh(self, attribute_names=["products_"])
@@ -181,7 +181,7 @@ async def get_products(
 
     async def get_errors(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Sequence[PipetaskError]:
         await session.refresh(self, attribute_names=["errors_"])
         return self.errors_
@@ -192,7 +192,7 @@ def __repr__(self) -> str:
     @classmethod
     async def get_create_kwargs(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> dict:
         try:
@@ -230,14 +230,14 @@ async def get_create_kwargs(
 
     async def copy_job(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         parent: ElementMixin,
     ) -> Job:
         """Copy a Job
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         parent : ElementMixin
@@ -298,7 +298,7 @@ async def copy_job(
 
     async def get_jobs(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         *,
         remaining_only: bool = False,
         skip_superseded: bool = True,
diff --git a/src/lsst/cmservice/db/node.py b/src/lsst/cmservice/db/node.py
index 212f9abf3..244e2f21d 100644
--- a/src/lsst/cmservice/db/node.py
+++ b/src/lsst/cmservice/db/node.py
@@ -5,7 +5,6 @@
 from typing import TYPE_CHECKING, Any
 
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.orm.collections import InstrumentedList
 
 from ..common import timestamp
@@ -27,6 +26,7 @@
 from .specification import Specification
 
 if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
     from .campaign import Campaign
     from .element import ElementMixin
 
@@ -60,13 +60,13 @@ class NodeMixin(RowMixin):
 
     async def get_spec_block(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> SpecBlock:
         """Get the `SpecBlock` object associated to a particular row
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -81,13 +81,13 @@ async def get_spec_block(
 
     async def get_specification(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Specification:
         """Get the `Specification` object associated to a particular row
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -101,13 +101,13 @@ async def get_specification(
 
     async def get_campaign(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Campaign:
         """Get the parent `Campaign`
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -119,13 +119,13 @@ async def get_campaign(
 
     async def get_parent(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> ElementMixin:
         """Get the parent `Element`
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -140,7 +140,7 @@ async def get_parent(
 
     async def get_handler(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Handler:
         """Get the Handler object associated with a particular row
 
@@ -149,7 +149,7 @@ async def get_handler(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -167,7 +167,7 @@ async def get_handler(
 
     async def resolve_collections(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         *,
         throw_overrides: bool = True,
     ) -> dict:
@@ -181,7 +181,7 @@ async def resolve_collections(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         throw_overrides : bool
@@ -221,7 +221,7 @@ async def resolve_collections(
 
     async def get_collections(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> dict:
         """Get the collection configuration associated with a particular row.
 
@@ -230,7 +230,7 @@ async def get_collections(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -262,7 +262,7 @@ async def get_collections(
 
     async def get_child_config(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> dict:
         """Get the child configuration associated with a particular row.
 
@@ -271,7 +271,7 @@ async def get_child_config(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -291,7 +291,7 @@ async def get_child_config(
 
     async def data_dict(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> dict:
         """Get the data configuration associated to a particular row
 
@@ -300,7 +300,7 @@ async def data_dict(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -326,7 +326,7 @@ async def data_dict(
 
     async def get_spec_aliases(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> dict:
         """Get the spec_aliases associated with a particular node
 
@@ -335,7 +335,7 @@ async def get_spec_aliases(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -359,14 +359,14 @@ async def get_spec_aliases(
 
     async def update_child_config(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> NodeMixin:
         """Update the child configuration associated with this Node
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         kwargs: Any
@@ -402,7 +402,7 @@ async def update_child_config(
 
     async def update_collections(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         *,
         force: bool = False,
         **kwargs: Any,
@@ -411,7 +411,7 @@ async def update_collections(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         kwargs: Any
@@ -446,14 +446,14 @@ async def update_collections(
 
     async def update_spec_aliases(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> NodeMixin:
         """Update the spec_alisases configuration associated with this Node
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         kwargs: Any
@@ -489,7 +489,7 @@ async def update_spec_aliases(
 
     async def update_metadata_dict(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> NodeMixin:
         """Update the metadata configuration associated with this Node.
@@ -499,7 +499,7 @@ async def update_metadata_dict(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         kwargs: Any
@@ -534,7 +534,7 @@ async def update_metadata_dict(
 
     async def update_data_dict(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> NodeMixin:
         """Update the data configuration associated with this Node.
@@ -544,7 +544,7 @@ async def update_data_dict(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         kwargs: Any
@@ -601,14 +601,14 @@ async def update_data_dict(
 
     async def check_prerequisites(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> bool:
         """Check if the prerequisties for processing a particular node are
         completed.
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -628,13 +628,13 @@ async def check_prerequisites(
 
     async def reject(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> NodeMixin:
         """Set a node as rejected
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -656,13 +656,13 @@ async def reject(
 
     async def accept(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> NodeMixin:
         """Set a node as accepted
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -690,7 +690,7 @@ async def accept(
 
     async def reset(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         *,
         fake_reset: bool = False,
     ) -> NodeMixin:
@@ -698,7 +698,7 @@ async def reset(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         fake_reset: bool
@@ -718,7 +718,7 @@ async def reset(
 
     async def _clean_up_node(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         *,
         fake_reset: bool = False,
     ) -> NodeMixin:
@@ -726,7 +726,7 @@ async def _clean_up_node(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         fake_reset: bool
@@ -741,7 +741,7 @@ async def _clean_up_node(
 
     async def process(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> tuple[bool, StatusEnum]:
         """Process this `Node` as much as possible
@@ -750,7 +750,7 @@ async def process(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -766,7 +766,7 @@ async def process(
 
     async def run_check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> tuple[bool, StatusEnum]:
         """Check on this Nodes's status
@@ -775,7 +775,7 @@ async def run_check(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -790,7 +790,7 @@ async def run_check(
 
     async def estimate_sleep_time(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         minimum_sleep_time: int = 10,
     ) -> int:
         """Estimate how long to sleep before calling process again.
@@ -800,7 +800,7 @@ async def estimate_sleep_time(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -815,7 +815,7 @@ async def estimate_sleep_time(
 
     async def update_mtime(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> None:
         """Update the mtime attribute in an element's hierarchy."""
         mtime = timestamp.element_time()
diff --git a/src/lsst/cmservice/db/queue.py b/src/lsst/cmservice/db/queue.py
index d93feed14..9e776b470 100644
--- a/src/lsst/cmservice/db/queue.py
+++ b/src/lsst/cmservice/db/queue.py
@@ -1,11 +1,10 @@
 from __future__ import annotations
 
 from datetime import UTC, datetime, timedelta
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from sqlalchemy import JSON, and_, select
 from sqlalchemy.dialects.postgresql import JSONB, TIMESTAMP
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.ext.mutable import MutableDict
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.schema import ForeignKey
@@ -22,6 +21,10 @@
 from .script import Script
 from .step import Step
 
+if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
+
+
 logger = LOGGER.bind(module=__name__)
 
 
@@ -71,13 +74,13 @@ class Queue(Base, NodeMixin):
 
     async def get_node(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> NodeMixin:
         """Get the parent `Node`
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -108,14 +111,14 @@ async def get_node(
     @classmethod
     async def get_queue_item(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> Queue:
         """Get the queue row corresponding to a partiuclar node
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
         Keywords
         --------
@@ -157,7 +160,7 @@ async def get_queue_item(
     @classmethod
     async def get_create_kwargs(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> dict:
         fullname = kwargs["fullname"]
@@ -200,7 +203,7 @@ async def get_create_kwargs(
 
     async def node_sleep_time(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> int:
         """Check how long to sleep based on what is running"""
         node = await self.get_node(session)
@@ -224,7 +227,7 @@ def waiting(
 
     async def process_node(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> bool:  # pragma: no cover
         """Process associated node and update queue row"""
         node = await self.get_node(session)
diff --git a/src/lsst/cmservice/db/row.py b/src/lsst/cmservice/db/row.py
index 3210da197..16dce5b25 100644
--- a/src/lsst/cmservice/db/row.py
+++ b/src/lsst/cmservice/db/row.py
@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, TypeVar
+from typing import TYPE_CHECKING, Any
 
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.ext.asyncio import AsyncSession, async_scoped_session
 
 from ..common.enums import StatusEnum
 from ..common.errors import (
@@ -21,8 +20,7 @@
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
-    T = TypeVar("T", bound="RowMixin")
-    A = TypeVar("A", AsyncSession, async_scoped_session)
+    from ..common.types import AnyAsyncSession
 
 DELETABLE_STATES = [
     StatusEnum.failed,
@@ -38,23 +36,23 @@ class RowMixin:
     Defines an interface to manipulate any sort of table.
     """
 
-    id: Any  # Primary Key, typically an int
-    name: Any  # Human-readable name for row
     fullname: Any  # Human-readable unique name for row
-
+    id: Any  # Primary Key, typically an int
     class_string: str  # Name to use for help functions and descriptions
+    col_names_for_table: list
+    name: Any  # Human-readable name for row
 
     @classmethod
-    async def get_rows(
+    async def get_rows[T: RowMixin](
         cls: type[T],
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> Sequence[T]:
         """Get rows associated to a particular table
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         Keywords
@@ -109,16 +107,16 @@ async def get_rows(
         return results.all()
 
     @classmethod
-    async def get_row(
+    async def get_row[T: RowMixin](
         cls: type[T],
-        session: A,
+        session: AnyAsyncSession,
         row_id: int,
     ) -> T:
         """Get a single row, matching row.id == row_id
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         row_id: int
@@ -135,16 +133,16 @@ async def get_row(
         return result
 
     @classmethod
-    async def get_row_by_name(
+    async def get_row_by_name[T: RowMixin](
         cls: type[T],
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         name: str,
     ) -> T:
         """Get a single row, with row.name == name
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         name : str
@@ -163,16 +161,16 @@ async def get_row_by_name(
         return row
 
     @classmethod
-    async def get_row_by_fullname(
+    async def get_row_by_fullname[T: RowMixin](
         cls: type[T],
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         fullname: str,
     ) -> T:
         """Get a single row, with row.fullname == fullname
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         fullname : str
@@ -193,14 +191,14 @@ async def get_row_by_fullname(
     @classmethod
     async def delete_row(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         row_id: int,
     ) -> None:
         """Delete a single row, matching row.id == row_id
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         row_id: int
@@ -231,14 +229,14 @@ async def delete_row(
     @classmethod
     async def _delete_hook(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         row_id: int,
     ) -> None:
         """Hook called during delete_row
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         row_id: int
@@ -250,9 +248,9 @@ async def _delete_hook(
         return
 
     @classmethod
-    async def update_row(
+    async def update_row[T: RowMixin](
         cls: type[T],
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         row_id: int,
         **kwargs: Any,
     ) -> T:
@@ -260,7 +258,7 @@ async def update_row(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         row_id: int
@@ -311,16 +309,16 @@ async def update_row(
         return row
 
     @classmethod
-    async def create_row(
+    async def create_row[T: RowMixin](
         cls: type[T],
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> T:
         """Create a single row
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         kwargs: Any
@@ -346,8 +344,8 @@ async def create_row(
 
     @classmethod
     async def get_create_kwargs(
-        cls: type[T],
-        session: async_scoped_session,
+        cls,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> dict:
         """Get additional keywords needed to create a row
@@ -358,7 +356,7 @@ async def get_create_kwargs(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         kwargs: Any
@@ -371,16 +369,16 @@ async def get_create_kwargs(
         """
         return kwargs
 
-    async def update_values(
+    async def update_values[T: RowMixin](
         self: T,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> T:
         """Update values in a row
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : A
             DB session manager
 
         kwargs: Any
diff --git a/src/lsst/cmservice/db/script.py b/src/lsst/cmservice/db/script.py
index 26187b555..82646a1ef 100644
--- a/src/lsst/cmservice/db/script.py
+++ b/src/lsst/cmservice/db/script.py
@@ -4,7 +4,6 @@
 
 from sqlalchemy import JSON
 from sqlalchemy.dialects.postgresql import JSONB
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.ext.mutable import MutableDict
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.schema import ForeignKey
@@ -25,6 +24,7 @@
 from .step import Step
 
 if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
     from .script_error import ScriptError
 
 
@@ -111,14 +111,14 @@ def level(self) -> LevelEnum:
 
     async def get_script_errors(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> list[ScriptError]:
         await session.refresh(self, attribute_names=["errors_"])
         return self.errors_
 
     async def get_campaign(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Campaign:
         """Maps self.get_parent().c_ to self.get_campaign() for consistency"""
         parent = await self.get_parent(session)
@@ -131,13 +131,13 @@ def node_type(self) -> NodeTypeEnum:
 
     async def get_parent(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> ElementMixin:
         """Get the parent `Element`
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
@@ -165,7 +165,7 @@ async def get_parent(
     @classmethod
     async def get_create_kwargs(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> dict:
         try:
@@ -229,7 +229,7 @@ async def get_create_kwargs(
 
     async def reset_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         to_status: StatusEnum,
         *,
         fake_reset: bool = False,
@@ -243,7 +243,7 @@ async def reset_script(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         to_status : StatusEnum
@@ -262,7 +262,7 @@ async def reset_script(
 
     async def review(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> StatusEnum:
         """Run review() function on this Script
@@ -272,7 +272,7 @@ async def review(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
diff --git a/src/lsst/cmservice/db/script_dependency.py b/src/lsst/cmservice/db/script_dependency.py
index 2ade4c254..e9ac58f75 100644
--- a/src/lsst/cmservice/db/script_dependency.py
+++ b/src/lsst/cmservice/db/script_dependency.py
@@ -4,7 +4,6 @@
 from uuid import UUID
 
 import sqlalchemy.dialects.postgresql as sapg
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.schema import ForeignKey
 
@@ -13,6 +12,7 @@
 from .row import RowMixin
 
 if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
     from .script import Script
 
 
@@ -41,13 +41,13 @@ def __repr__(self) -> str:
 
     async def is_done(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> bool:
         """Check if this dependency is completed
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
diff --git a/src/lsst/cmservice/db/session.py b/src/lsst/cmservice/db/session.py
index 1141f03e1..294fe755d 100644
--- a/src/lsst/cmservice/db/session.py
+++ b/src/lsst/cmservice/db/session.py
@@ -1,9 +1,93 @@
 """Module to create and handle async database sessions"""
 
-from safir.dependencies.db_session import db_session_dependency
-from sqlalchemy.ext.asyncio import async_scoped_session
+from collections.abc import AsyncGenerator
 
+# from pydantic import SecretStr  #noqa: ERA001
+from sqlalchemy import make_url
+from sqlalchemy.ext.asyncio import AsyncEngine, async_sessionmaker, create_async_engine
+from sqlmodel.ext.asyncio.session import AsyncSession
 
-async def get_async_scoped_session() -> async_scoped_session:
-    """Provides an async session from the safir session maker."""
+from ..config import config
+
+
+class DatabaseSessionDependency:
+    """A database session manager class designed to manage an async sqlalchemy
+    engine and produce sessions.
+
+    A module-level instance of this class is created, and when called, a new
+    async session is yielded.
+    """
+
+    def __init__(self) -> None:
+        self.engine: AsyncEngine | None = None
+        self.sessionmaker: async_sessionmaker[AsyncSession] | None = None
+
+    async def initialize(
+        self,
+        *,
+        isolation_level: str | None = None,
+        use_async: bool = True,
+        echo: bool = False,
+    ) -> None:
+        """Initialize the session dependency.
+
+        Parameters
+        ----------
+        url
+            Database connection URL, not including the password.
+        password
+            Database connection password.
+        isolation_level
+            If specified, sets a non-default isolation level for the database
+            engine.
+        use_async
+            If true (default), the database drivername will be forced to an
+            async form.
+        """
+        if isinstance(config.db.url, str):
+            url = make_url(config.db.url)
+        if use_async and url.drivername == "postgresql":
+            url = url.set(drivername="postgresql+asyncpg")
+        # FIXME use SecretStr for password
+        # if isinstance(config.db.password, SecretStr):
+        #     password = config.db.password.get_secret_value()  #noqa: ERA001
+        if config.db.password is not None:
+            url = url.set(password=config.db.password)
+        if self.engine:
+            await self.engine.dispose()
+        self.engine = create_async_engine(
+            url=url,
+            echo=config.db.echo,
+            # TODO add pool-level configs
+        )
+        self.sessionmaker = async_sessionmaker(self.engine, class_=AsyncSession, expire_on_commit=False)
+
+    async def __call__(self) -> AsyncGenerator[AsyncSession]:
+        """Yields a database session.
+
+        Yields
+        -------
+        sqlmodel.ext.asyncio.AsyncSession
+            The newly-created session.
+        """
+        if not self.sessionmaker:
+            raise RuntimeError("Async sessionmaker is not initialized")
+
+        async with self.sessionmaker() as session:
+            yield session
+
+    async def aclose(self) -> None:
+        """Shut down the database engine."""
+        if self.engine:
+            self.sessionmaker = None
+            await self.engine.dispose()
+            self._engine = None
+
+
+db_session_dependency = DatabaseSessionDependency()
+"""A module-level instance of the session manager"""
+
+
+# FIXME not sure why this pattern
+async def get_async_session() -> AsyncSession:
     return await anext(db_session_dependency())
diff --git a/src/lsst/cmservice/db/spec_block.py b/src/lsst/cmservice/db/spec_block.py
index 57a1856e7..5a135c645 100644
--- a/src/lsst/cmservice/db/spec_block.py
+++ b/src/lsst/cmservice/db/spec_block.py
@@ -1,9 +1,8 @@
 from __future__ import annotations
 
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from sqlalchemy import JSON
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import Mapped, mapped_column
 
@@ -11,6 +10,9 @@
 from .handler import Handler
 from .row import RowMixin
 
+if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
+
 
 class SpecBlock(Base, RowMixin):
     """Database table to manage blocks that are used to build campaigns
@@ -45,7 +47,7 @@ def __repr__(self) -> str:
     @classmethod
     async def get_create_kwargs(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> dict:
         handler = kwargs["handler"]
@@ -64,7 +66,7 @@ async def get_create_kwargs(
     @classmethod
     async def _delete_hook(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         row_id: int,
     ) -> None:
         Handler.remove_from_cache(row_id)
diff --git a/src/lsst/cmservice/db/specification.py b/src/lsst/cmservice/db/specification.py
index 6a7eee6d2..824cacc02 100644
--- a/src/lsst/cmservice/db/specification.py
+++ b/src/lsst/cmservice/db/specification.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from sqlalchemy import JSON
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import Mapped, mapped_column
 
@@ -10,6 +11,9 @@
 from .row import RowMixin
 from .spec_block import SpecBlock
 
+if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
+
 
 class Specification(Base, RowMixin):
     """Database table to manage mapping and grouping SpecBlocks
@@ -38,14 +42,14 @@ def __repr__(self) -> str:
 
     async def get_block(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         spec_block_name: str,
     ) -> SpecBlock:
         """Get a SpecBlock associated to this Specification
 
         Parameters
         ----------
-        session: async_scoped_session
+        session: AnyAsyncSession
             DB session manager
 
         spec_block_name: str
diff --git a/src/lsst/cmservice/db/step.py b/src/lsst/cmservice/db/step.py
index 5581ca682..d58e31ec5 100644
--- a/src/lsst/cmservice/db/step.py
+++ b/src/lsst/cmservice/db/step.py
@@ -5,7 +5,6 @@
 
 from sqlalchemy import JSON
 from sqlalchemy.dialects.postgresql import JSONB
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.ext.mutable import MutableDict
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.schema import ForeignKey, UniqueConstraint
@@ -22,6 +21,7 @@
 from .spec_block import SpecBlock
 
 if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
     from .group import Group
     from .job import Job
     from .script import Script
@@ -94,7 +94,7 @@ def __repr__(self) -> str:
 
     async def get_campaign(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Campaign:
         """Maps self.c_ to self.get_campaign() for consistency"""
         await session.refresh(self, attribute_names=["parent_"])
@@ -102,7 +102,7 @@ async def get_campaign(
 
     async def children(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> Iterable:
         """Maps self.g_ to self.children() for consistency"""
         await session.refresh(self, attribute_names=["g_"])
@@ -110,7 +110,7 @@ async def children(
 
     async def get_wms_reports(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedWmsTaskReportDict:
         the_dict = MergedWmsTaskReportDict(reports={})
@@ -122,7 +122,7 @@ async def get_wms_reports(
 
     async def get_tasks(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedTaskSetDict:
         the_dict = MergedTaskSetDict(reports={})
@@ -133,7 +133,7 @@ async def get_tasks(
 
     async def get_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> MergedProductSetDict:
         the_dict = MergedProductSetDict(reports={})
@@ -144,7 +144,7 @@ async def get_products(
 
     async def get_all_prereqs(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> list[Step]:
         all_prereqs: list[Step] = []
         await session.refresh(self, attribute_names=["prereqs_"])
@@ -158,7 +158,7 @@ async def get_all_prereqs(
     @classmethod
     async def get_create_kwargs(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         **kwargs: Any,
     ) -> dict:
         try:
diff --git a/src/lsst/cmservice/db/step_dependency.py b/src/lsst/cmservice/db/step_dependency.py
index 835214b90..063606b2a 100644
--- a/src/lsst/cmservice/db/step_dependency.py
+++ b/src/lsst/cmservice/db/step_dependency.py
@@ -4,7 +4,6 @@
 from uuid import UUID
 
 import sqlalchemy.dialects.postgresql as sapg
-from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.schema import ForeignKey
 
@@ -13,6 +12,7 @@
 from .row import RowMixin
 
 if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
     from .step import Step
 
 
@@ -41,13 +41,13 @@ def __repr__(self) -> str:
 
     async def is_done(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
     ) -> bool:
         """Check if this dependency is completed
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         Returns
diff --git a/src/lsst/cmservice/handlers/element_handler.py b/src/lsst/cmservice/handlers/element_handler.py
index aae1cfdd4..73527f015 100644
--- a/src/lsst/cmservice/handlers/element_handler.py
+++ b/src/lsst/cmservice/handlers/element_handler.py
@@ -4,8 +4,6 @@
 from typing import TYPE_CHECKING, Any
 from uuid import UUID, uuid5
 
-from sqlalchemy.ext.asyncio import async_scoped_session
-
 from ..common.enums import LevelEnum, StatusEnum
 from ..common.errors import CMYamlParseError, test_type_and_raise
 from ..common.notification import send_notification
@@ -18,6 +16,9 @@
 from ..db.script_dependency import ScriptDependency
 from .functions import render_campaign_steps
 
+if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
+
 
 class ElementHandler(Handler):
     """SubClass of Handler to deal with generic 'Element' operations,
@@ -26,7 +27,7 @@ class ElementHandler(Handler):
 
     @staticmethod
     async def _add_prerequisite(
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script_id: int,
         prereq_id: int,
         namespace: UUID | None = None,
@@ -35,7 +36,7 @@ async def _add_prerequisite(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         script_id: int
@@ -59,7 +60,7 @@ async def _add_prerequisite(
 
     async def process(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         node: NodeMixin,
         **kwargs: Any,
     ) -> tuple[bool, StatusEnum]:
@@ -67,7 +68,7 @@ async def process(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         node: NodeMixin
@@ -116,7 +117,7 @@ async def process(
 
     async def run_check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         node: NodeMixin,
         **kwargs: Any,
     ) -> tuple[bool, StatusEnum]:
@@ -126,7 +127,7 @@ async def run_check(
 
     async def prepare(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         element: ElementMixin,
     ) -> tuple[bool, StatusEnum]:
         """Prepare `Element` for processing
@@ -135,7 +136,7 @@ async def prepare(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         element: ElementMixin
@@ -218,7 +219,7 @@ async def prepare(
 
     async def continue_processing(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         element: ElementMixin,
         **kwargs: Any,
     ) -> tuple[bool, StatusEnum]:
@@ -228,7 +229,7 @@ async def continue_processing(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         element: ElementMixin
@@ -253,7 +254,7 @@ async def continue_processing(
 
     async def review(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         element: ElementMixin,
         **kwargs: Any,
     ) -> StatusEnum:
@@ -265,7 +266,7 @@ async def review(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         element: ElementMixin
@@ -282,7 +283,7 @@ async def review(
 
     async def _run_script_checks(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         element: ElementMixin,
         **kwargs: Any,
     ) -> bool:
@@ -290,7 +291,7 @@ async def _run_script_checks(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         element: ElementMixin
@@ -320,7 +321,7 @@ async def _run_script_checks(
 
     async def _run_job_checks(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         element: ElementMixin,
         **kwargs: Any,
     ) -> bool:
@@ -328,7 +329,7 @@ async def _run_job_checks(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         element: ElementMixin
@@ -357,7 +358,7 @@ async def _run_job_checks(
 
     async def check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         element: ElementMixin,
         **kwargs: Any,
     ) -> tuple[bool, StatusEnum]:
@@ -366,7 +367,7 @@ async def check(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         element: ElementMixin
@@ -424,7 +425,7 @@ async def check(
 
     async def _post_check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         element: ElementMixin,
         **kwargs: Any,
     ) -> StatusEnum:
@@ -432,7 +433,7 @@ async def _post_check(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         element: ElementMixin
@@ -451,7 +452,7 @@ class CampaignHandler(ElementHandler):
 
     async def prepare(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         element: ElementMixin,
     ) -> tuple[bool, StatusEnum]:
         if TYPE_CHECKING:
@@ -466,7 +467,7 @@ async def prepare(
 
     async def _post_check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         element: ElementMixin,
         **kwargs: Any,
     ) -> StatusEnum:
@@ -474,7 +475,7 @@ async def _post_check(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         element: ElementMixin
diff --git a/src/lsst/cmservice/handlers/elements.py b/src/lsst/cmservice/handlers/elements.py
index 9237b5430..567cc871b 100644
--- a/src/lsst/cmservice/handlers/elements.py
+++ b/src/lsst/cmservice/handlers/elements.py
@@ -2,11 +2,10 @@
 
 from collections.abc import AsyncGenerator
 from functools import partial
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 from anyio import to_thread
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from ..common.butler import BUTLER_FACTORY
 from ..common.enums import StatusEnum
@@ -20,6 +19,10 @@
 from ..db.script import Script
 from .script_handler import FunctionHandler
 
+if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
+
+
 logger = LOGGER.bind(module=__name__)
 
 
@@ -32,7 +35,7 @@ class RunElementScriptHandler(FunctionHandler):
 
     async def _do_run(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -49,7 +52,7 @@ async def _do_run(
 
     async def _do_check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -78,7 +81,7 @@ class RunJobsScriptHandler(RunElementScriptHandler):
 
     async def _do_prepare(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -102,7 +105,7 @@ async def _do_prepare(
 
     async def review_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -126,7 +129,7 @@ class Splitter:
     @classmethod
     async def split(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -135,7 +138,7 @@ async def split(
 
         Parameters
         ----------
-        session: async_scoped_session
+        session: AnyAsyncSession
             DB session manager
 
         script: Script
@@ -157,7 +160,7 @@ class NoSplit(Splitter):
     @classmethod
     async def split(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -177,7 +180,7 @@ class SplitByVals(Splitter):
     @classmethod
     async def split(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -203,7 +206,7 @@ class SplitByQuery(Splitter):
     @classmethod
     async def split(
         cls,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -281,7 +284,7 @@ class RunGroupsScriptHandler(RunElementScriptHandler):
 
     async def _do_prepare(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -320,7 +323,7 @@ class RunStepsScriptHandler(RunElementScriptHandler):
 
     async def _do_prepare(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
diff --git a/src/lsst/cmservice/handlers/functions.py b/src/lsst/cmservice/handlers/functions.py
index ad25ccb32..ff6c93e51 100644
--- a/src/lsst/cmservice/handlers/functions.py
+++ b/src/lsst/cmservice/handlers/functions.py
@@ -9,7 +9,6 @@
 from anyio import Path
 from pydantic.v1.utils import deep_update
 from sqlalchemy import select
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from lsst.ctrl.bps.bps_reports import compile_job_summary
 from lsst.ctrl.bps.wms_service import WmsRunReport, WmsStates
@@ -17,6 +16,7 @@
 from ..common.enums import DEFAULT_NAMESPACE, StatusEnum
 from ..common.errors import CMMissingFullnameError, CMYamlParseError
 from ..common.logging import LOGGER
+from ..common.types import AnyAsyncSession
 from ..config import config
 from ..db.campaign import Campaign
 from ..db.element import ElementMixin
@@ -24,7 +24,7 @@
 from ..db.pipetask_error import PipetaskError
 from ..db.pipetask_error_type import PipetaskErrorType
 from ..db.product_set import ProductSet
-from ..db.session import get_async_scoped_session
+from ..db.session import get_async_session
 from ..db.spec_block import SpecBlock
 from ..db.specification import Specification
 from ..db.step import Step
@@ -36,7 +36,7 @@
 
 
 async def upsert_spec_block(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     config_values: dict,
     loaded_specs: dict,
     *,
@@ -48,7 +48,7 @@ async def upsert_spec_block(
 
     Parameters
     ----------
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     config_values: dict
@@ -127,7 +127,7 @@ async def upsert_spec_block(
 
 
 async def upsert_specification(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     config_values: dict,
     *,
     allow_update: bool = False,
@@ -138,7 +138,7 @@ async def upsert_specification(
 
     Parameters
     ----------
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     config_values: dict
@@ -166,7 +166,7 @@ async def upsert_specification(
 
 
 async def load_specification(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     yaml_file: str | Path | deque,
     loaded_specs: dict | None = None,
     *,
@@ -178,7 +178,7 @@ async def load_specification(
 
     Parameters
     ----------
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     yaml_file: str | anyio.Path
@@ -259,13 +259,13 @@ async def load_specification(
 
 
 async def add_step_prerequisite(
-    session: async_scoped_session, depend_id: int, prereq_id: int, namespace: UUID | None = None
+    session: AnyAsyncSession, depend_id: int, prereq_id: int, namespace: UUID | None = None
 ) -> StepDependency:
     """Create and return a StepDependency
 
     Parameters
     ----------
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     depend_id: int
@@ -288,7 +288,7 @@ async def add_step_prerequisite(
 
 
 async def add_steps(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     campaign: Campaign,
     step_config_list: list[dict[str, dict]] | None,
 ) -> Campaign:
@@ -296,7 +296,7 @@ async def add_steps(
 
     Parameters
     ----------
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     campaign: Campaign
@@ -386,14 +386,14 @@ async def force_accept_node(
     node: int,
     db_class: type[ElementMixin],
     output_collection: str | None = None,
-    session: async_scoped_session | None = None,
+    session: AnyAsyncSession | None = None,
 ) -> None:
     """Force accept a node by bypassing state transition checks and setting
     node and node's scripts to accepted.
     """
     local_session = False
     if session is None:
-        session = await get_async_scoped_session()
+        session = await get_async_session()
         local_session = True
 
     the_node = await db_class.get_row(session, node)
@@ -431,7 +431,7 @@ async def force_accept_node(
 
 async def render_campaign_steps(
     campaign: Campaign | int,
-    session: async_scoped_session | None = None,
+    session: AnyAsyncSession | None = None,
 ) -> None:
     """Render the steps for a campaign.
 
@@ -444,7 +444,7 @@ async def render_campaign_steps(
     """
     local_session = False
     if session is None:
-        session = await get_async_scoped_session()
+        session = await get_async_session()
         local_session = True
     if isinstance(campaign, int):
         campaign = await Campaign.get_row(session, campaign)
@@ -466,7 +466,7 @@ async def render_campaign_steps(
 
 
 async def match_pipetask_error(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     task_name: str,
     diagnostic_message: str,
 ) -> PipetaskErrorType | None:
@@ -474,7 +474,7 @@ async def match_pipetask_error(
 
     Parameters
     ----------
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     task_name: str
@@ -495,7 +495,7 @@ async def match_pipetask_error(
 
 
 async def load_manifest_report(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     job_name: str,
     yaml_file: str | Path,
     fake_status: StatusEnum | None = None,
@@ -506,7 +506,7 @@ async def load_manifest_report(
 
     Parameters
     ----------
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     job_name: str
@@ -715,7 +715,7 @@ def status_from_bps_report(
 
 
 async def load_wms_reports(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     job: Job,
     wms_run_report: WmsRunReport | None,
 ) -> Job:  # pragma: no cover
@@ -725,7 +725,7 @@ async def load_wms_reports(
 
     Parameters
     ----------
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     job_name: str
@@ -764,14 +764,14 @@ async def load_wms_reports(
 
 
 async def load_error_types(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     yaml_file: str | Path,
 ) -> list[PipetaskErrorType]:
     """Parse and load error types
 
     Parameters
     ----------
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     yaml_file: str | anyio.Path
@@ -810,7 +810,7 @@ async def load_error_types(
 
 
 async def compute_job_status(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     job: Job,
 ) -> StatusEnum:
     await session.refresh(
diff --git a/src/lsst/cmservice/handlers/interface.py b/src/lsst/cmservice/handlers/interface.py
index 7c0cb8e1c..8a69b98c1 100644
--- a/src/lsst/cmservice/handlers/interface.py
+++ b/src/lsst/cmservice/handlers/interface.py
@@ -1,7 +1,6 @@
 from typing import TYPE_CHECKING, Any
 
 from sqlalchemy import select
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from .. import db
 from ..common.enums import LevelEnum, NodeTypeEnum, StatusEnum, TableEnum
@@ -13,6 +12,7 @@
     test_type_and_raise,
 )
 from ..common.logging import LOGGER
+from ..common.types import AnyAsyncSession
 from . import functions
 
 TABLE_DICT: dict[TableEnum, type[db.RowMixin]] = {
@@ -64,7 +64,7 @@ def get_table(
 
 
 async def get_row_by_table_and_id(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     row_id: int,
     table_enum: TableEnum,
 ) -> db.RowMixin:
@@ -72,7 +72,7 @@ async def get_row_by_table_and_id(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     row_id: int
@@ -105,7 +105,7 @@ async def get_row_by_table_and_id(
 
 
 async def get_node_by_level_and_id(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     element_id: int,
     level: LevelEnum,
 ) -> db.NodeMixin:
@@ -113,7 +113,7 @@ async def get_node_by_level_and_id(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     element_id: int
@@ -164,14 +164,14 @@ def get_node_type_by_fullname(
 
 
 async def get_element_by_fullname(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     fullname: str,
 ) -> db.ElementMixin:
     """Get a `Element` from the DB
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     fullname: str
@@ -208,14 +208,14 @@ async def get_element_by_fullname(
 
 
 async def get_node_by_fullname(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     fullname: str,
 ) -> db.NodeMixin:
     """Get a `Node` from the DB
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     fullname: str
@@ -241,7 +241,7 @@ async def get_node_by_fullname(
 
 
 async def process_script(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     fullname: str,
     fake_status: StatusEnum | None = None,
 ) -> tuple[bool, StatusEnum]:
@@ -249,7 +249,7 @@ async def process_script(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     fullname: str
@@ -276,7 +276,7 @@ async def process_script(
 
 
 async def process_element(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     fullname: str,
     fake_status: StatusEnum | None = None,
 ) -> tuple[bool, StatusEnum]:
@@ -284,7 +284,7 @@ async def process_element(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     fullname: str
@@ -313,7 +313,7 @@ async def process_element(
 
 
 async def process(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     fullname: str,
     fake_status: StatusEnum | None = None,
 ) -> tuple[bool, StatusEnum]:
@@ -321,7 +321,7 @@ async def process(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     fullname: str
@@ -356,7 +356,7 @@ async def process(
 
 
 async def reset_script(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     fullname: str,
     status: StatusEnum,
     *,
@@ -374,7 +374,7 @@ async def reset_script(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     fullname: str
@@ -403,7 +403,7 @@ async def reset_script(
 
 
 async def rescue_job(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     fullname: str,
 ) -> db.Job:
     """Run a rescue on a `Job`
@@ -414,7 +414,7 @@ async def rescue_job(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     fullname: str
@@ -441,7 +441,7 @@ async def rescue_job(
 
 
 async def mark_job_rescued(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     fullname: str,
 ) -> list[db.Job]:
     """Mark a `Job` as rescued
@@ -452,7 +452,7 @@ async def mark_job_rescued(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     fullname: str
@@ -481,14 +481,14 @@ async def mark_job_rescued(
 
 
 async def create_campaign(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     **kwargs: Any,
 ) -> db.Campaign:
     """Create a new Campaign
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     kwargs : Any
@@ -504,7 +504,7 @@ async def create_campaign(
 
 
 async def load_and_create_campaign(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     yaml_file: str,
     name: str,
     spec_block_assoc_name: str | None = None,
@@ -514,7 +514,7 @@ async def load_and_create_campaign(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     yaml_file: str
@@ -552,7 +552,7 @@ async def load_and_create_campaign(
 
 
 async def add_steps(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     fullname: str,
     child_configs: list[dict[str, Any]],
 ) -> db.Campaign:
@@ -560,7 +560,7 @@ async def add_steps(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     fullname: str
@@ -586,14 +586,14 @@ async def add_steps(
 
 
 async def load_error_types(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     yaml_file: str,
 ) -> list[db.PipetaskErrorType]:
     """Load a set of `PipetaskErrorType`s from a yaml file
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     yaml_file: str,
@@ -609,7 +609,7 @@ async def load_error_types(
 
 
 async def load_manifest_report(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     yaml_file: str,
     fullname: str,
     *,
@@ -619,7 +619,7 @@ async def load_manifest_report(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     yaml_file: str,
@@ -641,7 +641,7 @@ async def load_manifest_report(
 
 
 async def match_pipetask_errors(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     *,
     rematch: bool = False,
 ) -> list[db.PipetaskError]:
@@ -651,7 +651,7 @@ async def match_pipetask_errors(
 
     Parameters
     ----------
-    session : async_scoped_session
+    session : AnyAsyncSession
         DB session manager
 
     rematch: bool
diff --git a/src/lsst/cmservice/handlers/job_handler.py b/src/lsst/cmservice/handlers/job_handler.py
index c033e38cc..4224ba9d9 100644
--- a/src/lsst/cmservice/handlers/job_handler.py
+++ b/src/lsst/cmservice/handlers/job_handler.py
@@ -2,14 +2,13 @@
 
 from typing import TYPE_CHECKING, Any
 
-from sqlalchemy.ext.asyncio import async_scoped_session
-
 from ..common.enums import ErrorActionEnum, StatusEnum
 from ..common.errors import CMBadEnumError
 from ..db.element import ElementMixin
 from .element_handler import ElementHandler
 
 if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
     from ..db import Job
 
 
@@ -18,7 +17,7 @@ class JobHandler(ElementHandler):
 
     async def _post_check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         element: ElementMixin,
         **kwargs: Any,
     ) -> StatusEnum:
diff --git a/src/lsst/cmservice/handlers/jobs.py b/src/lsst/cmservice/handlers/jobs.py
index 0f735b704..7f6ff80ed 100644
--- a/src/lsst/cmservice/handlers/jobs.py
+++ b/src/lsst/cmservice/handlers/jobs.py
@@ -10,7 +10,6 @@
 from anyio import Path, to_thread
 from fastapi.concurrency import run_in_threadpool
 from jinja2 import Environment, PackageLoader
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from lsst.ctrl.bps import BaseWmsService, WmsRunReport, WmsStates
 from lsst.utils import doImport
@@ -36,6 +35,10 @@
 from .functions import compute_job_status, load_manifest_report, load_wms_reports, status_from_bps_report
 from .script_handler import FunctionHandler, ScriptHandler
 
+if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
+
+
 WMS_TO_TASK_STATUS_MAP = {
     WmsStates.UNKNOWN: TaskStatusEnum.missing,
     WmsStates.MISFIT: TaskStatusEnum.missing,
@@ -64,7 +67,7 @@ class BpsScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -149,7 +152,7 @@ async def _write_script(
         #       unless they are unique to the submission and separated for
         #       readability. The use of any kind of "shared" or "global" config
         #       items breaks provenance for all campaigns that reference them.
-        bps_wms_extra_files = data_dict.get("bps_wms_extra_files", [])
+        bps_wms_extra_files: list = data_dict.get("bps_wms_extra_files", [])
         bps_wms_clustering_file = data_dict.get("bps_wms_clustering_file", None)
         bps_wms_resources_file = data_dict.get("bps_wms_resources_file", None)
         bps_wms_yaml_file = data_dict.get("bps_wms_yaml_file", None)
@@ -233,7 +236,7 @@ async def _write_script(
 
     async def _check_slurm_job(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         slurm_id: str | None,
         script: Script,
         parent: ElementMixin,
@@ -263,7 +266,7 @@ async def _check_slurm_job(
 
     async def _check_htcondor_job(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         htcondor_id: str | None,
         script: Script,
         parent: ElementMixin,
@@ -303,7 +306,7 @@ async def _check_htcondor_job(
 
     async def launch(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -330,7 +333,7 @@ def get_bps_submit_dir(cls, bps_dict: dict) -> str | None:
 
     async def _reset_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -358,7 +361,7 @@ async def _reset_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -407,7 +410,7 @@ def _get_wms_svc(self, **kwargs: Any) -> BaseWmsService | None:
 
     async def _load_wms_reports(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         job: Job,
         wms_workflow_id: str | None,
         **kwargs: Any,
@@ -462,7 +465,7 @@ async def _load_wms_reports(
 
     async def _do_prepare(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin | Job,
         **kwargs: Any,
@@ -478,7 +481,7 @@ async def _do_prepare(
 
     async def _do_check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin | Job,
         **kwargs: Any,
@@ -497,7 +500,7 @@ async def _do_check(
 
     async def _reset_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -564,7 +567,7 @@ class ManifestReportScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -616,7 +619,7 @@ class ManifestReportLoadHandler(FunctionHandler):
 
     async def _do_prepare(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -644,7 +647,7 @@ async def _do_prepare(
 
     async def _do_check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin | Job,
         **kwargs: Any,
@@ -661,7 +664,7 @@ async def _do_check(
 
     async def _load_pipetask_report(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         job: Job,
         pipetask_report_yaml: str,
         fake_status: StatusEnum | None = None,
@@ -688,7 +691,7 @@ async def _load_pipetask_report(
 
     async def _reset_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
diff --git a/src/lsst/cmservice/handlers/script_handler.py b/src/lsst/cmservice/handlers/script_handler.py
index 57ac71484..6429fc958 100644
--- a/src/lsst/cmservice/handlers/script_handler.py
+++ b/src/lsst/cmservice/handlers/script_handler.py
@@ -3,7 +3,6 @@
 from typing import TYPE_CHECKING, Any
 
 from anyio import Path
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from ..common.bash import check_stamp_file, get_diagnostic_message, run_bash_job
 from ..common.enums import ErrorSourceEnum, ScriptMethodEnum, StatusEnum
@@ -26,6 +25,10 @@
 from ..db.script import Script
 from ..db.script_error import ScriptError
 
+if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
+
+
 logger = LOGGER.bind(module=__name__)
 
 DOUBLE_QUOTE = '"'
@@ -36,7 +39,7 @@ class BaseScriptHandler(Handler):
 
     async def process(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         node: NodeMixin,
         **kwargs: Any,
     ) -> tuple[bool, StatusEnum]:
@@ -129,7 +132,7 @@ async def process(
 
     async def run_check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         node: NodeMixin,
         **kwargs: Any,
     ) -> tuple[bool, StatusEnum]:
@@ -145,7 +148,7 @@ async def run_check(
 
     async def prepare(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
     ) -> StatusEnum:
@@ -157,7 +160,7 @@ async def prepare(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         script: Script
@@ -178,7 +181,7 @@ async def prepare(
 
     async def launch(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -191,7 +194,7 @@ async def launch(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         script: Script
@@ -209,7 +212,7 @@ async def launch(
 
     async def check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -222,7 +225,7 @@ async def check(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         script: Script
@@ -240,7 +243,7 @@ async def check(
 
     async def review_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -253,7 +256,7 @@ async def review_script(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         script: Script
@@ -272,7 +275,7 @@ async def review_script(
 
     async def reset_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         node: NodeMixin,
         to_status: StatusEnum,
         *,
@@ -305,7 +308,7 @@ async def reset_script(
 
     async def _reset_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -315,7 +318,7 @@ async def _reset_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -325,7 +328,7 @@ async def _purge_products(
 
     async def update_status(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         status: StatusEnum,
         node: NodeMixin,
         **kwargs: Any,
@@ -352,7 +355,7 @@ class ScriptHandler(BaseScriptHandler):
 
     @staticmethod
     async def _check_stamp_file(
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         stamp_file: str | None,
         script: Script,
         parent: ElementMixin,
@@ -362,7 +365,7 @@ async def _check_stamp_file(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         stamp_file: str | None
@@ -390,7 +393,7 @@ async def _check_stamp_file(
 
     async def _check_slurm_job(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         slurm_id: str | None,
         script: Script,
         parent: ElementMixin,
@@ -400,7 +403,7 @@ async def _check_slurm_job(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         slurm_id : str
@@ -426,7 +429,7 @@ async def _check_slurm_job(
 
     async def _check_htcondor_job(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         htcondor_id: str | None,
         script: Script,
         parent: ElementMixin,
@@ -436,7 +439,7 @@ async def _check_htcondor_job(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         htcondor_id : str | None
@@ -462,7 +465,7 @@ async def _check_htcondor_job(
 
     async def prepare(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -486,7 +489,7 @@ async def prepare(
 
     async def launch(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -535,7 +538,7 @@ async def launch(
 
     async def check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -581,7 +584,7 @@ async def check(
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -590,7 +593,7 @@ async def _write_script(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         script: Script
@@ -608,7 +611,7 @@ async def _write_script(
 
     async def _set_script_files(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         prod_area: str | Path,
     ) -> str:
@@ -620,7 +623,7 @@ async def _set_script_files(
 
     async def _reset_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -649,7 +652,7 @@ class FunctionHandler(BaseScriptHandler):
 
     async def prepare(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -667,7 +670,7 @@ async def prepare(
 
     async def launch(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -686,7 +689,7 @@ async def launch(
 
     async def check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -703,7 +706,7 @@ async def check(
 
     async def _do_prepare(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -712,7 +715,7 @@ async def _do_prepare(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         script: Script
@@ -730,7 +733,7 @@ async def _do_prepare(
 
     async def _do_run(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -739,7 +742,7 @@ async def _do_run(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         script: Script
@@ -757,7 +760,7 @@ async def _do_run(
 
     async def _do_check(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -766,7 +769,7 @@ async def _do_check(
 
         Parameters
         ----------
-        session : async_scoped_session
+        session : AnyAsyncSession
             DB session manager
 
         script: Script
@@ -784,7 +787,7 @@ async def _do_check(
 
     async def _reset_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
diff --git a/src/lsst/cmservice/handlers/scripts.py b/src/lsst/cmservice/handlers/scripts.py
index 3b5284270..575ea3883 100644
--- a/src/lsst/cmservice/handlers/scripts.py
+++ b/src/lsst/cmservice/handlers/scripts.py
@@ -5,7 +5,6 @@
 from typing import TYPE_CHECKING, Any
 
 from anyio import Path
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from ..common.bash import write_bash_script
 from ..common.butler import (
@@ -23,6 +22,10 @@
 from ..db.step import Step
 from .script_handler import ScriptHandler
 
+if TYPE_CHECKING:
+    from ..common.types import AnyAsyncSession
+
+
 logger = LOGGER.bind(module=__name__)
 
 
@@ -31,7 +34,7 @@ class NullScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -58,7 +61,7 @@ async def _write_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -82,7 +85,7 @@ class ChainCreateScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -117,7 +120,7 @@ async def _write_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -148,7 +151,7 @@ class ChainPrependScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -178,7 +181,7 @@ async def _write_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -210,7 +213,7 @@ class ChainCollectScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -257,7 +260,7 @@ async def _write_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -288,7 +291,7 @@ class TagInputsScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -318,7 +321,7 @@ async def _write_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -345,7 +348,7 @@ class TagCreateScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -371,7 +374,7 @@ async def _write_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -400,7 +403,7 @@ class TagAssociateScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -428,7 +431,7 @@ async def _write_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -462,7 +465,7 @@ class PrepareStepScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -505,7 +508,7 @@ async def _write_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -527,7 +530,7 @@ class ResourceUsageScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -557,7 +560,7 @@ async def _write_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -584,7 +587,7 @@ class HipsMapsScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -649,7 +652,7 @@ async def _write_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
@@ -683,7 +686,7 @@ class ValidateScriptHandler(ScriptHandler):
 
     async def _write_script(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         parent: ElementMixin,
         **kwargs: Any,
@@ -710,7 +713,7 @@ async def _write_script(
 
     async def _purge_products(
         self,
-        session: async_scoped_session,
+        session: AnyAsyncSession,
         script: Script,
         to_status: StatusEnum,
         *,
diff --git a/src/lsst/cmservice/main.py b/src/lsst/cmservice/main.py
index 5b53eec81..b1d4f8460 100644
--- a/src/lsst/cmservice/main.py
+++ b/src/lsst/cmservice/main.py
@@ -3,13 +3,13 @@
 
 import uvicorn
 from fastapi import FastAPI
-from safir.dependencies.db_session import db_session_dependency
 from safir.dependencies.http_client import http_client_dependency
 from safir.logging import configure_logging, configure_uvicorn_logging
 from safir.middleware.x_forwarded import XForwardedMiddleware
 
 from . import __version__
 from .config import config
+from .db.session import db_session_dependency
 from .routers import (
     healthz,
     index,
@@ -96,9 +96,8 @@ async def lifespan(app: FastAPI) -> AsyncGenerator:
     """Hook FastAPI init/cleanups."""
     app.state.tasks = set()
     # Dependency inits before app starts running
-    await db_session_dependency.initialize(config.db.url, config.db.password)
-    assert db_session_dependency._engine is not None
-    db_session_dependency._engine.echo = config.db.echo
+    await db_session_dependency.initialize()
+    assert db_session_dependency.engine is not None
 
     # App runs here...
     yield
diff --git a/src/lsst/cmservice/routers/actions.py b/src/lsst/cmservice/routers/actions.py
index a5840cd91..a199b3230 100644
--- a/src/lsst/cmservice/routers/actions.py
+++ b/src/lsst/cmservice/routers/actions.py
@@ -1,11 +1,11 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, HTTPException
-from safir.dependencies.db_session import db_session_dependency
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from .. import db, models
 from ..common.enums import StatusEnum
+from ..common.types import AnyAsyncSession
+from ..db.session import db_session_dependency
 from ..handlers import interface
 
 router = APIRouter(
@@ -21,7 +21,7 @@
 )
 async def process(
     query: models.ProcessNodeQuery,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> tuple[bool, StatusEnum]:
     """Invoke the interface.process function"""
     params = query.model_dump()
@@ -43,7 +43,7 @@ async def process(
 )
 async def reset_script(
     query: models.ResetScriptQuery,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> db.Script:
     """Invoke the interface.reset_script function"""
     params = query.model_dump()
@@ -63,7 +63,7 @@ async def reset_script(
 )
 async def rescue_job(
     query: models.NodeQuery,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> db.Job:
     """Invoke the interface.rescue_job function"""
     params = query.model_dump()
@@ -83,7 +83,7 @@ async def rescue_job(
 )
 async def mark_job_rescued(
     query: models.NodeQuery,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> list[db.Job]:
     """Invoke the interface.mark_job_rescued function"""
     params = query.model_dump()
@@ -103,7 +103,7 @@ async def mark_job_rescued(
 )
 async def rematch_pipetask_errors(
     query: models.RematchQuery,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> list[db.PipetaskError]:
     """Invoke the interface.match_pipetask_errors function"""
     params = query.model_dump()
diff --git a/src/lsst/cmservice/routers/campaigns.py b/src/lsst/cmservice/routers/campaigns.py
index 9430aee21..0956aa49a 100644
--- a/src/lsst/cmservice/routers/campaigns.py
+++ b/src/lsst/cmservice/routers/campaigns.py
@@ -5,15 +5,15 @@
 from uuid import uuid5
 
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException
-from safir.dependencies.db_session import db_session_dependency
 from sqlalchemy import select
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from .. import db, models
 from ..common import timestamp
 from ..common.enums import DEFAULT_NAMESPACE
 from ..common.graph import graph_from_edge_list, graph_to_dict
 from ..common.logging import LOGGER
+from ..common.types import AnyAsyncSession
+from ..db.session import db_session_dependency
 from ..handlers.functions import render_campaign_steps
 from . import wrappers
 
@@ -98,7 +98,7 @@
 )
 async def post_row(
     row_create: models.CampaignCreate,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     background_tasks: BackgroundTasks,
 ) -> db.Campaign:
     try:
@@ -125,7 +125,7 @@ async def post_row(
 )
 async def get_step_graph(
     row_id: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> Mapping:
     # Determine the namespace UUID for the campaign
     campaign = await db.Campaign.get_row(session, row_id)
@@ -148,7 +148,7 @@ async def get_step_graph(
 )
 async def get_script_graph(
     row_id: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> Mapping:
     # Determine the namespace UUID for the campaign
     campaign = await db.Campaign.get_row(session, row_id)
diff --git a/src/lsst/cmservice/routers/groups.py b/src/lsst/cmservice/routers/groups.py
index 56ff456ac..ddada5149 100644
--- a/src/lsst/cmservice/routers/groups.py
+++ b/src/lsst/cmservice/routers/groups.py
@@ -3,10 +3,10 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends
-from safir.dependencies.db_session import db_session_dependency
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from .. import db, models
+from ..common.types import AnyAsyncSession
+from ..db.session import db_session_dependency
 from . import wrappers
 
 # Template specialization
@@ -95,7 +95,7 @@
 )
 async def rescue_job(
     row_id: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> db.Job:
     """Invoke the Group.rescue_job function"""
     the_group = await DbClass.get_row(session, row_id)
@@ -110,7 +110,7 @@ async def rescue_job(
 )
 async def mark_job_rescued(
     row_id: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> list[db.Job]:
     """Invoke the Group.mark_job_rescued function"""
     the_group = await DbClass.get_row(session, row_id)
diff --git a/src/lsst/cmservice/routers/jobs.py b/src/lsst/cmservice/routers/jobs.py
index 4790fa55a..9e81b09d9 100644
--- a/src/lsst/cmservice/routers/jobs.py
+++ b/src/lsst/cmservice/routers/jobs.py
@@ -4,12 +4,12 @@
 from typing import TYPE_CHECKING, Annotated
 
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Response
-from safir.dependencies.db_session import db_session_dependency
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from .. import db, models
 from ..common.errors import CMBadStateTransitionError, CMMissingIDError
 from ..common.logging import LOGGER
+from ..common.types import AnyAsyncSession
+from ..db.session import db_session_dependency
 from ..handlers.functions import force_accept_node
 from . import wrappers
 
@@ -99,7 +99,7 @@
 )
 async def get_errors(
     row_id: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> Sequence[db.PipetaskError]:
     try:
         async with session.begin():
@@ -121,7 +121,7 @@ async def get_errors(
 async def accept_job(
     *,
     row_id: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     background_tasks: BackgroundTasks,
     force: bool = False,
     output_collection: str | None = None,
diff --git a/src/lsst/cmservice/routers/loaders.py b/src/lsst/cmservice/routers/loaders.py
index 26863e62b..225c78808 100644
--- a/src/lsst/cmservice/routers/loaders.py
+++ b/src/lsst/cmservice/routers/loaders.py
@@ -1,10 +1,10 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, HTTPException
-from safir.dependencies.db_session import db_session_dependency
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from .. import db, models
+from ..common.types import AnyAsyncSession
+from ..db.session import db_session_dependency
 from ..handlers import functions, interface
 
 router = APIRouter(
@@ -21,7 +21,7 @@
 )
 async def add_steps(
     query: models.AddSteps,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> db.Campaign:
     """Invoke the interface.add_steps function"""
     try:
@@ -40,7 +40,7 @@ async def add_steps(
 )
 async def load_specification(
     query: models.SpecificationLoad,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> db.Specification:
     """Load a specification object fom a yaml file
 
@@ -49,7 +49,7 @@ async def load_specification(
     query: models.SpecificationLoad
         Details of what to load
 
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     Returns
@@ -73,7 +73,7 @@ async def load_specification(
 )
 async def load_and_create_campaign(
     query: models.LoadAndCreateCampaign,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> db.Campaign:
     """Load a specification and use it to create a `Campaign`
 
@@ -82,7 +82,7 @@ async def load_and_create_campaign(
     query: models.LoadAndCreateCampaign
         Details of what to load and create
 
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     Returns
@@ -106,7 +106,7 @@ async def load_and_create_campaign(
 )
 async def load_error_types(
     query: models.YamlFileQuery,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> list[db.PipetaskErrorType]:
     """Load a set of PipetaskErrorType object from a yaml file
 
@@ -115,7 +115,7 @@ async def load_error_types(
     query: models.YamlFileQuery
         Details of what to load
 
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     Returns
@@ -139,7 +139,7 @@ async def load_error_types(
 )
 async def load_manifest_report(
     query: models.LoadManifestReport,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> db.Job:
     """Load a pipetask report and associated it to a Job
 
@@ -148,7 +148,7 @@ async def load_manifest_report(
     query: models.LoadManifestReport
         Details of what to load
 
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     Returns
diff --git a/src/lsst/cmservice/routers/queues.py b/src/lsst/cmservice/routers/queues.py
index b10416b50..02c52c508 100644
--- a/src/lsst/cmservice/routers/queues.py
+++ b/src/lsst/cmservice/routers/queues.py
@@ -3,12 +3,12 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, HTTPException
-from safir.dependencies.db_session import db_session_dependency
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from .. import db, models
 from ..common.errors import CMMissingIDError
 from ..common.logging import LOGGER
+from ..common.types import AnyAsyncSession
+from ..db.session import db_session_dependency
 from . import wrappers
 
 logger = LOGGER.bind(module=__name__)
@@ -51,7 +51,7 @@
     summary="Process the associated element",
 )
 async def process_element(
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     row_id: int,
 ) -> bool:
     """Process associated element
@@ -61,7 +61,7 @@ async def process_element(
     row_id: int
         ID of the Queue row in question
 
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     Returns
@@ -86,7 +86,7 @@ async def process_element(
     summary="Toggle the pause status of a queue entry",
 )
 async def toggle_active(
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     row_id: int,
 ) -> bool:
     """Toggle the active status of a queue entry.
@@ -96,7 +96,7 @@ async def toggle_active(
     row_id: int
         ID of the Queue row in question
 
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     Returns
@@ -121,7 +121,7 @@ async def toggle_active(
     summary="Check how long to sleep based on what is running",
 )
 async def sleep_time(
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     row_id: int,
 ) -> int:
     """Check how long to sleep based on what is running
@@ -131,7 +131,7 @@ async def sleep_time(
     row_id: int
         ID of the Queue row in question
 
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     Returns
diff --git a/src/lsst/cmservice/routers/scripts.py b/src/lsst/cmservice/routers/scripts.py
index 6fa61eb37..ed6ad47e0 100644
--- a/src/lsst/cmservice/routers/scripts.py
+++ b/src/lsst/cmservice/routers/scripts.py
@@ -4,12 +4,12 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, HTTPException
-from safir.dependencies.db_session import db_session_dependency
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from .. import db, models
 from ..common.enums import StatusEnum
 from ..common.errors import CMMissingIDError
+from ..common.types import AnyAsyncSession
+from ..db.session import db_session_dependency
 from . import wrappers
 
 # Template specialization
@@ -87,7 +87,7 @@
 async def reset_script(
     row_id: int,
     query: models.ResetQuery,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> StatusEnum:
     """Reset a script to an earlier status
 
@@ -96,7 +96,7 @@ async def reset_script(
     row_id: int
         ID of the script in question
 
-    session: async_scoped_session
+    session: AnyAsyncSession
         DB session manager
 
     Returns
@@ -123,7 +123,7 @@ async def reset_script(
 )
 async def get_script_errors(
     row_id: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> Sequence[db.ScriptError]:
     try:
         async with session.begin():
diff --git a/src/lsst/cmservice/routers/wrappers.py b/src/lsst/cmservice/routers/wrappers.py
index 36024215c..86906809c 100644
--- a/src/lsst/cmservice/routers/wrappers.py
+++ b/src/lsst/cmservice/routers/wrappers.py
@@ -13,13 +13,13 @@
 
 from fastapi import APIRouter, Depends, HTTPException
 from pydantic import BaseModel
-from safir.dependencies.db_session import db_session_dependency
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from .. import db, models
 from ..common.enums import StatusEnum
 from ..common.errors import CMBadStateTransitionError, CMMissingFullnameError, CMMissingIDError
 from ..common.logging import LOGGER
+from ..common.types import AnyAsyncSession
+from ..db.session import db_session_dependency
 
 logger = LOGGER.bind(module=__name__)
 
@@ -57,7 +57,7 @@ def get_rows_no_parent_function(
         summary=f"List all the {db_class.class_string}",
     )
     async def get_rows(
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
         skip: int = 0,
         limit: int = 100,
     ) -> Sequence[response_model_class]:
@@ -104,7 +104,7 @@ def get_rows_function(
         summary=f"List all the {db_class.class_string}",
     )
     async def get_rows(
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
         parent_id: int | None = None,
         skip: int = 0,
         limit: int = 100,
@@ -156,7 +156,7 @@ def get_row_function(
     )
     async def get_row(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -202,7 +202,7 @@ def get_row_by_fullname_function(
     )
     async def get_row_by_fullname(
         fullname: str,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -248,7 +248,7 @@ def get_row_by_name_function(
     )
     async def get_row_by_name(
         name: str,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -300,7 +300,7 @@ def post_row_function(
     )
     async def post_row(
         row_create: create_model_class,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> db_class:
         try:
             async with session.begin():
@@ -340,7 +340,7 @@ def delete_row_function(
     )
     async def delete_row(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> None:
         try:
             async with session.begin():
@@ -392,7 +392,7 @@ def put_row_function(
     async def update_row(
         row_id: int,
         row_update: update_model_class,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> db_class:
         try:
             async with session.begin():
@@ -433,7 +433,7 @@ def get_node_spec_block_function(
     )
     async def get_node_spec_block(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> models.SpecBlock:
         try:
             async with session.begin():
@@ -476,7 +476,7 @@ def get_node_specification_function(
     )
     async def get_node_specification(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> models.Specification:
         try:
             async with session.begin():
@@ -523,7 +523,7 @@ def get_node_parent_function(
     )
     async def get_node_parent(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -566,7 +566,7 @@ def get_node_resolved_collections_function(
     )
     async def get_node_resolved_collections(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> dict[str, str]:
         try:
             async with session.begin():
@@ -609,7 +609,7 @@ def get_node_collections_function(
     )
     async def get_node_collections(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> dict[str, str]:
         try:
             async with session.begin():
@@ -652,7 +652,7 @@ def get_node_child_config_function(
     )
     async def get_node_child_config(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> dict[str, str | int]:
         try:
             async with session.begin():
@@ -695,7 +695,7 @@ def get_node_data_dict_function(
     )
     async def get_node_data_dict(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> dict[str, str]:
         try:
             async with session.begin():
@@ -738,7 +738,7 @@ def get_node_spec_aliases_function(
     )
     async def get_node_spec_aliases(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> dict[str, str]:
         try:
             async with session.begin():
@@ -787,7 +787,7 @@ def update_node_status_function(
     async def update_node_status(
         row_id: int,
         query: models.UpdateStatusQuery,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -838,7 +838,7 @@ def update_node_collections_function(
     async def update_node_collections(
         row_id: int,
         query: models.UpdateNodeQuery,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -886,7 +886,7 @@ def update_node_child_config_function(
     async def update_node_child_config(
         row_id: int,
         query: models.UpdateNodeQuery,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -934,7 +934,7 @@ def update_node_data_dict_function(
     async def update_node_data_dict(
         row_id: int,
         query: models.UpdateNodeQuery,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -982,7 +982,7 @@ def update_node_spec_aliases_function(
     async def update_node_spec_aliases(
         row_id: int,
         query: models.UpdateNodeQuery,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -1025,7 +1025,7 @@ def get_node_check_prerequisites_function(
     )
     async def node_check_prerequisites(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> bool:
         try:
             async with session.begin():
@@ -1073,7 +1073,7 @@ def get_node_reject_function(
     )
     async def node_reject(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -1123,7 +1123,7 @@ def get_node_accept_function(
     )
     async def node_accept(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -1174,7 +1174,7 @@ def get_node_reset_function(
     async def node_reset(
         row_id: int,
         query: models.ResetQuery,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> response_model_class:
         try:
             async with session.begin():
@@ -1220,7 +1220,7 @@ def get_node_process_function(
     )
     async def node_process(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> tuple[bool, StatusEnum]:
         try:
             async with session.begin():
@@ -1264,7 +1264,7 @@ def get_node_run_check_function(
     )
     async def node_run_check(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> tuple[bool, StatusEnum]:
         try:
             async with session.begin():
@@ -1309,7 +1309,7 @@ def get_element_get_scripts_function(
     )
     async def element_get_scripts(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
         script_name: str = "",
     ) -> list[db.Script]:
         try:
@@ -1355,7 +1355,7 @@ def get_element_get_all_scripts_function(
     )
     async def element_get_all_scripts(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> list[db.Script]:
         try:
             async with session.begin():
@@ -1400,7 +1400,7 @@ def get_element_get_jobs_function(
     )
     async def element_get_jobs(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> list[db.Job]:
         try:
             async with session.begin():
@@ -1446,7 +1446,7 @@ def get_element_retry_script_function(
     async def element_retry_script(
         row_id: int,
         query: models.RetryScriptQuery,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> db.Script:
         try:
             async with session.begin():
@@ -1494,7 +1494,7 @@ def get_element_wms_task_reports_function(
     )
     async def element_get_wms_task_reports(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> models.MergedWmsTaskReportDict:
         try:
             async with session.begin():
@@ -1539,7 +1539,7 @@ def get_element_tasks_function(
     )
     async def element_get_tasks(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> models.MergedTaskSetDict:
         try:
             async with session.begin():
@@ -1584,7 +1584,7 @@ def get_element_products_function(
     )
     async def element_get_products(
         row_id: int,
-        session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+        session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> models.MergedProductSetDict:
         try:
             async with session.begin():
diff --git a/src/lsst/cmservice/web_app/app.py b/src/lsst/cmservice/web_app/app.py
index 485332a22..7018ee108 100644
--- a/src/lsst/cmservice/web_app/app.py
+++ b/src/lsst/cmservice/web_app/app.py
@@ -11,13 +11,10 @@
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from pydantic import BaseModel
-from safir.dependencies.db_session import db_session_dependency
 from safir.dependencies.http_client import http_client_dependency
-from sqlalchemy.ext.asyncio import async_scoped_session
 from starlette.exceptions import HTTPException as StarletteHTTPException
 
 from lsst.cmservice.common.enums import LevelEnum
-from lsst.cmservice.config import config
 from lsst.cmservice.web_app.pages.campaigns import get_all_campaigns, get_campaign_details, search_campaigns
 from lsst.cmservice.web_app.pages.group_details import get_group_by_id
 from lsst.cmservice.web_app.pages.job_details import get_job_by_id
@@ -35,14 +32,16 @@
     update_data_dict,
 )
 
+from ..common.types import AnyAsyncSession
+from ..db.session import db_session_dependency
+
 
 @asynccontextmanager
 async def lifespan(_: FastAPI) -> AsyncGenerator:
     """Hook FastAPI init/cleanups."""
     # Dependency inits before app starts running
-    await db_session_dependency.initialize(config.db.url, config.db.password)
-    assert db_session_dependency._engine is not None
-    db_session_dependency._engine.echo = config.db.echo
+    await db_session_dependency.initialize()
+    assert db_session_dependency.engine is not None
 
     # App runs here...
     yield
@@ -110,7 +109,7 @@ async def http_exception_handler(request: Request, exc: StarletteHTTPException)
 @web_app.get("/campaigns/", response_class=HTMLResponse)
 async def get_campaigns(
     request: Request,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> HTMLResponse:
     try:
         campaign_list = []
@@ -137,7 +136,7 @@ async def get_campaigns(
 async def search(
     request: Request,
     search_term: Annotated[str, Form()],
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> HTMLResponse:
     try:
         results = await search_campaigns(session, search_term)
@@ -163,7 +162,7 @@ async def search(
 async def get_steps(
     request: Request,
     campaign_id: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> HTMLResponse:
     try:
         campaign = await get_campaign_by_id(session, campaign_id)
@@ -194,7 +193,7 @@ async def get_step(
     request: Request,
     campaign_id: int,
     step_id: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> HTMLResponse:
     try:
         step, step_groups, step_scripts = await get_step_details_by_id(session, step_id)
@@ -218,7 +217,7 @@ async def get_step(
 async def get_group(
     request: Request,
     group_id: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> HTMLResponse:
     try:
         group_details, jobs, scripts = await get_group_by_id(session, group_id)
@@ -243,7 +242,7 @@ async def get_job(
     step_id: int,
     group_id: int,
     job_id: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> HTMLResponse:
     try:
         job_details, scripts = await get_job_by_id(session, job_id)
@@ -269,7 +268,7 @@ async def get_job(
 @web_app.get("/script/{campaign_id}/{step_id}/{group_id}/{job_id}/{script_id}/", response_class=HTMLResponse)
 async def get_script(
     request: Request,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     script_id: int,
     campaign_id: int | None = None,
     step_id: int | None = None,
@@ -329,7 +328,7 @@ async def update_element_collections(
     request: Request,
     element_id: int,
     element_type: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> HTMLResponse:
     try:
         element = await get_element(session, element_id, element_type)
@@ -360,7 +359,7 @@ async def update_element_child_config(
     request: Request,
     element_id: int,
     element_type: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> HTMLResponse:
     try:
         element = await get_element(session, element_id, element_type)
@@ -392,7 +391,7 @@ async def update_element_data_dict(
     request: Request,
     element_id: int,
     element_type: int,
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
 ) -> HTMLResponse:
     try:
         element = await get_element(session, element_id, element_type)
diff --git a/src/lsst/cmservice/web_app/pages/campaigns.py b/src/lsst/cmservice/web_app/pages/campaigns.py
index 31d0811a2..fd3efe55e 100644
--- a/src/lsst/cmservice/web_app/pages/campaigns.py
+++ b/src/lsst/cmservice/web_app/pages/campaigns.py
@@ -2,16 +2,16 @@
 from typing import TYPE_CHECKING
 
 from sqlalchemy import select
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from lsst.cmservice.common.enums import LevelEnum
 from lsst.cmservice.common.timestamp import iso_timestamp
+from lsst.cmservice.common.types import AnyAsyncSession
 from lsst.cmservice.db import Campaign, Group
 from lsst.cmservice.web_app.pages.steps import get_campaign_steps, get_step_details
 from lsst.cmservice.web_app.utils.utils import map_status
 
 
-async def get_campaign_details(session: async_scoped_session, campaign: Campaign) -> dict:
+async def get_campaign_details(session: AnyAsyncSession, campaign: Campaign) -> dict:
     if TYPE_CHECKING:
         assert isinstance(campaign.data, dict)
     collections = await campaign.resolve_collections(session, throw_overrides=False)
@@ -54,21 +54,21 @@ async def get_campaign_details(session: async_scoped_session, campaign: Campaign
     return campaign_details
 
 
-async def search_campaigns(session: async_scoped_session, search_term: str) -> Sequence:
+async def search_campaigns(session: AnyAsyncSession, search_term: str) -> Sequence:
     q = select(Campaign).where(Campaign.name.contains(search_term))
     async with session.begin_nested():
         results = await session.scalars(q)
         return results.all()
 
 
-async def get_campaign_groups(session: async_scoped_session, campaign: Campaign) -> Sequence:
+async def get_campaign_groups(session: AnyAsyncSession, campaign: Campaign) -> Sequence:
     q = select(Group).where(Group.c_ == campaign)
     async with session.begin_nested():
         results = await session.scalars(q)
         return results.all()
 
 
-async def get_all_campaigns(session: async_scoped_session) -> Sequence:
+async def get_all_campaigns(session: AnyAsyncSession) -> Sequence:
     q = select(Campaign)
     async with session.begin_nested():
         results = await session.scalars(q)
diff --git a/src/lsst/cmservice/web_app/pages/group_details.py b/src/lsst/cmservice/web_app/pages/group_details.py
index 13a97f1b8..2d0dc0661 100644
--- a/src/lsst/cmservice/web_app/pages/group_details.py
+++ b/src/lsst/cmservice/web_app/pages/group_details.py
@@ -1,14 +1,14 @@
 from typing import Any
 
 from sqlalchemy import select
-from sqlalchemy.ext.asyncio import async_scoped_session
 
+from lsst.cmservice.common.types import AnyAsyncSession
 from lsst.cmservice.db import Group, NodeMixin
 from lsst.cmservice.web_app.utils.utils import map_status
 
 
 async def get_group_by_id(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     group_id: int,
     campaign_id: int | None = None,
     step_id: int | None = None,
@@ -79,7 +79,7 @@ async def get_group_by_id(
         return group_details, jobs, scripts
 
 
-async def get_group_jobs(session: async_scoped_session, group: Group) -> list[dict]:
+async def get_group_jobs(session: AnyAsyncSession, group: Group) -> list[dict]:
     jobs = await group.children(session)
     return [
         {
@@ -98,7 +98,7 @@ async def get_group_jobs(session: async_scoped_session, group: Group) -> list[di
     ]
 
 
-async def get_group_scripts(session: async_scoped_session, group: Group) -> list[dict]:
+async def get_group_scripts(session: AnyAsyncSession, group: Group) -> list[dict]:
     scripts = await group.get_scripts(session)
     return [
         {
@@ -113,6 +113,6 @@ async def get_group_scripts(session: async_scoped_session, group: Group) -> list
     ]
 
 
-async def get_group_node(session: async_scoped_session, group_id: int) -> NodeMixin:
+async def get_group_node(session: AnyAsyncSession, group_id: int) -> NodeMixin:
     group = await Group.get_row(session, group_id)
     return group
diff --git a/src/lsst/cmservice/web_app/pages/job_details.py b/src/lsst/cmservice/web_app/pages/job_details.py
index a55b88689..d468aa17c 100644
--- a/src/lsst/cmservice/web_app/pages/job_details.py
+++ b/src/lsst/cmservice/web_app/pages/job_details.py
@@ -1,14 +1,14 @@
 from typing import Any
 
 from sqlalchemy import select
-from sqlalchemy.ext.asyncio import async_scoped_session
 
+from lsst.cmservice.common.types import AnyAsyncSession
 from lsst.cmservice.db import Job, NodeMixin
 from lsst.cmservice.web_app.utils.utils import map_status
 
 
 async def get_job_by_id(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     job_id: int,
 ) -> tuple[dict[str, Any] | None, list[dict[Any, Any]] | None]:
     q = select(Job).where(Job.id == job_id)
@@ -73,7 +73,7 @@ async def get_job_by_id(
         return job_details, scripts
 
 
-async def get_job_scripts(session: async_scoped_session, job: Job) -> list[dict]:
+async def get_job_scripts(session: AnyAsyncSession, job: Job) -> list[dict]:
     scripts = await job.get_scripts(session)
     job_scripts = [
         {
@@ -89,6 +89,6 @@ async def get_job_scripts(session: async_scoped_session, job: Job) -> list[dict]
     return job_scripts
 
 
-async def get_job_node(session: async_scoped_session, job_id: int) -> NodeMixin:
+async def get_job_node(session: AnyAsyncSession, job_id: int) -> NodeMixin:
     job = await Job.get_row(session, job_id)
     return job
diff --git a/src/lsst/cmservice/web_app/pages/script_details.py b/src/lsst/cmservice/web_app/pages/script_details.py
index 7328f1531..662aa99ba 100644
--- a/src/lsst/cmservice/web_app/pages/script_details.py
+++ b/src/lsst/cmservice/web_app/pages/script_details.py
@@ -2,8 +2,8 @@
 
 import starlette.requests
 from sqlalchemy import select
-from sqlalchemy.ext.asyncio import async_scoped_session
 
+from lsst.cmservice.common.types import AnyAsyncSession
 from lsst.cmservice.db import Group, Job, NodeMixin, Script, Step
 from lsst.cmservice.web_app.utils.utils import map_status
 
@@ -20,7 +20,7 @@ def is_script_collection(collection: tuple[str, str]) -> bool:
 
 
 async def get_script_by_id(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     script_id: int,
     request: starlette.requests.Request,
     campaign_id: int | None = None,
@@ -104,27 +104,27 @@ async def get_script_by_id(
         return script_details
 
 
-async def get_step_id_by_fullname(session: async_scoped_session, fullname: str) -> int | None:
+async def get_step_id_by_fullname(session: AnyAsyncSession, fullname: str) -> int | None:
     q = select(Step.id).where(Step.fullname == fullname)
     async with session.begin_nested():
         results = await session.scalars(q)
         return results.one_or_none()
 
 
-async def get_group_id_by_fullname(session: async_scoped_session, fullname: str) -> int | None:
+async def get_group_id_by_fullname(session: AnyAsyncSession, fullname: str) -> int | None:
     q = select(Group.id).where(Group.fullname == fullname)
     async with session.begin_nested():
         results = await session.scalars(q)
         return results.one_or_none()
 
 
-async def get_job_id_by_fullname(session: async_scoped_session, fullname: str) -> int | None:
+async def get_job_id_by_fullname(session: AnyAsyncSession, fullname: str) -> int | None:
     q = select(Job.id).where(Job.fullname == fullname)
     async with session.begin_nested():
         results = await session.scalars(q)
         return results.one_or_none()
 
 
-async def get_script_node(session: async_scoped_session, script_id: int) -> NodeMixin:
+async def get_script_node(session: AnyAsyncSession, script_id: int) -> NodeMixin:
     script = await Script.get_row(session, script_id)
     return script
diff --git a/src/lsst/cmservice/web_app/pages/step_details.py b/src/lsst/cmservice/web_app/pages/step_details.py
index fb9c26a39..1b5a15a2e 100644
--- a/src/lsst/cmservice/web_app/pages/step_details.py
+++ b/src/lsst/cmservice/web_app/pages/step_details.py
@@ -1,14 +1,13 @@
 from typing import Any
 
-from sqlalchemy.ext.asyncio import async_scoped_session
-
+from lsst.cmservice.common.types import AnyAsyncSession
 from lsst.cmservice.db import NodeMixin, Step
 from lsst.cmservice.web_app.pages.steps import get_step_details
 from lsst.cmservice.web_app.utils.utils import map_status
 
 
 async def get_step_details_by_id(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     step_id: int,
 ) -> tuple[Any, list[dict[Any, Any]], list[dict[Any, Any]]]:
     step = await Step.get_row(session, step_id)
@@ -23,7 +22,7 @@ async def get_step_details_by_id(
     return step_details, groups, scripts
 
 
-async def get_step_groups(session: async_scoped_session, step: Step) -> list[dict]:
+async def get_step_groups(session: AnyAsyncSession, step: Step) -> list[dict]:
     groups = await step.children(session)
     step_groups = [
         {
@@ -42,7 +41,7 @@ async def get_step_groups(session: async_scoped_session, step: Step) -> list[dic
     return step_groups
 
 
-async def get_step_scripts(session: async_scoped_session, step: Step) -> list[dict]:
+async def get_step_scripts(session: AnyAsyncSession, step: Step) -> list[dict]:
     scripts = await step.get_scripts(session)
     step_scripts = [
         {
@@ -58,6 +57,6 @@ async def get_step_scripts(session: async_scoped_session, step: Step) -> list[di
     return step_scripts
 
 
-async def get_step_node(session: async_scoped_session, step_id: int) -> NodeMixin:
+async def get_step_node(session: AnyAsyncSession, step_id: int) -> NodeMixin:
     step = await Step.get_row(session, step_id)
     return step
diff --git a/src/lsst/cmservice/web_app/pages/steps.py b/src/lsst/cmservice/web_app/pages/steps.py
index 187f78031..16a4fa4c4 100644
--- a/src/lsst/cmservice/web_app/pages/steps.py
+++ b/src/lsst/cmservice/web_app/pages/steps.py
@@ -1,22 +1,22 @@
 from collections.abc import Sequence
 
 from sqlalchemy import select
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from lsst.cmservice.common.enums import StatusEnum
+from lsst.cmservice.common.types import AnyAsyncSession
 from lsst.cmservice.db import Campaign, Step
 from lsst.cmservice.parsing.string import parse_element_fullname
 from lsst.cmservice.web_app.utils.utils import map_status
 
 
-async def get_campaign_steps(session: async_scoped_session, campaign_id: int) -> Sequence:
+async def get_campaign_steps(session: AnyAsyncSession, campaign_id: int) -> Sequence:
     q = select(Step).where(Step.parent_id == campaign_id).order_by(Step.id)
     async with session.begin_nested():
         results = await session.scalars(q)
         return results.all()
 
 
-async def get_step_details(session: async_scoped_session, step: Step) -> dict:
+async def get_step_details(session: AnyAsyncSession, step: Step) -> dict:
     step_groups = await step.children(session)
     no_groups = len(list(step_groups))
     no_groups_completed = len([group for group in step_groups if group.status is StatusEnum.accepted])
@@ -38,7 +38,7 @@ async def get_step_details(session: async_scoped_session, step: Step) -> dict:
     return step_details
 
 
-async def get_campaign_by_id(session: async_scoped_session, campaign_id: int) -> Campaign | None:
+async def get_campaign_by_id(session: AnyAsyncSession, campaign_id: int) -> Campaign | None:
     q = select(Campaign).where(Campaign.id == campaign_id)
     async with session.begin_nested():
         results = await session.scalars(q)
diff --git a/src/lsst/cmservice/web_app/utils/utils.py b/src/lsst/cmservice/web_app/utils/utils.py
index 7009be8c2..7027d8d29 100644
--- a/src/lsst/cmservice/web_app/utils/utils.py
+++ b/src/lsst/cmservice/web_app/utils/utils.py
@@ -1,6 +1,5 @@
-from sqlalchemy.ext.asyncio import async_scoped_session
-
 from lsst.cmservice.common.enums import LevelEnum, StatusEnum
+from lsst.cmservice.common.types import AnyAsyncSession
 from lsst.cmservice.db import NodeMixin
 
 
@@ -17,26 +16,22 @@ def map_status(status: StatusEnum) -> str | None:
     return None
 
 
-async def update_data_dict(session: async_scoped_session, element: NodeMixin, data_dict: dict) -> NodeMixin:
+async def update_data_dict(session: AnyAsyncSession, element: NodeMixin, data_dict: dict) -> NodeMixin:
     updated_element = await element.update_data_dict(session, **data_dict)
     return updated_element
 
 
-async def update_collections(
-    session: async_scoped_session, element: NodeMixin, collections: dict
-) -> NodeMixin:
+async def update_collections(session: AnyAsyncSession, element: NodeMixin, collections: dict) -> NodeMixin:
     updated_element = await element.update_collections(session, **collections)
     return updated_element
 
 
-async def update_child_config(
-    session: async_scoped_session, element: NodeMixin, child_config: dict
-) -> NodeMixin:
+async def update_child_config(session: AnyAsyncSession, element: NodeMixin, child_config: dict) -> NodeMixin:
     updated_element = await element.update_child_config(session, **child_config)
     return updated_element
 
 
-async def get_element(session: async_scoped_session, element_id: int, element_type: int) -> NodeMixin | None:
+async def get_element(session: AnyAsyncSession, element_id: int, element_type: int) -> NodeMixin | None:
     from lsst.cmservice.web_app.pages.group_details import get_group_node
     from lsst.cmservice.web_app.pages.job_details import get_job_node
     from lsst.cmservice.web_app.pages.script_details import get_script_node
diff --git a/tests/db/test_handlers.py b/tests/db/test_handlers.py
index 31f0d10eb..daf078bd8 100644
--- a/tests/db/test_handlers.py
+++ b/tests/db/test_handlers.py
@@ -8,17 +8,18 @@
 import structlog
 from _pytest.monkeypatch import MonkeyPatch
 from safir.database import create_async_session
-from sqlalchemy.ext.asyncio import AsyncEngine, async_scoped_session
+from sqlalchemy.ext.asyncio import AsyncEngine
 
 from lsst.cmservice import db
 from lsst.cmservice.common.enums import LevelEnum, StatusEnum
+from lsst.cmservice.common.types import AnyAsyncSession
 
 from .util_functions import cleanup, create_tree
 
 
 @pytest.mark.asyncio()
 async def check_run_script(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     parent: db.ElementMixin,
     script_name: str,
     spec_block_name: str,
@@ -47,7 +48,7 @@ async def check_run_script(
 
 @pytest.mark.asyncio()
 async def check_script(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     parent: db.ElementMixin,
     script_name: str,
     spec_block_name: str,
diff --git a/tests/db/util_functions.py b/tests/db/util_functions.py
index 6a2ab13f7..a3a172397 100644
--- a/tests/db/util_functions.py
+++ b/tests/db/util_functions.py
@@ -1,19 +1,19 @@
 import importlib
 from pathlib import Path
-from typing import TypeAlias, TypeVar
+from typing import TypeAlias
 
 import pytest
-from sqlalchemy.ext.asyncio import async_scoped_session
 
 from lsst.cmservice import db
 from lsst.cmservice.common import errors
 from lsst.cmservice.common.enums import LevelEnum, StatusEnum, TableEnum
+from lsst.cmservice.common.types import AnyAsyncSession
 
-E = TypeVar("E", db.Group, db.Campaign, db.Step, db.Job)
+type AnyElement = db.Group | db.Campaign | db.Step | db.Job
 
 
 async def add_scripts(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     element: db.ElementMixin,
 ) -> tuple[list[db.Script], db.ScriptDependency]:
     prep_script = await db.Script.create_row(
@@ -42,7 +42,7 @@ async def add_scripts(
 
 
 async def create_tree(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     level: LevelEnum,
     uuid_int: int,
 ) -> None:
@@ -128,7 +128,7 @@ async def create_tree(
 
 
 async def delete_all_rows(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     table_class: TypeAlias = db.RowMixin,
 ) -> None:
     rows = await table_class.get_rows(session)
@@ -140,7 +140,7 @@ async def delete_all_rows(
 
 
 async def delete_all_artifacts(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     *,
     check_cascade: bool = False,
 ) -> None:
@@ -159,20 +159,20 @@ async def delete_all_artifacts(
 
 
 async def delete_all_spec_stuff(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
 ) -> None:
     await delete_all_rows(session, db.Specification)
     await delete_all_rows(session, db.SpecBlock)
 
 
 async def delete_all_queues(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
 ) -> None:
     await delete_all_rows(session, db.Queue)
 
 
 async def cleanup(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     *,
     check_cascade: bool = False,
 ) -> None:
@@ -182,11 +182,12 @@ async def cleanup(
 
     await session.commit()
     await session.close()
-    await session.remove()
+    if hasattr(session, "remove"):
+        await session.remove()
 
 
 async def check_update_methods(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     entry: db.NodeMixin,
     entry_class: TypeAlias = db.ElementMixin,
 ) -> None:
@@ -294,7 +295,7 @@ async def check_update_methods(
 
 
 async def check_scripts(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     entry: db.ElementMixin,
 ) -> None:
     interface = importlib.import_module("lsst.cmservice.handlers.interface")
@@ -378,8 +379,8 @@ async def check_scripts(
 
 
 async def check_get_methods(
-    session: async_scoped_session,
-    entry: E,
+    session: AnyAsyncSession,
+    entry: AnyElement,
     entry_class: TypeAlias = db.ElementMixin,
     parent_class: TypeAlias | None = db.ElementMixin,
 ) -> None:
@@ -461,7 +462,7 @@ async def check_get_methods(
 
 
 async def check_queue(
-    session: async_scoped_session,
+    session: AnyAsyncSession,
     entry: db.ElementMixin,
 ) -> None:
     # make and test queue object

From 4ad117a354addaf192bc5ce43acad35f21b7b984 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Fri, 20 Jun 2025 11:25:50 -0500
Subject: [PATCH 05/37] chore(typing): - Refactor typealiases in router wrapper
 module - Remove "list" from spec_alias fields - Refactor typing in test
 modules - Update types in router tests - remove default values for
 TypeAliases

---
 src/lsst/cmservice/client/wrappers.py      |  52 ++--
 src/lsst/cmservice/common/types.py         |   6 +
 src/lsst/cmservice/db/campaign.py          |   2 +-
 src/lsst/cmservice/db/group.py             |   2 +-
 src/lsst/cmservice/db/job.py               |   2 +-
 src/lsst/cmservice/db/specification.py     |   2 +-
 src/lsst/cmservice/db/step.py              |   2 +-
 src/lsst/cmservice/models/element.py       |  12 +-
 src/lsst/cmservice/models/interface.py     |   8 +-
 src/lsst/cmservice/models/specification.py |   8 +-
 src/lsst/cmservice/routers/wrappers.py     | 269 +++++++++++----------
 tests/cli/util_functions.py                |  27 +--
 tests/routers/util_functions.py            |  57 ++---
 13 files changed, 236 insertions(+), 213 deletions(-)

diff --git a/src/lsst/cmservice/client/wrappers.py b/src/lsst/cmservice/client/wrappers.py
index 1f41b2410..4107abc28 100644
--- a/src/lsst/cmservice/client/wrappers.py
+++ b/src/lsst/cmservice/client/wrappers.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING, Any, TypeAlias
 
 from httpx import ConnectError, HTTPStatusError
-from pydantic import BaseModel, TypeAdapter
+from pydantic import TypeAdapter
 
 from .. import models
 from ..common.logging import LOGGER
@@ -17,7 +17,7 @@
 
 
 def get_rows_no_parent_function(
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
     query: str = "",
 ) -> Callable:
     """Return a function that gets all the rows from a table
@@ -28,7 +28,7 @@ def get_rows_no_parent_function(
 
     Parameters
     ----------
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     query: str
@@ -53,7 +53,7 @@ def get_rows(obj: CMClient) -> list[response_model_class]:
 
 
 def get_rows_function(
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
     query: str = "",
 ) -> Callable:  # pragma: no cover
     """Return a function that gets all the rows from a table
@@ -66,7 +66,7 @@ def get_rows_function(
 
     Parameters
     ----------
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     query: str
@@ -99,7 +99,7 @@ def get_rows(
 
 
 def get_row_function(
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
     query: str = "",
 ) -> Callable:
     """Return a function that gets a single row from a table (by ID)
@@ -107,7 +107,7 @@ def get_row_function(
 
     Parameters
     ----------
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     query: str
@@ -131,8 +131,8 @@ def row_get(
 
 
 def create_row_function(
-    response_model_class: TypeAlias = BaseModel,
-    create_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
+    create_model_class: TypeAlias,
     query: str = "",
 ) -> Callable:
     """Return a function that creates a single row in a table
@@ -140,10 +140,10 @@ def create_row_function(
 
     Parameters
     ----------
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
-    create_model_class: TypeAlias = BaseModel,
+    create_model_class: TypeAlias,
         Pydantic class used to serialize the inputs value
 
     query: str
@@ -168,8 +168,8 @@ def row_create(obj: CMClient, **kwargs: Any) -> response_model_class:
 
 
 def update_row_function(
-    response_model_class: TypeAlias = BaseModel,
-    update_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
+    update_model_class: TypeAlias,
     query: str = "",
 ) -> Callable:
     """Return a function that updates a single row in a table
@@ -177,10 +177,10 @@ def update_row_function(
 
     Parameters
     ----------
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
-    update_model_class: TypeAlias = BaseModel,
+    update_model_class: TypeAlias,
         Pydantic class used to serialize the input values
 
     query: str
@@ -233,7 +233,7 @@ def row_delete(
 
 
 def get_row_by_fullname_function(
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
     query: str = "",
 ) -> Callable:
     """Return a function that gets a single row from a table (by fullname)
@@ -241,7 +241,7 @@ def get_row_by_fullname_function(
 
     Parameters
     ----------
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     query: str
@@ -268,7 +268,7 @@ def get_row_by_fullname(
 
 
 def get_row_by_name_function(
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
     query: str = "",
 ) -> Callable:
     """Return a function that gets a single row from a table (by name)
@@ -276,7 +276,7 @@ def get_row_by_name_function(
 
     Parameters
     ----------
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     query: str
@@ -316,7 +316,7 @@ def get_node_property_function(
 
     Parameters
     ----------
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     query: str
@@ -353,7 +353,7 @@ def get_node_post_query_function(
 
     Parameters
     ----------
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     query_class: TypeAlias
@@ -394,7 +394,7 @@ def get_node_post_no_query_function(
 
     Parameters
     ----------
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     query: str
@@ -421,7 +421,7 @@ def node_update(
 
 
 def get_general_post_function(
-    query_class: TypeAlias = BaseModel,
+    query_class: TypeAlias,
     response_model_class: TypeAlias = Any,
     query: str = "",
     results_key: str | None = None,
@@ -431,7 +431,7 @@ def get_general_post_function(
 
     Parameters
     ----------
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     query: str
@@ -460,7 +460,7 @@ def general_post_function(
 
 
 def get_general_query_function(
-    query_class: TypeAlias = BaseModel,
+    query_class: TypeAlias,
     response_model_class: TypeAlias = Any,
     query: str = "",
     query_suffix: str = "",
@@ -474,7 +474,7 @@ def get_general_query_function(
     query_class: TypeAlias
         Pydantic class used to serialize the query parameters
 
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     query: str
diff --git a/src/lsst/cmservice/common/types.py b/src/lsst/cmservice/common/types.py
index 7f8ef633d..169a52d4f 100644
--- a/src/lsst/cmservice/common/types.py
+++ b/src/lsst/cmservice/common/types.py
@@ -2,5 +2,11 @@
 from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlmodel.ext.asyncio.session import AsyncSession
 
+from .. import models
+
 type AnyAsyncSession = AsyncSession | AsyncSessionSA | async_scoped_session
 """A type union of async database sessions the application may use"""
+
+
+type AnyCampaignElement = models.Group | models.Campaign | models.Step | models.Job
+"""A type union of Campaign elements"""
diff --git a/src/lsst/cmservice/db/campaign.py b/src/lsst/cmservice/db/campaign.py
index 0c7d299da..c31afcbfc 100644
--- a/src/lsst/cmservice/db/campaign.py
+++ b/src/lsst/cmservice/db/campaign.py
@@ -62,7 +62,7 @@ class Campaign(Base, ElementMixin):
     metadata_: Mapped[dict] = mapped_column("metadata_", type_=MutableDict.as_mutable(JSONB), default=dict)
     child_config: Mapped[dict | list | None] = mapped_column(type_=JSON)
     collections: Mapped[dict | list | None] = mapped_column(type_=JSON)
-    spec_aliases: Mapped[dict | list | None] = mapped_column(type_=JSON)
+    spec_aliases: Mapped[dict | None] = mapped_column(type_=JSON)
 
     spec_: Mapped[Specification] = relationship(
         "Specification",
diff --git a/src/lsst/cmservice/db/group.py b/src/lsst/cmservice/db/group.py
index 30780d1c2..e902fcf75 100644
--- a/src/lsst/cmservice/db/group.py
+++ b/src/lsst/cmservice/db/group.py
@@ -61,7 +61,7 @@ class Group(Base, ElementMixin):
     metadata_: Mapped[dict] = mapped_column("metadata_", type_=MutableDict.as_mutable(JSONB), default=dict)
     child_config: Mapped[dict | list | None] = mapped_column(type_=JSON)
     collections: Mapped[dict | list | None] = mapped_column(type_=JSON)
-    spec_aliases: Mapped[dict | list | None] = mapped_column(type_=JSON)
+    spec_aliases: Mapped[dict | None] = mapped_column(type_=JSON)
 
     spec_block_: Mapped[SpecBlock] = relationship("SpecBlock", viewonly=True)
     c_: Mapped["Campaign"] = relationship(
diff --git a/src/lsst/cmservice/db/job.py b/src/lsst/cmservice/db/job.py
index 53ba44c66..cdb52df20 100644
--- a/src/lsst/cmservice/db/job.py
+++ b/src/lsst/cmservice/db/job.py
@@ -68,7 +68,7 @@ class Job(Base, ElementMixin):
     )
     child_config: Mapped[dict | list | None] = mapped_column(type_=JSON)
     collections: Mapped[dict | list | None] = mapped_column(type_=JSON)
-    spec_aliases: Mapped[dict | list | None] = mapped_column(type_=JSON)
+    spec_aliases: Mapped[dict | None] = mapped_column(type_=JSON)
     wms_job_id: Mapped[str | None] = mapped_column()
     stamp_url: Mapped[str | None] = mapped_column()
 
diff --git a/src/lsst/cmservice/db/specification.py b/src/lsst/cmservice/db/specification.py
index 824cacc02..33a4b26b8 100644
--- a/src/lsst/cmservice/db/specification.py
+++ b/src/lsst/cmservice/db/specification.py
@@ -28,7 +28,7 @@ class Specification(Base, RowMixin):
     data: Mapped[dict] = mapped_column(type_=JSON, default=dict)
     child_config: Mapped[dict | list | None] = mapped_column(type_=JSON)
     collections: Mapped[dict | list | None] = mapped_column(type_=JSON)
-    spec_aliases: Mapped[dict | list | None] = mapped_column(type_=JSON)
+    spec_aliases: Mapped[dict | None] = mapped_column(type_=JSON)
 
     col_names_for_table = ["id", "name"]
 
diff --git a/src/lsst/cmservice/db/step.py b/src/lsst/cmservice/db/step.py
index d58e31ec5..54524c5cb 100644
--- a/src/lsst/cmservice/db/step.py
+++ b/src/lsst/cmservice/db/step.py
@@ -58,7 +58,7 @@ class Step(Base, ElementMixin):
     metadata_: Mapped[dict] = mapped_column("metadata_", type_=MutableDict.as_mutable(JSONB), default=dict)
     child_config: Mapped[dict | list | None] = mapped_column(type_=JSON)
     collections: Mapped[dict | list | None] = mapped_column(type_=JSON)
-    spec_aliases: Mapped[dict | list | None] = mapped_column(type_=JSON)
+    spec_aliases: Mapped[dict | None] = mapped_column(type_=JSON)
 
     spec_block_: Mapped[SpecBlock] = relationship("SpecBlock", viewonly=True)
     parent_: Mapped[Campaign] = relationship("Campaign", back_populates="s_")
diff --git a/src/lsst/cmservice/models/element.py b/src/lsst/cmservice/models/element.py
index a20ec71b2..eb4ebbc18 100644
--- a/src/lsst/cmservice/models/element.py
+++ b/src/lsst/cmservice/models/element.py
@@ -21,13 +21,13 @@ class ElementBase(BaseModel):
     metadata_: dict = Field(default_factory=dict)
 
     # Overrides for configuring child nodes
-    child_config: dict | str | None = None
+    child_config: dict | None = None
 
     # Overrides for making collection names
-    collections: dict | str | None = None
+    collections: dict | None = None
 
     # Overrides for which SpecBlocks to use in constructing child Nodes
-    spec_aliases: dict | str | None = None
+    spec_aliases: dict | None = None
 
     # Override for Callback handler class
     handler: str | None = None
@@ -75,13 +75,13 @@ class ElementUpdate(BaseModel):
     metadata_: dict | None = None
 
     # Overrides for configuring child nodes
-    child_config: dict | str | None = None
+    child_config: dict | None = None
 
     # Overrides for making collection names
-    collections: dict | str | None = None
+    collections: dict | None = None
 
     # Overrides for which SpecBlocks to use in constructing child Nodes
-    spec_aliases: dict | str | None = None
+    spec_aliases: dict | None = None
 
     # Override for Callback handler class
     handler: str | None = None
diff --git a/src/lsst/cmservice/models/interface.py b/src/lsst/cmservice/models/interface.py
index 34336d622..7112724a7 100644
--- a/src/lsst/cmservice/models/interface.py
+++ b/src/lsst/cmservice/models/interface.py
@@ -138,13 +138,13 @@ class LoadAndCreateCampaign(YamlFileQuery):
     # If empty use {spec_name}#campaign
     spec_block_assoc_name: str | None = None
     # Parameter Overrides
-    data: dict | str | None = None
+    data: dict | None = None
     # Overrides for configuring child nodes
-    child_config: dict | str | None = None
+    child_config: dict | None = None
     # Overrides for making collection names
-    collections: dict | str | None = None
+    collections: dict | None = None
     # Overrides for which SpecBlocks to use in constructing child Nodes
-    spec_aliases: dict | str | None = None
+    spec_aliases: dict | None = None
     # Override for Callback handler class
     handler: str | None = None
     # Allow updating existing specifications
diff --git a/src/lsst/cmservice/models/specification.py b/src/lsst/cmservice/models/specification.py
index b7528dd79..462fd1a8f 100644
--- a/src/lsst/cmservice/models/specification.py
+++ b/src/lsst/cmservice/models/specification.py
@@ -14,16 +14,16 @@ class SpecificationBase(BaseModel):
     name: str
 
     # Parameter Overrides
-    data: dict | str | None = None
+    data: dict | None = None
 
     # Overrides for configuring child nodes
-    child_config: dict | str | None = None
+    child_config: dict | None = None
 
     # Overrides for making collection names
-    collections: dict | str | None = None
+    collections: dict | None = None
 
     # Overrides for which SpecBlocks to use in constructing child Nodes
-    spec_aliases: dict | str | None = None
+    spec_aliases: dict | None = None
 
 
 class SpecificationCreate(SpecificationBase):
diff --git a/src/lsst/cmservice/routers/wrappers.py b/src/lsst/cmservice/routers/wrappers.py
index 86906809c..ed72324e6 100644
--- a/src/lsst/cmservice/routers/wrappers.py
+++ b/src/lsst/cmservice/routers/wrappers.py
@@ -9,10 +9,9 @@
 """
 
 from collections.abc import Callable, Sequence
-from typing import Annotated, TypeAlias
+from typing import TYPE_CHECKING, Annotated, TypeAlias
 
 from fastapi import APIRouter, Depends, HTTPException
-from pydantic import BaseModel
 
 from .. import db, models
 from ..common.enums import StatusEnum
@@ -26,8 +25,8 @@
 
 def get_rows_no_parent_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.RowMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.RowMixin],
 ) -> Callable:
     """Return a function that gets all the rows from a table
     and attaches that function to a router.
@@ -40,10 +39,10 @@ def get_rows_no_parent_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: TypeAlias
         Underlying database class
 
     Returns
@@ -54,13 +53,14 @@ def get_rows_no_parent_function(
 
     @router.get(
         "/list",
-        summary=f"List all the {db_class.class_string}",
+        summary=f"List all the {db_class.__qualname__}",
+        response_model=Sequence[response_model_class],
     )
     async def get_rows(
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
         skip: int = 0,
         limit: int = 100,
-    ) -> Sequence[response_model_class]:
+    ) -> Sequence[db.RowMixin]:
         try:
             async with session.begin():
                 return await db_class.get_rows(session, skip=skip, limit=limit)
@@ -73,8 +73,8 @@ async def get_rows(
 
 def get_rows_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.RowMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.RowMixin],
 ) -> Callable:
     """Return a function that gets all the rows from a table
     and attaches that function to a router.
@@ -87,10 +87,10 @@ def get_rows_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: TypeAlias
         Underlying database class
 
     Returns
@@ -101,14 +101,15 @@ def get_rows_function(
 
     @router.get(
         "/list",
-        summary=f"List all the {db_class.class_string}",
+        summary=f"List all the {db_class.__qualname__}",
+        response_model=Sequence[response_model_class],
     )
     async def get_rows(
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
         parent_id: int | None = None,
         skip: int = 0,
         limit: int = 100,
-    ) -> Sequence[response_model_class]:
+    ) -> Sequence[db.RowMixin]:
         try:
             async with session.begin():
                 return await db_class.get_rows(
@@ -127,8 +128,8 @@ async def get_rows(
 
 def get_row_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.RowMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.RowMixin],
 ) -> Callable:
     """Return a function that gets a single row from a table (by ID)
     and attaches that function to a router.
@@ -138,7 +139,7 @@ def get_row_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -152,12 +153,13 @@ def get_row_function(
 
     @router.get(
         "/get/{row_id}",
-        summary=f"Retrieve a {db_class.class_string} by name",
+        summary=f"Retrieve a {db_class.__qualname__} by name",
+        response_model=response_model_class,
     )
     async def get_row(
         row_id: int,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.RowMixin:
         try:
             async with session.begin():
                 return await db_class.get_row(session, row_id)
@@ -173,8 +175,8 @@ async def get_row(
 
 def get_row_by_fullname_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.RowMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.RowMixin],
 ) -> Callable:
     """Return a function that gets a single row from a table (by fullname)
     and attaches that function to a router.
@@ -184,7 +186,7 @@ def get_row_by_fullname_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -198,12 +200,13 @@ def get_row_by_fullname_function(
 
     @router.get(
         "/get_row_by_fullname",
-        summary=f"Retrieve a {db_class.class_string} by name",
+        summary=f"Retrieve a {db_class.__qualname__} by name",
+        response_model=response_model_class,
     )
     async def get_row_by_fullname(
         fullname: str,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.RowMixin:
         try:
             async with session.begin():
                 return await db_class.get_row_by_fullname(session, fullname)
@@ -219,8 +222,8 @@ async def get_row_by_fullname(
 
 def get_row_by_name_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.RowMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.RowMixin],
 ) -> Callable:
     """Return a function that gets a single row from a table (by name)
     and attaches that function to a router.
@@ -230,7 +233,7 @@ def get_row_by_name_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -244,12 +247,13 @@ def get_row_by_name_function(
 
     @router.get(
         "/get_row_by_name",
-        summary=f"Retrieve a {db_class.class_string} by name",
+        summary=f"Retrieve a {db_class.__qualname__} by name",
+        response_model=response_model_class,
     )
     async def get_row_by_name(
         name: str,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.RowMixin:
         try:
             async with session.begin():
                 return await db_class.get_row_by_name(session, name)
@@ -265,9 +269,9 @@ async def get_row_by_name(
 
 def post_row_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    create_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.RowMixin,
+    response_model_class: TypeAlias,
+    create_model_class: TypeAlias,
+    db_class: type[db.RowMixin],
 ) -> Callable:
     """Return a function that creates a single row in a table
     and attaches that function to a router.
@@ -277,10 +281,10 @@ def post_row_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel,
+    response_model_class: TypeAlias,
         Pydantic class used to serialize the return value
 
-    create_model_class: TypeAlias = BaseModel,
+    create_model_class: TypeAlias,
         Pydantic class used to serialize the inputs value
 
     db_class: TypeAlias = db.RowMixin
@@ -296,12 +300,12 @@ def post_row_function(
         "/create",
         status_code=201,
         response_model=response_model_class,
-        summary=f"Create a {db_class.class_string}",
+        summary=f"Create a {db_class.__qualname__}",
     )
     async def post_row(
         row_create: create_model_class,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> db_class:
+    ) -> db.RowMixin:
         try:
             async with session.begin():
                 return await db_class.create_row(session, **row_create.model_dump())
@@ -314,7 +318,7 @@ async def post_row(
 
 def delete_row_function(
     router: APIRouter,
-    db_class: TypeAlias = db.RowMixin,
+    db_class: type[db.RowMixin],
 ) -> Callable:
     """Return a function that deletes a single row in a table
     and attaches that function to a router.
@@ -336,7 +340,7 @@ def delete_row_function(
     @router.delete(
         "/delete/{row_id}",
         status_code=204,
-        summary=f"Delete a {db_class.class_string}",
+        summary=f"Delete a {db_class.__qualname__}",
     )
     async def delete_row(
         row_id: int,
@@ -357,9 +361,9 @@ async def delete_row(
 
 def put_row_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    update_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.RowMixin,
+    response_model_class: TypeAlias,
+    update_model_class: TypeAlias,
+    db_class: type[db.RowMixin],
 ) -> Callable:
     """Return a function that updates a single row in a table
     and attaches that function to a router.
@@ -369,10 +373,10 @@ def put_row_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel
+    response_model_class: TypeAlias
         Pydantic class used to serialize the return values
 
-    update_model_class: TypeAlias = BaseModel,
+    update_model_class: TypeAlias,
         Pydantic class used to serialize the input values
 
     db_class: TypeAlias = db.RowMixin
@@ -387,13 +391,13 @@ def put_row_function(
     @router.put(
         "/update/{row_id}",
         response_model=response_model_class,
-        summary=f"Update a {db_class.class_string}",
+        summary=f"Update a {db_class.__qualname__}",
     )
     async def update_row(
         row_id: int,
         row_update: update_model_class,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> db_class:
+    ) -> db.RowMixin:
         try:
             async with session.begin():
                 return await db_class.update_row(session, row_id, **row_update.model_dump())
@@ -409,7 +413,7 @@ async def update_row(
 
 def get_node_spec_block_function(
     router: APIRouter,
-    db_class: TypeAlias = db.NodeMixin,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function gets the SpecBlock associated to a Node.
 
@@ -418,7 +422,7 @@ def get_node_spec_block_function(
     router: APIRouter
         Router to attach the function to
 
-    db_class: TypeAlias = db.RowMixin
+    db_class: TypeAlias = db.NodeMixin
         Underlying database class
 
     Returns
@@ -429,12 +433,13 @@ def get_node_spec_block_function(
 
     @router.get(
         "/get/{row_id}/spec_block",
-        summary=f"Get the SpecBlock associated to a {db_class.class_string}",
+        summary=f"Get the SpecBlock associated to a {db_class.__qualname__}",
+        response_model=models.SpecBlock,
     )
     async def get_node_spec_block(
         row_id: int,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> models.SpecBlock:
+    ) -> db.SpecBlock:
         try:
             async with session.begin():
                 the_node = await db_class.get_row(session, row_id)
@@ -452,7 +457,7 @@ async def get_node_spec_block(
 
 def get_node_specification_function(
     router: APIRouter,
-    db_class: TypeAlias = db.NodeMixin,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function gets the Specification associated to a Node.
 
@@ -472,12 +477,13 @@ def get_node_specification_function(
 
     @router.get(
         "/get/{row_id}/specification",
-        summary=f"Get the Specification associated to a {db_class.class_string}",
+        summary=f"Get the Specification associated to a {db_class.__qualname__}",
+        response_model=models.Specification,
     )
     async def get_node_specification(
         row_id: int,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> models.Specification:
+    ) -> db.Specification:
         try:
             async with session.begin():
                 the_node = await db_class.get_row(session, row_id)
@@ -495,8 +501,8 @@ async def get_node_specification(
 
 def get_node_parent_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.NodeMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function gets the parent Node associated to a Node.
 
@@ -505,7 +511,7 @@ def get_node_parent_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel
+    response_model_class: TypeAlias
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -519,12 +525,13 @@ def get_node_parent_function(
 
     @router.get(
         "/get/{row_id}/parent",
-        summary=f"Get the Parent associated to a {db_class.class_string}",
+        summary=f"Get the Parent associated to a {db_class.__qualname__}",
+        response_model=response_model_class,
     )
     async def get_node_parent(
         row_id: int,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.NodeMixin:
         try:
             async with session.begin():
                 the_node = await db_class.get_row(session, row_id)
@@ -542,7 +549,7 @@ async def get_node_parent(
 
 def get_node_resolved_collections_function(
     router: APIRouter,
-    db_class: TypeAlias = db.NodeMixin,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function gets resolved collection names associated to a Node.
 
@@ -562,7 +569,7 @@ def get_node_resolved_collections_function(
 
     @router.get(
         "/get/{row_id}/resolved_collections",
-        summary=f"Get the resolved collections associated to a {db_class.class_string}",
+        summary=f"Get the resolved collections associated to a {db_class.__qualname__}",
     )
     async def get_node_resolved_collections(
         row_id: int,
@@ -585,7 +592,7 @@ async def get_node_resolved_collections(
 
 def get_node_collections_function(
     router: APIRouter,
-    db_class: TypeAlias = db.NodeMixin,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function gets collection names associated to a Node.
 
@@ -605,7 +612,7 @@ def get_node_collections_function(
 
     @router.get(
         "/get/{row_id}/collections",
-        summary=f"Get the collections associated to a {db_class.class_string}",
+        summary=f"Get the collections associated to a {db_class.__qualname__}",
     )
     async def get_node_collections(
         row_id: int,
@@ -628,7 +635,7 @@ async def get_node_collections(
 
 def get_node_child_config_function(
     router: APIRouter,
-    db_class: TypeAlias = db.NodeMixin,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function gets child_conifg dict associated to a Node.
 
@@ -648,7 +655,7 @@ def get_node_child_config_function(
 
     @router.get(
         "/get/{row_id}/child_config",
-        summary=f"Get the child_config associated to a {db_class.class_string}",
+        summary=f"Get the child_config associated to a {db_class.__qualname__}",
     )
     async def get_node_child_config(
         row_id: int,
@@ -671,7 +678,7 @@ async def get_node_child_config(
 
 def get_node_data_dict_function(
     router: APIRouter,
-    db_class: TypeAlias = db.NodeMixin,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function gets data_dict associated to a Node.
 
@@ -691,7 +698,7 @@ def get_node_data_dict_function(
 
     @router.get(
         "/get/{row_id}/data_dict",
-        summary=f"Get the data_dict associated to a {db_class.class_string}",
+        summary=f"Get the data_dict associated to a {db_class.__qualname__}",
     )
     async def get_node_data_dict(
         row_id: int,
@@ -714,7 +721,7 @@ async def get_node_data_dict(
 
 def get_node_spec_aliases_function(
     router: APIRouter,
-    db_class: TypeAlias = db.NodeMixin,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function that gets the spec_aliases associated to a Node.
 
@@ -734,7 +741,7 @@ def get_node_spec_aliases_function(
 
     @router.get(
         "/get/{row_id}/spec_aliases",
-        summary=f"Get the spec_aliases associated to a {db_class.class_string}",
+        summary=f"Get the spec_aliases associated to a {db_class.__qualname__}",
     )
     async def get_node_spec_aliases(
         row_id: int,
@@ -757,8 +764,8 @@ async def get_node_spec_aliases(
 
 def update_node_status_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.NodeMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function that updates the status of a Node.
 
@@ -767,7 +774,7 @@ def update_node_status_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel
+    response_model_class: TypeAlias
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -783,12 +790,13 @@ def update_node_status_function(
         "/update/{row_id}/status",
         status_code=201,
         summary="Update status field associated to a node",
+        response_model=response_model_class,
     )
     async def update_node_status(
         row_id: int,
         query: models.UpdateStatusQuery,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.NodeMixin:
         try:
             async with session.begin():
                 the_node = await db_class.get_row(session, row_id)
@@ -808,8 +816,8 @@ async def update_node_status(
 
 def update_node_collections_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.NodeMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function that updates the collections associated to a Node.
 
@@ -818,7 +826,7 @@ def update_node_collections_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel
+    response_model_class: TypeAlias
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -833,13 +841,14 @@ def update_node_collections_function(
     @router.post(
         "/update/{row_id}/collections",
         status_code=201,
-        summary=f"Update the collections associated to a {db_class.class_string}",
+        summary=f"Update the collections associated to a {db_class.__qualname__}",
+        response_model=response_model_class,
     )
     async def update_node_collections(
         row_id: int,
         query: models.UpdateNodeQuery,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.NodeMixin:
         try:
             async with session.begin():
                 the_node = await db_class.get_row(session, row_id)
@@ -857,8 +866,8 @@ async def update_node_collections(
 
 def update_node_child_config_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.NodeMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function that updates the child_config associated to a Node.
 
@@ -867,7 +876,7 @@ def update_node_child_config_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel
+    response_model_class: TypeAlias
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -881,13 +890,14 @@ def update_node_child_config_function(
 
     @router.post(
         "/update/{row_id}/child_config",
-        summary=f"Update the child_config associated to a {db_class.class_string}",
+        summary=f"Update the child_config associated to a {db_class.__qualname__}",
+        response_model=response_model_class,
     )
     async def update_node_child_config(
         row_id: int,
         query: models.UpdateNodeQuery,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.NodeMixin:
         try:
             async with session.begin():
                 the_node = await db_class.get_row(session, row_id)
@@ -905,8 +915,8 @@ async def update_node_child_config(
 
 def update_node_data_dict_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.NodeMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function that updates the data_dict associated to a Node.
 
@@ -915,7 +925,7 @@ def update_node_data_dict_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel
+    response_model_class: TypeAlias
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -929,13 +939,14 @@ def update_node_data_dict_function(
 
     @router.post(
         "/update/{row_id}/data_dict",
-        summary=f"Update the data_dict associated to a {db_class.class_string}",
+        summary=f"Update the data_dict associated to a {db_class.__qualname__}",
+        response_model=response_model_class,
     )
     async def update_node_data_dict(
         row_id: int,
         query: models.UpdateNodeQuery,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.NodeMixin:
         try:
             async with session.begin():
                 the_node = await db_class.get_row(session, row_id)
@@ -953,8 +964,8 @@ async def update_node_data_dict(
 
 def update_node_spec_aliases_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.NodeMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function that updates the spec_aliases associated to a Node.
 
@@ -963,7 +974,7 @@ def update_node_spec_aliases_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel
+    response_model_class: TypeAlias
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -977,13 +988,14 @@ def update_node_spec_aliases_function(
 
     @router.post(
         "/update/{row_id}/spec_aliases",
-        summary=f"Update the spec_aliases associated to a {db_class.class_string}",
+        summary=f"Update the spec_aliases associated to a {db_class.__qualname__}",
+        response_model=response_model_class,
     )
     async def update_node_spec_aliases(
         row_id: int,
         query: models.UpdateNodeQuery,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.NodeMixin:
         try:
             async with session.begin():
                 the_node = await db_class.get_row(session, row_id)
@@ -1001,7 +1013,7 @@ async def update_node_spec_aliases(
 
 def get_node_check_prerequisites_function(
     router: APIRouter,
-    db_class: TypeAlias = db.NodeMixin,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function that checks the prerequisites of a Node.
 
@@ -1021,7 +1033,7 @@ def get_node_check_prerequisites_function(
 
     @router.get(
         "/get/{row_id}/check_prerequisites",
-        summary=f"Check the prerequisites associated to a {db_class.class_string}",
+        summary=f"Check the prerequisites associated to a {db_class.__qualname__}",
     )
     async def node_check_prerequisites(
         row_id: int,
@@ -1044,8 +1056,8 @@ async def node_check_prerequisites(
 
 def get_node_reject_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.NodeMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function that marks a Node as rejected.
 
@@ -1054,7 +1066,7 @@ def get_node_reject_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel
+    response_model_class: TypeAlias
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -1069,12 +1081,13 @@ def get_node_reject_function(
     @router.post(
         "/action/{row_id}/reject",
         status_code=201,
-        summary=f"Mark a {db_class.class_string} as rejected",
+        summary=f"Mark a {db_class.__qualname__} as rejected",
+        response_model=response_model_class,
     )
     async def node_reject(
         row_id: int,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.NodeMixin:
         try:
             async with session.begin():
                 the_node = await db_class.get_row(session, row_id)
@@ -1094,8 +1107,8 @@ async def node_reject(
 
 def get_node_accept_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.NodeMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function that marks a Node as accepted.
 
@@ -1104,7 +1117,7 @@ def get_node_accept_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel
+    response_model_class: TypeAlias
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -1119,12 +1132,13 @@ def get_node_accept_function(
     @router.post(
         "/action/{row_id}/accept",
         status_code=201,
-        summary=f"Mark a {db_class.class_string} as accepted",
+        summary=f"Mark a {db_class.__qualname__} as accepted",
+        response_model=response_model_class,
     )
     async def node_accept(
         row_id: int,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.NodeMixin:
         try:
             async with session.begin():
                 the_node = await db_class.get_row(session, row_id)
@@ -1144,8 +1158,8 @@ async def node_accept(
 
 def get_node_reset_function(
     router: APIRouter,
-    response_model_class: TypeAlias = BaseModel,
-    db_class: TypeAlias = db.NodeMixin,
+    response_model_class: TypeAlias,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function resets a Node status to waiting.
 
@@ -1154,7 +1168,7 @@ def get_node_reset_function(
     router: APIRouter
         Router to attach the function to
 
-    response_model_class: TypeAlias = BaseModel
+    response_model_class: TypeAlias
         Pydantic class used to serialize the return value
 
     db_class: TypeAlias = db.RowMixin
@@ -1169,13 +1183,14 @@ def get_node_reset_function(
     @router.post(
         "/action/{row_id}/reset",
         status_code=201,
-        summary=f"Mark a {db_class.class_string} as reseted",
+        summary=f"Mark a {db_class.__qualname__} as reseted",
+        response_model=response_model_class,
     )
     async def node_reset(
         row_id: int,
         query: models.ResetQuery,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
-    ) -> response_model_class:
+    ) -> db.NodeMixin:
         try:
             async with session.begin():
                 the_node = await db_class.get_row(session, row_id)
@@ -1195,7 +1210,7 @@ async def node_reset(
 
 def get_node_process_function(
     router: APIRouter,
-    db_class: TypeAlias = db.NodeMixin,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function that causes a Node to be processed.
 
@@ -1216,7 +1231,7 @@ def get_node_process_function(
     @router.post(
         "/action/{row_id}/process",
         status_code=201,
-        summary=f"Mark a {db_class.class_string} as processed",
+        summary=f"Mark a {db_class.__qualname__} as processed",
     )
     async def node_process(
         row_id: int,
@@ -1239,7 +1254,7 @@ async def node_process(
 
 def get_node_run_check_function(
     router: APIRouter,
-    db_class: TypeAlias = db.NodeMixin,
+    db_class: type[db.NodeMixin],
 ) -> Callable:
     """Return a function that checks the status of a Node.
 
@@ -1260,7 +1275,7 @@ def get_node_run_check_function(
     @router.post(
         "/action/{row_id}/run_check",
         status_code=201,
-        summary=f"Mark a {db_class.class_string} as run_checked",
+        summary=f"Mark a {db_class.__qualname__} as run_checked",
     )
     async def node_run_check(
         row_id: int,
@@ -1283,7 +1298,7 @@ async def node_run_check(
 
 def get_element_get_scripts_function(
     router: APIRouter,
-    db_class: TypeAlias = db.ElementMixin,
+    db_class: type[db.ElementMixin],
 ) -> Callable:
     """Return a function get the scripts associated to an Element.
 
@@ -1305,7 +1320,7 @@ def get_element_get_scripts_function(
         "/get/{row_id}/scripts",
         status_code=201,
         response_model=Sequence[models.Script],
-        summary=f"Get the scripts associated to a {db_class.class_string}",
+        summary=f"Get the scripts associated to a {db_class.__qualname__}",
     )
     async def element_get_scripts(
         row_id: int,
@@ -1329,7 +1344,7 @@ async def element_get_scripts(
 
 def get_element_get_all_scripts_function(
     router: APIRouter,
-    db_class: TypeAlias = db.ElementMixin,
+    db_class: type[db.ElementMixin],
 ) -> Callable:
     """Return a function that gets all scripts associated to an Element.
 
@@ -1351,7 +1366,7 @@ def get_element_get_all_scripts_function(
         "/get/{row_id}/all_scripts",
         status_code=201,
         response_model=Sequence[models.Script],
-        summary=f"Get the all scripts associated to a {db_class.class_string}",
+        summary=f"Get the all scripts associated to a {db_class.__qualname__}",
     )
     async def element_get_all_scripts(
         row_id: int,
@@ -1374,7 +1389,7 @@ async def element_get_all_scripts(
 
 def get_element_get_jobs_function(
     router: APIRouter,
-    db_class: TypeAlias = db.ElementMixin,
+    db_class: type[db.ElementMixin],
 ) -> Callable:
     """Return a function get the jobs associated to an Element.
 
@@ -1396,7 +1411,7 @@ def get_element_get_jobs_function(
         "/get/{row_id}/jobs",
         status_code=201,
         response_model=Sequence[models.Job],
-        summary=f"Get the jobs associated to a {db_class.class_string}",
+        summary=f"Get the jobs associated to a {db_class.__qualname__}",
     )
     async def element_get_jobs(
         row_id: int,
@@ -1419,7 +1434,7 @@ async def element_get_jobs(
 
 def get_element_retry_script_function(
     router: APIRouter,
-    db_class: TypeAlias = db.ElementMixin,
+    db_class: type[db.ElementMixin],
 ) -> Callable:
     """Return a function that will retry a script
 
@@ -1441,13 +1456,15 @@ def get_element_retry_script_function(
         "/action/{row_id}/retry_script",
         status_code=201,
         response_model=models.Script,
-        summary=f"Retry a script associated to a {db_class.class_string}",
+        summary=f"Retry a script associated to a {db_class.__qualname__}",
     )
     async def element_retry_script(
         row_id: int,
         query: models.RetryScriptQuery,
         session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     ) -> db.Script:
+        if TYPE_CHECKING:
+            assert query.script_name is not None
         try:
             async with session.begin():
                 the_element = await db_class.get_row(session, row_id)
@@ -1468,7 +1485,7 @@ async def element_retry_script(
 
 def get_element_wms_task_reports_function(
     router: APIRouter,
-    db_class: TypeAlias = db.ElementMixin,
+    db_class: type[db.ElementMixin],
 ) -> Callable:
     """Return a function get the WmsTaskReports associated to an Element.
 
@@ -1490,7 +1507,7 @@ def get_element_wms_task_reports_function(
         "/get/{row_id}/wms_task_reports",
         status_code=201,
         response_model=models.MergedWmsTaskReportDict,
-        summary=f"Get the WmsTaskReports associated to a {db_class.class_string}",
+        summary=f"Get the WmsTaskReports associated to a {db_class.__qualname__}",
     )
     async def element_get_wms_task_reports(
         row_id: int,
@@ -1513,7 +1530,7 @@ async def element_get_wms_task_reports(
 
 def get_element_tasks_function(
     router: APIRouter,
-    db_class: TypeAlias = db.ElementMixin,
+    db_class: type[db.ElementMixin],
 ) -> Callable:
     """Return a function get the TaskSets associated to an Element.
 
@@ -1535,7 +1552,7 @@ def get_element_tasks_function(
         "/get/{row_id}/tasks",
         status_code=201,
         response_model=models.MergedTaskSetDict,
-        summary=f"Get the TaskSets associated to a {db_class.class_string}",
+        summary=f"Get the TaskSets associated to a {db_class.__qualname__}",
     )
     async def element_get_tasks(
         row_id: int,
@@ -1558,7 +1575,7 @@ async def element_get_tasks(
 
 def get_element_products_function(
     router: APIRouter,
-    db_class: TypeAlias = db.ElementMixin,
+    db_class: type[db.ElementMixin],
 ) -> Callable:
     """Return a function get the ProductSets associated to an Element.
 
@@ -1580,7 +1597,7 @@ def get_element_products_function(
         "/get/{row_id}/products",
         status_code=201,
         response_model=models.MergedProductSetDict,
-        summary=f"Get the ProductSets associated to a {db_class.class_string}",
+        summary=f"Get the ProductSets associated to a {db_class.__qualname__}",
     )
     async def element_get_products(
         row_id: int,
diff --git a/tests/cli/util_functions.py b/tests/cli/util_functions.py
index b91d77155..287091d95 100644
--- a/tests/cli/util_functions.py
+++ b/tests/cli/util_functions.py
@@ -1,6 +1,6 @@
 import uuid
 from pathlib import Path
-from typing import TypeAlias, TypeVar
+from typing import TypeAlias
 
 import yaml
 from click import BaseCommand
@@ -9,12 +9,10 @@
 
 from lsst.cmservice import models
 from lsst.cmservice.common.enums import LevelEnum, StatusEnum
+from lsst.cmservice.common.types import AnyCampaignElement
 
-T = TypeVar("T")
-E = TypeVar("E", models.Group, models.Campaign, models.Step, models.Job)
 
-
-def check_and_parse_result(
+def check_and_parse_result[T](
     result: Result,
     return_class: type[T],
 ) -> T:
@@ -35,7 +33,7 @@ def expect_failed_result(
 def add_scripts(
     runner: CliRunner,
     client_top: BaseCommand,
-    element: models.ElementMixin,
+    element: AnyCampaignElement,
     namespace: uuid.UUID,
 ) -> tuple[list[models.Script], models.Dependency | None]:
     namespaced_spec_block_name = uuid.uuid5(namespace, "null_script")
@@ -171,7 +169,7 @@ def delete_all_rows(
     runner: CliRunner,
     client_top: BaseCommand,
     entry_class_name: str,
-    entry_class: TypeAlias = models.ElementMixin,
+    entry_class: TypeAlias,
 ) -> None:
     result = runner.invoke(client_top, f"{entry_class_name} list --output yaml")
     rows = check_and_parse_result(result, list[entry_class])
@@ -224,12 +222,12 @@ def cleanup(
     delete_all_queues(runner, client_top)
 
 
-def check_update_methods(
+def check_update_methods[E: AnyCampaignElement](
     runner: CliRunner,
     client_top: BaseCommand,
-    entry: models.ElementMixin,
+    entry: E,
     entry_class_name: str,
-    entry_class: TypeAlias = models.ElementMixin,
+    entry_class: type[E],
 ) -> None:
     result = runner.invoke(
         client_top,
@@ -319,6 +317,7 @@ def check_update_methods(
     )
     # FIXME: is this the return type we want?
     check_spec = check_and_parse_result(result, entry_class)
+    assert check_spec.spec_aliases is not None
     assert check_spec.spec_aliases["test"] == "dummy", "update_spec_aliases failed"
 
     result = runner.invoke(
@@ -339,7 +338,7 @@ def check_update_methods(
 def check_scripts(
     runner: CliRunner,
     client_top: BaseCommand,
-    entry: models.ElementMixin,
+    entry: AnyCampaignElement,
     entry_class_name: str,
 ) -> None:
     models.ScriptQuery(
@@ -417,9 +416,9 @@ def check_scripts(
 def check_get_methods(
     runner: CliRunner,
     client_top: BaseCommand,
-    entry: E,
+    entry: AnyCampaignElement,
     entry_class_name: str,
-    entry_class: TypeAlias = models.ElementMixin,
+    entry_class: type[AnyCampaignElement],
 ) -> None:
     result = runner.invoke(client_top, f"{entry_class_name} get all --output yaml --row_id {entry.id}")
     check_get = check_and_parse_result(result, entry_class)
@@ -481,7 +480,7 @@ def check_get_methods(
 def check_queue(
     runner: CliRunner,
     client_top: BaseCommand,
-    entry: models.ElementMixin,
+    entry: AnyCampaignElement,
     *,
     run_daemon: bool = False,
 ) -> None:
diff --git a/tests/routers/util_functions.py b/tests/routers/util_functions.py
index c0b1772b7..e22f76dfd 100644
--- a/tests/routers/util_functions.py
+++ b/tests/routers/util_functions.py
@@ -1,18 +1,16 @@
 from pathlib import Path
-from typing import TypeAlias, TypeVar
+from typing import TypeAlias
 
 from httpx import AsyncClient, Response
 from pydantic import TypeAdapter
 
 from lsst.cmservice import models
 from lsst.cmservice.common.enums import LevelEnum, StatusEnum
+from lsst.cmservice.common.types import AnyCampaignElement
 from lsst.cmservice.config import config
 
-T = TypeVar("T")
-E = TypeVar("E", models.Group, models.Campaign, models.Step, models.Job)
 
-
-def check_and_parse_response(
+def check_and_parse_response[T](
     response: Response,
     return_class: type[T],
 ) -> T:
@@ -32,7 +30,7 @@ def expect_failed_response(
 
 async def add_scripts(
     client: AsyncClient,
-    element: E,
+    element: AnyCampaignElement,
     api_version: str,
 ) -> tuple[list[models.Script], models.Dependency]:
     prep_script_model = models.ScriptCreate(
@@ -183,7 +181,7 @@ async def delete_all_rows(
     client: AsyncClient,
     api_version: str,
     entry_class_name: str,
-    entry_class: TypeAlias = models.ElementMixin,
+    entry_class: TypeAlias,
 ) -> None:
     response = await client.get(f"{config.asgi.prefix}/{api_version}/{entry_class_name}/list")
     rows = check_and_parse_response(response, list[entry_class])
@@ -242,7 +240,7 @@ async def check_update_methods(
     api_version: str,
     entry: models.ElementMixin,
     entry_class_name: str,
-    entry_class: TypeAlias = models.ElementMixin,
+    entry_class: type[models.ElementMixin],
 ) -> None:
     update_model = models.UpdateNodeQuery(
         fullname=entry.fullname,
@@ -252,8 +250,8 @@ async def check_update_methods(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/update/{entry.id}/data_dict",
         content=update_model.model_dump_json(),
     )
-    check = check_and_parse_response(response, entry_class)
-    assert check.data["test"] == "dummy", "update_data_dict failed"
+    check_a = check_and_parse_response(response, entry_class)
+    assert check_a.data["test"] == "dummy", "update_data_dict failed"
 
     response = await client.post(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/update/-1/data_dict",
@@ -264,8 +262,8 @@ async def check_update_methods(
     response = await client.get(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/get/{entry.id}/data_dict",
     )
-    check = check_and_parse_response(response, dict)
-    assert check["test"] == "dummy", "get_data_dict failed"
+    check_b = check_and_parse_response(response, dict)
+    assert check_b["test"] == "dummy", "get_data_dict failed"
 
     response = await client.get(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/get/-1/data_dict",
@@ -280,8 +278,9 @@ async def check_update_methods(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/update/{entry.id}/collections",
         content=update_model.model_dump_json(),
     )
-    check = check_and_parse_response(response, entry_class)
-    assert check.collections["test"] == "dummy", "update_collections failed"
+    check_c = check_and_parse_response(response, entry_class)
+    assert check_c.collections is not None
+    assert check_c.collections["test"] == "dummy", "update_collections failed"
 
     response = await client.post(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/update/-1/collections",
@@ -292,8 +291,8 @@ async def check_update_methods(
     response = await client.get(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/get/{entry.id}/collections",
     )
-    check = check_and_parse_response(response, dict)
-    assert check["test"] == "dummy", "get_collections failed"
+    check_d = check_and_parse_response(response, dict)
+    assert check_d["test"] == "dummy", "get_collections failed"
 
     response = await client.get(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/get/-1/collections",
@@ -303,8 +302,8 @@ async def check_update_methods(
     response = await client.get(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/get/{entry.id}/resolved_collections",
     )
-    check = check_and_parse_response(response, dict)
-    assert check["test"] == "dummy", "get_resolved_collections failed"
+    check_e = check_and_parse_response(response, dict)
+    assert check_e["test"] == "dummy", "get_resolved_collections failed"
 
     response = await client.get(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/get/-1/resolved_collections",
@@ -319,8 +318,9 @@ async def check_update_methods(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/update/{entry.id}/child_config",
         content=update_model.model_dump_json(),
     )
-    check = check_and_parse_response(response, entry_class)
-    assert check.child_config["test"] == "dummy", "update_child_config failed"
+    check_f = check_and_parse_response(response, entry_class)
+    assert check_f.child_config is not None
+    assert check_f.child_config["test"] == "dummy", "update_child_config failed"
 
     response = await client.post(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/update/-1/child_config",
@@ -331,8 +331,8 @@ async def check_update_methods(
     response = await client.get(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/get/{entry.id}/child_config",
     )
-    check = check_and_parse_response(response, dict)
-    assert check["test"] == "dummy", "get_child_config failed"
+    check_g = check_and_parse_response(response, dict)
+    assert check_g["test"] == "dummy", "get_child_config failed"
 
     response = await client.get(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/get/-1/child_config",
@@ -347,8 +347,9 @@ async def check_update_methods(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/update/{entry.id}/spec_aliases",
         content=update_model.model_dump_json(),
     )
-    check = check_and_parse_response(response, entry_class)
-    assert check.spec_aliases["test"] == "dummy", "update_spec_aliases failed"
+    check_h = check_and_parse_response(response, entry_class)
+    assert check_h.spec_aliases is not None
+    assert check_h.spec_aliases["test"] == "dummy", "update_spec_aliases failed"
 
     response = await client.post(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/update/-1/spec_aliases",
@@ -359,8 +360,8 @@ async def check_update_methods(
     response = await client.get(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/get/{entry.id}/spec_aliases",
     )
-    check = check_and_parse_response(response, dict)
-    assert check["test"] == "dummy", "get_spec_aliases failed"
+    check_i = check_and_parse_response(response, dict)
+    assert check_i["test"] == "dummy", "get_spec_aliases failed"
 
     response = await client.get(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/get/-1/spec_aliases",
@@ -670,12 +671,12 @@ async def check_scripts(
     expect_failed_response(response, 404)
 
 
-async def check_get_methods(
+async def check_get_methods[E: AnyCampaignElement](
     client: AsyncClient,
     api_version: str,
     entry: E,
     entry_class_name: str,
-    entry_class: TypeAlias = models.ElementMixin,
+    entry_class: type[E],
 ) -> None:
     response = await client.get(
         f"{config.asgi.prefix}/{api_version}/{entry_class_name}/get/{entry.id}",

From a2b610388fdf53d1fdf7cd8c3df6ceae12d54f43 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Thu, 26 Jun 2025 16:34:07 -0500
Subject: [PATCH 06/37] fix(parse): Allow '-' in element names (fixes #186)

---
 src/lsst/cmservice/parsing/string.py | 10 +++++-----
 tests/test_parsing.py                |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lsst/cmservice/parsing/string.py b/src/lsst/cmservice/parsing/string.py
index 24a052ede..dc485a187 100644
--- a/src/lsst/cmservice/parsing/string.py
+++ b/src/lsst/cmservice/parsing/string.py
@@ -48,11 +48,11 @@ def parse_element_fullname(fullname: str) -> Fullname:
     fullname_r = re.compile(
         (
             r"^"
-            r"(?P<campaign>[\w]+){1}(?:\/)*"
-            r"(?P<step>[\w]+){0,1}(?:\/)*"
-            r"(?P<group>[\w]+){0,1}(?:\/)*"
-            r"(?P<job>[\w]+){0,1}(?:\/)*"
-            r"(?P<script>[\w]+){0,1}"
+            r"(?P<campaign>[\w-]+){1}(?:\/)*"
+            r"(?P<step>[\w-]+){0,1}(?:\/)*"
+            r"(?P<group>[\w-]+){0,1}(?:\/)*"
+            r"(?P<job>[\w-]+){0,1}(?:\/)*"
+            r"(?P<script>[\w-]+){0,1}"
             r"$"
         ),
         re.MULTILINE,
diff --git a/tests/test_parsing.py b/tests/test_parsing.py
index 63fffb30d..101096725 100644
--- a/tests/test_parsing.py
+++ b/tests/test_parsing.py
@@ -11,6 +11,7 @@
         ("campaign_name/step_name/group0", "group"),
         ("campaign_name/step_name", "step"),
         ("campaign_name", "campaign"),
+        ("campaign-name", "campaign"),
     ],
 )
 def test_fullname_parsing(fullname: str, expected: str) -> None:

From c7f1edf3377688c75cae1a9895575268d21fdfa2 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Thu, 26 Jun 2025 16:51:16 -0500
Subject: [PATCH 07/37] fix(config): add config.bps.artifact_path - removes
 "prod_area" from scope of campaign configuration, set via application config
 instead. - fixes #187

---
 Makefile                                 |  1 +
 src/lsst/cmservice/config.py             |  5 +++++
 src/lsst/cmservice/handlers/jobs.py      |  7 +++----
 src/lsst/cmservice/handlers/scripts.py   | 22 +++++++++++-----------
 tests/fixtures/seeds/empty_config.yaml   |  1 -
 tests/fixtures/seeds/start_trivial.yaml  |  1 -
 tests/fixtures/seeds/test_hsc_micro.yaml |  2 --
 tests/fixtures/seeds/test_trivial.yaml   |  1 -
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 055bc1c80..f01fa4fe8 100644
--- a/Makefile
+++ b/Makefile
@@ -108,6 +108,7 @@ test: PGPORT=$(shell docker compose port postgresql 5432 | cut -d: -f2)
 test: export DB__URL=postgresql://cm-service@localhost:${PGPORT}/cm-service
 test: export DB__PASSWORD=INSECURE-PASSWORD
 test: export DB__TABLE_SCHEMA=cm_service_test
+test: export BPS__ARTIFACT_PATH=$(PWD)/output
 test: run-compose
 	alembic upgrade head
 	pytest -vvv --asyncio-mode=auto --cov=lsst.cmservice --cov-branch --cov-report=term --cov-report=html ${PYTEST_ARGS}
diff --git a/src/lsst/cmservice/config.py b/src/lsst/cmservice/config.py
index bfb045c15..2bd83bd68 100644
--- a/src/lsst/cmservice/config.py
+++ b/src/lsst/cmservice/config.py
@@ -60,6 +60,11 @@ class BpsConfiguration(BaseModel):
         default=16,
     )
 
+    artifact_path: str = Field(
+        description="Filesystem path location for writing artifacts (`prod_area`)",
+        default="/prod_area",
+    )
+
 
 class ButlerConfiguration(BaseModel):
     """Configuration settings for butler client operations.
diff --git a/src/lsst/cmservice/handlers/jobs.py b/src/lsst/cmservice/handlers/jobs.py
index 7f6ff80ed..5b1eff8ed 100644
--- a/src/lsst/cmservice/handlers/jobs.py
+++ b/src/lsst/cmservice/handlers/jobs.py
@@ -78,11 +78,11 @@ async def _write_script(
         await session.refresh(parent, attribute_names=["c_"])
         data_dict = await script.data_dict(session)
         resolved_cols = await script.resolve_collections(session)
+        prod_area = os.path.expandvars(config.bps.artifact_path)
 
         # Resolve mandatory data element inputs. All of these values must be
         # provided somewhere along the SpecBlock chain.
         try:
-            prod_area = os.path.expandvars(data_dict["prod_area"])
             butler_repo = os.path.expandvars(data_dict["butler_repo"])
             lsst_version = os.path.expandvars(data_dict.get("lsst_version", "w_latest"))
             lsst_distrib_dir = os.path.expandvars(data_dict["lsst_distrib_dir"])
@@ -575,7 +575,7 @@ async def _write_script(
         if TYPE_CHECKING:
             assert isinstance(parent, Job)
         data_dict = await script.data_dict(session)
-        prod_area = await Path(os.path.expandvars(data_dict["prod_area"])).resolve()
+        prod_area = await Path(os.path.expandvars(config.bps.artifact_path)).resolve()
         resolved_cols = await script.resolve_collections(session)
         script_url = await self._set_script_files(session, script, prod_area)
         butler_repo = data_dict["butler_repo"]
@@ -626,8 +626,7 @@ async def _do_prepare(
     ) -> StatusEnum:
         if TYPE_CHECKING:
             assert isinstance(parent, Job)
-        data_dict = await script.data_dict(session)
-        prod_area = await Path(os.path.expandvars(data_dict["prod_area"])).resolve()
+        prod_area = await Path(os.path.expandvars(config.bps.artifact_path)).resolve()
 
         report_url = parent.metadata_.get("report_url") or (
             prod_area / parent.fullname / "manifest_report.yaml"
diff --git a/src/lsst/cmservice/handlers/scripts.py b/src/lsst/cmservice/handlers/scripts.py
index 575ea3883..f678880ea 100644
--- a/src/lsst/cmservice/handlers/scripts.py
+++ b/src/lsst/cmservice/handlers/scripts.py
@@ -43,7 +43,7 @@ async def _write_script(
         data_dict = await script.data_dict(session)
         try:
             output_coll = resolved_cols["output"]
-            script_url = await self._set_script_files(session, script, data_dict["prod_area"])
+            script_url = await self._set_script_files(session, script, config.bps.artifact_path)
             butler_repo = data_dict["butler_repo"]
         except KeyError as e:
             raise CMMissingScriptInputError(f"{script.fullname} missing an input: {e}") from e
@@ -95,7 +95,7 @@ async def _write_script(
         try:
             output_coll = resolved_cols["output"]
             input_colls = resolved_cols["inputs"]
-            script_url = await self._set_script_files(session, script, data_dict["prod_area"])
+            script_url = await self._set_script_files(session, script, config.bps.artifact_path)
             butler_repo = data_dict["butler_repo"]
         except KeyError as msg:
             logger.exception()
@@ -161,7 +161,7 @@ async def _write_script(
         try:
             output_coll = resolved_cols["output"]
             input_coll = resolved_cols["input"]
-            script_url = await self._set_script_files(session, script, data_dict["prod_area"])
+            script_url = await self._set_script_files(session, script, config.bps.artifact_path)
             butler_repo = data_dict["butler_repo"]
         except KeyError as msg:
             raise CMMissingScriptInputError(f"{script.fullname} missing an input: {msg}") from msg
@@ -241,7 +241,7 @@ async def _write_script(
             raise CMMissingScriptInputError(
                 "Must specify what to collect in ChainCollectScriptHandler, jobs or steps",
             )
-        script_url = await self._set_script_files(session, script, data_dict["prod_area"])
+        script_url = await self._set_script_files(session, script, config.bps.artifact_path)
         butler_repo = data_dict["butler_repo"]
         command = f"{config.butler.butler_bin} collection-chain {butler_repo} {output_coll}"
         for collect_coll_ in collect_colls:
@@ -301,7 +301,7 @@ async def _write_script(
         try:
             output_coll = resolved_cols["output"]
             input_coll = resolved_cols["input"]
-            script_url = await self._set_script_files(session, script, data_dict["prod_area"])
+            script_url = await self._set_script_files(session, script, config.bps.artifact_path)
             butler_repo = data_dict["butler_repo"]
             data_query = data_dict.get("data_query")
         except KeyError as msg:
@@ -357,7 +357,7 @@ async def _write_script(
         data_dict = await script.data_dict(session)
         try:
             output_coll = resolved_cols["output"]
-            script_url = await self._set_script_files(session, script, data_dict["prod_area"])
+            script_url = await self._set_script_files(session, script, config.bps.artifact_path)
             butler_repo = data_dict["butler_repo"]
         except KeyError as msg:
             raise CMMissingScriptInputError(f"{script.fullname} missing an input: {msg}") from msg
@@ -413,7 +413,7 @@ async def _write_script(
         try:
             input_coll = resolved_cols["input"]
             output_coll = resolved_cols["output"]
-            script_url = await self._set_script_files(session, script, data_dict["prod_area"])
+            script_url = await self._set_script_files(session, script, config.bps.artifact_path)
             butler_repo = data_dict["butler_repo"]
         except KeyError as msg:
             raise CMMissingScriptInputError(f"{script.fullname} missing an input: {msg}") from msg
@@ -477,7 +477,7 @@ async def _write_script(
         resolved_cols = await script.resolve_collections(session)
         data_dict = await script.data_dict(session)
         try:
-            script_url = await self._set_script_files(session, script, data_dict["prod_area"])
+            script_url = await self._set_script_files(session, script, config.bps.artifact_path)
             butler_repo = data_dict["butler_repo"]
             output_coll = resolved_cols["output"]
         except KeyError as msg:
@@ -537,7 +537,7 @@ async def _write_script(
     ) -> StatusEnum:
         resolved_cols = await script.resolve_collections(session)
         data_dict = await script.data_dict(session)
-        prod_area = os.path.expandvars(data_dict["prod_area"])
+        prod_area = os.path.expandvars(config.bps.artifact_path)
         script_url = await self._set_script_files(session, script, prod_area)
         butler_repo = data_dict["butler_repo"]
         usage_graph_url = os.path.expandvars(f"{prod_area}/{parent.fullname}/resource_usage.qgraph")
@@ -594,7 +594,7 @@ async def _write_script(
     ) -> StatusEnum:
         resolved_cols = await script.resolve_collections(session)
         data_dict = await script.data_dict(session)
-        prod_area = os.path.expandvars(data_dict["prod_area"])
+        prod_area = os.path.expandvars(config.bps.artifact_path)
         script_url = await self._set_script_files(session, script, prod_area)
         butler_repo = data_dict["butler_repo"]
         hips_maps_graph_url = os.path.expandvars(f"{prod_area}/{parent.fullname}/hips_maps.qgraph")
@@ -696,7 +696,7 @@ async def _write_script(
         try:
             input_coll = resolved_cols["input"]
             output_coll = resolved_cols["output"]
-            script_url = await self._set_script_files(session, script, data_dict["prod_area"])
+            script_url = await self._set_script_files(session, script, config.bps.artifact_path)
             butler_repo = data_dict["butler_repo"]
         except KeyError as msg:
             raise CMMissingScriptInputError(f"{script.fullname} missing an input: {msg}") from msg
diff --git a/tests/fixtures/seeds/empty_config.yaml b/tests/fixtures/seeds/empty_config.yaml
index 1b8f1d40b..d30242b50 100644
--- a/tests/fixtures/seeds/empty_config.yaml
+++ b/tests/fixtures/seeds/empty_config.yaml
@@ -29,7 +29,6 @@ Campaign:
       campaign_validation: "{out}/validate"
     data:
       butler_repo: "/repo/main"
-      prod_area: "output/archive"
       data_query: "instrument = 'HSC'"
       lsst_version: "${WEEKLY}"
 - Specification:
diff --git a/tests/fixtures/seeds/start_trivial.yaml b/tests/fixtures/seeds/start_trivial.yaml
index 4cf245675..ce8bccea1 100644
--- a/tests/fixtures/seeds/start_trivial.yaml
+++ b/tests/fixtures/seeds/start_trivial.yaml
@@ -6,6 +6,5 @@ Campaign:
     campaign_source: HSC/raw/RC2
   data:
     lsst_version: w_2024_38
-    prod_area: /tmp/trivial
     butler_repo: "/repo/main"
     data_query: "instrument = 'HSC' AND exposure in (30504, 30502) AND detector in (45, 46, 47, 48)"
diff --git a/tests/fixtures/seeds/test_hsc_micro.yaml b/tests/fixtures/seeds/test_hsc_micro.yaml
index f32ae2457..bca8fe430 100644
--- a/tests/fixtures/seeds/test_hsc_micro.yaml
+++ b/tests/fixtures/seeds/test_hsc_micro.yaml
@@ -23,7 +23,6 @@
             split_min_groups: 2
     data:
       butler_repo: "/repo/main"
-      prod_area: "output/archive"
       data_query: "instrument = 'HSC' AND exposure in (30504, 30502) AND detector in (45, 46, 47, 48)"
       lsst_version: w_2025_01
       bps_wms_clustering_file: "${DRP_PIPE_DIR}/bps/clustering/HSC/DRP-RC2-clustering.yaml"
@@ -65,7 +64,6 @@
       campaign_validation: "{out}/validate"
     data:
       butler_repo: "/repo/main"
-      prod_area: "output/archive"
       data_query: "instrument = 'HSC'"
       lsst_version: "${WEEKLY}"
 - Specification:
diff --git a/tests/fixtures/seeds/test_trivial.yaml b/tests/fixtures/seeds/test_trivial.yaml
index a51b58c30..c9ee849a6 100644
--- a/tests/fixtures/seeds/test_trivial.yaml
+++ b/tests/fixtures/seeds/test_trivial.yaml
@@ -16,7 +16,6 @@
             split_method: no_split
     data:
       butler_repo: "/repo/main"
-      prod_area: "output/archive"
       data_query: "instrument = 'HSC' AND exposure in (30504, 30502) AND detector in (45, 46, 47, 48)"
       lsst_version: w_2023_46
 - Specification:

From d57c9e3aa55b2e9be3f9d4afb431e2181a8624e5 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Thu, 26 Jun 2025 17:02:19 -0500
Subject: [PATCH 08/37] fix(daemon): Correct types in due date checks (#188)

---
 src/lsst/cmservice/common/daemon.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lsst/cmservice/common/daemon.py b/src/lsst/cmservice/common/daemon.py
index 81089f78c..c49f7d159 100644
--- a/src/lsst/cmservice/common/daemon.py
+++ b/src/lsst/cmservice/common/daemon.py
@@ -18,11 +18,11 @@
 async def check_due_date(session: AnyAsyncSession, node: NodeMixin, time_next_check: datetime) -> None:
     """For a provided due date, check if the queue entry is overdue"""
 
-    due_date = node.metadata_.get("due_date", None)
+    due_date: int | None = node.metadata_.get("due_date", None)
     if due_date is None:
         return None
 
-    if time_next_check > due_date:
+    if time_next_check.timestamp() > due_date:
         campaign = await node.get_campaign(session)
         await notification.send_notification(for_status=StatusEnum.overdue, for_campaign=campaign)
 

From 7231e4be6a4170677c692a811bee87a41fbfdf1d Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Thu, 26 Jun 2025 17:47:07 -0500
Subject: [PATCH 09/37] chore(project): Update contribution docs and update
 release branch name regex. [skip ci]

---
 docs/CONTRIBUTING.md | 4 +---
 pyproject.toml       | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 3d78cfce5..8bb337ad5 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -19,9 +19,7 @@ Releases are performed at an unspecified cadence, to be no shorter than 1 week a
 - Releases are named according to their semantic version (major.minor.patch).
 - Releases are made by adding a named tag to the trunk branch.
 - Each release will increment the minor version and set the patch level to 0, e.g., `1.0.12` -> `1.1.0`
-- If a bugfix commit needs to be added to a release, then a retroactive branch will be created from the
-  release tag; the commit is cherry-picked into the release branch and a new tag is written with an incremented
-  patch level, e.g., `1.23.0` -> `1.23.1`.
+- If a bugfix commit in the trunk needs to be added to a release, then a retroactive branch will be created from the affected release tag; any fix commits are cherry-picked into the release branch and a new tag is written with an incremented patch level, e.g., `1.23.0` -> `1.23.1`. This release branch is never merged to `main` (trunk) but is kept for subsequent cherry-picked fixes.
 - The major version is incremented only in the presence of user-facing breaking changes.
 
 This project uses `python-semantic-release` to manage releases. A release may be triggered by any ticket branch
diff --git a/pyproject.toml b/pyproject.toml
index 53d38a6d3..8499cac29 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -223,10 +223,16 @@ tag_format = "{version}"
 match = "main"
 prerelease = false
 
+# A Ticketed release branch
 [tool.semantic_release.branches.release]
 match = "^tickets/DM-\\d+(.*)/release$"
 prerelease = false
 
+# A non-ticketed release branch
+[tool.semantic_release.branches.bugfix]
+match = "^release/\\d+.\\d+.\\d+$"
+prerelease = false
+
 [tool.semantic_release.branches.ticket]
 match = "^tickets/DM-\\d+(.*)$"
 prerelease_token = "rc"

From cc0985740a1c880a6a1b019ca67102893e6e45d4 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Fri, 27 Jun 2025 10:28:44 -0500
Subject: [PATCH 10/37] chore(docs): Update deployment doc [skip ci]

---
 docs/DEPLOYING.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/DEPLOYING.md b/docs/DEPLOYING.md
index 753817620..f2bc7759a 100644
--- a/docs/DEPLOYING.md
+++ b/docs/DEPLOYING.md
@@ -50,3 +50,18 @@ The CM Service consumes several secrets from the k8s application environment. Th
   - The AWS "default" profile is configured to use environment variables for its credentials source, so the appropriate secrets should be assigned to the `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables.
 
   - Authentication values for other profiles are stored in a secret mounted as a file at `/etc/aws/credentials`.
+
+## Dev / Staging Deployments
+Development or staging builds are deployed to the USDF Kubernetes vcluster `usdf-cm-dev`.
+
+Prior to deploying a new build using a prerelease tag, release tag, or ticket branch tag, it may be necessary to clear the database of all data so it can be migrated from scratch.
+
+### Clearing the Database
+After appropriately setting the Kubernetes context and namespace:
+
+1. Scale down the daemon deployment using `kubectl scale deployment cm-service-daemon --replicas=0`.
+1. Obtain a shell in an API server pod using `kubectl exec -it cm-service-server-<hash> -- bash`.
+1. Within this shell, downgrade the database migration using `alembic downgrade base`.
+
+> [!CAUTION]
+> This operation unconditionally destroys the database contents and all objects.

From a8b07d41dd40f94897116702664aecfbce4b0659 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Fri, 27 Jun 2025 12:48:13 -0500
Subject: [PATCH 11/37] fix: Initialize bps_submit_dir to None in
 BpsScriptHandler - addresses #195

---
 src/lsst/cmservice/handlers/jobs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lsst/cmservice/handlers/jobs.py b/src/lsst/cmservice/handlers/jobs.py
index 5b1eff8ed..1325d809e 100644
--- a/src/lsst/cmservice/handlers/jobs.py
+++ b/src/lsst/cmservice/handlers/jobs.py
@@ -287,7 +287,7 @@ async def _check_htcondor_job(
         # Irrespective of status, if the bps stdout log file exists, try to
         # parse it for valuable information
         # FIXME is this appropriate? maybe it should only be for terminal state
-        bps_submit_dir: str | None
+        bps_submit_dir: str | None = None
         if fake_status is not None:
             wms_job_id = "fake_job"
             bps_submit_dir = "fake_path"

From 5ea2ce7399e439548ee00aae05074b840fc7d45c Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Mon, 30 Jun 2025 11:32:50 -0500
Subject: [PATCH 12/37] chore(deps): Add pytransitions - pin testcontainers to
 last good release

---
 pyproject.toml |  3 ++-
 uv.lock        | 25 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8499cac29..2b8d31f63 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,6 +44,7 @@ dependencies = [
     "httpx>=0.27.2",
     "networkx>=3.5",
     "sqlmodel>=0.0.24",
+    "pytransitions>=0.9.2",
 ]
 
 [dependency-groups]
@@ -74,7 +75,7 @@ dev = [
     "types-pyyaml>=6.0.12.20240917",
     "types-tabulate>=0.9.0.20240106",
     "respx>=0.22.0",
-    "testcontainers[postgres]>=4.11.0",
+    "testcontainers[postgres]==4.10.*",
 ]
 
 [project.scripts]
diff --git a/uv.lock b/uv.lock
index 34dffae90..fe4ebf543 100644
--- a/uv.lock
+++ b/uv.lock
@@ -827,6 +827,7 @@ dependencies = [
     { name = "pydantic" },
     { name = "pydantic-settings" },
     { name = "python-multipart" },
+    { name = "pytransitions" },
     { name = "rich" },
     { name = "safir", extra = ["db"] },
     { name = "sqlalchemy", extra = ["asyncio"] },
@@ -884,6 +885,7 @@ requires-dist = [
     { name = "pydantic", specifier = "==2.11.*" },
     { name = "pydantic-settings", specifier = "==2.9.*" },
     { name = "python-multipart", specifier = "==0.0.*" },
+    { name = "pytransitions", specifier = ">=0.9.2" },
     { name = "rich", specifier = "==13.9.*" },
     { name = "safir", extras = ["db"], specifier = "==7.0.*" },
     { name = "sqlalchemy", extras = ["asyncio"], specifier = "==2.0.*" },
@@ -910,7 +912,7 @@ dev = [
     { name = "respx", specifier = ">=0.22.0" },
     { name = "ruff", specifier = ">=0.8.0" },
     { name = "sqlalchemy", extras = ["mypy"], specifier = ">=2.0.36" },
-    { name = "testcontainers", extras = ["postgres"], specifier = ">=4.11.0" },
+    { name = "testcontainers", extras = ["postgres"], specifier = "==4.10.*" },
     { name = "types-pyyaml", specifier = ">=6.0.12.20240917" },
     { name = "types-tabulate", specifier = ">=0.9.0.20240106" },
 ]
@@ -1688,14 +1690,23 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a4/62/02da182e544a51a5c3ccf4b03ab79df279f9c60c5e82d5e8bec7ca26ac11/python_slugify-8.0.4-py2.py3-none-any.whl", hash = "sha256:276540b79961052b66b7d116620b36518847f52d5fd9e3a70164fc8c50faa6b8", size = 10051, upload-time = "2024-02-08T18:32:43.911Z" },
 ]
 
+[[package]]
+name = "pytransitions"
+version = "0.9.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "six" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ad/3b/0c24c66483962fb45ba273607fff0bd07770890c5b52152f17398d7069cb/pytransitions-0.9.2.tar.gz", hash = "sha256:c4d2363b76864ff2b532a3c420a552f9c57becbac0582c1f236fea78d2570860", size = 123751, upload-time = "2024-12-10T07:18:00.416Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a2/69/d544505e6cf4c02e81eca91129179d93cda04b5611c91e176f76145a9cb9/pytransitions-0.9.2-py3-none-any.whl", hash = "sha256:796207d77f0b80719fcfb30f8a36702262f1dd940def13b970f4d8d91c4b5297", size = 112935, upload-time = "2024-12-10T07:17:57.05Z" },
+]
+
 [[package]]
 name = "pywin32"
 version = "310"
 source = { registry = "https://pypi.org/simple" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f7/b1/68aa2986129fb1011dabbe95f0136f44509afaf072b12b8f815905a39f33/pywin32-310-cp311-cp311-win32.whl", hash = "sha256:1e765f9564e83011a63321bb9d27ec456a0ed90d3732c4b2e312b855365ed8bd", size = 8784284, upload-time = "2025-03-17T00:55:53.124Z" },
-    { url = "https://files.pythonhosted.org/packages/b3/bd/d1592635992dd8db5bb8ace0551bc3a769de1ac8850200cfa517e72739fb/pywin32-310-cp311-cp311-win_amd64.whl", hash = "sha256:126298077a9d7c95c53823934f000599f66ec9296b09167810eb24875f32689c", size = 9520748, upload-time = "2025-03-17T00:55:55.203Z" },
-    { url = "https://files.pythonhosted.org/packages/90/b1/ac8b1ffce6603849eb45a91cf126c0fa5431f186c2e768bf56889c46f51c/pywin32-310-cp311-cp311-win_arm64.whl", hash = "sha256:19ec5fc9b1d51c4350be7bb00760ffce46e6c95eaf2f0b2f1150657b1a43c582", size = 8455941, upload-time = "2025-03-17T00:55:57.048Z" },
     { url = "https://files.pythonhosted.org/packages/6b/ec/4fdbe47932f671d6e348474ea35ed94227fb5df56a7c30cbbb42cd396ed0/pywin32-310-cp312-cp312-win32.whl", hash = "sha256:8a75a5cc3893e83a108c05d82198880704c44bbaee4d06e442e471d3c9ea4f3d", size = 8796239, upload-time = "2025-03-17T00:55:58.807Z" },
     { url = "https://files.pythonhosted.org/packages/e3/e5/b0627f8bb84e06991bea89ad8153a9e50ace40b2e1195d68e9dff6b03d0f/pywin32-310-cp312-cp312-win_amd64.whl", hash = "sha256:bf5c397c9a9a19a6f62f3fb821fbf36cac08f03770056711f765ec1503972060", size = 9503839, upload-time = "2025-03-17T00:56:00.8Z" },
     { url = "https://files.pythonhosted.org/packages/1f/32/9ccf53748df72301a89713936645a664ec001abd35ecc8578beda593d37d/pywin32-310-cp312-cp312-win_arm64.whl", hash = "sha256:2349cc906eae872d0663d4d6290d13b90621eaf78964bb1578632ff20e152966", size = 8459470, upload-time = "2025-03-17T00:56:02.601Z" },
@@ -2032,7 +2043,7 @@ wheels = [
 
 [[package]]
 name = "testcontainers"
-version = "4.11.0"
+version = "4.10.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "docker" },
@@ -2041,9 +2052,9 @@ dependencies = [
     { name = "urllib3" },
     { name = "wrapt" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/94/ea/5e89a6ddc294a081907189e3ec1e565694d76864a552163527f708d3ced1/testcontainers-4.11.0.tar.gz", hash = "sha256:48faa72d0ba8d141495d5aec08f8cd5d244ed77c1c4089a4ce1df7b5e12caaf3", size = 64426, upload-time = "2025-06-16T10:59:57.965Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a1/49/9c618aff1c50121d183cdfbc3a4a5cf2727a2cde1893efe6ca55c7009196/testcontainers-4.10.0.tar.gz", hash = "sha256:03f85c3e505d8b4edeb192c72a961cebbcba0dd94344ae778b4a159cb6dcf8d3", size = 63327, upload-time = "2025-04-02T16:13:27.582Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ea/e8/c54f0624f998f9210bff3df84f58ea47120b58412c4623a53277df4d1e75/testcontainers-4.11.0-py3-none-any.whl", hash = "sha256:36f0e1165ce2b504b1e8b8c9779ca738d3baad57d402e35c22ccf01a371fda0d", size = 108597, upload-time = "2025-06-16T10:59:56.153Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/0a/824b0c1ecf224802125279c3effff2e25ed785ed046e67da6e53d928de4c/testcontainers-4.10.0-py3-none-any.whl", hash = "sha256:31ed1a81238c7e131a2a29df6db8f23717d892b592fa5a1977fd0dcd0c23fc23", size = 107414, upload-time = "2025-04-02T16:13:25.785Z" },
 ]
 
 [[package]]

From bad82e53ff3b21bb1b11b510fe5c10e7ea3157a5 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Tue, 1 Jul 2025 14:03:07 -0500
Subject: [PATCH 13/37] fix(status): make reviewable a terminal unsuccessful
 script status

---
 src/lsst/cmservice/common/enums.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lsst/cmservice/common/enums.py b/src/lsst/cmservice/common/enums.py
index 6b362e779..59834c4e5 100644
--- a/src/lsst/cmservice/common/enums.py
+++ b/src/lsst/cmservice/common/enums.py
@@ -145,7 +145,7 @@ def is_successful_element(self) -> bool:
 
     def is_successful_script(self) -> bool:
         """Is this successful state for Script"""
-        return self.value >= StatusEnum.reviewable.value
+        return self.value >= StatusEnum.accepted.value
 
     def is_bad(self) -> bool:
         """Is this a failed state"""
@@ -166,6 +166,7 @@ def is_terminal_script(self) -> bool:
             [
                 self.is_successful_script(),
                 self.is_bad(),
+                self is StatusEnum.reviewable,
             ]
         )
 

From bc997547f5eced8d3a4eeffc8760d24aededb208 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Tue, 17 Jun 2025 11:40:09 -0500
Subject: [PATCH 14/37] feat(db): Add migrations and models for v2 tables

feat(db): Extend v2 model fields with pydantic aliases
---
 .../versions/1da92a1c740f_create_v2_tables.py | 247 ++++++++++++++++
 src/lsst/cmservice/common/enums.py            |  17 ++
 src/lsst/cmservice/db/campaigns_v2.py         | 279 ++++++++++++++++++
 src/lsst/cmservice/db/manifests_v2.py         |  34 +++
 src/lsst/cmservice/db/session.py              |  29 +-
 5 files changed, 589 insertions(+), 17 deletions(-)
 create mode 100644 alembic/versions/1da92a1c740f_create_v2_tables.py
 create mode 100644 src/lsst/cmservice/db/campaigns_v2.py
 create mode 100644 src/lsst/cmservice/db/manifests_v2.py

diff --git a/alembic/versions/1da92a1c740f_create_v2_tables.py b/alembic/versions/1da92a1c740f_create_v2_tables.py
new file mode 100644
index 000000000..127ee5604
--- /dev/null
+++ b/alembic/versions/1da92a1c740f_create_v2_tables.py
@@ -0,0 +1,247 @@
+"""create v2 tables
+
+Revision ID: 1da92a1c740f
+Revises: acf951c80750
+Create Date: 2025-06-13 14:56:31.238050+00:00
+
+"""
+
+from collections.abc import Sequence
+from enum import Enum
+from uuid import NAMESPACE_DNS
+
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "1da92a1c740f"
+down_revision: str | None = "acf951c80750"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+DEFAULT_CAMPAIGN_NAMESPACE = "dda54a0c-6878-5c95-ac4f-007f6808049e"
+"""UUID5 of name 'io.lsst.cmservice' in `uuid.NAMESPACE_DNS`."""
+
+# DB model uses mapped columns with Python Enum types, but we do not care
+# to use native enums in the database, so when we have such a column, this
+# definition will produce a VARCHAR instead.
+ENUM_COLUMN_AS_VARCHAR = sa.Enum(Enum, length=20, native_enum=False, check_constraint=False)
+
+
+def upgrade() -> None:
+    # Create table for machines v2
+    machines_v2 = op.create_table(
+        "machines_v2",
+        sa.Column("id", postgresql.UUID(), nullable=False),
+        sa.Column("state", sa.PickleType, nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+        if_not_exists=True,
+    )
+
+    # Create table for campaigns v2
+    campaigns_v2 = op.create_table(
+        "campaigns_v2",
+        sa.Column("id", postgresql.UUID(), nullable=False),
+        sa.Column("name", postgresql.VARCHAR(), nullable=False),
+        sa.Column("namespace", postgresql.UUID(), nullable=False, default=DEFAULT_CAMPAIGN_NAMESPACE),
+        sa.Column("owner", postgresql.VARCHAR(), nullable=True),
+        sa.Column(
+            "metadata",
+            postgresql.JSONB(),
+            nullable=False,
+            default=dict,
+            server_default=sa.text("'{}'::json"),
+        ),
+        sa.Column(
+            "configuration",
+            postgresql.JSONB(),
+            nullable=False,
+            default=dict,
+            server_default=sa.text("'{}'::json"),
+        ),
+        sa.Column("status", ENUM_COLUMN_AS_VARCHAR, nullable=False, default="waiting"),
+        sa.Column(
+            "machine", postgresql.UUID(), sa.ForeignKey(machines_v2.c.id, ondelete="CASCADE"), nullable=True
+        ),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("name", "namespace"),
+        if_not_exists=True,
+    )
+
+    # Create node and edges tables for campaign digraph
+    nodes_v2 = op.create_table(
+        "nodes_v2",
+        sa.Column("id", postgresql.UUID(), nullable=False),
+        sa.Column(
+            "namespace",
+            postgresql.UUID(),
+            sa.ForeignKey(campaigns_v2.c.id, ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column("name", postgresql.VARCHAR(), nullable=False),
+        sa.Column("version", postgresql.INTEGER(), nullable=False, default=1),
+        sa.Column("kind", ENUM_COLUMN_AS_VARCHAR, nullable=False, default="node"),
+        sa.Column(
+            "metadata",
+            postgresql.JSONB(),
+            nullable=False,
+            default=dict,
+            server_default=sa.text("'{}'::json"),
+        ),
+        sa.Column(
+            "configuration",
+            postgresql.JSONB(),
+            nullable=False,
+            default=dict,
+            server_default=sa.text("'{}'::json"),
+        ),
+        sa.Column("status", ENUM_COLUMN_AS_VARCHAR, nullable=False, default="waiting"),
+        sa.Column(
+            "machine", postgresql.UUID(), sa.ForeignKey(machines_v2.c.id, ondelete="CASCADE"), nullable=True
+        ),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("name", "version", "namespace"),
+        if_not_exists=True,
+    )
+
+    _ = op.create_table(
+        "edges_v2",
+        sa.Column("id", postgresql.UUID(), nullable=False),
+        sa.Column("name", postgresql.VARCHAR(), nullable=False),
+        sa.Column(
+            "namespace",
+            postgresql.UUID(),
+            sa.ForeignKey(campaigns_v2.c.id, ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column("source", postgresql.UUID(), sa.ForeignKey(nodes_v2.c.id), nullable=False),
+        sa.Column("target", postgresql.UUID(), sa.ForeignKey(nodes_v2.c.id), nullable=False),
+        sa.Column(
+            "metadata",
+            postgresql.JSONB(),
+            nullable=False,
+            default=dict,
+            server_default=sa.text("'{}'::json"),
+        ),
+        sa.Column(
+            "configuration",
+            postgresql.JSONB(),
+            nullable=False,
+            default=dict,
+            server_default=sa.text("'{}'::json"),
+        ),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("source", "target", "namespace"),
+        if_not_exists=True,
+    )
+
+    # Create table for spec blocks v2 ("manifests")
+    _ = op.create_table(
+        "manifests_v2",
+        sa.Column("id", postgresql.UUID(), nullable=False),
+        sa.Column("name", postgresql.VARCHAR(), nullable=False),
+        sa.Column(
+            "namespace",
+            postgresql.UUID(),
+            sa.ForeignKey(campaigns_v2.c.id, ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column("version", postgresql.INTEGER(), nullable=False, default=1),
+        sa.Column("kind", ENUM_COLUMN_AS_VARCHAR, nullable=False, default="other"),
+        sa.Column(
+            "metadata",
+            postgresql.JSONB(),
+            nullable=False,
+            default=dict,
+            server_default=sa.text("'{}'::json"),
+        ),
+        sa.Column(
+            "spec",
+            postgresql.JSONB(),
+            nullable=False,
+            default=dict,
+            server_default=sa.text("'{}'::json"),
+        ),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("name", "version", "namespace"),
+        if_not_exists=True,
+    )
+
+    # Create table for tasks v2
+    _ = op.create_table(
+        "tasks_v2",
+        sa.Column("id", postgresql.UUID(), nullable=False),
+        sa.Column("namespace", postgresql.UUID(), nullable=False),
+        sa.Column("node", postgresql.UUID(), nullable=False),
+        sa.Column("priority", postgresql.INTEGER(), nullable=True),
+        sa.Column("created_at", postgresql.TIMESTAMP(timezone=True), nullable=False),
+        sa.Column("last_processed_at", postgresql.TIMESTAMP(timezone=True), nullable=True),
+        sa.Column("finished_at", postgresql.TIMESTAMP(timezone=True), nullable=True),
+        sa.Column("wms_id", postgresql.VARCHAR(), nullable=True),
+        sa.Column("site_affinity", postgresql.ARRAY(postgresql.VARCHAR()), nullable=True),
+        sa.Column("status", ENUM_COLUMN_AS_VARCHAR, nullable=False),
+        sa.Column("previous_status", ENUM_COLUMN_AS_VARCHAR, nullable=True),
+        sa.Column(
+            "metadata",
+            postgresql.JSONB(),
+            nullable=False,
+            default=dict,
+            server_default=sa.text("'{}'::json"),
+        ),
+        sa.PrimaryKeyConstraint("id"),
+        sa.ForeignKeyConstraint(["node"], ["nodes_v2.id"]),
+        sa.ForeignKeyConstraint(["namespace"], ["campaigns_v2.id"]),
+        if_not_exists=True,
+    )
+
+    _ = op.create_table(
+        "activity_log_v2",
+        sa.Column("id", postgresql.UUID(), nullable=False),
+        sa.Column("namespace", postgresql.UUID(), nullable=False),
+        sa.Column("node", postgresql.UUID(), sa.ForeignKey(nodes_v2.c.id), nullable=False),
+        sa.Column("operator", postgresql.VARCHAR(), nullable=False, default="root"),
+        sa.Column("from_status", ENUM_COLUMN_AS_VARCHAR, nullable=False),
+        sa.Column("to_status", ENUM_COLUMN_AS_VARCHAR, nullable=False),
+        sa.Column(
+            "detail",
+            postgresql.JSONB(),
+            nullable=False,
+            default=dict,
+            server_default=sa.text("'{}'::json"),
+        ),
+        sa.Column(
+            "metadata",
+            postgresql.JSONB(),
+            nullable=False,
+            default=dict,
+            server_default=sa.text("'{}'::json"),
+        ),
+        if_not_exists=True,
+    )
+
+    # Insert default campaign (namespace) record
+    op.bulk_insert(
+        campaigns_v2,
+        [
+            {
+                "id": DEFAULT_CAMPAIGN_NAMESPACE,
+                "namespace": str(NAMESPACE_DNS),
+                "name": "DEFAULT",
+                "owner": "root",
+            }
+        ],
+    )
+
+
+def downgrade() -> None:
+    """Drop tables in the reverse order in which they were created."""
+    op.drop_table("activity_log_v2", if_exists=True)
+    op.drop_table("tasks_v2", if_exists=True)
+    op.drop_table("manifests_v2", if_exists=True)
+    op.drop_table("edges_v2", if_exists=True)
+    op.drop_table("nodes_v2", if_exists=True)
+    op.drop_table("campaigns_v2", if_exists=True)
+    op.drop_table("machines_v2", if_exists=True)
diff --git a/src/lsst/cmservice/common/enums.py b/src/lsst/cmservice/common/enums.py
index 59834c4e5..50d07f331 100644
--- a/src/lsst/cmservice/common/enums.py
+++ b/src/lsst/cmservice/common/enums.py
@@ -287,3 +287,20 @@ class WmsComputeSite(enum.Enum):
     lanc = 2
     ral = 3
     in2p3 = 4
+
+
+class ManifestKind(enum.Enum):
+    """Define a manifest kind"""
+
+    campaign = enum.auto()
+    node = enum.auto()
+    edge = enum.auto()
+    # Legacy kinds
+    specification = enum.auto()
+    spec_block = enum.auto()
+    step = enum.auto()
+    group = enum.auto()
+    job = enum.auto()
+    script = enum.auto()
+    # Fallback kind
+    other = enum.auto()
diff --git a/src/lsst/cmservice/db/campaigns_v2.py b/src/lsst/cmservice/db/campaigns_v2.py
new file mode 100644
index 000000000..aa7802fcc
--- /dev/null
+++ b/src/lsst/cmservice/db/campaigns_v2.py
@@ -0,0 +1,279 @@
+from datetime import datetime
+from typing import Annotated, Any
+from uuid import NAMESPACE_DNS, UUID, uuid5
+
+from pydantic import AliasChoices, PlainSerializer, PlainValidator, ValidationInfo, model_validator
+from sqlalchemy.dialects import postgresql
+from sqlalchemy.ext.mutable import MutableDict, MutableList
+from sqlalchemy.types import PickleType
+from sqlmodel import Column, Enum, Field, SQLModel, String
+
+from ..common.enums import ManifestKind, StatusEnum
+from ..config import config
+
+_default_campaign_namespace = uuid5(namespace=NAMESPACE_DNS, name="io.lsst.cmservice")
+"""Default UUID5 namespace for campaigns"""
+
+
+def jsonb_column(name: str, aliases: list[str] | None = None) -> Any:
+    """Constructor for a Field based on a JSONB database column.
+
+    If provided, a list of aliases will be used to construct a pydantic
+    ``AliasChoices`` object for the field's validation alias, which improves
+    usability by making model validation more flexible (e.g., having "metadata"
+    and "metadata_" refer to the same field).
+
+    Additionally, the first alias in the list will be used for the model's
+    serialization alias.
+    """
+    schema_extra = {}
+    if aliases:
+        schema_extra = {
+            "validation_alias": AliasChoices(*aliases),
+            "serialization_alias": aliases[0],
+        }
+    return Field(
+        sa_column=Column(name, MutableDict.as_mutable(postgresql.JSONB)),
+        default_factory=dict,
+        schema_extra=schema_extra,
+    )
+
+
+# NOTES
+# - model validation is not triggered when table=True
+# - Every object model needs to have three flavors:
+#   1. the declarative model of the object's database table
+#   2. the model of the manifest when creating a new object
+#   3. the model of the manifest when updating an object
+#   4. a response model for APIs related to the object
+
+EnumSerializer = PlainSerializer(
+    lambda x: x.name,
+    return_type="str",
+    when_used="always",
+)
+"""A serializer for enums that produces its name, not the value."""
+
+
+StatusEnumValidator = PlainValidator(lambda x: StatusEnum[x] if isinstance(x, str) else StatusEnum(x))
+"""A validator for the StatusEnum that can parse the enum from either a name
+or a value.
+"""
+
+
+ManifestKindEnumValidator = PlainValidator(
+    lambda x: ManifestKind[x] if isinstance(x, str) else ManifestKind(x)
+)
+"""A validator for the ManifestKindEnum that can parse the enum from a name
+or a value.
+"""
+
+
+class BaseSQLModel(SQLModel):
+    __table_args__ = {"schema": config.db.table_schema}
+
+
+class CampaignBase(BaseSQLModel):
+    """Campaigns_v2 base model, used to create new Campaign objects."""
+
+    id: UUID = Field(primary_key=True)
+    name: str
+    namespace: UUID
+    owner: str | None = Field(default=None)
+    status: Annotated[StatusEnum, StatusEnumValidator, EnumSerializer] | None = Field(
+        default=StatusEnum.waiting,
+        sa_column=Column("status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)),
+    )
+    metadata_: dict = jsonb_column("metadata", aliases=["metadata", "metadata_"])
+    configuration: dict = jsonb_column("configuration", aliases=["configuration", "data", "spec"])
+
+
+class CampaignModel(CampaignBase):
+    """model used for resource creation."""
+
+    @model_validator(mode="before")
+    @classmethod
+    def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
+        """Validates the model based on different types of raw inputs,
+        where some default non-optional fields can be auto-populated.
+        """
+        if isinstance(data, dict):
+            if "name" not in data:
+                raise ValueError("'name' must be specified.")
+            if "namespace" not in data:
+                data["namespace"] = _default_campaign_namespace
+            if "id" not in data:
+                data["id"] = uuid5(namespace=data["namespace"], name=data["name"])
+        return data
+
+
+class Campaign(CampaignModel, table=True):
+    """Model used for database operations involving campaigns_v2 table rows"""
+
+    __tablename__: str = "campaigns_v2"  # type: ignore[misc]
+
+    machine: UUID | 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(
+        default=ManifestKind.other,
+        sa_column=Column("kind", Enum(ManifestKind, length=20, native_enum=False, create_constraint=False)),
+    )
+    status: Annotated[StatusEnum, StatusEnumValidator, EnumSerializer] | None = Field(
+        default=StatusEnum.waiting,
+        sa_column=Column("status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)),
+    )
+    metadata_: dict = jsonb_column("metadata", aliases=["metadata", "metadata_"])
+    configuration: dict = jsonb_column("configuration", aliases=["configuration", "data", "spec"])
+
+
+class NodeModel(NodeBase):
+    """model validating class for Nodes"""
+
+    @model_validator(mode="before")
+    @classmethod
+    def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
+        if isinstance(data, dict):
+            if "version" not in data:
+                data["version"] = 1
+            if "name" not in data:
+                raise ValueError("'name' must be specified.")
+            if "namespace" not in data:
+                data["namespace"] = _default_campaign_namespace
+            if "id" not in data:
+                data["id"] = uuid5(namespace=data["namespace"], name=f"""{data["name"]}.{data["version"]}""")
+        return data
+
+
+class Node(NodeModel, table=True):
+    __tablename__: str = "nodes_v2"  # type: ignore[misc]
+
+    machine: UUID | None
+
+
+class EdgeBase(BaseSQLModel):
+    """edges_v2 db table"""
+
+    id: UUID = Field(primary_key=True)
+    name: str
+    namespace: UUID = Field(foreign_key="campaigns_v2.id")
+    source: UUID = Field(foreign_key="nodes_v2.id")
+    target: UUID = Field(foreign_key="nodes_v2.id")
+    metadata_: dict = jsonb_column("metadata", aliases=["metadata", "metadata_"])
+    configuration: dict = jsonb_column("configuration", aliases=["configuration", "data", "spec"])
+
+
+class EdgeModel(EdgeBase):
+    """model validating class for Edges"""
+
+    @model_validator(mode="before")
+    @classmethod
+    def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
+        if isinstance(data, dict):
+            if "name" not in data:
+                raise ValueError("'name' must be specified.")
+            if "namespace" not in data:
+                raise ValueError("Edges may only exist in a 'namespace'.")
+            if "id" not in data:
+                data["id"] = uuid5(namespace=data["namespace"], name=data["name"])
+        return data
+
+
+class EdgeResponseModel(EdgeModel):
+    source: Any
+    target: Any
+
+
+class Edge(EdgeModel, table=True):
+    __tablename__: str = "edges_v2"  # type: ignore[misc]
+
+
+class MachineBase(BaseSQLModel):
+    """machines_v2 db table."""
+
+    id: UUID = Field(primary_key=True)
+    state: Any | None = Field(sa_column=Column("state", PickleType))
+
+
+class ManifestBase(BaseSQLModel):
+    """manifests_v2 db table"""
+
+    id: UUID = Field(primary_key=True)
+    name: str
+    version: int
+    namespace: UUID
+    kind: Annotated[ManifestKind, EnumSerializer] = Field(
+        default=ManifestKind.other,
+        sa_column=Column("kind", Enum(ManifestKind, length=20, native_enum=False, create_constraint=False)),
+    )
+    metadata_: dict = jsonb_column("metadata", aliases=["metadata", "metadata_"])
+    spec: dict = jsonb_column("spec", aliases=["spec", "configuration", "data"])
+
+
+class ManifestModel(ManifestBase):
+    """model validating class for Manifests"""
+
+    @model_validator(mode="before")
+    @classmethod
+    def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
+        if isinstance(data, dict):
+            if "version" not in data:
+                data["version"] = 1
+            if "name" not in data:
+                raise ValueError("'name' must be specified.")
+            if "namespace" not in data:
+                data["namespace"] = _default_campaign_namespace
+            if "id" not in data:
+                data["id"] = uuid5(namespace=data["namespace"], name=f"""{data["name"]}.{data["version"]}""")
+        return data
+
+
+class Manifest(ManifestBase, table=True):
+    __tablename__: str = "manifests_v2"  # type: ignore[misc]
+
+
+class Task(SQLModel, table=True):
+    """tasks_v2 db table"""
+
+    __tablename__: str = "tasks_v2"  # type: ignore[misc]
+
+    id: UUID = Field(primary_key=True)
+    namespace: UUID
+    node: UUID
+    priority: int
+    created_at: datetime
+    last_processed_at: datetime
+    finished_at: datetime
+    wms_id: str
+    site_affinity: list[str] = Field(
+        sa_column=Column("site_affinity", MutableList.as_mutable(postgresql.ARRAY(String())))
+    )
+    status: Annotated[StatusEnum, StatusEnumValidator, EnumSerializer] = Field(
+        sa_column=Column("status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)),
+    )
+    previous_status: Annotated[StatusEnum, StatusEnumValidator, EnumSerializer] = Field(
+        sa_column=Column(
+            "previous_status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)
+        ),
+    )
+
+
+class ActivityLogBase(BaseSQLModel):
+    id: UUID = Field(primary_key=True)
+    namespace: UUID
+    node: UUID
+    operator: str
+    from_status: Annotated[StatusEnum, EnumSerializer]
+    to_status: Annotated[StatusEnum, EnumSerializer]
+    detail: dict = jsonb_column("detail")
+
+
+class ActivityLog(ActivityLogBase, table=True):
+    __tablename__: str = "activity_log_v2"  # type: ignore[misc]
diff --git a/src/lsst/cmservice/db/manifests_v2.py b/src/lsst/cmservice/db/manifests_v2.py
new file mode 100644
index 000000000..90cef6d2d
--- /dev/null
+++ b/src/lsst/cmservice/db/manifests_v2.py
@@ -0,0 +1,34 @@
+from typing import Annotated
+
+from pydantic import AliasChoices
+from sqlmodel import Field, SQLModel
+
+from ..common.enums import ManifestKind
+from .campaigns_v2 import EnumSerializer, ManifestKindEnumValidator
+
+
+# this can probably be a BaseModel since this is not a db relation, but the
+# distinction probably doesn't matter
+class ManifestWrapper(SQLModel):
+    """a model for an object's Manifest wrapper, used by APIs where the `spec`
+    should be the kind's table model, more or less.
+    """
+
+    apiversion: str = Field(default="io.lsst.cmservice/v1")
+    kind: Annotated[ManifestKind, ManifestKindEnumValidator, EnumSerializer] = Field(
+        default=ManifestKind.other,
+    )
+    metadata_: dict = Field(
+        default_factory=dict,
+        schema_extra={
+            "validation_alias": AliasChoices("metadata", "metadata_"),
+            "serialization_alias": "metadata",
+        },
+    )
+    spec: dict = Field(
+        default_factory=dict,
+        schema_extra={
+            "validation_alias": AliasChoices("spec", "configuration", "data"),
+            "serialization_alias": "spec",
+        },
+    )
diff --git a/src/lsst/cmservice/db/session.py b/src/lsst/cmservice/db/session.py
index 294fe755d..3824fb5bc 100644
--- a/src/lsst/cmservice/db/session.py
+++ b/src/lsst/cmservice/db/session.py
@@ -3,7 +3,7 @@
 from collections.abc import AsyncGenerator
 
 # from pydantic import SecretStr  #noqa: ERA001
-from sqlalchemy import make_url
+from sqlalchemy import URL, make_url
 from sqlalchemy.ext.asyncio import AsyncEngine, async_sessionmaker, create_async_engine
 from sqlmodel.ext.asyncio.session import AsyncSession
 
@@ -18,45 +18,40 @@ class DatabaseSessionDependency:
     async session is yielded.
     """
 
+    engine: AsyncEngine | None
+    sessionmaker: async_sessionmaker[AsyncSession] | None
+    url: URL
+
     def __init__(self) -> None:
-        self.engine: AsyncEngine | None = None
-        self.sessionmaker: async_sessionmaker[AsyncSession] | None = None
+        self.engine = None
+        self.sessionmaker = None
 
     async def initialize(
         self,
         *,
-        isolation_level: str | None = None,
         use_async: bool = True,
-        echo: bool = False,
     ) -> None:
         """Initialize the session dependency.
 
         Parameters
         ----------
-        url
-            Database connection URL, not including the password.
-        password
-            Database connection password.
-        isolation_level
-            If specified, sets a non-default isolation level for the database
-            engine.
         use_async
             If true (default), the database drivername will be forced to an
             async form.
         """
         if isinstance(config.db.url, str):
-            url = make_url(config.db.url)
-        if use_async and url.drivername == "postgresql":
-            url = url.set(drivername="postgresql+asyncpg")
+            self.url = make_url(config.db.url)
+        if use_async and self.url.drivername == "postgresql":
+            self.url = self.url.set(drivername="postgresql+asyncpg")
         # FIXME use SecretStr for password
         # if isinstance(config.db.password, SecretStr):
         #     password = config.db.password.get_secret_value()  #noqa: ERA001
         if config.db.password is not None:
-            url = url.set(password=config.db.password)
+            self.url = self.url.set(password=config.db.password)
         if self.engine:
             await self.engine.dispose()
         self.engine = create_async_engine(
-            url=url,
+            url=self.url,
             echo=config.db.echo,
             # TODO add pool-level configs
         )

From 276b295732b5b91326371b8b40ce40392ae19837 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Tue, 17 Jun 2025 11:36:25 -0500
Subject: [PATCH 15/37] feat(frontend): enable frontend by config flag

---
 src/lsst/cmservice/config.py | 5 +++++
 src/lsst/cmservice/main.py   | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lsst/cmservice/config.py b/src/lsst/cmservice/config.py
index 2bd83bd68..9ef57935d 100644
--- a/src/lsst/cmservice/config.py
+++ b/src/lsst/cmservice/config.py
@@ -461,6 +461,11 @@ class AsgiConfiguration(BaseModel):
         default="/cm-service",
     )
 
+    enable_frontend: bool = Field(
+        description="Whether to run the frontend web app",
+        default=True,
+    )
+
     frontend_prefix: str = Field(
         description="The URL prefix for the frontend web app",
         default="/web_app",
diff --git a/src/lsst/cmservice/main.py b/src/lsst/cmservice/main.py
index b1d4f8460..84cd598a2 100644
--- a/src/lsst/cmservice/main.py
+++ b/src/lsst/cmservice/main.py
@@ -124,7 +124,8 @@ async def lifespan(app: FastAPI) -> AsyncGenerator:
 app.include_router(v1.router, prefix=config.asgi.prefix)
 
 # Start the frontend web application.
-app.mount(config.asgi.frontend_prefix, web_app)
+if config.asgi.enable_frontend:
+    app.mount(config.asgi.frontend_prefix, web_app)
 
 
 if __name__ == "__main__":

From e68b8e0d961a0f931f83afac76351c6141ed24a0 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Wed, 18 Jun 2025 09:26:04 -0500
Subject: [PATCH 16/37] chore(api): Relocate and refactor asgi router tags

---
 src/lsst/cmservice/main.py                    | 71 +-------------
 src/lsst/cmservice/routers/__init__.py        | 98 +++++++++++++++++++
 src/lsst/cmservice/routers/actions.py         |  2 +-
 src/lsst/cmservice/routers/campaigns.py       |  4 +-
 src/lsst/cmservice/routers/groups.py          |  4 +-
 src/lsst/cmservice/routers/jobs.py            |  4 +-
 src/lsst/cmservice/routers/loaders.py         |  2 +-
 .../cmservice/routers/pipetask_error_types.py |  4 +-
 src/lsst/cmservice/routers/pipetask_errors.py |  4 +-
 src/lsst/cmservice/routers/product_sets.py    |  4 +-
 src/lsst/cmservice/routers/queues.py          |  4 +-
 .../cmservice/routers/script_dependencies.py  |  4 +-
 src/lsst/cmservice/routers/script_errors.py   |  4 +-
 src/lsst/cmservice/routers/scripts.py         |  4 +-
 src/lsst/cmservice/routers/spec_blocks.py     |  4 +-
 src/lsst/cmservice/routers/specifications.py  |  4 +-
 .../cmservice/routers/step_dependencies.py    |  4 +-
 src/lsst/cmservice/routers/steps.py           |  4 +-
 src/lsst/cmservice/routers/task_sets.py       |  4 +-
 .../cmservice/routers/wms_task_reports.py     |  4 +-
 20 files changed, 117 insertions(+), 120 deletions(-)

diff --git a/src/lsst/cmservice/main.py b/src/lsst/cmservice/main.py
index 84cd598a2..8b0742cb2 100644
--- a/src/lsst/cmservice/main.py
+++ b/src/lsst/cmservice/main.py
@@ -13,6 +13,7 @@
 from .routers import (
     healthz,
     index,
+    tags_metadata,
     v1,
 )
 from .web_app import web_app
@@ -20,76 +21,6 @@
 configure_uvicorn_logging(config.logging.level)
 configure_logging(profile=config.logging.profile, log_level=config.logging.level, name=config.asgi.title)
 
-tags_metadata = [
-    {
-        "name": "Loaders",
-        "description": "Operations that load Objects in to the DB.",
-    },
-    {
-        "name": "Actions",
-        "description": "Operations perform actions on existing Objects in to the DB."
-        "In many cases this will result in the creating of new objects in the DB.",
-    },
-    {
-        "name": "Campaigns",
-        "description": "Operations with `campaign`s. A `campaign` consists of several processing `step`s "
-        "which are run sequentially. A `campaign` also holds configuration such as a URL for a butler repo "
-        "and a production area. `campaign`s must be uniquely named withing a given `production`.",
-    },
-    {
-        "name": "Steps",
-        "description": "Operations with `step`s. A `step` consists of several processing `group`s which "
-        "may be run in parallel. `step`s must be uniquely named within a give `campaign`.",
-    },
-    {
-        "name": "Groups",
-        "description": "Operations with `groups`. A `group` can be processed in a single `workflow`, "
-        "but we also need to account for possible failures. `group`s must be uniquely named within a "
-        "given `step`.",
-    },
-    {
-        "name": "Scripts",
-        "description": "Operations with `scripts`. A `script` does a single operation, either something"
-        "that is done asynchronously, such as making new collections in the Butler, or creating"
-        "new objects in the DB, such as new `steps` and `groups`.",
-    },
-    {
-        "name": "Jobs",
-        "description": "Operations with `jobs`. A `job` runs a single `workflow`: keeps a count"
-        "of the results data products and keeps track of associated errors.",
-    },
-    {
-        "name": "Pipetask Error Types",
-        "description": "Operations with `pipetask_error_type` table.",
-    },
-    {
-        "name": "Pipetask Errors",
-        "description": "Operations with `pipetask_error` table.",
-    },
-    {
-        "name": "Product Sets",
-        "description": "Operations with `product_set` table.",
-    },
-    {
-        "name": "Task Sets",
-        "description": "Operations with `task_set` table.",
-    },
-    {
-        "name": "Script Dependencies",
-        "description": "Operations with `script_dependency` table.",
-    },
-    {
-        "name": "Step Dependencies",
-        "description": "Operations with `step_dependency` table.",
-    },
-    {
-        "name": "Wms Task Reports",
-        "description": "Operations with `wms_task_report` table.",
-    },
-    {"name": "Specifications", "description": "Operations with `specification` table."},
-    {"name": "SpecBlocks", "description": "Operations with `spec_block` table."},
-]
-
 
 @asynccontextmanager
 async def lifespan(app: FastAPI) -> AsyncGenerator:
diff --git a/src/lsst/cmservice/routers/__init__.py b/src/lsst/cmservice/routers/__init__.py
index ecda61585..3ae25ad8f 100644
--- a/src/lsst/cmservice/routers/__init__.py
+++ b/src/lsst/cmservice/routers/__init__.py
@@ -40,3 +40,101 @@
     wms_task_reports,
     wrappers,
 )
+
+tags_metadata = [
+    {
+        "name": "actions",
+        "description": "Operations perform actions on existing Objects in to the DB."
+        "In many cases this will result in the creating of new objects in the DB.",
+    },
+    {
+        "name": "campaigns",
+        "description": "Operations with `campaign`s. A `campaign` consists of several processing `step`s "
+        "which are run sequentially. A `campaign` also holds configuration such as a URL for a butler repo "
+        "and a production area. `campaign`s must be uniquely named withing a given `production`.",
+    },
+    {
+        "name": "edges",
+        "description": "Operations with `edge`s within a `campaign` graph.",
+    },
+    {
+        "name": "groups",
+        "description": "Operations with `groups`. A `group` can be processed in a single `workflow`, "
+        "but we also need to account for possible failures. `group`s must be uniquely named within a "
+        "given `step`.",
+    },
+    {
+        "name": "health",
+        "description": "Operations that check or report on the health of the application",
+    },
+    {
+        "name": "internal",
+        "description": "Operations that are used by processes that are internal to the application",
+    },
+    {
+        "name": "jobs",
+        "description": "Operations with `jobs`. A `job` runs a single `workflow`: keeps a count"
+        "of the results data products and keeps track of associated errors.",
+    },
+    {
+        "name": "loaders",
+        "description": "Operations that load Objects in to the DB.",
+    },
+    {
+        "name": "manifests",
+        "description": "Operations on manifests.",
+    },
+    {
+        "name": "pipetask error types",
+        "description": "Operations with `pipetask_error_type` table.",
+    },
+    {
+        "name": "pipetask errors",
+        "description": "Operations with `pipetask_error` table.",
+    },
+    {
+        "name": "product sets",
+        "description": "Operations with `product_set` table.",
+    },
+    {
+        "name": "scripts",
+        "description": "Operations with `scripts`. A `script` does a single operation, either something"
+        "that is done asynchronously, such as making new collections in the Butler, or creating"
+        "new objects in the DB, such as new `steps` and `groups`.",
+    },
+    {
+        "name": "script dependencies",
+        "description": "Operations with `script_dependency` table.",
+    },
+    {
+        "name": "script errors",
+        "description": "Operations with `script_errors` table.",
+    },
+    {"name": "spec blocks", "description": "Operations with `spec_block` table."},
+    {"name": "specifications", "description": "Operations with `specification` table."},
+    {
+        "name": "steps",
+        "description": "Operations with `step`s. A `step` consists of several processing `group`s which "
+        "may be run in parallel. `step`s must be uniquely named within a give `campaign`.",
+    },
+    {
+        "name": "step dependencies",
+        "description": "Operations with `step_dependency` table.",
+    },
+    {
+        "name": "task sets",
+        "description": "Operations with `task_set` table.",
+    },
+    {
+        "name": "v1",
+        "description": "Operations associated with the v1 legacy application",
+    },
+    {
+        "name": "v2",
+        "description": "Operations associated with the v2 application",
+    },
+    {
+        "name": "wms task reports",
+        "description": "Operations with `wms_task_report` table.",
+    },
+]
diff --git a/src/lsst/cmservice/routers/actions.py b/src/lsst/cmservice/routers/actions.py
index a199b3230..41342c32d 100644
--- a/src/lsst/cmservice/routers/actions.py
+++ b/src/lsst/cmservice/routers/actions.py
@@ -10,7 +10,7 @@
 
 router = APIRouter(
     prefix="/actions",
-    tags=["Actions"],
+    tags=["actions"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/campaigns.py b/src/lsst/cmservice/routers/campaigns.py
index 0956aa49a..3df4ee167 100644
--- a/src/lsst/cmservice/routers/campaigns.py
+++ b/src/lsst/cmservice/routers/campaigns.py
@@ -29,14 +29,12 @@
 UpdateModelClass = models.CampaignUpdate
 # Specify the associated database table
 DbClass = db.Campaign
-# Specify the tag in the router documentation
-TAG_STRING = "Campaigns"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["campaigns"],
 )
 
 # Attach functions to the router
diff --git a/src/lsst/cmservice/routers/groups.py b/src/lsst/cmservice/routers/groups.py
index ddada5149..212c9cc17 100644
--- a/src/lsst/cmservice/routers/groups.py
+++ b/src/lsst/cmservice/routers/groups.py
@@ -18,14 +18,12 @@
 UpdateModelClass = models.GroupUpdate
 # Specify the associated database table
 DbClass = db.Group
-# Specify the tag in the router documentation
-TAG_STRING = "Groups"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["groups"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/jobs.py b/src/lsst/cmservice/routers/jobs.py
index 9e81b09d9..08be3723e 100644
--- a/src/lsst/cmservice/routers/jobs.py
+++ b/src/lsst/cmservice/routers/jobs.py
@@ -24,14 +24,12 @@
 UpdateModelClass = models.JobUpdate
 # Specify the associated database table
 DbClass = db.Job
-# Specify the tag in the router documentation
-TAG_STRING = "Jobs"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["jobs"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/loaders.py b/src/lsst/cmservice/routers/loaders.py
index 225c78808..bb2938375 100644
--- a/src/lsst/cmservice/routers/loaders.py
+++ b/src/lsst/cmservice/routers/loaders.py
@@ -9,7 +9,7 @@
 
 router = APIRouter(
     prefix="/load",
-    tags=["Loaders"],
+    tags=["loaders"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/pipetask_error_types.py b/src/lsst/cmservice/routers/pipetask_error_types.py
index 7139199e1..37b40db10 100644
--- a/src/lsst/cmservice/routers/pipetask_error_types.py
+++ b/src/lsst/cmservice/routers/pipetask_error_types.py
@@ -14,14 +14,12 @@
 UpdateModelClass = models.PipetaskErrorTypeUpdate
 # Specify the associated database table
 DbClass = db.PipetaskErrorType
-# Specify the tag in the router documentation
-TAG_STRING = "Pipetask Error Types"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["pipetask error types"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/pipetask_errors.py b/src/lsst/cmservice/routers/pipetask_errors.py
index 352ef24fc..07dd8bf8e 100644
--- a/src/lsst/cmservice/routers/pipetask_errors.py
+++ b/src/lsst/cmservice/routers/pipetask_errors.py
@@ -14,14 +14,12 @@
 UpdateModelClass = models.PipetaskErrorUpdate
 # Specify the associated database table
 DbClass = db.PipetaskError
-# Specify the tag in the router documentation
-TAG_STRING = "Pipetask Errors"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["pipetask errors"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/product_sets.py b/src/lsst/cmservice/routers/product_sets.py
index 34875b8ff..29683dac0 100644
--- a/src/lsst/cmservice/routers/product_sets.py
+++ b/src/lsst/cmservice/routers/product_sets.py
@@ -14,14 +14,12 @@
 UpdateModelClass = models.ProductSetUpdate
 # Specify the associated database table
 DbClass = db.ProductSet
-# Specify the tag in the router documentation
-TAG_STRING = "Product Sets"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["product sets"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/queues.py b/src/lsst/cmservice/routers/queues.py
index 02c52c508..92b1f9243 100644
--- a/src/lsst/cmservice/routers/queues.py
+++ b/src/lsst/cmservice/routers/queues.py
@@ -22,14 +22,12 @@
 UpdateModelClass = models.QueueUpdate
 # Specify the associated database table
 DbClass = db.Queue
-# Specify the tag in the router documentation
-TAG_STRING = "Queues"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["queues"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/script_dependencies.py b/src/lsst/cmservice/routers/script_dependencies.py
index 9bc9d720c..25866e199 100644
--- a/src/lsst/cmservice/routers/script_dependencies.py
+++ b/src/lsst/cmservice/routers/script_dependencies.py
@@ -12,14 +12,12 @@
 CreateModelClass = models.DependencyCreate
 # Specify the associated database table
 DbClass = db.ScriptDependency
-# Specify the tag in the router documentation
-TAG_STRING = "Script Dependencies"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["script dependencies"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/script_errors.py b/src/lsst/cmservice/routers/script_errors.py
index 4b71d0b12..35a7cec45 100644
--- a/src/lsst/cmservice/routers/script_errors.py
+++ b/src/lsst/cmservice/routers/script_errors.py
@@ -14,14 +14,12 @@
 UpdateModelClass = models.ScriptErrorUpdate
 # Specify the associated database table
 DbClass = db.ScriptError
-# Specify the tag in the router documentation
-TAG_STRING = "ScriptErrors"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["script errors"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/scripts.py b/src/lsst/cmservice/routers/scripts.py
index ed6ad47e0..903bd6343 100644
--- a/src/lsst/cmservice/routers/scripts.py
+++ b/src/lsst/cmservice/routers/scripts.py
@@ -21,14 +21,12 @@
 UpdateModelClass = models.ScriptUpdate
 # Specify the associated database table
 DbClass = db.Script
-# Specify the tag in the router documentation
-TAG_STRING = "Scripts"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["scripts"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/spec_blocks.py b/src/lsst/cmservice/routers/spec_blocks.py
index ab469c4d3..9e3bb2978 100644
--- a/src/lsst/cmservice/routers/spec_blocks.py
+++ b/src/lsst/cmservice/routers/spec_blocks.py
@@ -14,14 +14,12 @@
 UpdateModelClass = models.SpecBlockUpdate
 # Specify the associated database table
 DbClass = db.SpecBlock
-# Specify the tag in the router documentation
-TAG_STRING = "SpecBlocks"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["specblocks"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/specifications.py b/src/lsst/cmservice/routers/specifications.py
index 47af01b10..85c5ad16e 100644
--- a/src/lsst/cmservice/routers/specifications.py
+++ b/src/lsst/cmservice/routers/specifications.py
@@ -14,14 +14,12 @@
 UpdateModelClass = models.SpecificationUpdate
 # Specify the associated database table
 DbClass = db.Specification
-# Specify the tag in the router documentation
-TAG_STRING = "Specifications"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["specifications"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/step_dependencies.py b/src/lsst/cmservice/routers/step_dependencies.py
index fc8eeb5f0..642f7e570 100644
--- a/src/lsst/cmservice/routers/step_dependencies.py
+++ b/src/lsst/cmservice/routers/step_dependencies.py
@@ -12,14 +12,12 @@
 CreateModelClass = models.DependencyCreate
 # Specify the associated database table
 DbClass = db.StepDependency
-# Specify the tag in the router documentation
-TAG_STRING = "Step Dependencies"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["step dependencies"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/steps.py b/src/lsst/cmservice/routers/steps.py
index 707faae3a..c3a92679e 100644
--- a/src/lsst/cmservice/routers/steps.py
+++ b/src/lsst/cmservice/routers/steps.py
@@ -14,14 +14,12 @@
 UpdateModelClass = models.StepUpdate
 # Specify the associated database table
 DbClass = db.Step
-# Specify the tag in the router documentation
-TAG_STRING = "Steps"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["steps"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/task_sets.py b/src/lsst/cmservice/routers/task_sets.py
index 07f223f3b..e459c7b2d 100644
--- a/src/lsst/cmservice/routers/task_sets.py
+++ b/src/lsst/cmservice/routers/task_sets.py
@@ -14,14 +14,12 @@
 UpdateModelClass = models.TaskSetUpdate
 # Specify the associated database table
 DbClass = db.TaskSet
-# Specify the tag in the router documentation
-TAG_STRING = "Task Sets"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["task sets"],
 )
 
 
diff --git a/src/lsst/cmservice/routers/wms_task_reports.py b/src/lsst/cmservice/routers/wms_task_reports.py
index 9355aa334..04e63a046 100644
--- a/src/lsst/cmservice/routers/wms_task_reports.py
+++ b/src/lsst/cmservice/routers/wms_task_reports.py
@@ -14,14 +14,12 @@
 UpdateModelClass = models.WmsTaskReportUpdate
 # Specify the associated database table
 DbClass = db.WmsTaskReport
-# Specify the tag in the router documentation
-TAG_STRING = "Wms Task Reports"
 
 
 # Build the router
 router = APIRouter(
     prefix=f"/{DbClass.class_string}",
-    tags=[TAG_STRING],
+    tags=["wms task reports"],
 )
 
 

From a9aa398b7d5b562fbb9a1890351a43fbbecf69a5 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Tue, 17 Jun 2025 11:45:23 -0500
Subject: [PATCH 17/37] feat(test): add test infrastructure for v2

---
 tests/v2/__init__.py |   0
 tests/v2/conftest.py | 123 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+)
 create mode 100644 tests/v2/__init__.py
 create mode 100644 tests/v2/conftest.py

diff --git a/tests/v2/__init__.py b/tests/v2/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/v2/conftest.py b/tests/v2/conftest.py
new file mode 100644
index 000000000..9a80d6d19
--- /dev/null
+++ b/tests/v2/conftest.py
@@ -0,0 +1,123 @@
+"""Shared conftest module for v2 unit and functional tests."""
+
+import os
+from collections.abc import AsyncGenerator, Generator
+from uuid import uuid4
+
+import pytest
+import pytest_asyncio
+from fastapi.testclient import TestClient
+from httpx import ASGITransport, AsyncClient
+from sqlalchemy.ext.asyncio import create_async_engine
+from sqlalchemy.pool import NullPool
+from sqlmodel import SQLModel
+from testcontainers.postgres import PostgresContainer
+
+from lsst.cmservice.common.types import AnyAsyncSession
+from lsst.cmservice.config import config
+from lsst.cmservice.db.base import Base
+from lsst.cmservice.db.session import DatabaseSessionDependency, db_session_dependency
+from lsst.cmservice.main import app
+
+POSTGRES_CONTAINER_IMAGE = "postgres:16"
+
+
+@pytest.fixture(scope="module")
+def monkeypatch_module() -> Generator[pytest.MonkeyPatch]:
+    with pytest.MonkeyPatch.context() as mp:
+        yield mp
+
+
+@pytest_asyncio.fixture(scope="module", loop_scope="module")
+async def rawdb(monkeypatch_module: pytest.MonkeyPatch) -> AsyncGenerator[DatabaseSessionDependency]:
+    """Test fixture for a postgres container.
+
+    A scoped ephemeral container will be created for the test if the env var
+    `TEST__LOCAL_DB` is not set; otherwise the fixture will assume that the
+    correct database is available to the test environment through ordinary
+    configuration parameters.
+    """
+
+    # use a different table schema for each test session
+    table_schema = uuid4().hex[-8:]
+    monkeypatch_module.setattr(target=config.db, name="table_schema", value=table_schema)
+    monkeypatch_module.setattr(target=config.asgi, name="enable_frontend", value=False)
+
+    if os.getenv("TEST__LOCAL_DB") is not None:
+        await db_session_dependency.initialize()
+        assert db_session_dependency.engine is not None
+        yield db_session_dependency
+        await db_session_dependency.aclose()
+    else:
+        with PostgresContainer(
+            image=POSTGRES_CONTAINER_IMAGE,
+            username="cm-service",
+            password="INSECURE-PASSWORD",
+            dbname="cm-service",
+            driver="asyncpg",
+        ) as postgres:
+            psql_url = postgres.get_connection_url()
+            monkeypatch_module.setattr(target=config.db, name="url", value=psql_url)
+            monkeypatch_module.setattr(target=config.db, name="password", value=postgres.password)
+            monkeypatch_module.setattr(target=config.db, name="echo", value=True)
+            await db_session_dependency.initialize()
+            assert db_session_dependency.engine is not None
+            yield db_session_dependency
+            await db_session_dependency.aclose()
+
+
+@pytest_asyncio.fixture(scope="module", loop_scope="module")
+async def testdb(rawdb: DatabaseSessionDependency) -> AsyncGenerator[DatabaseSessionDependency]:
+    """Test fixture for a migrated postgres container.
+
+    This fixture creates all the database objects defined for the ORM metadata
+    and drops them at the end of the fixture scope.
+    """
+    # v1 objects are created from the legacy DeclarativeBase class and
+    # v2 objects are created from the SQLModel metadata.
+    async with create_async_engine(url=rawdb.url, poolclass=NullPool).begin() as aconn:
+        await aconn.run_sync(SQLModel.metadata.create_all)
+        await aconn.run_sync(Base.metadata.create_all)
+    yield rawdb
+    async with create_async_engine(url=rawdb.url, poolclass=NullPool).begin() as aconn:
+        await aconn.run_sync(SQLModel.metadata.drop_all)
+        await aconn.run_sync(Base.metadata.drop_all)
+
+
+@pytest_asyncio.fixture(name="session", scope="module", loop_scope="module")
+async def session_fixture(testdb: DatabaseSessionDependency) -> AsyncGenerator[AnyAsyncSession]:
+    """Test fixture for an async database session"""
+
+    assert testdb.sessionmaker is not None
+    async with testdb.sessionmaker() as session:
+        yield session
+
+
+@pytest_asyncio.fixture(name="client")
+async def client_fixture(session: AnyAsyncSession) -> AsyncGenerator[TestClient]:
+    """Test fixture for a FastAPI test client with dependency injection
+    overriden.
+    """
+
+    def get_session_override() -> AnyAsyncSession:
+        return session
+
+    app.dependency_overrides[db_session_dependency] = get_session_override
+    client = TestClient(app)
+    yield client
+    app.dependency_overrides.clear()
+
+
+@pytest_asyncio.fixture(name="aclient")
+async def async_client_fixture(session: AnyAsyncSession) -> AsyncGenerator[AsyncClient]:
+    """Test fixture for an HTTPX async test client with dependency injection
+    overriden.
+    """
+
+    def get_session_override() -> AnyAsyncSession:
+        return session
+
+    app.dependency_overrides[db_session_dependency] = get_session_override
+    async with AsyncClient(transport=ASGITransport(app), base_url="http://test") as aclient:
+        yield aclient
+    app.dependency_overrides.clear()

From 9352918c7fd648811d4287b0bd4fca06430a67a8 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Wed, 18 Jun 2025 11:32:33 -0500
Subject: [PATCH 18/37] feat(db): apply pool configurations to db session

---
 src/lsst/cmservice/config.py     | 28 +++++++++++++++++++++++++++-
 src/lsst/cmservice/db/session.py | 21 ++++++++++++---------
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/lsst/cmservice/config.py b/src/lsst/cmservice/config.py
index 9ef57935d..93105dfae 100644
--- a/src/lsst/cmservice/config.py
+++ b/src/lsst/cmservice/config.py
@@ -8,6 +8,7 @@
     AliasChoices,
     BaseModel,
     Field,
+    SecretStr,
     computed_field,
     field_serializer,
     field_validator,
@@ -545,7 +546,7 @@ class DatabaseConfiguration(BaseModel):
         description="The URL for the cm-service database",
     )
 
-    password: str | None = Field(
+    password: SecretStr | None = Field(
         default=None,
         description="The password for the cm-service database",
     )
@@ -560,6 +561,31 @@ class DatabaseConfiguration(BaseModel):
         description="SQLAlchemy engine echo setting for the cm-service database",
     )
 
+    max_overflow: int = Field(
+        default=10,
+        description="Maximum connection overflow allowed for QueuePool.",
+    )
+
+    pool_size: int = Field(
+        default=5,
+        description="Number of open connections kept in the QueuePool",
+    )
+
+    pool_recycle: int = Field(
+        default=-1,
+        description="Timeout in seconds before connections are recycled",
+    )
+
+    pool_timeout: int = Field(
+        default=30,
+        description="Wait timeout for acquiring a connection from the pool",
+    )
+
+    pool_fields: set[str] = Field(
+        default={"max_overflow", "pool_size", "pool_recycle", "pool_timeout"},
+        description="Set of fields used for connection pool configuration",
+    )
+
 
 class Configuration(BaseSettings):
     """Configuration for cm-service.
diff --git a/src/lsst/cmservice/db/session.py b/src/lsst/cmservice/db/session.py
index 3824fb5bc..9a1f12c04 100644
--- a/src/lsst/cmservice/db/session.py
+++ b/src/lsst/cmservice/db/session.py
@@ -2,9 +2,9 @@
 
 from collections.abc import AsyncGenerator
 
-# from pydantic import SecretStr  #noqa: ERA001
 from sqlalchemy import URL, make_url
 from sqlalchemy.ext.asyncio import AsyncEngine, async_sessionmaker, create_async_engine
+from sqlalchemy.pool import AsyncAdaptedQueuePool, Pool
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 from ..config import config
@@ -21,6 +21,7 @@ class DatabaseSessionDependency:
     engine: AsyncEngine | None
     sessionmaker: async_sessionmaker[AsyncSession] | None
     url: URL
+    pool_class: type[Pool] = AsyncAdaptedQueuePool
 
     def __init__(self) -> None:
         self.engine = None
@@ -39,21 +40,23 @@ async def initialize(
             If true (default), the database drivername will be forced to an
             async form.
         """
+        await self.aclose()
         if isinstance(config.db.url, str):
             self.url = make_url(config.db.url)
         if use_async and self.url.drivername == "postgresql":
             self.url = self.url.set(drivername="postgresql+asyncpg")
-        # FIXME use SecretStr for password
-        # if isinstance(config.db.password, SecretStr):
-        #     password = config.db.password.get_secret_value()  #noqa: ERA001
         if config.db.password is not None:
-            self.url = self.url.set(password=config.db.password)
-        if self.engine:
-            await self.engine.dispose()
+            self.url = self.url.set(password=config.db.password.get_secret_value())
+        pool_kwargs = (
+            config.db.model_dump(include=config.db.pool_fields)
+            if self.pool_class is AsyncAdaptedQueuePool
+            else {}
+        )
         self.engine = create_async_engine(
             url=self.url,
             echo=config.db.echo,
-            # TODO add pool-level configs
+            poolclass=self.pool_class,
+            **pool_kwargs,
         )
         self.sessionmaker = async_sessionmaker(self.engine, class_=AsyncSession, expire_on_commit=False)
 
@@ -76,7 +79,7 @@ async def aclose(self) -> None:
         if self.engine:
             self.sessionmaker = None
             await self.engine.dispose()
-            self._engine = None
+            self.engine = None
 
 
 db_session_dependency = DatabaseSessionDependency()

From c0f2b9573f8fcf48a77194b087207a6825976c84 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Thu, 19 Jun 2025 11:35:51 -0500
Subject: [PATCH 19/37] feat(jsonpatch): Implement jsonpatch module for RFC6902
 update ops

---
 src/lsst/cmservice/common/jsonpatch.py | 224 +++++++++++++++++++++++++
 tests/common/test_jsonpatch.py         | 150 +++++++++++++++++
 2 files changed, 374 insertions(+)
 create mode 100644 src/lsst/cmservice/common/jsonpatch.py
 create mode 100644 tests/common/test_jsonpatch.py

diff --git a/src/lsst/cmservice/common/jsonpatch.py b/src/lsst/cmservice/common/jsonpatch.py
new file mode 100644
index 000000000..b57ce69af
--- /dev/null
+++ b/src/lsst/cmservice/common/jsonpatch.py
@@ -0,0 +1,224 @@
+"""Module implementing functions to support json-patch operations on Python
+objects based on RFC6902.
+"""
+
+import operator
+from collections.abc import MutableMapping, MutableSequence
+from functools import reduce
+from typing import TYPE_CHECKING, Any, Literal
+
+from pydantic import AliasChoices, BaseModel, Field
+
+type AnyMutable = MutableMapping | MutableSequence
+
+
+class JSONPatchError(Exception):
+    """Exception raised when a JSON patch operation cannot be completed."""
+
+    pass
+
+
+class JSONPatch(BaseModel):
+    """Model representing a PATCH operation using RFC6902.
+
+    This model will generally be accepted as a ``Sequence[JSONPatch]``.
+    """
+
+    op: Literal["add", "remove", "replace", "move", "copy", "test"]
+    path: str = Field(
+        description="An RFC6901 JSON Pointer", pattern=r"^\/(metadata|spec|configuration|metadata_|data)\/.*$"
+    )
+    value: Any | None = None
+    from_: str | None = Field(
+        default=None,
+        pattern=r"^\/(metadata|spec|configuration|metadata_|data)\/.*$",
+        validation_alias=AliasChoices("from", "from_"),
+    )
+
+
+def apply_json_patch[T: MutableMapping](op: JSONPatch, o: T) -> T:
+    """Applies a jsonpatch to an object, returning the modified object.
+
+    Modifications are made in-place (i.e., the input object is not copied).
+
+    Notes
+    -----
+    While this JSON Patch operation nominally implements RFC6902, there are
+    some edge cases inappropriate to the application that are supported by the
+    RFC but disallowed through lack of support:
+
+    - Unsupported: JSON pointer values that refer to object/dict keys that are
+      numeric, e.g., {"1": "first", "2": "second"}
+    - Unsupported: JSON pointer values that refer to an entire object, e.g.,
+      "" -- the JSON Patch must have a root element ("/") per the model.
+    - Unsupported: JSON pointer values taht refer to a nameless object, e.g.,
+      "/" -- JSON allows object keys to be the empty string ("") but this is
+      disallowed by the application.
+    """
+    # The JSON Pointer root value is discarded as the rest of the pointer is
+    # split into parts
+    op_path = op.path.split("/")[1:]
+
+    # The terminal path part is either the name of a key or an index in a list
+    # FIXME this assumes that an "integer-string" in the path is always refers
+    #       to a list index, although it could just as well be a key in a dict
+    #       like ``{"1": "first, "2": "second"}`` which is complicated by the
+    #       fact that Python dict keys can be either ints or strs but this is
+    #       not allowed in JSON (i.e., object keys MUST be strings)
+    # FIXME this doesn't support, e.g., nested lists with multiple index values
+    #       in the path, e.g., ``[["a", "A"], ["b", "B"]]``
+    target_key_or_index: str | None = op_path.pop()
+    if target_key_or_index is None:
+        raise JSONPatchError("JSON Patch operations on empty keys not allowed.")
+
+    reference_token: int | str
+    # the reference token is referring to a an array index if the token is
+    # numeric or is the single character "-"
+    if target_key_or_index == "-":
+        reference_token = target_key_or_index
+    elif target_key_or_index.isnumeric():
+        reference_token = int(target_key_or_index)
+    else:
+        reference_token = str(target_key_or_index)
+
+    # The remaining parts of the path are a pointer to the object needing
+    # modification, which should reduce to either a dict or a list
+    try:
+        op_target: AnyMutable = reduce(operator.getitem, op_path, o)
+    except KeyError:
+        raise JSONPatchError(f"Path {op.path} not found in object")
+
+    match op:
+        case JSONPatch(op="add", value=new_value):
+            if reference_token == "-" and isinstance(op_target, MutableSequence):
+                # The "-" reference token is unique to the add operation and
+                # means the next element beyond the end of the current list
+                op_target.append(new_value)
+            elif isinstance(reference_token, int) and isinstance(op_target, MutableSequence):
+                op_target.insert(reference_token, new_value)
+            elif isinstance(reference_token, str) and isinstance(op_target, MutableMapping):
+                op_target[reference_token] = new_value
+
+        case JSONPatch(op="replace", value=new_value):
+            # The main difference between replace and add is that replace will
+            # not create new properties or elements in the target
+            if reference_token == "-":
+                raise JSONPatchError("Cannot use reference token `-` with replace operation.")
+            elif isinstance(op_target, MutableMapping):
+                try:
+                    assert reference_token in op_target.keys()
+                except AssertionError:
+                    raise JSONPatchError(f"Cannot replace missing key {reference_token} in object")
+            elif isinstance(reference_token, int) and isinstance(op_target, MutableSequence):
+                try:
+                    assert reference_token < len(op_target)
+                except AssertionError:
+                    raise JSONPatchError(f"Cannot replace missing index {reference_token} in object")
+
+            if TYPE_CHECKING:
+                assert isinstance(op_target, MutableMapping)
+            op_target[reference_token] = new_value
+
+        case JSONPatch(op="remove"):
+            if isinstance(reference_token, str) and isinstance(op_target, MutableMapping):
+                if reference_token == "-":
+                    raise JSONPatchError("Removal operations not allowed on `-` reference token")
+                _ = op_target.pop(reference_token, None)
+            elif isinstance(reference_token, int):
+                try:
+                    _ = op_target.pop(reference_token)
+                except IndexError:
+                    # The index we are meant to remove does not exist, but that
+                    # is not an error (idempotence)
+                    pass
+            else:
+                # This should be unreachable
+                raise ValueError("Reference token in JSON Patch must be int | str")
+
+        case JSONPatch(op="move", from_=from_location):
+            # the move operation is equivalent to a remove(from) + add(target)
+            if TYPE_CHECKING:
+                assert from_location is not None
+
+            # Handle the from_location with the same logic as the op.path
+            from_path = from_location.split("/")[1:]
+
+            # Is the last element of the from_path an index or a key?
+            from_target: str | int = from_path.pop()
+            try:
+                from_target = int(from_target)
+            except ValueError:
+                pass
+
+            try:
+                from_object = reduce(operator.getitem, from_path, o)
+                value = from_object[from_target]
+            except (KeyError, IndexError):
+                raise JSONPatchError(f"Path {from_location} not found in object")
+
+            # add the value to the new location
+            op_target[reference_token] = value  # type: ignore[index]
+            # and remove it from the old
+            _ = from_object.pop(from_target)
+
+        case JSONPatch(op="copy", from_=from_location):
+            # The copy op is the same as the move op except the original is not
+            # removed
+            if TYPE_CHECKING:
+                assert from_location is not None
+
+            # Handle the from_location with the same logic as the op.path
+            from_path = from_location.split("/")[1:]
+
+            # Is the last element of the from_path an index or a key?
+            from_target = from_path.pop()
+            try:
+                from_target = int(from_target)
+            except ValueError:
+                pass
+
+            try:
+                from_object = reduce(operator.getitem, from_path, o)
+                value = from_object[from_target]
+            except (KeyError, IndexError):
+                raise JSONPatchError(f"Path {from_location} not found in object")
+
+            # add the value to the new location
+            op_target[reference_token] = value  # type: ignore[index]
+
+        case JSONPatch(op="test", value=assert_value):
+            # assert that the patch value is present at the patch path
+            # The main difference between test and replace is that test does
+            # not make any modifications after its assertions
+            if reference_token == "-":
+                raise JSONPatchError("Cannot use reference token `-` with test operation.")
+            elif isinstance(op_target, MutableMapping):
+                try:
+                    assert reference_token in op_target.keys()
+                except AssertionError:
+                    raise JSONPatchError(
+                        f"Test operation assertion failed: Key {reference_token} does not exist at {op.path}"
+                    )
+            elif isinstance(reference_token, int) and isinstance(op_target, MutableSequence):
+                try:
+                    assert reference_token < len(op_target)
+                except AssertionError:
+                    raise JSONPatchError(
+                        f"Test operation assertion failed: "
+                        f"Index {reference_token} does not exist at {op.path}"
+                    )
+
+            if TYPE_CHECKING:
+                assert isinstance(op_target, MutableMapping)
+            try:
+                assert op_target[reference_token] == assert_value
+            except AssertionError:
+                raise JSONPatchError(
+                    f"Test operation assertion failed: {op.path} does not match value {assert_value}"
+                )
+
+        case _:
+            # Model validation should prevent this from ever happening
+            raise JSONPatchError(f"Unknown JSON Patch operation: {op.op}")
+
+    return o
diff --git a/tests/common/test_jsonpatch.py b/tests/common/test_jsonpatch.py
new file mode 100644
index 000000000..73e823914
--- /dev/null
+++ b/tests/common/test_jsonpatch.py
@@ -0,0 +1,150 @@
+from typing import Any
+
+import pytest
+
+from lsst.cmservice.common.jsonpatch import JSONPatch, JSONPatchError, apply_json_patch
+
+
+@pytest.fixture
+def target_object() -> dict[str, Any]:
+    return {
+        "apiVersion": "io.lsst.cmservice/v1",
+        "spec": {
+            "one": 1,
+            "two": 2,
+            "three": 4,
+            "a_list": ["a", "b", "c", "e"],
+            "tag_list": ["yes", "yeah", "yep"],
+        },
+        "metadata": {
+            "owner": "bob_loblaw",
+        },
+    }
+
+
+def test_jsonpatch_add(target_object: dict[str, Any]) -> None:
+    """Tests the use of an add operation with a JSON Patch."""
+
+    # Fail to add a value to an element that does not exist
+    op = JSONPatch(op="add", path="/spec/b_list/0", value="a")
+    with pytest.raises(JSONPatchError):
+        _ = apply_json_patch(op, target_object)
+
+    # Fix the missing "four" property in the spec
+    op = JSONPatch(op="add", path="/spec/four", value=4)
+    target_object = apply_json_patch(op, target_object)
+    assert target_object["spec"].get("four") == 4
+
+    # Insert the missing "d" value in the spec's a_list property
+    op = JSONPatch(op="add", path="/spec/a_list/3", value="d")
+    target_object = apply_json_patch(op, target_object)
+    assert target_object["spec"].get("a_list")[3] == "d"
+    assert target_object["spec"].get("a_list")[4] == "e"
+
+    # Append to an existing list using "-"
+    op = JSONPatch(op="add", path="/spec/a_list/-", value="f")
+    target_object = apply_json_patch(op, target_object)
+    assert len(target_object["spec"]["a_list"]) == 6
+    assert target_object["spec"]["a_list"][-1] == "f"
+
+
+def test_jsonpatch_replace(target_object: dict[str, Any]) -> None:
+    """Tests the use of a replace operation with a JSON Patch."""
+
+    # Fail to replace a value for a missing key
+    op = JSONPatch(op="replace", path="/spec/five", value=5)
+    with pytest.raises(JSONPatchError):
+        _ = apply_json_patch(op, target_object)
+
+    # Fail to replace a value for a missing index
+    op = JSONPatch(op="replace", path="/spec/a_list/4", value="e")
+    with pytest.raises(JSONPatchError):
+        _ = apply_json_patch(op, target_object)
+
+    # Fix the incorrect "three" property in the spec
+    op = JSONPatch(op="replace", path="/spec/three", value=3)
+    target_object = apply_json_patch(op, target_object)
+    assert target_object["spec"]["three"] == 3
+
+
+def test_jsonpatch_remove(target_object: dict[str, Any]) -> None:
+    """Tests the use of a remove operation with a JSON Patch."""
+
+    # Remove the first element ("a") of the "a_list" property in the spec
+    op = JSONPatch(op="remove", path="/spec/a_list/0")
+    target_object = apply_json_patch(op, target_object)
+    assert target_object["spec"]["a_list"][0] == "b"
+
+    # Remove the a non-existent index from the same list (not an error)
+    op = JSONPatch(op="remove", path="/spec/a_list/8")
+    target_object = apply_json_patch(op, target_object)
+    assert len(target_object["spec"]["a_list"]) == 3
+
+    # Remove the previously added key "four" element in the spec
+    op = JSONPatch(op="remove", path="/spec/four")
+    target_object = apply_json_patch(op, target_object)
+    assert "four" not in target_object["spec"].keys()
+
+    # Repeat the previous removal (not an error)
+    op = JSONPatch(op="remove", path="/spec/four")
+    target_object = apply_json_patch(op, target_object)
+
+
+def test_jsonpatch_move(target_object: dict[str, Any]) -> None:
+    """Tests the use of a move operation with a JSON Patch."""
+
+    # move the tags list from spec to metadata
+    op = JSONPatch(op="move", path="/metadata/tag_list", from_="/spec/tag_list")
+    target_object = apply_json_patch(op, target_object)
+    assert "tag_list" not in target_object["spec"].keys()
+    assert "tag_list" in target_object["metadata"].keys()
+
+    # Fail to move a nonexistent object
+    op = JSONPatch(op="move", path="/spec/yes_such_list", from_="/spec/no_such_list")
+    with pytest.raises(JSONPatchError):
+        _ = apply_json_patch(op, target_object)
+
+
+def test_jsonpatch_copy(target_object: dict[str, Any]) -> None:
+    """Tests the use of a copy operation with a JSON Patch."""
+
+    # copy the owner from metadata to spec as the name "pilot"
+    op = JSONPatch(op="copy", path="/spec/pilot", from_="/metadata/owner")
+    target_object = apply_json_patch(op, target_object)
+    assert target_object["spec"]["pilot"] == target_object["metadata"]["owner"]
+
+    # Fail to copy a nonexistent object
+    op = JSONPatch(op="copy", path="/spec/yes_such_list", from_="/spec/no_such_list")
+    with pytest.raises(JSONPatchError):
+        _ = apply_json_patch(op, target_object)
+
+
+def test_jsonpatch_test(target_object: dict[str, Any]) -> None:
+    """Tests the use of a test/assert operation with a JSON Patch."""
+
+    # test successful assertion
+    op = JSONPatch(op="test", path="/metadata/owner", value="bob_loblaw")
+    _ = apply_json_patch(op, target_object)
+
+    op = JSONPatch(op="test", path="/spec/a_list/0", value="a")
+    _ = apply_json_patch(op, target_object)
+
+    # test value mismatch
+    op = JSONPatch(op="test", path="/metadata/owner", value="bob_alice")
+    with pytest.raises(JSONPatchError):
+        _ = apply_json_patch(op, target_object)
+
+    # test missing key
+    op = JSONPatch(op="test", path="/metadata/pilot", value="bob_alice")
+    with pytest.raises(JSONPatchError):
+        _ = apply_json_patch(op, target_object)
+
+    # test missing index
+    op = JSONPatch(op="test", path="/spec/a_list/8", value="bob_alice")
+    with pytest.raises(JSONPatchError):
+        _ = apply_json_patch(op, target_object)
+
+    # test bad reference token
+    op = JSONPatch(op="test", path="/spec/a_list/-", value="bob_alice")
+    with pytest.raises(JSONPatchError):
+        _ = apply_json_patch(op, target_object)

From a1e7987e13760a370e013ab9cac79921c1c43c00 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Wed, 18 Jun 2025 11:33:44 -0500
Subject: [PATCH 20/37] 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
---
 .github/workflows/ci.yaml                  |   1 +
 pyproject.toml                             |   2 +-
 src/lsst/cmservice/db/__init__.py          |   1 +
 src/lsst/cmservice/db/campaigns_v2.py      |  37 ++-
 src/lsst/cmservice/main.py                 |   2 +
 src/lsst/cmservice/routers/v2/__init__.py  |  13 +
 src/lsst/cmservice/routers/v2/campaigns.py | 345 +++++++++++++++++++++
 src/lsst/cmservice/routers/v2/manifests.py | 266 ++++++++++++++++
 tests/conftest.py                          |  13 +-
 tests/v2/conftest.py                       |  44 ++-
 tests/v2/test_campaign_routes.py           | 185 +++++++++++
 tests/v2/test_db.py                        |  52 ++++
 tests/v2/test_manifest_routes.py           | 229 ++++++++++++++
 13 files changed, 1161 insertions(+), 29 deletions(-)
 create mode 100644 src/lsst/cmservice/routers/v2/__init__.py
 create mode 100644 src/lsst/cmservice/routers/v2/campaigns.py
 create mode 100644 src/lsst/cmservice/routers/v2/manifests.py
 create mode 100644 tests/v2/test_campaign_routes.py
 create mode 100644 tests/v2/test_db.py
 create mode 100644 tests/v2/test_manifest_routes.py

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 96d726f92..2e4a8b8c0 100644
--- a/.github/workflows/ci.yaml
+++ b/.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:
diff --git a/pyproject.toml b/pyproject.toml
index 2b8d31f63..35907ae34 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -170,7 +170,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
diff --git a/src/lsst/cmservice/db/__init__.py b/src/lsst/cmservice/db/__init__.py
index 11f61d4fe..eeec4db4e 100644
--- a/src/lsst/cmservice/db/__init__.py
+++ b/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
diff --git a/src/lsst/cmservice/db/campaigns_v2.py b/src/lsst/cmservice/db/campaigns_v2.py
index aa7802fcc..e4686be01 100644
--- a/src/lsst/cmservice/db/campaigns_v2.py
+++ b/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,6 +119,15 @@ 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"""
 
@@ -122,11 +135,11 @@ class NodeBase(BaseSQLModel):
     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)),
     )
@@ -255,10 +268,10 @@ class Task(SQLModel, table=True):
     site_affinity: list[str] = Field(
         sa_column=Column("site_affinity", MutableList.as_mutable(postgresql.ARRAY(String())))
     )
-    status: Annotated[StatusEnum, StatusEnumValidator, EnumSerializer] = Field(
+    status: StatusField = Field(
         sa_column=Column("status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)),
     )
-    previous_status: Annotated[StatusEnum, StatusEnumValidator, EnumSerializer] = Field(
+    previous_status: StatusField = Field(
         sa_column=Column(
             "previous_status", Enum(StatusEnum, 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")
 
 
diff --git a/src/lsst/cmservice/main.py b/src/lsst/cmservice/main.py
index 8b0742cb2..db3133e09 100644
--- a/src/lsst/cmservice/main.py
+++ b/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:
diff --git a/src/lsst/cmservice/routers/v2/__init__.py b/src/lsst/cmservice/routers/v2/__init__.py
new file mode 100644
index 000000000..94d0c1a86
--- /dev/null
+++ b/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)
diff --git a/src/lsst/cmservice/routers/v2/campaigns.py b/src/lsst/cmservice/routers/v2/campaigns.py
new file mode 100644
index 000000000..ecd1e1cda
--- /dev/null
+++ b/src/lsst/cmservice/routers/v2/campaigns.py
@@ -0,0 +1,345 @@
+"""http routers for managing Campaign tables.
+
+The /campaigns endpoint supports a collection resource and single resources
+representing campaign objects within CM-Service.
+"""
+
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Annotated
+from uuid import UUID, uuid5
+
+from fastapi import APIRouter, Depends, HTTPException, Query, Request, Response
+from sqlalchemy.orm import aliased
+from sqlmodel import col, select
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+from ...common.enums import ManifestKind
+from ...common.logging import LOGGER
+from ...db.campaigns_v2 import Campaign, CampaignModel, CampaignUpdate, Edge, Node
+from ...db.manifests_v2 import ManifestWrapper
+from ...db.session import db_session_dependency
+
+# TODO should probably bind a logger to the fastapi app or something
+logger = LOGGER.bind(module=__name__)
+
+
+# Build the router
+router = APIRouter(
+    prefix="/campaigns",
+    tags=["campaigns", "v2"],
+)
+
+
+@router.get(
+    "/",
+    summary="Get a list of campaigns",
+)
+async def read_campaign_collection(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    limit: Annotated[int, Query(le=100)] = 10,
+    offset: Annotated[int, Query()] = 0,
+) -> Sequence[CampaignModel]:
+    """..."""
+    try:
+        campaigns = await session.exec(select(Campaign).offset(offset).limit(limit))
+
+        response.headers["Next"] = str(
+            request.url_for("read_campaign_collection").include_query_params(
+                offset=(offset + limit), limit=limit
+            )
+        )
+        if offset > 0:
+            response.headers["Previous"] = str(
+                request.url_for("read_campaign_collection").include_query_params(
+                    offset=(offset - limit), limit=limit
+                )
+            )
+        return campaigns.all()
+    except Exception as msg:
+        logger.exception()
+        raise HTTPException(status_code=500, detail=f"{str(msg)}") from msg
+
+
+@router.get(
+    "/{campaign_name}",
+    summary="Get campaign detail",
+)
+async def read_campaign_resource(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    campaign_name: str,
+) -> Campaign:
+    """Fetch a single campaign from the database given either the campaign id
+    or its name.
+    """
+    s = select(Campaign)
+    # The input could be a campaign UUID or it could be a literal name.
+    try:
+        if campaign_id := UUID(campaign_name):
+            s = s.where(Campaign.id == campaign_id)
+    except ValueError:
+        s = s.where(Campaign.name == campaign_name)
+
+    campaign = (await session.exec(s)).one_or_none()
+    # set the response headers
+    if campaign is not None:
+        response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign.id))
+        response.headers["Nodes"] = str(
+            request.url_for("read_campaign_node_collection", campaign_name=campaign.id)
+        )
+        response.headers["Edges"] = str(
+            request.url_for("read_campaign_edge_collection", campaign_name=campaign.id)
+        )
+        return campaign
+    else:
+        raise HTTPException(status_code=404)
+
+
+@router.patch(
+    "/{campaign_name}",
+    summary="Update campaign detail",
+    status_code=202,
+)
+async def update_campaign_resource(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    campaign_name: str,
+    patch_data: CampaignUpdate,
+) -> Campaign:
+    """Partial update method for campaigns.
+
+    Should primarily be used to set the status of a campaign, e.g., from
+    waiting->ready, in order to trigger any validation rules contained in that
+    transition.
+
+    Another common use case would be to set status to "paused".
+
+    This could be used to update a campaign's metadata, but otherwise the
+    status is the only field available for modification, and even then there is
+    not an imperative "change the status" command, rather a request to evolve
+    the state of a campaign from A to B, which may or may not be successful.
+
+    Rather than manipulating the campaign's record, a change to status should
+    instead create a work item for the task processing queue for an executor
+    to discover and attempt to act upon. Barring that, the work should be
+    delegated to a Background Task. This is why the method returns a 202; the
+    user needs to check back "later" to see if the requested state change has
+    occurred.
+    """
+    use_rfc7396 = False
+    use_rfc6902 = False
+    mutable_fields = []
+    if request.headers["Content-Type"] == "application/merge-patch+json":
+        use_rfc7396 = True
+        mutable_fields.extend(["owner", "status"])
+    elif request.headers["Content-Type"] == "application/json-patch+json":
+        use_rfc6902 = True
+        mutable_fields.extend(["configuration", "metadata_"])
+        raise HTTPException(status_code=501, detail="Not yet implemented.")
+    else:
+        raise HTTPException(status_code=406, detail="Unsupported Content-Type")
+
+    if TYPE_CHECKING:
+        assert use_rfc7396
+        assert not use_rfc6902
+    s = select(Campaign)
+    # The input could be a campaign UUID or it could be a literal name.
+    try:
+        if campaign_id := UUID(campaign_name):
+            s = s.where(Campaign.id == campaign_id)
+    except ValueError:
+        s = s.where(Campaign.name == campaign_name)
+
+    campaign = (await session.exec(s)).one_or_none()
+    if campaign is None:
+        raise HTTPException(status_code=404, detail="No such campaign")
+
+    # update the campaign with the patch data
+    update_data = patch_data.model_dump(exclude_unset=True)
+    campaign.sqlmodel_update(update_data)
+    session.add(campaign)
+    await session.commit()
+    await session.refresh(campaign)
+    # set the response headers
+    if campaign is not None:
+        response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign.id))
+        response.headers["Nodes"] = str(
+            request.url_for("read_campaign_node_collection", campaign_name=campaign.id)
+        )
+        response.headers["Edges"] = str(
+            request.url_for("read_campaign_edge_collection", campaign_name=campaign.id)
+        )
+    return campaign
+
+
+@router.get(
+    "/{campaign_name}/nodes",
+    summary="Get campaign Nodes",
+)
+async def read_campaign_node_collection(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    campaign_name: str,
+    limit: Annotated[int, Query(le=100)] = 10,
+    offset: Annotated[int, Query()] = 0,
+) -> Sequence[Node]:
+    # This is a convenience api that could also be `/nodes?campaign=...
+
+    # The input could be a campaign UUID or it could be a literal name.
+    # TODO this could just as well be a campaign query with a join to nodes
+    s = select(Node)
+    try:
+        if campaign_id := UUID(campaign_name):
+            s = s.where(Node.namespace == campaign_id)
+    except ValueError:
+        # FIXME get an id from a name
+        raise HTTPException(status_code=422, detail="campaign_name must be a uuid")
+    s = s.offset(offset).limit(limit)
+    nodes = await session.exec(s)
+    response.headers["Next"] = str(
+        request.url_for(
+            "read_campaign_node_collection",
+            campaign_name=campaign_name,
+        ).include_query_params(offset=(offset + limit), limit=limit),
+    )
+    # TODO Previous
+    return nodes.all()
+
+
+@router.get(
+    "/{campaign_name}/edges",
+    summary="Get campaign Edges",
+)
+async def read_campaign_edge_collection(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    campaign_name: str,
+    *,
+    resolve_names: bool = False,
+) -> Sequence[Edge]:
+    # This is a convenience api that could also be `/edges?campaign=...
+
+    # The input could be a campaign UUID or it could be a literal name.
+    # This is why raw SQL is better than ORMs
+    # This is probably better off as two queries instead of a "complicated"
+    # join.
+    if resolve_names:
+        source_nodes = aliased(Node, name="source")
+        target_nodes = aliased(Node, name="target")
+        s = (
+            select(
+                col(Edge.id).label("id"),
+                col(Edge.name).label("name"),
+                col(Edge.namespace).label("namespace"),
+                col(source_nodes.name).label("source"),
+                col(target_nodes.name).label("target"),
+                col(Edge.configuration).label("configuration"),
+            )  # type: ignore
+            .join_from(Edge, source_nodes, Edge.source == source_nodes.id)
+            .join_from(Edge, target_nodes, Edge.target == target_nodes.id)
+        )
+    else:
+        s = select(Edge)
+    try:
+        if campaign_id := UUID(campaign_name):
+            s = s.where(Edge.namespace == campaign_id)
+    except ValueError:
+        # FIXME get an id from a name
+        raise HTTPException(status_code=422, detail="campaign_name must be a uuid")
+    edges = await session.exec(s)
+    return edges.all()
+
+
+@router.delete(
+    "/{campaign_name}/edges/{edge_name}",
+    summary="Delete campaign edge",
+    status_code=204,
+)
+async def delete_campaign_edge_resource(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    campaign_name: str,
+    edge_name: str,
+) -> None:
+    """Delete an edge resource from the campaign, using either name or id."""
+    # If the campaign name is not a uuid, find the appropriate id
+    try:
+        campaign_id = UUID(campaign_name)
+    except ValueError:
+        # FIXME get an id from a name
+        raise HTTPException(status_code=422, detail="campaign_name must be a uuid")
+
+    try:
+        edge_id = UUID(edge_name)
+    except ValueError:
+        edge_id = uuid5(campaign_id, edge_name)
+
+    s = select(Edge).where(Edge.id == edge_id)
+    edge_to_delete = (await session.exec(s)).one_or_none()
+
+    if edge_to_delete is not None:
+        await session.delete(edge_to_delete)
+        await session.commit()
+    else:
+        raise HTTPException(status_code=404, detail="No such edge.")
+    return None
+
+
+@router.post(
+    "/",
+    summary="Add a campaign resource",
+)
+async def create_campaign_resource(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    manifest: ManifestWrapper,
+) -> Campaign:
+    # Validate the input by checking the "kind" of manifest is a campaign
+    if manifest.kind is not ManifestKind.campaign:
+        raise HTTPException(
+            status_code=422, detail="Campaigns may only be created from a 'campaign' manifest"
+        )
+    # and that the manifest includes any required fields, though this could
+    # just as well be a try/except ValueError around `_.model_validate()`
+    elif (campaign_name := manifest.metadata_.pop("name", None)) is None:
+        raise HTTPException(status_code=400, detail="Campaigns must have a name set in '.metadata.name'")
+
+    # Create a campaign spec from the manifest, delegating the creation of new
+    # dynamic fields to the model validation method, -OR- create new dynamic
+    # fields here.
+    campaign = Campaign.model_validate(
+        dict(
+            name=campaign_name,
+            metadata_=manifest.metadata_,
+            # owner = ...  # TODO Get username from gafaelfawr # noqa: ERA001
+        )
+    )
+
+    # A new campaign comes with a START and END node
+    start_node = Node.model_validate(dict(name="START", namespace=campaign.id))
+    end_node = Node.model_validate(dict(name="END", namespace=campaign.id))
+    # Put the campaign in the database
+    session.add(campaign)
+    session.add(start_node)
+    session.add(end_node)
+    await session.commit()
+    await session.refresh(campaign)
+
+    # set the response headers
+    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign.id))
+    response.headers["Nodes"] = str(
+        request.url_for("read_campaign_node_collection", campaign_name=campaign.id)
+    )
+    response.headers["Edges"] = str(
+        request.url_for("read_campaign_edge_collection", campaign_name=campaign.id)
+    )
+
+    return campaign
diff --git a/src/lsst/cmservice/routers/v2/manifests.py b/src/lsst/cmservice/routers/v2/manifests.py
new file mode 100644
index 000000000..9cc1274db
--- /dev/null
+++ b/src/lsst/cmservice/routers/v2/manifests.py
@@ -0,0 +1,266 @@
+"""http routers for managing Manifest tables.
+
+The /manifests endpoint supports a collection resource and single resources
+representing manifest objects within CM-Service.
+"""
+
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Annotated
+from uuid import UUID, uuid5
+
+from fastapi import APIRouter, Depends, HTTPException, Query, Request, Response
+from sqlmodel import col, select
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+from ...common.enums import ManifestKind
+from ...common.jsonpatch import JSONPatch, JSONPatchError, apply_json_patch
+from ...common.logging import LOGGER
+from ...db.campaigns_v2 import Campaign, Manifest, _default_campaign_namespace
+from ...db.manifests_v2 import ManifestWrapper
+from ...db.session import db_session_dependency
+
+# TODO should probably bind a logger to the fastapi app or something
+logger = LOGGER.bind(module=__name__)
+
+
+# Build the router
+router = APIRouter(
+    prefix="/manifests",
+    tags=["manifests", "v2"],
+)
+
+
+@router.get(
+    "/",
+    summary="Get a list of manifests",
+)
+async def read_manifest_collection(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    offset: Annotated[int, Query()] = 0,
+    limit: Annotated[int, Query(le=100)] = 10,
+) -> Sequence[Manifest]:
+    """Gets all manifests"""
+    response.headers["Next"] = str(
+        request.url_for("read_manifest_collection").include_query_params(offset=(offset + limit), limit=limit)
+    )
+    if offset > 0:
+        response.headers["Previous"] = str(
+            request.url_for("read_manifest_collection").include_query_params(
+                offset=(offset - limit), limit=limit
+            )
+        )
+    try:
+        nodes = await session.exec(select(Manifest).offset(offset).limit(limit))
+        return nodes.all()
+    except Exception as msg:
+        logger.exception()
+        raise HTTPException(status_code=500, detail=f"{str(msg)}") from msg
+
+
+@router.get(
+    "/{manifest_name_or_id}",
+    summary="Get manifest detail",
+)
+async def read_single_resource(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    manifest_name_or_id: str,
+    manifest_version: Annotated[int | None, Query(ge=0, alias="version")] = None,
+) -> Manifest:
+    """Fetch a single manifest from the database given either an id or name.
+
+    When available, only the most recent version of the Manifest is returned,
+    unless the version is provided as part of the query string.
+    """
+    s = select(Manifest)
+    # The input could be a UUID or it could be a literal name.
+    try:
+        if _id := UUID(manifest_name_or_id):
+            s = s.where(Manifest.id == _id)
+    except ValueError:
+        s = s.where(Manifest.name == manifest_name_or_id)
+
+    if manifest_version is None:
+        s = s.order_by(col(Manifest.version).desc()).limit(1)
+    else:
+        s = s.where(Manifest.version == manifest_version)
+
+    manifest = (await session.exec(s)).one_or_none()
+    if manifest is not None:
+        response.headers["Self"] = str(
+            request.url_for("read_single_resource", manifest_name_or_id=manifest.id)
+        )
+        return manifest
+    else:
+        raise HTTPException(status_code=404)
+
+
+@router.post(
+    "/",
+    summary="Add a manifest resource",
+    status_code=204,
+)
+async def create_one_or_more_resources(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    manifests: ManifestWrapper | list[ManifestWrapper],
+) -> None:
+    # TODO should support query parameters that scope the namespace, such that
+    #      response headers from a campaign-create operation can immediately
+    #      follow a link to node-create for that campaign.
+
+    # We could be given a single manifest or a list of them. In the singleton
+    # case, wrap it in a list so we can treat everything equally
+    if not isinstance(manifests, list):
+        manifests = [manifests]
+
+    for manifest in manifests:
+        # Validate the input by checking the "kind" of manifest.
+        # The difference between a "manifest" and a "node" is iffy, but all we
+        # want to assert here is that nodes, campaigns, and edges don't go in
+        # the manifest table
+        if manifest.kind in [ManifestKind.campaign, ManifestKind.node, ManifestKind.edge]:
+            raise HTTPException(status_code=422, detail=f"Manifests may not be a {manifest.kind.name} kind.")
+
+        # and that the manifest includes any required fields, though this could
+        # just as well be a try/except ValueError around `_.model_validate()`
+        elif (_name := manifest.metadata_.pop("name", None)) is None:
+            raise HTTPException(status_code=400, detail="Manifests must have a name set in '.metadata.name'")
+
+        # TODO match node with jsonschema and validate
+
+        # A manifest must exist in the namespace of an existing campaign
+        # or the default namespace
+        _namespace: str | None = manifest.metadata_.pop("namespace", None)
+        if _namespace is None:
+            _namespace_uuid = _default_campaign_namespace
+        else:
+            try:
+                _namespace_uuid = UUID(_namespace)
+            except ValueError:
+                # get the campaign ID by its name to use as a namespace
+                # it is an error if the namespace/campaign does not exist
+                # FIXME but this could also be handled by FK constraints
+                if (
+                    _campaign_id := (
+                        await session.exec(select(Campaign.id).where(Campaign.name == _namespace))
+                    ).one_or_none()
+                ) is None:
+                    raise HTTPException(status_code=422, detail="Requested namespace does not exist.")
+                _namespace_uuid = _campaign_id
+
+        # A node must be a new version if name+namespace already exists
+        # - check db for node as name+namespace, get version and increment
+        _version = int(manifest.metadata_.pop("version", 0))
+
+        s = (
+            select(Manifest)
+            .where(Manifest.name == _name)
+            .where(Manifest.namespace == _namespace_uuid)
+            .order_by(col(Manifest.version).desc())
+            .limit(1)
+        )
+        _previous = (await session.exec(s)).one_or_none()
+
+        _version = _previous.version if _previous else _version
+        _version += 1
+        _manifest = Manifest(
+            id=uuid5(_namespace_uuid, f"{_name}.{_version}"),
+            name=_name,
+            namespace=_namespace_uuid,
+            kind=manifest.kind,
+            version=_version,
+            metadata_=manifest.metadata_,
+            spec=manifest.spec,
+        )
+
+        # Put the node in the database
+        session.add(_manifest)
+
+    await session.commit()
+    return None
+
+
+@router.patch(
+    "/{manifest_name_or_id}",
+    summary="Update manifest detail",
+    status_code=202,
+)
+async def update_manifest_resource(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    manifest_name_or_id: str,
+    patch_data: Sequence[JSONPatch],
+) -> Manifest:
+    """Partial update method for manifests.
+
+    A Manifest's spec or metadata may be updated with this PATCH operation. All
+    updates to a Manifest creates a new version of the Manifest instead of
+    updating an existing record in-place. This preserves history and keeps
+    previous manifest versions available.
+
+    A Manifest's name, id, kind, or namespace may not be modified by this
+    method, and attempts to do so will produce a 4XX client error.
+
+    This PATCH endpoint supports only RFC6902 json-patch requests.
+
+    Notes
+    -----
+    - This API always targets the latest version of a manifest when applying
+      a patch. This requires and maintains a "linear" sequence of versions;
+      it is not permissible to "patch" a previous version and create a "tree"-
+      like history of manifests. For exmaple, every manifest may be diffed
+      against any previous version without having to consider branches.
+    """
+    use_rfc6902 = False
+    if request.headers["Content-Type"] == "application/json-patch+json":
+        use_rfc6902 = True
+    else:
+        raise HTTPException(status_code=406, detail="Unsupported Content-Type")
+
+    if TYPE_CHECKING:
+        assert use_rfc6902
+
+    s = select(Manifest)
+    # The input could be a UUID or it could be a literal name.
+    try:
+        if _id := UUID(manifest_name_or_id):
+            s = s.where(Manifest.id == _id)
+    except ValueError:
+        s = s.where(Manifest.name == manifest_name_or_id)
+
+    # we want to order and sort by version, in descending order, so we always
+    # fetch only the most recent version of manifest
+    # FIXME this implies that when a manifest ID is provided, it should be an
+    # error if it is not the most recent version.
+    s = s.order_by(col(Manifest.version).desc()).limit(1)
+
+    old_manifest = (await session.exec(s)).one_or_none()
+    if old_manifest is None:
+        raise HTTPException(status_code=404, detail="No such campaign")
+
+    new_manifest = old_manifest.model_dump(by_alias=True)
+    new_manifest["version"] += 1
+    new_manifest["id"] = uuid5(new_manifest["namespace"], f"{new_manifest['name']}.{new_manifest['version']}")
+
+    for patch in patch_data:
+        try:
+            apply_json_patch(patch, new_manifest)
+        except JSONPatchError as e:
+            raise HTTPException(
+                status_code=422,
+                detail=f"Unable to process one or more patch operations: {e}",
+            )
+
+    # create Manifest from new_manifest, add to session, and commit
+    new_manifest_db = Manifest.model_validate(new_manifest)
+    session.add(new_manifest_db)
+    await session.commit()
+
+    # TODO response headers
+    return new_manifest_db
diff --git a/tests/conftest.py b/tests/conftest.py
index c7d182919..00997a3d8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,3 +1,4 @@
+import importlib
 from collections.abc import AsyncIterator, Iterator
 from typing import Any
 
@@ -12,7 +13,7 @@
 from safir.testing.uvicorn import UvicornProcess, spawn_uvicorn
 from sqlalchemy.ext.asyncio import AsyncEngine
 
-from lsst.cmservice import db, main
+from lsst.cmservice import db
 from lsst.cmservice.common.enums import ScriptMethodEnum
 from lsst.cmservice.config import config as config_
 
@@ -23,6 +24,8 @@ def set_app_config(monkeypatch: Any) -> None:
     config_.script_handler = ScriptMethodEnum.bash
 
 
+# FIXME this fixture should be refactored not to use unnecessary safir helper
+#       functions, as all this functionality already exists without it.
 @pytest_asyncio.fixture(name="engine")
 async def engine_fixture() -> AsyncIterator[AsyncEngine]:
     """Return a SQLAlchemy AsyncEngine configured to talk to the app db."""
@@ -40,8 +43,10 @@ async def app_fixture() -> AsyncIterator[FastAPI]:
     Wraps the application in a lifespan manager so that startup and shutdown
     events are sent during test execution.
     """
-    async with LifespanManager(main.app):
-        yield main.app
+    main_ = importlib.import_module("lsst.cmservice.main")
+    app: FastAPI = getattr(main_, "app")
+    async with LifespanManager(app):
+        yield app
 
 
 @pytest_asyncio.fixture(name="client")
@@ -51,6 +56,8 @@ async def client_fixture(app: FastAPI) -> AsyncIterator[AsyncClient]:
         yield the_client
 
 
+# FIXME this fixture should be replaced by patching the CLIRunner's httpx
+#       client (see client_fixture)
 @pytest_asyncio.fixture(name="uvicorn")
 async def uvicorn_fixture(tmp_path_factory: TempPathFactory) -> AsyncIterator[UvicornProcess]:
     """Spawn and return a uvicorn process hosting the test app."""
diff --git a/tests/v2/conftest.py b/tests/v2/conftest.py
index 9a80d6d19..1323a27ea 100644
--- a/tests/v2/conftest.py
+++ b/tests/v2/conftest.py
@@ -1,23 +1,24 @@
 """Shared conftest module for v2 unit and functional tests."""
 
+import importlib
 import os
 from collections.abc import AsyncGenerator, Generator
-from uuid import uuid4
+from typing import TYPE_CHECKING
 
 import pytest
 import pytest_asyncio
 from fastapi.testclient import TestClient
 from httpx import ASGITransport, AsyncClient
-from sqlalchemy.ext.asyncio import create_async_engine
 from sqlalchemy.pool import NullPool
 from sqlmodel import SQLModel
 from testcontainers.postgres import PostgresContainer
 
 from lsst.cmservice.common.types import AnyAsyncSession
 from lsst.cmservice.config import config
-from lsst.cmservice.db.base import Base
 from lsst.cmservice.db.session import DatabaseSessionDependency, db_session_dependency
-from lsst.cmservice.main import app
+
+if TYPE_CHECKING:
+    from fastapi import FastAPI
 
 POSTGRES_CONTAINER_IMAGE = "postgres:16"
 
@@ -38,12 +39,10 @@ async def rawdb(monkeypatch_module: pytest.MonkeyPatch) -> AsyncGenerator[Databa
     configuration parameters.
     """
 
-    # use a different table schema for each test session
-    table_schema = uuid4().hex[-8:]
-    monkeypatch_module.setattr(target=config.db, name="table_schema", value=table_schema)
     monkeypatch_module.setattr(target=config.asgi, name="enable_frontend", value=False)
 
     if os.getenv("TEST__LOCAL_DB") is not None:
+        db_session_dependency.pool_class = NullPool
         await db_session_dependency.initialize()
         assert db_session_dependency.engine is not None
         yield db_session_dependency
@@ -60,6 +59,7 @@ async def rawdb(monkeypatch_module: pytest.MonkeyPatch) -> AsyncGenerator[Databa
             monkeypatch_module.setattr(target=config.db, name="url", value=psql_url)
             monkeypatch_module.setattr(target=config.db, name="password", value=postgres.password)
             monkeypatch_module.setattr(target=config.db, name="echo", value=True)
+            db_session_dependency.pool_class = NullPool
             await db_session_dependency.initialize()
             assert db_session_dependency.engine is not None
             yield db_session_dependency
@@ -75,26 +75,29 @@ async def testdb(rawdb: DatabaseSessionDependency) -> AsyncGenerator[DatabaseSes
     """
     # v1 objects are created from the legacy DeclarativeBase class and
     # v2 objects are created from the SQLModel metadata.
-    async with create_async_engine(url=rawdb.url, poolclass=NullPool).begin() as aconn:
+    assert rawdb.engine is not None
+    async with rawdb.engine.begin() as aconn:
+        await aconn.run_sync(SQLModel.metadata.drop_all)
         await aconn.run_sync(SQLModel.metadata.create_all)
-        await aconn.run_sync(Base.metadata.create_all)
     yield rawdb
-    async with create_async_engine(url=rawdb.url, poolclass=NullPool).begin() as aconn:
+    async with rawdb.engine.begin() as aconn:
         await aconn.run_sync(SQLModel.metadata.drop_all)
-        await aconn.run_sync(Base.metadata.drop_all)
 
 
 @pytest_asyncio.fixture(name="session", scope="module", loop_scope="module")
 async def session_fixture(testdb: DatabaseSessionDependency) -> AsyncGenerator[AnyAsyncSession]:
     """Test fixture for an async database session"""
-
+    assert testdb.engine is not None
     assert testdb.sessionmaker is not None
     async with testdb.sessionmaker() as session:
-        yield session
+        try:
+            yield session
+        finally:
+            await session.close()
+    await testdb.engine.dispose()
 
 
-@pytest_asyncio.fixture(name="client")
-async def client_fixture(session: AnyAsyncSession) -> AsyncGenerator[TestClient]:
+def client_fixture(session: AnyAsyncSession) -> Generator[TestClient]:
     """Test fixture for a FastAPI test client with dependency injection
     overriden.
     """
@@ -102,22 +105,29 @@ async def client_fixture(session: AnyAsyncSession) -> AsyncGenerator[TestClient]
     def get_session_override() -> AnyAsyncSession:
         return session
 
+    main_ = importlib.import_module("lsst.cmservice.main")
+    app: FastAPI = getattr(main_, "app")
+
     app.dependency_overrides[db_session_dependency] = get_session_override
     client = TestClient(app)
     yield client
     app.dependency_overrides.clear()
 
 
-@pytest_asyncio.fixture(name="aclient")
+@pytest_asyncio.fixture(name="aclient", scope="module", loop_scope="module")
 async def async_client_fixture(session: AnyAsyncSession) -> AsyncGenerator[AsyncClient]:
     """Test fixture for an HTTPX async test client with dependency injection
     overriden.
     """
+    main_ = importlib.import_module("lsst.cmservice.main")
+    app: FastAPI = getattr(main_, "app")
 
     def get_session_override() -> AnyAsyncSession:
         return session
 
     app.dependency_overrides[db_session_dependency] = get_session_override
-    async with AsyncClient(transport=ASGITransport(app), base_url="http://test") as aclient:
+    async with AsyncClient(
+        follow_redirects=True, transport=ASGITransport(app), base_url="http://test"
+    ) as aclient:
         yield aclient
     app.dependency_overrides.clear()
diff --git a/tests/v2/test_campaign_routes.py b/tests/v2/test_campaign_routes.py
new file mode 100644
index 000000000..5545e1008
--- /dev/null
+++ b/tests/v2/test_campaign_routes.py
@@ -0,0 +1,185 @@
+"""Tests v2 fastapi campaign routes"""
+
+from uuid import NAMESPACE_DNS, uuid4, uuid5
+
+import pytest
+from httpx import AsyncClient, HTTPStatusError
+
+pytestmark = pytest.mark.asyncio(loop_scope="module")
+"""All tests in this module will run in the same event loop."""
+
+
+async def test_async_list_campaigns(aclient: AsyncClient) -> None:
+    x = await aclient.get("/cm-service/v2/campaigns")
+    assert len(x.json()) == 0
+    assert True
+
+
+async def test_async_list_campaign(aclient: AsyncClient) -> None:
+    """Tests lookup of a single campaign by name and by ID"""
+    campaign_name = uuid4().hex[-8:]
+
+    x = await aclient.get(
+        f"/cm-service/v2/campaigns/{campaign_name}",
+    )
+    assert x.status_code == 404
+
+    x = await aclient.post(
+        "/cm-service/v2/campaigns",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "campaign",
+            "metadata_": {"name": campaign_name},
+            "spec": {},
+        },
+    )
+    assert x.is_success
+    campaign_id = x.json()["id"]
+
+    x = await aclient.get(
+        f"/cm-service/v2/campaigns/{campaign_name}",
+    )
+    assert x.is_success
+
+    x = await aclient.get(
+        f"/cm-service/v2/campaigns/{campaign_id}",
+    )
+    assert x.is_success
+
+
+async def test_async_create_campaign(aclient: AsyncClient) -> None:
+    # Test failure to create campaign with invalid manifest (wrong kind)
+    campaign_name = uuid4().hex[-8:]
+    x = await aclient.post(
+        "/cm-service/v2/campaigns",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "node",
+            "metadata": {
+                "name": campaign_name,
+            },
+            "spec": {},
+        },
+    )
+    with pytest.raises(HTTPStatusError):
+        assert x.status_code == 422
+        x.raise_for_status()
+
+    del x
+
+    # Test failure to create campaign with incomplete manifest (missing name)
+    x = await aclient.post(
+        "/cm-service/v2/campaigns",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "campaign",
+            "metadata": {},
+            "spec": {},
+        },
+    )
+    with pytest.raises(HTTPStatusError):
+        assert x.status_code == 400
+        x.raise_for_status()
+
+    del x
+
+    # Test successful campaign creation
+    x = await aclient.post(
+        "/cm-service/v2/campaigns",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "campaign",
+            "metadata": {"name": campaign_name},
+            "spec": {},
+        },
+    )
+
+    assert x.is_success
+
+    campaign = x.json()
+    # - the campaign should exist in the namespace of the default campaign
+    assert campaign["namespace"] == str(uuid5(NAMESPACE_DNS, "io.lsst.cmservice"))
+    # - the returned campaign's ID should be the name of the campaign within
+    #   the namespace of the default campaign
+    assert campaign["id"] == str(uuid5(uuid5(NAMESPACE_DNS, "io.lsst.cmservice"), campaign_name))
+    assert campaign["status"] == "waiting"
+
+    # - the response headers should have pointers to other API endpoints for
+    #   the campaign
+    assert set(["self", "nodes", "edges"]) <= x.headers.keys()
+
+    # - the provided links should be valid
+    y = await aclient.get(x.headers["self"])
+    assert y.is_success
+
+    y = await aclient.get(x.headers["nodes"])
+    assert y.is_success
+    # A new empty campaign should have a START and END node
+    nodes = y.json()
+    assert len(nodes) == 2
+    y = await aclient.get(x.headers["edges"])
+    assert y.is_success
+    # A new empty campaign should not have any edges
+    edges = y.json()
+    assert len(edges) == 0
+
+
+async def test_async_patch_campaign(aclient: AsyncClient) -> None:
+    # Create a new campaign with spec data
+    campaign_name = uuid4().hex[-8:]
+    x = await aclient.post(
+        "/cm-service/v2/campaigns",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "campaign",
+            "metadata_": {"name": campaign_name},
+            "spec": {
+                "collections": ["a", "b", "c"],
+                "enable_notifications": True,
+            },
+        },
+    )
+
+    assert x.is_success
+    # The response header 'self' has the canonical url for the new campaign
+    campaign_url = x.headers["self"]
+
+    # Try an unsupported content-type for patch
+    y = await aclient.patch(
+        campaign_url,
+        json={"status": "ready", "owner": "bob_loblaw"},
+        headers={"Content-Type": "application/not-supported+json"},
+    )
+    assert y.status_code == 406
+
+    # Update the campaign using RFC6902
+    y = await aclient.patch(
+        campaign_url,
+        json={"status": "ready", "owner": "bob_loblaw"},
+        headers={"Content-Type": "application/json-patch+json"},
+    )
+    # RFC6902 not implemented
+    assert y.status_code == 501
+
+    # Update the campaign using RFC7396 and campaign id
+    y = await aclient.patch(
+        campaign_url,
+        json={"status": "ready", "owner": "bob_loblaw"},
+        headers={"Content-Type": "application/merge-patch+json"},
+    )
+    assert y.is_success
+    updated_campaign = y.json()
+    assert updated_campaign["owner"] == "bob_loblaw"
+    assert updated_campaign["status"] == "ready"
+
+    # Update the campaign again using RFC7396, ensuring only a single field
+    # is patched, using campaign name
+    y = await aclient.patch(
+        f"/cm-service/v2/campaigns/{campaign_name}",
+        json={"owner": "alice_bob"},
+        headers={"Content-Type": "application/merge-patch+json"},
+    )
+    assert y.is_success
+    updated_campaign = y.json()
+    assert updated_campaign["owner"] == "alice_bob"
+    assert updated_campaign["status"] == "ready"
diff --git a/tests/v2/test_db.py b/tests/v2/test_db.py
new file mode 100644
index 000000000..2f3bd5511
--- /dev/null
+++ b/tests/v2/test_db.py
@@ -0,0 +1,52 @@
+"""Tests v2 database operations"""
+
+from uuid import uuid5
+
+import pytest
+from sqlmodel import select
+
+from lsst.cmservice.db.campaigns_v2 import Campaign, _default_campaign_namespace
+from lsst.cmservice.db.session import DatabaseSessionDependency
+
+
+@pytest.mark.asyncio
+async def test_create_campaigns_v2(testdb: DatabaseSessionDependency) -> None:
+    assert testdb.sessionmaker is not None
+
+    campaign_name = "test_campaign"
+    campaign = Campaign(
+        id=uuid5(_default_campaign_namespace, campaign_name),
+        name=campaign_name,
+        namespace=_default_campaign_namespace,
+        owner="test",
+        metadata_={"mtime": 0, "crtime": 0},
+        configuration={"mtime": 0, "crtime": 0},
+    )
+    async with testdb.sessionmaker() as session:
+        session.add(campaign)
+        await session.commit()
+
+    del campaign
+
+    async with testdb.sessionmaker() as session:
+        statement = select(Campaign).where(Campaign.name == "test_campaign")
+        results = await session.exec(statement)
+        campaign = results.one()
+        campaign.name = "a_new_name"
+        campaign.configuration["mtime"] = 1750107719
+        campaign.metadata_["crtime"] = 1750107719
+        await session.commit()
+
+    del campaign
+
+    async with testdb.sessionmaker() as session:
+        statement = select(Campaign).where(Campaign.name == "a_new_name")
+        results = await session.exec(statement)
+        campaign = results.one()
+        assert campaign.name == "a_new_name"
+        assert "mtime" in campaign.configuration
+        assert "crtime" in campaign.metadata_
+        assert campaign.configuration["mtime"] == 1750107719
+        assert campaign.configuration["crtime"] == 0
+        assert campaign.metadata_["crtime"] == 1750107719
+        assert campaign.metadata_["mtime"] == 0
diff --git a/tests/v2/test_manifest_routes.py b/tests/v2/test_manifest_routes.py
new file mode 100644
index 000000000..2563a45f3
--- /dev/null
+++ b/tests/v2/test_manifest_routes.py
@@ -0,0 +1,229 @@
+"""Tests v2 fastapi manifest routes"""
+
+from uuid import uuid4
+
+import pytest
+from httpx import AsyncClient
+
+pytestmark = pytest.mark.asyncio(loop_scope="module")
+"""All tests in this module will run in the same event loop."""
+
+
+async def test_async_list_manifests(aclient: AsyncClient) -> None:
+    x = await aclient.get("/cm-service/v2/manifests")
+    assert x.is_success
+    assert len(x.json()) == 0
+    assert True
+
+
+async def test_async_load_manifests(aclient: AsyncClient) -> None:
+    campaign_name = uuid4().hex[-8:]
+
+    # Try to create a campaign manifest
+    x = await aclient.post(
+        "/cm-service/v2/manifests",
+        json={
+            "apiversion": "io.lsst.cmservice/v1",
+            "kind": "campaign",
+            "metadata_": {},
+            "spec": {},
+        },
+    )
+    assert x.is_client_error
+
+    # Try to create a manifest without a name
+    x = await aclient.post(
+        "/cm-service/v2/manifests",
+        json={
+            "apiversion": "io.lsst.cmservice/v1",
+            "kind": "other",
+            "metadata_": {},
+            "spec": {},
+        },
+    )
+    assert x.is_client_error
+
+    # Try to create a manifest with an unknown namespace
+    x = await aclient.post(
+        "/cm-service/v2/manifests",
+        json={
+            "apiversion": "io.lsst.cmservice/v1",
+            "kind": "other",
+            "metadata_": {
+                "name": uuid4().hex[-8:],
+                "namespace": campaign_name,
+            },
+            "spec": {},
+        },
+    )
+    assert x.is_client_error
+
+    # Create a manifest in the default namespace
+    x = await aclient.post(
+        "/cm-service/v2/manifests",
+        json={
+            "apiversion": "io.lsst.cmservice/v1",
+            "kind": "other",
+            "metadata_": {
+                "name": uuid4().hex[-8:],
+            },
+            "spec": {
+                "one": 1,
+                "two": 2,
+                "three": 4,
+            },
+        },
+    )
+    assert x.is_success
+
+    # Create a campaign for additional manifests
+    x = await aclient.post(
+        "/cm-service/v2/campaigns",
+        json={
+            "kind": "campaign",
+            "metadata": {"name": campaign_name},
+        },
+    )
+    assert x.is_success
+    campaign_id = x.json()["id"]
+
+    # Create multiple manifests in the campaign namespace by both its name and
+    # its id. The first uses the most "proper" manifest field names "metadata"
+    # and "spec"; the second uses alternate "metadata_" and "data" aliases.
+    x = await aclient.post(
+        "/cm-service/v2/manifests",
+        json=[
+            {
+                "apiversion": "io.lsst.cmservice/v1",
+                "kind": "other",
+                "metadata": {
+                    "name": uuid4().hex[-8:],
+                    "namespace": campaign_id,
+                },
+                "spec": {
+                    "one": 1,
+                    "two": 2,
+                    "three": 4,
+                },
+            },
+            {
+                "apiversion": "io.lsst.cmservice/v1",
+                "kind": "other",
+                "metadata_": {
+                    "name": uuid4().hex[-8:],
+                    "namespace": campaign_name,
+                },
+                "data": {
+                    "one": 1,
+                    "two": 2,
+                    "three": 4,
+                },
+            },
+        ],
+    )
+    assert x.is_success
+
+    # Get all the loaded manifests
+    x = await aclient.get("/cm-service/v2/manifests")
+    assert x.is_success
+    manifests = x.json()
+    assert len(manifests) == 3
+
+
+async def test_async_patch_manifest(aclient: AsyncClient) -> None:
+    """Tests partial update of manifests and single resource retrieval."""
+    campaign_name = uuid4().hex[-8:]
+    manifest_name = uuid4().hex[-8:]
+
+    # Create a campaign and a manifest
+    x = await aclient.post(
+        "/cm-service/v2/campaigns",
+        json={
+            "kind": "campaign",
+            "metadata": {"name": campaign_name},
+        },
+    )
+    assert x.is_success
+
+    x = await aclient.post(
+        "/cm-service/v2/manifests",
+        json={
+            "apiversion": "io.lsst.cmservice/v1",
+            "kind": "other",
+            "metadata": {
+                "name": manifest_name,
+                "namespace": campaign_name,
+            },
+            "spec": {
+                "one": 1,
+                "two": 2,
+                "three": 4,
+                "a_list": ["a", "b", "c", "e"],
+            },
+        },
+    )
+
+    # "Correct" the spec of the loaded manifest
+    x = await aclient.patch(
+        f"/cm-service/v2/manifests/{manifest_name}",
+        headers={"Content-Type": "application/json-patch+json"},
+        json=[
+            {
+                "op": "replace",
+                "path": "/spec/three",
+                "value": 3,
+            },
+            {
+                "op": "replace",
+                "path": "/spec/a_list/3",
+                "value": "d",
+            },
+            {
+                "op": "add",
+                "path": "/spec/four",
+                "value": 4,
+            },
+            {
+                "op": "add",
+                "path": "/spec/owner",
+                "value": "bob_loblaw",
+            },
+        ],
+    )
+    assert x.is_success
+    patched_manifest = x.json()
+    assert patched_manifest["version"] == 2
+    assert patched_manifest["spec"]["three"] == 3
+    assert patched_manifest["spec"]["a_list"][3] == "d"
+    assert patched_manifest["spec"]["four"] == 4
+    assert patched_manifest["spec"]["owner"] == "bob_loblaw"
+
+    # In the previous test we added the "owner" to the wrong path, so now we
+    # want to <move> it from spec->metadata
+    x = await aclient.patch(
+        f"/cm-service/v2/manifests/{manifest_name}",
+        headers={"Content-Type": "application/json-patch+json"},
+        json=[
+            {
+                "op": "move",
+                "path": "/metadata/owner",
+                "from": "/spec/owner",
+            }
+        ],
+    )
+    assert x.is_success
+    patched_manifest = x.json()
+    assert patched_manifest["version"] == 3
+    assert patched_manifest["metadata"]["owner"] == "bob_loblaw"
+    assert "owner" not in patched_manifest["spec"]
+
+    # Get the manifest with multiple versions
+    # First, make sure when not indicated, the most recent version is returned
+    x = await aclient.get(f"/cm-service/v2/manifests/{manifest_name}")
+    assert x.is_success
+    assert x.json()["version"] == 3
+
+    # Next, get a specific version of the manifest
+    x = await aclient.get(f"/cm-service/v2/manifests/{manifest_name}?version=2")
+    assert x.is_success
+    assert x.json()["version"] == 2

From 09f4a469cb1e3e8d33502de5b6549962c7abf925 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Mon, 23 Jun 2025 14:04:38 -0500
Subject: [PATCH 21/37] feat(db): Update Models - add state machine db model -
 rearrange shared types and serde helpers - support arbitrary table schema in
 new db models and tests - Refactor validation function for enum fields - Add
 FK relations to model fields

---
 src/lsst/cmservice/common/types.py    | 16 +++++++
 src/lsst/cmservice/config.py          |  4 +-
 src/lsst/cmservice/db/campaigns_v2.py | 60 ++++++++++-----------------
 src/lsst/cmservice/db/manifests_v2.py | 12 ++----
 src/lsst/cmservice/models/serde.py    | 44 ++++++++++++++++++++
 tests/models/test_serde.py            | 33 +++++++++++++++
 tests/v2/conftest.py                  | 18 ++++++--
 tests/v2/test_db.py                   | 29 ++++++++++++-
 tests/v2/test_manifest_routes.py      | 32 ++++++++++++++
 9 files changed, 195 insertions(+), 53 deletions(-)
 create mode 100644 src/lsst/cmservice/models/serde.py
 create mode 100644 tests/models/test_serde.py

diff --git a/src/lsst/cmservice/common/types.py b/src/lsst/cmservice/common/types.py
index 169a52d4f..840d3bfa2 100644
--- a/src/lsst/cmservice/common/types.py
+++ b/src/lsst/cmservice/common/types.py
@@ -1,8 +1,12 @@
+from typing import Annotated
+
 from sqlalchemy.ext.asyncio import AsyncSession as AsyncSessionSA
 from sqlalchemy.ext.asyncio import async_scoped_session
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 from .. import models
+from ..models.serde import EnumSerializer, ManifestKindEnumValidator, StatusEnumValidator
+from .enums import ManifestKind, StatusEnum
 
 type AnyAsyncSession = AsyncSession | AsyncSessionSA | async_scoped_session
 """A type union of async database sessions the application may use"""
@@ -10,3 +14,15 @@
 
 type AnyCampaignElement = models.Group | models.Campaign | models.Step | models.Job
 """A type union of Campaign elements"""
+
+
+type StatusField = Annotated[StatusEnum, StatusEnumValidator, EnumSerializer]
+"""A type for fields representing a Status with a custom validator tuned for
+enums operations.
+"""
+
+
+type KindField = Annotated[ManifestKind, ManifestKindEnumValidator, EnumSerializer]
+"""A type for fields representing a Kind with a custom validator tuned for
+enums operations.
+"""
diff --git a/src/lsst/cmservice/config.py b/src/lsst/cmservice/config.py
index 93105dfae..099bc8810 100644
--- a/src/lsst/cmservice/config.py
+++ b/src/lsst/cmservice/config.py
@@ -551,8 +551,8 @@ class DatabaseConfiguration(BaseModel):
         description="The password for the cm-service database",
     )
 
-    table_schema: str | None = Field(
-        default=None,
+    table_schema: str = Field(
+        default="public",
         description="Schema to use for cm-service database",
     )
 
diff --git a/src/lsst/cmservice/db/campaigns_v2.py b/src/lsst/cmservice/db/campaigns_v2.py
index e4686be01..655fa9112 100644
--- a/src/lsst/cmservice/db/campaigns_v2.py
+++ b/src/lsst/cmservice/db/campaigns_v2.py
@@ -1,19 +1,23 @@
 from datetime import datetime
-from typing import Annotated, Any
+from typing import Any
 from uuid import NAMESPACE_DNS, UUID, uuid5
 
-from pydantic import AliasChoices, PlainSerializer, PlainValidator, ValidationInfo, model_validator
+from pydantic import AliasChoices, ValidationInfo, model_validator
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.ext.mutable import MutableDict, MutableList
 from sqlalchemy.types import PickleType
-from sqlmodel import Column, Enum, Field, SQLModel, String
+from sqlmodel import Column, Enum, Field, MetaData, SQLModel, String
 
 from ..common.enums import ManifestKind, StatusEnum
+from ..common.types import KindField, StatusField
 from ..config import config
 
 _default_campaign_namespace = uuid5(namespace=NAMESPACE_DNS, name="io.lsst.cmservice")
 """Default UUID5 namespace for campaigns"""
 
+metadata: MetaData = MetaData(schema=config.db.table_schema)
+"""SQLModel metadata for table models"""
+
 
 def jsonb_column(name: str, aliases: list[str] | None = None) -> Any:
     """Constructor for a Field based on a JSONB database column.
@@ -47,34 +51,10 @@ def jsonb_column(name: str, aliases: list[str] | None = None) -> Any:
 #   3. the model of the manifest when updating an object
 #   4. a response model for APIs related to the object
 
-EnumSerializer = PlainSerializer(
-    lambda x: x.name,
-    return_type="str",
-    when_used="always",
-)
-"""A serializer for enums that produces its name, not the value."""
-
-
-StatusEnumValidator = PlainValidator(lambda x: StatusEnum[x] if isinstance(x, str) else StatusEnum(x))
-"""A validator for the StatusEnum that can parse the enum from either a name
-or a value.
-"""
-
-
-ManifestKindEnumValidator = PlainValidator(
-    lambda x: ManifestKind[x] if isinstance(x, str) else ManifestKind(x)
-)
-"""A validator for the ManifestKindEnum that can parse the enum from a name
-or a value.
-"""
-
-
-type StatusField = Annotated[StatusEnum, StatusEnumValidator, EnumSerializer]
-type KindField = Annotated[ManifestKind, ManifestKindEnumValidator, EnumSerializer]
-
 
 class BaseSQLModel(SQLModel):
     __table_args__ = {"schema": config.db.table_schema}
+    metadata = metadata
 
 
 class CampaignBase(BaseSQLModel):
@@ -116,10 +96,10 @@ class Campaign(CampaignModel, table=True):
 
     __tablename__: str = "campaigns_v2"  # type: ignore[misc]
 
-    machine: UUID | None
+    machine: UUID | None = Field(foreign_key="machines_v2.id", default=None, ondelete="CASCADE")
 
 
-class CampaignUpdate(SQLModel):
+class CampaignUpdate(BaseSQLModel):
     """Model representing updatable fields for a PATCH operation on a Campaign
     using RFC7396.
     """
@@ -168,7 +148,7 @@ def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
 class Node(NodeModel, table=True):
     __tablename__: str = "nodes_v2"  # type: ignore[misc]
 
-    machine: UUID | None
+    machine: UUID | None = Field(foreign_key="machines_v2.id", default=None, ondelete="CASCADE")
 
 
 class EdgeBase(BaseSQLModel):
@@ -215,13 +195,19 @@ class MachineBase(BaseSQLModel):
     state: Any | None = Field(sa_column=Column("state", PickleType))
 
 
+class Machine(MachineBase, table=True):
+    """machines_v2 db table."""
+
+    __tablename__: str = "machines_v2"  # type: ignore[misc]
+
+
 class ManifestBase(BaseSQLModel):
     """manifests_v2 db table"""
 
     id: UUID = Field(primary_key=True)
     name: str
     version: int
-    namespace: UUID
+    namespace: UUID = Field(foreign_key="campaigns_v2.id")
     kind: KindField = Field(
         default=ManifestKind.other,
         sa_column=Column("kind", Enum(ManifestKind, length=20, native_enum=False, create_constraint=False)),
@@ -252,14 +238,14 @@ class Manifest(ManifestBase, table=True):
     __tablename__: str = "manifests_v2"  # type: ignore[misc]
 
 
-class Task(SQLModel, table=True):
+class Task(BaseSQLModel, table=True):
     """tasks_v2 db table"""
 
     __tablename__: str = "tasks_v2"  # type: ignore[misc]
 
     id: UUID = Field(primary_key=True)
-    namespace: UUID
-    node: UUID
+    namespace: UUID = Field(foreign_key="campaigns_v2.id")
+    node: UUID = Field(foreign_key="nodes_v2.id")
     priority: int
     created_at: datetime
     last_processed_at: datetime
@@ -280,8 +266,8 @@ class Task(SQLModel, table=True):
 
 class ActivityLogBase(BaseSQLModel):
     id: UUID = Field(primary_key=True)
-    namespace: UUID
-    node: UUID
+    namespace: UUID = Field(foreign_key="campaigns_v2.id")
+    node: UUID = Field(foreign_key="nodes_v2.id")
     operator: str
     to_status: StatusField = Field(
         sa_column=Column(
diff --git a/src/lsst/cmservice/db/manifests_v2.py b/src/lsst/cmservice/db/manifests_v2.py
index 90cef6d2d..78dd088bb 100644
--- a/src/lsst/cmservice/db/manifests_v2.py
+++ b/src/lsst/cmservice/db/manifests_v2.py
@@ -1,23 +1,19 @@
-from typing import Annotated
+"""Module for models representing generic CM Service manifests."""
 
 from pydantic import AliasChoices
 from sqlmodel import Field, SQLModel
 
 from ..common.enums import ManifestKind
-from .campaigns_v2 import EnumSerializer, ManifestKindEnumValidator
+from ..common.types import KindField
 
 
-# this can probably be a BaseModel since this is not a db relation, but the
-# distinction probably doesn't matter
 class ManifestWrapper(SQLModel):
-    """a model for an object's Manifest wrapper, used by APIs where the `spec`
+    """A model for an object's Manifest wrapper, used by APIs where the `spec`
     should be the kind's table model, more or less.
     """
 
     apiversion: str = Field(default="io.lsst.cmservice/v1")
-    kind: Annotated[ManifestKind, ManifestKindEnumValidator, EnumSerializer] = Field(
-        default=ManifestKind.other,
-    )
+    kind: KindField = Field(default=ManifestKind.other)
     metadata_: dict = Field(
         default_factory=dict,
         schema_extra={
diff --git a/src/lsst/cmservice/models/serde.py b/src/lsst/cmservice/models/serde.py
new file mode 100644
index 000000000..02ac5c467
--- /dev/null
+++ b/src/lsst/cmservice/models/serde.py
@@ -0,0 +1,44 @@
+"""Module for serialization and deserialization support for pydantic and
+other derivative models.
+"""
+
+from enum import EnumType
+from functools import partial
+from typing import Any
+
+from pydantic import PlainSerializer, PlainValidator
+
+from ..common.enums import ManifestKind, StatusEnum
+
+
+def EnumValidator[T: EnumType](value: Any, enum_: T) -> T:
+    """Create an enum from the input value. The input can be either the
+    enum name or its value.
+
+    Used as a Validator for a pydantic field.
+    """
+    try:
+        new_enum: T = enum_[value] if value in enum_.__members__ else enum_(value)
+    except (KeyError, ValueError):
+        raise ValueError(f"Value must be a member of {enum_.__qualname__}")
+    return new_enum
+
+
+EnumSerializer = PlainSerializer(
+    lambda x: x.name,
+    return_type="str",
+    when_used="always",
+)
+"""A serializer for enums that produces its name, not the value."""
+
+
+StatusEnumValidator = PlainValidator(partial(EnumValidator, enum_=StatusEnum))
+"""A validator for the StatusEnum that can parse the enum from either a name
+or a value.
+"""
+
+
+ManifestKindEnumValidator = PlainValidator(partial(EnumValidator, enum_=ManifestKind))
+"""A validator for the ManifestKindEnum that can parse the enum from a name
+or a value.
+"""
diff --git a/tests/models/test_serde.py b/tests/models/test_serde.py
new file mode 100644
index 000000000..ab450eeba
--- /dev/null
+++ b/tests/models/test_serde.py
@@ -0,0 +1,33 @@
+import pytest
+from pydantic import BaseModel, ValidationError
+
+from lsst.cmservice.common.enums import ManifestKind, StatusEnum
+from lsst.cmservice.common.types import KindField, StatusField
+
+
+class TestModel(BaseModel):
+    status: StatusField
+    kind: KindField
+
+
+def test_validators() -> None:
+    """Test model field enum validators."""
+    # test enum validation by name and value
+    x = TestModel(status=0, kind="campaign")
+    assert x.status is StatusEnum.waiting
+    assert x.kind is ManifestKind.campaign
+
+    # test bad input (wrong name)
+    with pytest.raises(ValidationError):
+        x = TestModel(status="bad", kind="edge")
+
+    # test bad input (bad value)
+    with pytest.raises(ValidationError):
+        x = TestModel(status="waiting", kind=99)
+
+
+def test_serializers() -> None:
+    x = TestModel(status="accepted", kind="node")
+    y = x.model_dump()
+    assert y["status"] == "accepted"
+    assert y["kind"] == "node"
diff --git a/tests/v2/conftest.py b/tests/v2/conftest.py
index 1323a27ea..a9ed6d2c1 100644
--- a/tests/v2/conftest.py
+++ b/tests/v2/conftest.py
@@ -4,17 +4,19 @@
 import os
 from collections.abc import AsyncGenerator, Generator
 from typing import TYPE_CHECKING
+from uuid import uuid4
 
 import pytest
 import pytest_asyncio
 from fastapi.testclient import TestClient
 from httpx import ASGITransport, AsyncClient
 from sqlalchemy.pool import NullPool
-from sqlmodel import SQLModel
+from sqlalchemy.schema import CreateSchema, DropSchema
 from testcontainers.postgres import PostgresContainer
 
 from lsst.cmservice.common.types import AnyAsyncSession
 from lsst.cmservice.config import config
+from lsst.cmservice.db.campaigns_v2 import metadata
 from lsst.cmservice.db.session import DatabaseSessionDependency, db_session_dependency
 
 if TYPE_CHECKING:
@@ -37,9 +39,13 @@ async def rawdb(monkeypatch_module: pytest.MonkeyPatch) -> AsyncGenerator[Databa
     `TEST__LOCAL_DB` is not set; otherwise the fixture will assume that the
     correct database is available to the test environment through ordinary
     configuration parameters.
+
+    The tests are performed within a random temporary schema that is created
+    and dropped along with the tables.
     """
 
     monkeypatch_module.setattr(target=config.asgi, name="enable_frontend", value=False)
+    monkeypatch_module.setattr(target=config.db, name="table_schema", value=uuid4().hex[:8])
 
     if os.getenv("TEST__LOCAL_DB") is not None:
         db_session_dependency.pool_class = NullPool
@@ -77,11 +83,15 @@ async def testdb(rawdb: DatabaseSessionDependency) -> AsyncGenerator[DatabaseSes
     # v2 objects are created from the SQLModel metadata.
     assert rawdb.engine is not None
     async with rawdb.engine.begin() as aconn:
-        await aconn.run_sync(SQLModel.metadata.drop_all)
-        await aconn.run_sync(SQLModel.metadata.create_all)
+        await aconn.run_sync(metadata.drop_all)
+        await aconn.execute(CreateSchema(config.db.table_schema, if_not_exists=True))
+        await aconn.run_sync(metadata.create_all)
+        await aconn.commit()
     yield rawdb
     async with rawdb.engine.begin() as aconn:
-        await aconn.run_sync(SQLModel.metadata.drop_all)
+        await aconn.run_sync(metadata.drop_all)
+        await aconn.execute(DropSchema(config.db.table_schema, if_exists=True))
+        await aconn.commit()
 
 
 @pytest_asyncio.fixture(name="session", scope="module", loop_scope="module")
diff --git a/tests/v2/test_db.py b/tests/v2/test_db.py
index 2f3bd5511..7995f52f2 100644
--- a/tests/v2/test_db.py
+++ b/tests/v2/test_db.py
@@ -1,16 +1,18 @@
 """Tests v2 database operations"""
 
-from uuid import uuid5
+from uuid import uuid4, uuid5
 
 import pytest
 from sqlmodel import select
 
-from lsst.cmservice.db.campaigns_v2 import Campaign, _default_campaign_namespace
+from lsst.cmservice.db.campaigns_v2 import Campaign, Machine, _default_campaign_namespace
 from lsst.cmservice.db.session import DatabaseSessionDependency
 
 
 @pytest.mark.asyncio
 async def test_create_campaigns_v2(testdb: DatabaseSessionDependency) -> None:
+    """Tests the campaigns_v2 table by creating and updating a Campaign."""
+
     assert testdb.sessionmaker is not None
 
     campaign_name = "test_campaign"
@@ -50,3 +52,26 @@ async def test_create_campaigns_v2(testdb: DatabaseSessionDependency) -> None:
         assert campaign.configuration["crtime"] == 0
         assert campaign.metadata_["crtime"] == 1750107719
         assert campaign.metadata_["mtime"] == 0
+
+
+@pytest.mark.asyncio
+async def test_create_machines_v2(testdb: DatabaseSessionDependency) -> None:
+    """Tests the machines_v2 table by storing + retrieving a pickled object."""
+
+    assert testdb.sessionmaker is not None
+
+    # the machines table is a PickleType so it doesn't really matter for this
+    # test what kind of object is being pickled.
+    o = {"a": [1, 2, 3, 4, {"aa": [[0, 1], [2, 3]]}]}
+
+    machine_id = uuid4()
+    machine = Machine(id=machine_id, state=o)
+    async with testdb.sessionmaker() as session:
+        session.add(machine)
+        await session.commit()
+
+    async with testdb.sessionmaker() as session:
+        s = select(Machine).where(Machine.id == machine_id).limit(1)
+        unpickled = (await session.exec(s)).one()
+
+    assert unpickled.state == o
diff --git a/tests/v2/test_manifest_routes.py b/tests/v2/test_manifest_routes.py
index 2563a45f3..589f3be26 100644
--- a/tests/v2/test_manifest_routes.py
+++ b/tests/v2/test_manifest_routes.py
@@ -217,12 +217,44 @@ async def test_async_patch_manifest(aclient: AsyncClient) -> None:
     assert patched_manifest["metadata"]["owner"] == "bob_loblaw"
     assert "owner" not in patched_manifest["spec"]
 
+    # Using the "test" operator as a gating function, try but fail to update
+    # the previously moved owner field
+    x = await aclient.patch(
+        f"/cm-service/v2/manifests/{manifest_name}",
+        headers={"Content-Type": "application/json-patch+json"},
+        json=[
+            {
+                "op": "test",
+                "path": "/spec/owner",
+                "value": "bob_loblaw",
+            },
+            {
+                "op": "replace",
+                "path": "/spec/owner",
+                "value": "lob_boblaw",
+            },
+            {
+                "op": "add",
+                "path": "/metadata/scope",
+                "value": "drp",
+            },
+        ],
+    )
+    assert x.is_client_error
+
     # Get the manifest with multiple versions
     # First, make sure when not indicated, the most recent version is returned
+    # Note: the previous patch with a failing test op must not have created any
+    # new version.
     x = await aclient.get(f"/cm-service/v2/manifests/{manifest_name}")
     assert x.is_success
     assert x.json()["version"] == 3
 
+    # RFC6902 prescribes an all-or-nothing patch operation, so the previous op
+    # with a failing test assertion must not have otherwise completed, e.g.,
+    # the addition of a "scope" key to the manifest's metadata
+    assert "scope" not in x.json().get("metadata")
+
     # Next, get a specific version of the manifest
     x = await aclient.get(f"/cm-service/v2/manifests/{manifest_name}?version=2")
     assert x.is_success

From d7742da07e1a5ccbfa4ebb44bf5eedf1b4c89cf6 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Wed, 25 Jun 2025 10:54:26 -0500
Subject: [PATCH 22/37] feat(api): Refactor validating manifests feat(api):
 Refactor campaign and node routes

---
 src/lsst/cmservice/db/manifests_v2.py      | 109 +++++++++++++++++----
 src/lsst/cmservice/routers/v2/campaigns.py |  24 ++---
 src/lsst/cmservice/routers/v2/manifests.py |  42 +++-----
 tests/v2/conftest.py                       |  11 ++-
 tests/v2/test_campaign_routes.py           |  32 +++---
 tests/v2/test_manifest_routes.py           |   9 +-
 6 files changed, 140 insertions(+), 87 deletions(-)

diff --git a/src/lsst/cmservice/db/manifests_v2.py b/src/lsst/cmservice/db/manifests_v2.py
index 78dd088bb..0b080ba43 100644
--- a/src/lsst/cmservice/db/manifests_v2.py
+++ b/src/lsst/cmservice/db/manifests_v2.py
@@ -1,30 +1,101 @@
-"""Module for models representing generic CM Service manifests."""
+"""Module for models representing generic CM Service manifests.
 
-from pydantic import AliasChoices
-from sqlmodel import Field, SQLModel
+These manifests are used in APIs, especially when creating resources. They do
+not necessarily represent the object's database or ORM model.
+"""
 
-from ..common.enums import ManifestKind
+from typing import Self
+
+from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ValidationInfo, model_validator
+
+from ..common.enums import DEFAULT_NAMESPACE, ManifestKind
 from ..common.types import KindField
 
 
-class ManifestWrapper(SQLModel):
-    """A model for an object's Manifest wrapper, used by APIs where the `spec`
-    should be the kind's table model, more or less.
+class Manifest[MetadataT, SpecT](BaseModel):
+    """A parameterized model for an object's Manifest, used by APIs where the
+    `spec` should be the kind's table model, more or less.
     """
 
     apiversion: str = Field(default="io.lsst.cmservice/v1")
     kind: KindField = Field(default=ManifestKind.other)
-    metadata_: dict = Field(
-        default_factory=dict,
-        schema_extra={
-            "validation_alias": AliasChoices("metadata", "metadata_"),
-            "serialization_alias": "metadata",
-        },
+    metadata_: MetadataT = Field(
+        validation_alias=AliasChoices("metadata", "metadata_"),
+        serialization_alias="metadata",
     )
-    spec: dict = Field(
-        default_factory=dict,
-        schema_extra={
-            "validation_alias": AliasChoices("spec", "configuration", "data"),
-            "serialization_alias": "spec",
-        },
+    spec: SpecT = Field(
+        validation_alias=AliasChoices("spec", "configuration", "data"),
+        serialization_alias="spec",
     )
+
+
+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.
+
+    Notes
+    -----
+    Any spec body is allowed via config, but any fields that aren't first-class
+    fields won't be subject to validation or available as model attributes
+    except in the ``__pydantic_extra__`` dictionary. The full spec will be
+    expressed via ``model_dump()``.
+    """
+
+    model_config = ConfigDict(extra="allow")
+
+
+class VersionedMetadata(ManifestMetadata):
+    """Metadata model for versioned Manifests."""
+
+    version: int = 0
+
+
+class ManifestModelMetadata(VersionedMetadata):
+    """Manifest model for general Manifests. These manifests are versioned but
+    a namespace is optional.
+    """
+
+    namespace: str = Field(default=str(DEFAULT_NAMESPACE))
+
+
+class ManifestModel(Manifest[ManifestModelMetadata, ManifestSpec]):
+    """Manifest model for generic Manifest handling."""
+
+    @model_validator(mode="after")
+    def custom_model_validator(self, info: ValidationInfo) -> Self:
+        """Validate an Campaign Manifest after a model has been created."""
+        if self.kind in [ManifestKind.campaign, ManifestKind.node, ManifestKind.edge]:
+            raise ValueError(f"Manifests may not be a {self.kind.name} kind.")
+
+        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]):
+    """validating model for campaigns"""
+
+    @model_validator(mode="after")
+    def custom_model_validator(self, info: ValidationInfo) -> Self:
+        """Validate an Campaign Manifest after a model has been created."""
+        if self.kind is not ManifestKind.campaign:
+            raise ValueError("Campaigns may only be created from a <campaign> manifest")
+
+        return self
diff --git a/src/lsst/cmservice/routers/v2/campaigns.py b/src/lsst/cmservice/routers/v2/campaigns.py
index ecd1e1cda..dfcb80339 100644
--- a/src/lsst/cmservice/routers/v2/campaigns.py
+++ b/src/lsst/cmservice/routers/v2/campaigns.py
@@ -13,10 +13,9 @@
 from sqlmodel import col, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
-from ...common.enums import ManifestKind
 from ...common.logging import LOGGER
-from ...db.campaigns_v2 import Campaign, CampaignModel, CampaignUpdate, Edge, Node
-from ...db.manifests_v2 import ManifestWrapper
+from ...db.campaigns_v2 import Campaign, CampaignUpdate, Edge, Node
+from ...db.manifests_v2 import CampaignManifest
 from ...db.session import db_session_dependency
 
 # TODO should probably bind a logger to the fastapi app or something
@@ -40,7 +39,7 @@ async def read_campaign_collection(
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
     limit: Annotated[int, Query(le=100)] = 10,
     offset: Annotated[int, Query()] = 0,
-) -> Sequence[CampaignModel]:
+) -> Sequence[Campaign]:
     """..."""
     try:
         campaigns = await session.exec(select(Campaign).offset(offset).limit(limit))
@@ -300,25 +299,15 @@ async def create_campaign_resource(
     request: Request,
     response: Response,
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
-    manifest: ManifestWrapper,
+    manifest: CampaignManifest,
 ) -> Campaign:
-    # Validate the input by checking the "kind" of manifest is a campaign
-    if manifest.kind is not ManifestKind.campaign:
-        raise HTTPException(
-            status_code=422, detail="Campaigns may only be created from a 'campaign' manifest"
-        )
-    # and that the manifest includes any required fields, though this could
-    # just as well be a try/except ValueError around `_.model_validate()`
-    elif (campaign_name := manifest.metadata_.pop("name", None)) is None:
-        raise HTTPException(status_code=400, detail="Campaigns must have a name set in '.metadata.name'")
-
     # Create a campaign spec from the manifest, delegating the creation of new
     # dynamic fields to the model validation method, -OR- create new dynamic
     # fields here.
     campaign = Campaign.model_validate(
         dict(
-            name=campaign_name,
-            metadata_=manifest.metadata_,
+            name=manifest.metadata_.name,
+            metadata_=manifest.metadata_.model_dump(),
             # owner = ...  # TODO Get username from gafaelfawr # noqa: ERA001
         )
     )
@@ -326,6 +315,7 @@ async def create_campaign_resource(
     # A new campaign comes with a START and END node
     start_node = Node.model_validate(dict(name="START", namespace=campaign.id))
     end_node = Node.model_validate(dict(name="END", namespace=campaign.id))
+
     # Put the campaign in the database
     session.add(campaign)
     session.add(start_node)
diff --git a/src/lsst/cmservice/routers/v2/manifests.py b/src/lsst/cmservice/routers/v2/manifests.py
index 9cc1274db..308f4a33e 100644
--- a/src/lsst/cmservice/routers/v2/manifests.py
+++ b/src/lsst/cmservice/routers/v2/manifests.py
@@ -12,11 +12,10 @@
 from sqlmodel import col, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
-from ...common.enums import ManifestKind
 from ...common.jsonpatch import JSONPatch, JSONPatchError, apply_json_patch
 from ...common.logging import LOGGER
 from ...db.campaigns_v2 import Campaign, Manifest, _default_campaign_namespace
-from ...db.manifests_v2 import ManifestWrapper
+from ...db.manifests_v2 import ManifestModel
 from ...db.session import db_session_dependency
 
 # TODO should probably bind a logger to the fastapi app or something
@@ -103,39 +102,23 @@ async def read_single_resource(
     summary="Add a manifest resource",
     status_code=204,
 )
-async def create_one_or_more_resources(
+async def create_one_or_more_manifests(
     request: Request,
     response: Response,
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
-    manifests: ManifestWrapper | list[ManifestWrapper],
+    manifests: ManifestModel | list[ManifestModel],
 ) -> None:
-    # TODO should support query parameters that scope the namespace, such that
-    #      response headers from a campaign-create operation can immediately
-    #      follow a link to node-create for that campaign.
-
     # We could be given a single manifest or a list of them. In the singleton
     # case, wrap it in a list so we can treat everything equally
     if not isinstance(manifests, list):
         manifests = [manifests]
 
     for manifest in manifests:
-        # Validate the input by checking the "kind" of manifest.
-        # The difference between a "manifest" and a "node" is iffy, but all we
-        # want to assert here is that nodes, campaigns, and edges don't go in
-        # the manifest table
-        if manifest.kind in [ManifestKind.campaign, ManifestKind.node, ManifestKind.edge]:
-            raise HTTPException(status_code=422, detail=f"Manifests may not be a {manifest.kind.name} kind.")
-
-        # and that the manifest includes any required fields, though this could
-        # just as well be a try/except ValueError around `_.model_validate()`
-        elif (_name := manifest.metadata_.pop("name", None)) is None:
-            raise HTTPException(status_code=400, detail="Manifests must have a name set in '.metadata.name'")
-
-        # TODO match node with jsonschema and validate
+        _name = manifest.metadata_.name
 
         # A manifest must exist in the namespace of an existing campaign
         # or the default namespace
-        _namespace: str | None = manifest.metadata_.pop("namespace", None)
+        _namespace: str | None = manifest.metadata_.namespace
         if _namespace is None:
             _namespace_uuid = _default_campaign_namespace
         else:
@@ -153,9 +136,8 @@ async def create_one_or_more_resources(
                     raise HTTPException(status_code=422, detail="Requested namespace does not exist.")
                 _namespace_uuid = _campaign_id
 
-        # A node must be a new version if name+namespace already exists
-        # - check db for node as name+namespace, get version and increment
-        _version = int(manifest.metadata_.pop("version", 0))
+        # A manifest must be a new version if name+namespace already exists
+        # check db for manifest as name+namespace, get version and increment
 
         s = (
             select(Manifest)
@@ -164,9 +146,9 @@ async def create_one_or_more_resources(
             .order_by(col(Manifest.version).desc())
             .limit(1)
         )
-        _previous = (await session.exec(s)).one_or_none()
 
-        _version = _previous.version if _previous else _version
+        _previous = (await session.exec(s)).one_or_none()
+        _version = _previous.version if _previous else manifest.metadata_.version
         _version += 1
         _manifest = Manifest(
             id=uuid5(_namespace_uuid, f"{_name}.{_version}"),
@@ -174,8 +156,8 @@ async def create_one_or_more_resources(
             namespace=_namespace_uuid,
             kind=manifest.kind,
             version=_version,
-            metadata_=manifest.metadata_,
-            spec=manifest.spec,
+            metadata_=manifest.metadata_.model_dump(),
+            spec=manifest.spec.model_dump(),
         )
 
         # Put the node in the database
@@ -214,7 +196,7 @@ async def update_manifest_resource(
     - This API always targets the latest version of a manifest when applying
       a patch. This requires and maintains a "linear" sequence of versions;
       it is not permissible to "patch" a previous version and create a "tree"-
-      like history of manifests. For exmaple, every manifest may be diffed
+      like history of manifests. For example, every manifest may be diffed
       against any previous version without having to consider branches.
     """
     use_rfc6902 = False
diff --git a/tests/v2/conftest.py b/tests/v2/conftest.py
index a9ed6d2c1..ccd19505c 100644
--- a/tests/v2/conftest.py
+++ b/tests/v2/conftest.py
@@ -4,12 +4,13 @@
 import os
 from collections.abc import AsyncGenerator, Generator
 from typing import TYPE_CHECKING
-from uuid import uuid4
+from uuid import NAMESPACE_DNS, uuid4
 
 import pytest
 import pytest_asyncio
 from fastapi.testclient import TestClient
 from httpx import ASGITransport, AsyncClient
+from sqlalchemy import insert
 from sqlalchemy.pool import NullPool
 from sqlalchemy.schema import CreateSchema, DropSchema
 from testcontainers.postgres import PostgresContainer
@@ -86,6 +87,14 @@ async def testdb(rawdb: DatabaseSessionDependency) -> AsyncGenerator[DatabaseSes
         await aconn.run_sync(metadata.drop_all)
         await aconn.execute(CreateSchema(config.db.table_schema, if_not_exists=True))
         await aconn.run_sync(metadata.create_all)
+        await aconn.execute(
+            insert(metadata.tables[f"{metadata.schema}.campaigns_v2"]).values(
+                id="dda54a0c-6878-5c95-ac4f-007f6808049e",
+                namespace=str(NAMESPACE_DNS),
+                name="DEFAULT",
+                owner="root",
+            )
+        )
         await aconn.commit()
     yield rawdb
     async with rawdb.engine.begin() as aconn:
diff --git a/tests/v2/test_campaign_routes.py b/tests/v2/test_campaign_routes.py
index 5545e1008..75a514055 100644
--- a/tests/v2/test_campaign_routes.py
+++ b/tests/v2/test_campaign_routes.py
@@ -3,19 +3,20 @@
 from uuid import NAMESPACE_DNS, uuid4, uuid5
 
 import pytest
-from httpx import AsyncClient, HTTPStatusError
+from httpx import AsyncClient
 
 pytestmark = pytest.mark.asyncio(loop_scope="module")
 """All tests in this module will run in the same event loop."""
 
 
-async def test_async_list_campaigns(aclient: AsyncClient) -> None:
+async def test_list_campaigns(aclient: AsyncClient) -> None:
+    """Tests listing the set of all campaigns."""
+    # initially, only the default campaign should be available.
     x = await aclient.get("/cm-service/v2/campaigns")
-    assert len(x.json()) == 0
-    assert True
+    assert len(x.json()) == 1
 
 
-async def test_async_list_campaign(aclient: AsyncClient) -> None:
+async def test_list_campaign(aclient: AsyncClient) -> None:
     """Tests lookup of a single campaign by name and by ID"""
     campaign_name = uuid4().hex[-8:]
 
@@ -47,9 +48,11 @@ async def test_async_list_campaign(aclient: AsyncClient) -> None:
     assert x.is_success
 
 
-async def test_async_create_campaign(aclient: AsyncClient) -> None:
+async def test_negative_campaign(aclient: AsyncClient) -> None:
+    """Tests campaign api negative results."""
     # Test failure to create campaign with invalid manifest (wrong kind)
     campaign_name = uuid4().hex[-8:]
+
     x = await aclient.post(
         "/cm-service/v2/campaigns",
         json={
@@ -61,11 +64,7 @@ async def test_async_create_campaign(aclient: AsyncClient) -> None:
             "spec": {},
         },
     )
-    with pytest.raises(HTTPStatusError):
-        assert x.status_code == 422
-        x.raise_for_status()
-
-    del x
+    assert x.is_client_error
 
     # Test failure to create campaign with incomplete manifest (missing name)
     x = await aclient.post(
@@ -77,11 +76,11 @@ async def test_async_create_campaign(aclient: AsyncClient) -> None:
             "spec": {},
         },
     )
-    with pytest.raises(HTTPStatusError):
-        assert x.status_code == 400
-        x.raise_for_status()
+    assert x.is_client_error
 
-    del x
+
+async def test_create_campaign(aclient: AsyncClient) -> None:
+    campaign_name = uuid4().hex[-8:]
 
     # Test successful campaign creation
     x = await aclient.post(
@@ -93,7 +92,6 @@ async def test_async_create_campaign(aclient: AsyncClient) -> None:
             "spec": {},
         },
     )
-
     assert x.is_success
 
     campaign = x.json()
@@ -124,7 +122,7 @@ async def test_async_create_campaign(aclient: AsyncClient) -> None:
     assert len(edges) == 0
 
 
-async def test_async_patch_campaign(aclient: AsyncClient) -> None:
+async def test_patch_campaign(aclient: AsyncClient) -> None:
     # Create a new campaign with spec data
     campaign_name = uuid4().hex[-8:]
     x = await aclient.post(
diff --git a/tests/v2/test_manifest_routes.py b/tests/v2/test_manifest_routes.py
index 589f3be26..0c4144e11 100644
--- a/tests/v2/test_manifest_routes.py
+++ b/tests/v2/test_manifest_routes.py
@@ -9,14 +9,14 @@
 """All tests in this module will run in the same event loop."""
 
 
-async def test_async_list_manifests(aclient: AsyncClient) -> None:
+async def test_list_manifests(aclient: AsyncClient) -> None:
     x = await aclient.get("/cm-service/v2/manifests")
     assert x.is_success
     assert len(x.json()) == 0
     assert True
 
 
-async def test_async_load_manifests(aclient: AsyncClient) -> None:
+async def test_load_manifests(aclient: AsyncClient) -> None:
     campaign_name = uuid4().hex[-8:]
 
     # Try to create a campaign manifest
@@ -82,6 +82,7 @@ async def test_async_load_manifests(aclient: AsyncClient) -> None:
         json={
             "kind": "campaign",
             "metadata": {"name": campaign_name},
+            "spec": {},
         },
     )
     assert x.is_success
@@ -128,9 +129,10 @@ async def test_async_load_manifests(aclient: AsyncClient) -> None:
     assert x.is_success
     manifests = x.json()
     assert len(manifests) == 3
+    assert manifests[-1]["spec"]["one"] == 1
 
 
-async def test_async_patch_manifest(aclient: AsyncClient) -> None:
+async def test_patch_manifest(aclient: AsyncClient) -> None:
     """Tests partial update of manifests and single resource retrieval."""
     campaign_name = uuid4().hex[-8:]
     manifest_name = uuid4().hex[-8:]
@@ -141,6 +143,7 @@ async def test_async_patch_manifest(aclient: AsyncClient) -> None:
         json={
             "kind": "campaign",
             "metadata": {"name": campaign_name},
+            "spec": {},
         },
     )
     assert x.is_success

From 444a743c09461fe64af310d0d76dc609d01dbe39 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Mon, 23 Jun 2025 16:37:25 -0500
Subject: [PATCH 23/37] feat(api): Add edge and node apis feat(api): Refactor
 node and edge models

---
 src/lsst/cmservice/db/campaigns_v2.py     |  80 ++------
 src/lsst/cmservice/db/manifests_v2.py     |  41 ++++
 src/lsst/cmservice/routers/v2/__init__.py |   4 +
 src/lsst/cmservice/routers/v2/edges.py    | 209 +++++++++++++++++++
 src/lsst/cmservice/routers/v2/nodes.py    | 236 ++++++++++++++++++++++
 tests/v2/test_edge_routes.py              | 142 +++++++++++++
 tests/v2/test_node_routes.py              | 130 ++++++++++++
 7 files changed, 779 insertions(+), 63 deletions(-)
 create mode 100644 src/lsst/cmservice/routers/v2/edges.py
 create mode 100644 src/lsst/cmservice/routers/v2/nodes.py
 create mode 100644 tests/v2/test_edge_routes.py
 create mode 100644 tests/v2/test_node_routes.py

diff --git a/src/lsst/cmservice/db/campaigns_v2.py b/src/lsst/cmservice/db/campaigns_v2.py
index 655fa9112..9f8d7bdef 100644
--- a/src/lsst/cmservice/db/campaigns_v2.py
+++ b/src/lsst/cmservice/db/campaigns_v2.py
@@ -1,3 +1,5 @@
+"""ORM Models for v2 tables and objects."""
+
 from datetime import datetime
 from typing import Any
 from uuid import NAMESPACE_DNS, UUID, uuid5
@@ -43,15 +45,6 @@ def jsonb_column(name: str, aliases: list[str] | None = None) -> Any:
     )
 
 
-# NOTES
-# - model validation is not triggered when table=True
-# - Every object model needs to have three flavors:
-#   1. the declarative model of the object's database table
-#   2. the model of the manifest when creating a new object
-#   3. the model of the manifest when updating an object
-#   4. a response model for APIs related to the object
-
-
 class BaseSQLModel(SQLModel):
     __table_args__ = {"schema": config.db.table_schema}
     metadata = metadata
@@ -71,10 +64,6 @@ class CampaignBase(BaseSQLModel):
     metadata_: dict = jsonb_column("metadata", aliases=["metadata", "metadata_"])
     configuration: dict = jsonb_column("configuration", aliases=["configuration", "data", "spec"])
 
-
-class CampaignModel(CampaignBase):
-    """model used for resource creation."""
-
     @model_validator(mode="before")
     @classmethod
     def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
@@ -83,7 +72,7 @@ def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
         """
         if isinstance(data, dict):
             if "name" not in data:
-                raise ValueError("'name' must be specified.")
+                raise ValueError("<campaign> name missing.")
             if "namespace" not in data:
                 data["namespace"] = _default_campaign_namespace
             if "id" not in data:
@@ -91,7 +80,7 @@ def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
         return data
 
 
-class Campaign(CampaignModel, table=True):
+class Campaign(CampaignBase, table=True):
     """Model used for database operations involving campaigns_v2 table rows"""
 
     __tablename__: str = "campaigns_v2"  # type: ignore[misc]
@@ -126,26 +115,25 @@ class NodeBase(BaseSQLModel):
     metadata_: dict = jsonb_column("metadata", aliases=["metadata", "metadata_"])
     configuration: dict = jsonb_column("configuration", aliases=["configuration", "data", "spec"])
 
-
-class NodeModel(NodeBase):
-    """model validating class for Nodes"""
-
     @model_validator(mode="before")
     @classmethod
     def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
+        """Validates the model based on different types of raw inputs,
+        where some default non-optional fields can be auto-populated.
+        """
         if isinstance(data, dict):
-            if "version" not in data:
-                data["version"] = 1
-            if "name" not in data:
-                raise ValueError("'name' must be specified.")
-            if "namespace" not in data:
-                data["namespace"] = _default_campaign_namespace
+            if (node_name := data.get("name")) is None:
+                raise ValueError("<node> name missing.")
+            if (node_namespace := data.get("namespace")) is None:
+                raise ValueError("<node> namespace missing.")
+            if (node_version := data.get("version")) is None:
+                data["version"] = node_version = 1
             if "id" not in data:
-                data["id"] = uuid5(namespace=data["namespace"], name=f"""{data["name"]}.{data["version"]}""")
+                data["id"] = uuid5(namespace=node_namespace, name=f"{node_name}.{node_version}")
         return data
 
 
-class Node(NodeModel, table=True):
+class Node(NodeBase, table=True):
     __tablename__: str = "nodes_v2"  # type: ignore[misc]
 
     machine: UUID | None = Field(foreign_key="machines_v2.id", default=None, ondelete="CASCADE")
@@ -163,28 +151,12 @@ class EdgeBase(BaseSQLModel):
     configuration: dict = jsonb_column("configuration", aliases=["configuration", "data", "spec"])
 
 
-class EdgeModel(EdgeBase):
-    """model validating class for Edges"""
-
-    @model_validator(mode="before")
-    @classmethod
-    def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
-        if isinstance(data, dict):
-            if "name" not in data:
-                raise ValueError("'name' must be specified.")
-            if "namespace" not in data:
-                raise ValueError("Edges may only exist in a 'namespace'.")
-            if "id" not in data:
-                data["id"] = uuid5(namespace=data["namespace"], name=data["name"])
-        return data
-
-
-class EdgeResponseModel(EdgeModel):
+class EdgeResponseModel(EdgeBase):
     source: Any
     target: Any
 
 
-class Edge(EdgeModel, table=True):
+class Edge(EdgeBase, table=True):
     __tablename__: str = "edges_v2"  # type: ignore[misc]
 
 
@@ -216,24 +188,6 @@ class ManifestBase(BaseSQLModel):
     spec: dict = jsonb_column("spec", aliases=["spec", "configuration", "data"])
 
 
-class ManifestModel(ManifestBase):
-    """model validating class for Manifests"""
-
-    @model_validator(mode="before")
-    @classmethod
-    def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
-        if isinstance(data, dict):
-            if "version" not in data:
-                data["version"] = 1
-            if "name" not in data:
-                raise ValueError("'name' must be specified.")
-            if "namespace" not in data:
-                data["namespace"] = _default_campaign_namespace
-            if "id" not in data:
-                data["id"] = uuid5(namespace=data["namespace"], name=f"""{data["name"]}.{data["version"]}""")
-        return data
-
-
 class Manifest(ManifestBase, table=True):
     __tablename__: str = "manifests_v2"  # type: ignore[misc]
 
diff --git a/src/lsst/cmservice/db/manifests_v2.py b/src/lsst/cmservice/db/manifests_v2.py
index 0b080ba43..af3cfde28 100644
--- a/src/lsst/cmservice/db/manifests_v2.py
+++ b/src/lsst/cmservice/db/manifests_v2.py
@@ -5,6 +5,7 @@
 """
 
 from typing import Self
+from uuid import uuid4
 
 from pydantic import AliasChoices, BaseModel, ConfigDict, Field, ValidationInfo, model_validator
 
@@ -99,3 +100,43 @@ def custom_model_validator(self, info: ValidationInfo) -> Self:
             raise ValueError("Campaigns may only be created from a <campaign> manifest")
 
         return self
+
+
+class EdgeMetadata(ManifestMetadata):
+    """Metadata model for an Edge Manifest.
+
+    A default random alphanumeric 8-byte name is generated if no name provided.
+    """
+
+    name: str = Field(default_factory=lambda: uuid4().hex[:8])
+
+
+class EdgeSpec(ManifestSpec):
+    """Spec model for an Edge Manifest."""
+
+    source: str
+    target: str
+
+
+class EdgeManifest(Manifest[EdgeMetadata, EdgeSpec]):
+    """validating model for Edges"""
+
+    @model_validator(mode="after")
+    def custom_model_validator(self, info: ValidationInfo) -> Self:
+        """Validate an Edge Manifest after a model has been created."""
+        if self.kind is not ManifestKind.edge:
+            raise ValueError("Edges may only be created from an <edge> manifest")
+
+        return self
+
+
+class NodeManifest(Manifest[VersionedMetadata, ManifestSpec]):
+    """validating model for Nodes"""
+
+    @model_validator(mode="after")
+    def custom_model_validator(self, info: ValidationInfo) -> Self:
+        """Validate a Node Manifest after a model has been created."""
+        if self.kind is not ManifestKind.node:
+            raise ValueError("Nodes may only be created from an <node> manifest")
+
+        return self
diff --git a/src/lsst/cmservice/routers/v2/__init__.py b/src/lsst/cmservice/routers/v2/__init__.py
index 94d0c1a86..938b69d99 100644
--- a/src/lsst/cmservice/routers/v2/__init__.py
+++ b/src/lsst/cmservice/routers/v2/__init__.py
@@ -2,7 +2,9 @@
 
 from . import (
     campaigns,
+    edges,
     manifests,
+    nodes,
 )
 
 router = APIRouter(
@@ -10,4 +12,6 @@
 )
 
 router.include_router(campaigns.router)
+router.include_router(edges.router)
 router.include_router(manifests.router)
+router.include_router(nodes.router)
diff --git a/src/lsst/cmservice/routers/v2/edges.py b/src/lsst/cmservice/routers/v2/edges.py
new file mode 100644
index 000000000..f3b65b20f
--- /dev/null
+++ b/src/lsst/cmservice/routers/v2/edges.py
@@ -0,0 +1,209 @@
+"""http routers for managing Edges.
+
+The /edges endpoint supports a collection resource and single resources
+representing edge objects within CM-Service.
+"""
+
+from collections.abc import Sequence
+from typing import Annotated
+from uuid import UUID, uuid5
+
+from fastapi import APIRouter, Depends, HTTPException, Query, Request, Response
+from sqlmodel import select
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+from ...common.logging import LOGGER
+from ...db.campaigns_v2 import Campaign, Edge
+from ...db.manifests_v2 import EdgeManifest
+from ...db.session import db_session_dependency
+
+# TODO should probably bind a logger to the fastapi app or something
+logger = LOGGER.bind(module=__name__)
+
+
+# Build the router
+router = APIRouter(
+    prefix="/edges",
+    tags=["edges", "v2"],
+)
+
+
+@router.get(
+    "/",
+    summary="Get a list of edges",
+)
+async def read_edges_collection(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    offset: Annotated[int, Query(ge=0)] = 0,
+    limit: Annotated[int, Query(le=100)] = 10,
+) -> Sequence[Edge]:
+    """Fetches and returns all edges known to the service.
+
+    Notes
+    -----
+    For campaign-scoped edges, one should use the /campaigns/{}/edges route.
+    """
+    try:
+        edges = await session.exec(select(Edge).offset(offset).limit(limit))
+        response.headers["Next"] = (
+            request.url_for("read_edges_collection")
+            .include_query_params(offset=(offset + limit), limit=limit)
+            .__str__()
+        )
+        response.headers["Previous"] = (
+            request.url_for("read_edges_collection")
+            .include_query_params(offset=(offset - limit), limit=limit)
+            .__str__()
+        )
+        return edges.all()
+    except Exception as msg:
+        logger.exception()
+        raise HTTPException(status_code=500, detail=f"{str(msg)}") from msg
+
+
+@router.get(
+    "/{edge_name}",
+    summary="Get edge detail",
+)
+async def read_edge_resource(
+    request: Request,
+    response: Response,
+    edge_name: str,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+) -> Edge:
+    """Fetch a single edge from the database given the edge name or id.
+
+    The response headers include links to the connected nodes, the associated
+    campaign, and to the graph with which the edge is associated (i.e., the
+    collection of all campaign edges).
+    """
+    s = select(Edge)
+    # The input could be UUID or a literal name.
+    try:
+        if edge_id := UUID(edge_name):
+            s = s.where(Edge.id == edge_id)
+    except ValueError:
+        s = s.where(Edge.name == edge_name)
+
+    edge = (await session.exec(s)).one_or_none()
+    if edge is None:
+        raise HTTPException(status_code=404)
+    response.headers["Self"] = request.url_for("read_edge_resource", edge_name=edge.id).__str__()
+    response.headers["Source"] = request.url_for("read_node_resource", node_name=edge.source).__str__()
+    response.headers["Target"] = request.url_for("read_node_resource", node_name=edge.target).__str__()
+    response.headers["Campaign"] = request.url_for(
+        "read_campaign_resource", campaign_name=edge.namespace
+    ).__str__()
+    response.headers["Graph"] = request.url_for(
+        "read_campaign_edge_collection", campaign_name=edge.namespace
+    ).__str__()
+    return edge
+
+
+@router.post(
+    "/",
+    summary="Add a edge resource",
+)
+async def create_edge_resource(
+    request: Request,
+    response: Response,
+    manifest: EdgeManifest,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+) -> Edge:
+    """Creates a new edge from a Manifest.
+
+    The Manifest must be of type "edge" and include a campaign namespace in its
+    metadata. If an edge name is not provided, a random name is assigned.
+
+    ```
+    ---
+    apiVersion: "io.lsst.cmservice/v1"
+    kind: edge
+    metadata:
+        name: {edge name}
+        namespace: {campaign uuid}
+    spec:
+        source: {node name or id}
+        target: {ndoe name or id}
+    ```
+    """
+    edge_name = manifest.metadata_.name
+    source_node = manifest.spec.source
+    target_node = manifest.spec.target
+
+    # A edge must exist in the namespace of an existing campaign
+    edge_namespace: str = manifest.metadata_.namespace
+    try:
+        edge_namespace_uuid: UUID | None = UUID(edge_namespace)
+    except ValueError:
+        # get the campaign ID by its name to use as a namespace
+        edge_namespace_uuid = (
+            await session.exec(select(Campaign.id).where(Campaign.name == edge_namespace))
+        ).one_or_none()
+
+    # it is an error if the provided namespace (campaign) does not exist
+    if edge_namespace_uuid is None:
+        raise HTTPException(status_code=422, detail="Requested campaign namespace does not exist.")
+
+    # an edge may specify the source and target nodes by name and version,
+    # which means the UUID of these nodes is deterministic, or we could go to
+    # the database to discover them + validate their existence.
+    # TODO the edge spec should support mappings for source/target nodes but
+    # for now assume the provided name has `.vN` appended to it already or
+    # default to v1
+    source_node = f"{source_node}.1" if "." not in source_node else str(source_node)
+    target_node = f"{target_node}.1" if "." not in target_node else str(target_node)
+
+    # An edge's name is not necessarily deterministic, so for the ID we'll
+    # construct a UUID5 that involves the nodes instead
+    edge_id = uuid5(edge_namespace_uuid, f"{source_node}->{target_node}")
+
+    edge = Edge(
+        id=edge_id,
+        name=edge_name,
+        namespace=edge_namespace_uuid,
+        source=uuid5(edge_namespace_uuid, source_node),
+        target=uuid5(edge_namespace_uuid, target_node),
+        configuration=manifest.spec.model_dump(),
+    )
+
+    # The merge operation is effectively an upsert should an edge matching the
+    # id already exist
+    edge = await session.merge(edge, load=True)
+    await session.commit()
+
+    response.headers["Self"] = request.url_for("read_edge_resource", edge_name=edge.id).__str__()
+    response.headers["Source"] = request.url_for("read_node_resource", node_name=edge.source).__str__()
+    response.headers["Target"] = request.url_for("read_node_resource", node_name=edge.target).__str__()
+    response.headers["Campaign"] = request.url_for(
+        "read_campaign_resource", campaign_name=edge.namespace
+    ).__str__()
+    response.headers["Graph"] = request.url_for(
+        "read_campaign_edge_collection", campaign_name=edge.namespace
+    ).__str__()
+    return edge
+
+
+@router.delete(
+    "/{edge_id}",
+    summary="Delete edge",
+    status_code=204,
+)
+async def delete_edge_resource(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    edge_id: UUID,
+) -> None:
+    """Delete an edge given its id."""
+    s = select(Edge).where(Edge.id == edge_id)
+    edge_to_delete = (await session.exec(s)).one_or_none()
+
+    if edge_to_delete is None:
+        raise HTTPException(status_code=404, detail="No such edge.")
+
+    await session.delete(edge_to_delete)
+    await session.commit()
+    return None
diff --git a/src/lsst/cmservice/routers/v2/nodes.py b/src/lsst/cmservice/routers/v2/nodes.py
new file mode 100644
index 000000000..11014633d
--- /dev/null
+++ b/src/lsst/cmservice/routers/v2/nodes.py
@@ -0,0 +1,236 @@
+"""http routers for managing Nodes.
+
+The /nodes endpoint supports a collection resource and single resources
+representing node objects within CM-Service.
+"""
+
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Annotated
+from uuid import UUID, uuid5
+
+from fastapi import APIRouter, Depends, HTTPException, Query, Request, Response
+from sqlmodel import col, select
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+from ...common.jsonpatch import JSONPatch, JSONPatchError, apply_json_patch
+from ...common.logging import LOGGER
+from ...db.campaigns_v2 import Campaign, Node
+from ...db.manifests_v2 import NodeManifest
+from ...db.session import db_session_dependency
+
+# TODO should probably bind a logger to the fastapi app or something
+logger = LOGGER.bind(module=__name__)
+
+
+# Build the router
+router = APIRouter(
+    prefix="/nodes",
+    tags=["nodes", "v2"],
+)
+
+
+@router.get(
+    "/",
+    summary="Get a list of nodes",
+)
+async def read_nodes_collection(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    offset: Annotated[int, Query(ge=0)] = 0,
+    limit: Annotated[int, Query(le=100)] = 10,
+) -> Sequence[Node]:
+    """Fetches and returns all nodes known to the service.
+
+    Notes
+    -----
+    For campaign-scoped nodes, one should use the /campaigns/{}/nodes route.
+    """
+    try:
+        nodes = await session.exec(select(Node).offset(offset).limit(limit))
+        response.headers["Next"] = (
+            request.url_for("read_nodes_collection")
+            .include_query_params(offset=(offset + limit), limit=limit)
+            .__str__()
+        )
+        response.headers["Previous"] = (
+            request.url_for("read_nodes_collection")
+            .include_query_params(offset=(offset - limit), limit=limit)
+            .__str__()
+        )
+        return nodes.all()
+    except Exception as msg:
+        logger.exception()
+        raise HTTPException(status_code=500, detail=f"{str(msg)}") from msg
+
+
+@router.get(
+    "/{node_name}",
+    summary="Get node detail",
+)
+async def read_node_resource(
+    request: Request,
+    response: Response,
+    node_name: str,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+) -> Node:
+    """Fetch a single node from the database given either the node id
+    or its name.
+    """
+    s = select(Node)
+    # The input could be a campaign UUID or it could be a literal name.
+    try:
+        if node_id := UUID(node_name):
+            s = s.where(Node.id == node_id)
+    except ValueError:
+        s = s.where(Node.name == node_name)
+
+    node = (await session.exec(s)).one_or_none()
+    if node is None:
+        raise HTTPException(status_code=404)
+    response.headers["Self"] = request.url_for("read_node_resource", node_name=node.id).__str__()
+    response.headers["Campaign"] = request.url_for(
+        "read_campaign_resource", campaign_name=node.namespace
+    ).__str__()
+    return node
+
+
+@router.post(
+    "/",
+    summary="Add a node resource",
+)
+async def create_node_resource(
+    request: Request,
+    response: Response,
+    manifest: NodeManifest,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+) -> Node:
+    node_name = manifest.metadata_.name
+    node_namespace = manifest.metadata_.namespace
+
+    try:
+        node_namespace_uuid: UUID | None = UUID(node_namespace)
+    except ValueError:
+        # get the campaign ID by its name to use as a namespace
+        node_namespace_uuid = (
+            await session.exec(select(Campaign.id).where(Campaign.name == node_namespace))
+        ).one_or_none()
+
+    # it is an error if the provided namespace (campaign) does not exist
+    # FIXME but this could also be handled by FK constraints
+    if node_namespace_uuid is None:
+        raise HTTPException(status_code=404, detail="Requested campaign namespace does not exist.")
+
+    # A node must be a new version if name+namespace already exists
+    # - check db for node as name+namespace, get current version and increment
+    node_version = int(manifest.metadata_.version)
+
+    s = (
+        select(Node)
+        .where(Node.name == node_name)
+        .where(Node.namespace == node_namespace_uuid)
+        .order_by(col(Node.version).desc())
+        .limit(1)
+    )
+    previous_node = (await session.exec(s)).one_or_none()
+
+    node_version = previous_node.version if previous_node else node_version
+    node_version += 1
+    node = Node(
+        id=uuid5(node_namespace_uuid, f"{node_name}.{node_version}"),
+        name=node_name,
+        namespace=node_namespace_uuid,
+        version=node_version,
+        configuration=manifest.spec.model_dump(),
+    )
+
+    # Put the node in the database
+    session.add(node)
+    await session.commit()
+    await session.refresh(node)
+    response.headers["Self"] = request.url_for("read_node_resource", node_name=node.id).__str__()
+    response.headers["Campaign"] = request.url_for(
+        "read_campaign_resource", campaign_name=node.namespace
+    ).__str__()
+    return node
+
+
+@router.patch(
+    "/{node_name_or_id}",
+    summary="Update node detail",
+    status_code=202,
+)
+async def update_node_resource(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    node_name_or_id: str,
+    patch_data: Sequence[JSONPatch],
+) -> Node:
+    """Partial update method for nodes.
+
+    A Nodes's spec or metadata may be updated with this PATCH operation. All
+    updates to a Node creates a new version of the Node instead of
+    updating an existing record in-place. This preserves history and keeps
+    previous node versions available.
+
+    A Node's name, id, kind, or namespace may not be modified by this
+    method, and attempts to do so will produce a 4XX client error.
+
+    This PATCH endpoint supports RFC6902 json-patch and RFCrequests.
+
+    Notes
+    -----
+    - This API always targets the latest version of a manifest when applying
+      a patch. This requires and maintains a "linear" sequence of versions;
+      it is not permissible to "patch" a previous version and create a "tree"-
+      like history of manifests. For exmaple, every manifest may be diffed
+      against any previous version without having to consider branches.
+    """
+    use_rfc6902 = False
+    if request.headers["Content-Type"] == "application/json-patch+json":
+        use_rfc6902 = True
+    else:
+        raise HTTPException(status_code=406, detail="Unsupported Content-Type")
+
+    if TYPE_CHECKING:
+        assert use_rfc6902
+
+    s = select(Node)
+    # The input could be a UUID or it could be a literal name.
+    try:
+        if _id := UUID(node_name_or_id):
+            s = s.where(Node.id == _id)
+    except ValueError:
+        s = s.where(Node.name == node_name_or_id)
+
+    # we want to order and sort by version, in descending order, so we always
+    # fetch only the most recent version of manifest
+    # FIXME this implies that when a node ID is provided, it should be an
+    # error if it is not the most recent version.
+    s = s.order_by(col(Node.version).desc()).limit(1)
+
+    old_manifest = (await session.exec(s)).one_or_none()
+    if old_manifest is None:
+        raise HTTPException(status_code=404, detail="No such node")
+
+    new_manifest = old_manifest.model_dump(by_alias=True)
+    new_manifest["version"] += 1
+    new_manifest["id"] = uuid5(new_manifest["namespace"], f"{new_manifest['name']}.{new_manifest['version']}")
+
+    for patch in patch_data:
+        try:
+            apply_json_patch(patch, new_manifest)
+        except JSONPatchError as e:
+            raise HTTPException(
+                status_code=422,
+                detail=f"Unable to process one or more patch operations: {e}",
+            )
+
+    # create Manifest from new_manifest, add to session, and commit
+    new_manifest_db = Node.model_validate(new_manifest)
+    session.add(new_manifest_db)
+    await session.commit()
+
+    # TODO response headers
+    return new_manifest_db
diff --git a/tests/v2/test_edge_routes.py b/tests/v2/test_edge_routes.py
new file mode 100644
index 000000000..1c8285dec
--- /dev/null
+++ b/tests/v2/test_edge_routes.py
@@ -0,0 +1,142 @@
+"""Tests v2 fastapi edge routes"""
+
+from uuid import uuid4
+
+import pytest
+from httpx import AsyncClient
+
+pytestmark = pytest.mark.asyncio(loop_scope="module")
+"""All tests in this module will run in the same event loop."""
+
+
+async def test_list_delete_no_edges(aclient: AsyncClient) -> None:
+    """Tests listing and deleting edges when there are no edges available."""
+    x = await aclient.get("/cm-service/v2/edges")
+    assert x.is_success
+    assert len(x.json()) == 0
+
+    x = await aclient.get(f"/cm-service/v2/edges/{uuid4()}")
+    assert x.status_code == 404
+
+    x = await aclient.delete(f"/cm-service/v2/edges/{uuid4()}")
+    assert x.status_code == 404
+
+
+async def test_edge_negative(aclient: AsyncClient) -> None:
+    """Tests edge route negative outcomes."""
+
+    # negative test: failing request model validation
+    x = await aclient.post(
+        "cm-service/v2/edges",
+        json={
+            "kind": "no_such_kind",
+        },
+    )
+    assert x.is_client_error
+
+    # negative test: using wrong manifest kind
+    x = await aclient.post(
+        "cm-service/v2/edges",
+        json={
+            "kind": "other",
+        },
+    )
+    assert x.is_client_error
+
+    # negative test: missing edge source or target
+    x = await aclient.post(
+        "cm-service/v2/edges",
+        json={
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[8:], "namespace": "test_campaign"},
+            "spec": {
+                "source": "START",
+            },
+        },
+    )
+    assert x.is_client_error
+
+    x = await aclient.post(
+        "cm-service/v2/edges",
+        json={
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[8:], "namespace": "test_campaign"},
+            "spec": {
+                "target": "END",
+            },
+        },
+    )
+    assert x.is_client_error
+
+    # negative test: missing campaign namespace
+    x = await aclient.post(
+        "cm-service/v2/edges",
+        json={
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[8:]},
+            "spec": {"source": "START", "target": "END"},
+        },
+    )
+    assert x.is_client_error
+
+    # negative: fail to delete an edge using a non-uuid string (like a name)
+    x = await aclient.delete(
+        "/cm-service/v2/edges/not_an_edge_id",
+    )
+    assert x.status_code == 422
+
+
+async def test_edge_lifecycle(aclient: AsyncClient) -> None:
+    """Tests edge lifecycle."""
+    campaign_name = uuid4().hex[:8]
+
+    # Create a campaign for edges. Campaigns come with START and END nodes.
+    x = await aclient.post(
+        "/cm-service/v2/campaigns",
+        json={
+            "kind": "campaign",
+            "metadata": {"name": campaign_name},
+            "spec": {},
+        },
+    )
+    assert x.is_success
+    campaign_id = x.json()["id"]
+
+    # Create an edge between START and END
+    x = await aclient.post(
+        "/cm-service/v2/edges",
+        json={
+            "kind": "edge",
+            "metadata": {
+                "name": uuid4().hex[8:],
+                "namespace": campaign_id,
+            },
+            "spec": {
+                "source": "START",
+                "target": "END",
+            },
+        },
+    )
+    assert x.is_success
+    assert "Campaign" in x.headers
+    edge = x.json()
+    edge_name = edge["name"]
+    edge_self_url = x.headers["Self"]
+    target_node_url = x.headers["Target"]
+    source_node_url = x.headers["Source"]
+
+    # Verify header links to source and target nodes
+    x = await aclient.get(source_node_url)
+    assert x.is_success
+    assert x.json()["name"] == "START"
+
+    x = await aclient.get(target_node_url)
+    assert x.is_success
+    assert x.json()["name"] == "END"
+
+    x = await aclient.get(f"/cm-service/v2/edges/{edge_name}")
+    assert x.is_success
+    edge = x.json()
+
+    x = await aclient.delete(f"{edge_self_url}")
+    assert x.is_success
diff --git a/tests/v2/test_node_routes.py b/tests/v2/test_node_routes.py
new file mode 100644
index 000000000..4ee5a2ddb
--- /dev/null
+++ b/tests/v2/test_node_routes.py
@@ -0,0 +1,130 @@
+"""Tests v2 fastapi node routes"""
+
+from uuid import uuid4
+
+import pytest
+from httpx import AsyncClient
+
+pytestmark = pytest.mark.asyncio(loop_scope="module")
+"""All tests in this module will run in the same event loop."""
+
+
+async def test_list_delete_no_nodes(aclient: AsyncClient) -> None:
+    """Tests listing nodes when there are no nodes available."""
+    x = await aclient.get("/cm-service/v2/nodes")
+    assert x.is_success
+    assert len(x.json()) == 0
+
+    x = await aclient.get(f"/cm-service/v2/nodes/{uuid4()}")
+    assert x.status_code == 404
+
+    # there is no delete api for nodes
+    x = await aclient.delete(f"/cm-service/v2/nodes/{uuid4()}")
+    assert x.status_code == 405
+
+
+async def test_node_negative(aclient: AsyncClient) -> None:
+    """Tests node route negative outcomes."""
+
+    # negative test: failing request model validation
+    x = await aclient.post(
+        "cm-service/v2/nodes",
+        json={
+            "kind": "no_such_kind",
+        },
+    )
+    assert x.is_client_error
+
+    # negative test: using wrong manifest kind
+    x = await aclient.post(
+        "cm-service/v2/nodes",
+        json={
+            "kind": "other",
+        },
+    )
+    assert x.is_client_error
+
+    # negative test: missing node name
+    x = await aclient.post(
+        "cm-service/v2/nodes",
+        json={
+            "kind": "node",
+            "metadata": {},
+            "spec": {},
+        },
+    )
+    assert x.is_client_error
+
+    # negative test: missing campaign namespace
+    x = await aclient.post(
+        "cm-service/v2/nodes",
+        json={
+            "kind": "node",
+            "metadata": {"name": uuid4().hex[8:]},
+            "spec": {},
+        },
+    )
+    assert x.is_client_error
+
+
+async def test_node_lifecycle(aclient: AsyncClient) -> None:
+    """Tests node lifecycle."""
+    campaign_name = uuid4().hex[:8]
+
+    # Create a campaign for edges. Campaigns come with START and END nodes.
+    x = await aclient.post(
+        "/cm-service/v2/campaigns",
+        json={
+            "kind": "campaign",
+            "metadata": {"name": campaign_name},
+            "spec": {},
+        },
+    )
+    assert x.is_success
+    campaign_id = x.json()["id"]
+
+    # Create a new campaign node
+    x = await aclient.post(
+        "/cm-service/v2/nodes",
+        json={
+            "kind": "node",
+            "metadata": {"name": uuid4().hex[8:], "namespace": campaign_id},
+            "spec": {
+                "handler": "lsst.cmservice.handlers.element_handler.ElementHandler",
+                "pipeline_yaml": "${DRP_PIPE_DIR}/pipelines/HSC/DRP-RC2.yaml#step1",
+                "query": [{"instrument": "HSC"}, {"skymap": "hsc_rings_v1"}],
+                "split": {
+                    "dataset": "raw",
+                    "field": "exposure",
+                    "method": "query",
+                    "minGroups": 3,
+                    "maxInFlight": 3,
+                },
+            },
+        },
+    )
+    assert x.is_success
+    node = x.json()
+    assert node["version"] == 1
+    node_url = x.headers["Self"]
+
+    # Edit a Node using RFC6902 json-patch
+    x = await aclient.patch(
+        node_url,
+        headers={"Content-Type": "application/json-patch+json"},
+        json=[
+            {"op": "replace", "path": "/configuration/split/maxInFlight", "value": 4},
+            {
+                "op": "add",
+                "path": "/configuration/query/-",
+                "value": {"dimension": "fact"},
+            },
+        ],
+    )
+    assert x.is_success
+    node = x.json()
+
+    # test that the updates have been made and the version has been bumped
+    assert node["configuration"]["split"]["maxInFlight"] == 4
+    assert node["configuration"]["query"][-1]["dimension"] == "fact"
+    assert node["version"] == 2

From e0aa818f24d09801705f674f0d58eb87a97befcc Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Thu, 26 Jun 2025 16:14:29 -0500
Subject: [PATCH 24/37] feat(graph): Implement graph functions

---
 src/lsst/cmservice/common/graph.py     | 121 +++++++++++++-
 src/lsst/cmservice/db/campaigns_v2.py  |   8 +-
 src/lsst/cmservice/routers/v2/edges.py |   3 +-
 tests/v2/test_graph.py                 | 217 +++++++++++++++++++++++++
 4 files changed, 346 insertions(+), 3 deletions(-)
 create mode 100644 tests/v2/test_graph.py

diff --git a/src/lsst/cmservice/common/graph.py b/src/lsst/cmservice/common/graph.py
index f2a1e71e8..42086aafb 100644
--- a/src/lsst/cmservice/common/graph.py
+++ b/src/lsst/cmservice/common/graph.py
@@ -1,8 +1,10 @@
-from collections.abc import Mapping, Sequence
+from collections.abc import Iterable, Mapping, MutableSet, Sequence
 
 import networkx as nx
+from sqlalchemy import select
 
 from ..db import Script, ScriptDependency, Step, StepDependency
+from ..db.campaigns_v2 import Edge, Node
 from ..parsing.string import parse_element_fullname
 from .types import AnyAsyncSession
 
@@ -35,8 +37,125 @@ async def graph_from_edge_list(
     return g
 
 
+async def graph_from_edge_list_v2(
+    edges: Sequence[Edge],
+    node_type: type[Node],
+    session: AnyAsyncSession,
+) -> nx.DiGraph:
+    """Given a sequence of Edges, create a directed graph for these
+    edges with nodes derived from database lookups of the related objects.
+    """
+    g = nx.DiGraph()
+    g.add_edges_from([(e.source, e.target) for e in edges])
+
+    # The graph understands the nodes in terms of the IDs used in the edges,
+    # but we want to hydrate the entire Node model for subsequent users of this
+    # graph to reference without dipping back to the Database.
+    for node in g.nodes:
+        s = select(Node).where(Node.id == node)
+        db_node: Node = (await session.execute(s)).scalars().one()
+
+        # This Node is going on an adventure where it does not need to drag its
+        # SQLAlchemy baggage along, so we expunge it from the session before
+        # adding it to the graph.
+        session.expunge(db_node)
+        g.nodes[node]["model"] = db_node
+
+    # TODO validate graph now raise exception, or leave it to the caller?
+    return g
+
+
 def graph_to_dict(g: nx.DiGraph) -> Mapping:
     """Renders a networkx directed graph to a mapping format suitable for JSON
     serialization.
     """
     return nx.node_link_data(g, edges="edges")
+
+
+def validate_graph(g: nx.DiGraph, source: str = "START", sink: str = "END") -> bool:
+    """Validates a graph by asserting by traversal that a complete and correct
+    path exists between `source` and `sink` nodes.
+
+    "Correct" means that there are no cycles or isolate nodes (nodes with
+    degree 0) and no nodes with degree 1.
+    """
+    try:
+        # Test that G is a directed graph with no cycles
+        is_valid = nx.is_directed_acyclic_graph(g)
+        assert is_valid
+
+        # And that any path from source to sink exists
+        is_valid = nx.has_path(g, source, sink)
+        assert is_valid
+
+        # Guard against bad graphs where START and/or END have been connected
+        # such that they are no longer the only source and sink
+        ...
+
+        # Test that there are no isolated Nodes in the graph. A node becomes
+        # isolated if it was involved with an edge that has been removed from
+        # G with no replacement edge added, in which case the node should also
+        # be removed.
+        is_valid = nx.number_of_isolates(g) == 0
+        assert is_valid
+
+        # TODO Given the set of nodes in the graph, consider all paths in G
+        #      from source to sink, making sure every node appears in a path?
+
+        # Every node in G that is not the START/END node must have a degree
+        # of at least 2 (one inbound and one outbound edge). If G has any
+        # node with a degree of 1, it cannot be considered valid.
+        g_degree_view: Iterable = nx.degree(g, (n for n in g.nodes if n not in [source, sink]))
+        is_valid = min([d[1] for d in g_degree_view]) > 1
+        assert is_valid
+    except (nx.exception.NodeNotFound, AssertionError):
+        return False
+    return True
+
+
+def processable_graph_nodes(g: nx.DiGraph) -> Iterable[Node]:
+    """Traverse the graph G and produce an iterator of any nodes that are
+    candidates for processing, i.e., their status is waiting/prepared/running
+    and their ancestors are complete/successful. Graph nodes in a failed state
+    will block the graph and prevent candidacy for subsequent nodes.
+
+    Yields
+    ------
+    `lsst.cmservice.db.campaigns_v2.Node`
+        A Node ORM object that has been ``expunge``d from its ``Session``.
+
+    Notes
+    -----
+    This function operates only on valid graphs (see `validate_graph()`) that
+    have been built by the `graph_from_edge_list_v2()` function, where each
+    graph-node is decorated with a "model" attribute referring to an expunged
+    instance of ``Node``. This ``Node`` can be ``add``ed back to a ``Session``
+    and manipulated in the usual way.
+    """
+    processable_nodes: MutableSet[Node] = set()
+
+    # A valid campaign graph will have only one source (START) with in_degree 0
+    # and only one sink (END) with out_degree 0
+    source = next(v for v, d in g.in_degree() if d == 0)
+    sink = next(v for v, d in g.out_degree() if d == 0)
+
+    # For each path through the graph, evaluate the state of nodes to determine
+    # which nodes are up for processing. When there are multiple paths, we have
+    # parallelization and common ancestors may be evaluated more than once,
+    # which is an exercise in optimization left as a TODO
+    for path in nx.all_simple_paths(g, source, sink):
+        for n in path:
+            node: Node = g.nodes[n]["model"]
+            if node.status.is_processable_element():
+                processable_nodes.add(node)
+                # We found a processable node in this path, stop traversal
+                break
+            elif node.status.is_bad():
+                # We reached a failed node in this path, it is blocked
+                break
+            else:
+                # This node must be in a "successful" terminal state
+                continue
+
+    # the inspection should stop when there are no more nodes to check
+    yield from processable_nodes
diff --git a/src/lsst/cmservice/db/campaigns_v2.py b/src/lsst/cmservice/db/campaigns_v2.py
index 9f8d7bdef..8350f43aa 100644
--- a/src/lsst/cmservice/db/campaigns_v2.py
+++ b/src/lsst/cmservice/db/campaigns_v2.py
@@ -100,6 +100,12 @@ class CampaignUpdate(BaseSQLModel):
 class NodeBase(BaseSQLModel):
     """nodes_v2 db table"""
 
+    def __hash__(self) -> int:
+        """A Node is hashable according to its unique ID, so it can be used in
+        sets and other places hashable types are required.
+        """
+        return self.id.int
+
     id: UUID = Field(primary_key=True)
     name: str
     namespace: UUID
@@ -108,7 +114,7 @@ class NodeBase(BaseSQLModel):
         default=ManifestKind.other,
         sa_column=Column("kind", Enum(ManifestKind, length=20, native_enum=False, create_constraint=False)),
     )
-    status: StatusField | None = Field(
+    status: StatusField = Field(
         default=StatusEnum.waiting,
         sa_column=Column("status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)),
     )
diff --git a/src/lsst/cmservice/routers/v2/edges.py b/src/lsst/cmservice/routers/v2/edges.py
index f3b65b20f..20b35faae 100644
--- a/src/lsst/cmservice/routers/v2/edges.py
+++ b/src/lsst/cmservice/routers/v2/edges.py
@@ -126,7 +126,7 @@ async def create_edge_resource(
         namespace: {campaign uuid}
     spec:
         source: {node name or id}
-        target: {ndoe name or id}
+        target: {node name or id}
     ```
     """
     edge_name = manifest.metadata_.name
@@ -153,6 +153,7 @@ async def create_edge_resource(
     # TODO the edge spec should support mappings for source/target nodes but
     # for now assume the provided name has `.vN` appended to it already or
     # default to v1
+    # TODO support node id in spec
     source_node = f"{source_node}.1" if "." not in source_node else str(source_node)
     target_node = f"{target_node}.1" if "." not in target_node else str(target_node)
 
diff --git a/tests/v2/test_graph.py b/tests/v2/test_graph.py
new file mode 100644
index 000000000..dce353d67
--- /dev/null
+++ b/tests/v2/test_graph.py
@@ -0,0 +1,217 @@
+"""Tests graph operations using v2 objects"""
+
+from collections.abc import AsyncGenerator
+from uuid import uuid4
+
+import networkx as nx
+import pytest
+import pytest_asyncio
+from httpx import AsyncClient
+
+from lsst.cmservice.common.enums import StatusEnum
+from lsst.cmservice.common.graph import graph_from_edge_list_v2, processable_graph_nodes, validate_graph
+from lsst.cmservice.common.types import AnyAsyncSession
+from lsst.cmservice.db.campaigns_v2 import Edge, Node
+
+pytestmark = pytest.mark.asyncio(loop_scope="module")
+"""All tests in this module will run in the same event loop."""
+
+
+@pytest_asyncio.fixture(scope="module", loop_scope="module")
+async def test_campaign(aclient: AsyncClient) -> AsyncGenerator[str]:
+    """Fixture managing a test campaign with two (additional) nodes."""
+    campaign_name = uuid4().hex[-8:]
+    node_ids = []
+
+    x = await aclient.post(
+        "/cm-service/v2/campaigns",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "campaign",
+            "metadata": {"name": campaign_name},
+            "spec": {},
+        },
+    )
+    campaign_edge_url = x.headers["Edges"]
+    campaign = x.json()
+
+    # create a trio of nodes for the campaign
+    for _ in range(3):
+        x = await aclient.post(
+            "/cm-service/v2/nodes",
+            json={
+                "apiVersion": "io.lsst.cmservice/v1",
+                "kind": "node",
+                "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+                "spec": {},
+            },
+        )
+        node = x.json()
+        node_ids.append(node["name"])
+
+    # Create edges between each campaign node with parallelization
+    _ = await aclient.post(
+        "/cm-service/v2/edges",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+            "spec": {
+                "source": "START",
+                "target": node_ids[0],
+            },
+        },
+    )
+    _ = await aclient.post(
+        "/cm-service/v2/edges",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+            "spec": {
+                "source": node_ids[0],
+                "target": node_ids[1],
+            },
+        },
+    )
+    _ = await aclient.post(
+        "/cm-service/v2/edges",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+            "spec": {
+                "source": node_ids[0],
+                "target": node_ids[2],
+            },
+        },
+    )
+    _ = await aclient.post(
+        "/cm-service/v2/edges",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+            "spec": {
+                "source": node_ids[1],
+                "target": "END",
+            },
+        },
+    )
+    _ = await aclient.post(
+        "/cm-service/v2/edges",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+            "spec": {
+                "source": node_ids[2],
+                "target": "END",
+            },
+        },
+    )
+    yield campaign_edge_url
+
+
+async def test_build_and_walk_graph(
+    aclient: AsyncClient, session: AnyAsyncSession, test_campaign: str
+) -> None:
+    """Test the generation and traversal of a campaign graph as created in the
+    ``test_campaign`` fixture.
+
+    Test that the graph is traversed from START to END in order, and that as
+    graph nodes are "processable" they can be handled. In this test, the status
+    of each node is set to "accepted" and updated in the databse. The campaign
+    graph is recreated between each stage of the mock graph processing.
+
+    The test campaign is a set of 3 nodes arranged in a graph:
+
+    ```
+    START --> A --> B --> END
+                --> C -->
+    ```
+    """
+    edge_list = [Edge.model_validate(edge) for edge in (await aclient.get(test_campaign)).json()]
+    graph = await graph_from_edge_list_v2(edge_list, Node, session)
+
+    # the START node should be the only processable Node
+    for node in processable_graph_nodes(graph):
+        assert node.name == "START"
+        assert node.status is StatusEnum.waiting
+        # Add the Node back to the session and update its status
+        session.add(node)
+        await session.refresh(node)
+        node.status = StatusEnum.accepted
+        await session.commit()
+
+    # Repeat the graph building and traversal, this time expecting a single
+    # node that is not "START"
+    graph = await graph_from_edge_list_v2(edge_list, Node, session)
+    for node in processable_graph_nodes(graph):
+        assert node.name != "START"
+        assert node.status is StatusEnum.waiting
+        # Add the Node back to the session and update its status
+        session.add(node)
+        await session.refresh(node)
+        node.status = StatusEnum.accepted
+        await session.commit()
+
+    # Repeat the graph building and traversal, this time expecting a pair of
+    # nodes processable in parallel
+    graph = await graph_from_edge_list_v2(edge_list, Node, session)
+    count = 0
+    for node in processable_graph_nodes(graph):
+        count += 1
+        assert node.name != "START"
+        assert node.status is StatusEnum.waiting
+        # Add the Node back to the session and update its status
+        session.add(node)
+        await session.refresh(node)
+        node.status = StatusEnum.accepted
+        await session.commit()
+    assert count == 2
+
+    # Finally, expect the END node
+    graph = await graph_from_edge_list_v2(edge_list, Node, session)
+    for node in processable_graph_nodes(graph):
+        assert node.name == "END"
+        assert node.status is StatusEnum.waiting
+        # Add the Node back to the session and update its status
+        session.add(node)
+        await session.refresh(node)
+        node.status = StatusEnum.accepted
+        await session.commit()
+
+
+def test_validate_graph() -> None:
+    """Test basic graph validation operations using a simple DAG."""
+    edge_list = [("A", "B"), ("B", "C"), ("C", "D"), ("C", "E"), ("D", "F"), ("E", "F")]
+
+    g = nx.DiGraph()
+    g.add_edges_from(edge_list)
+
+    # this is a valid graph
+    assert validate_graph(g, "A", "F")
+
+    # add a new parallel node with no path to sink
+    g.add_edge("C", "CC")
+    assert not validate_graph(g, "A", "F")
+
+    # create a cycle with the new node
+    g.add_edge("CC", "A")
+    assert not validate_graph(g, "A", "F")
+
+    # correct the path
+    g.remove_edge("CC", "A")
+    g.add_edge("CC", "F")
+    assert validate_graph(g, "A", "F")
+
+    # remove the edges from a node
+    g.remove_edge("CC", "F")
+    g.remove_edge("C", "CC")
+    # the graph is invalid because "CC" is now an isolate
+    assert not validate_graph(g, "A", "F")
+
+    # remove the unneeded node
+    g.remove_node("CC")
+    assert validate_graph(g, "A", "F")

From c7911b3aed6e52f767bc533b2069385a2ddd6e54 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Fri, 27 Jun 2025 11:32:39 -0500
Subject: [PATCH 25/37] feat(api): Implement v2 campaign graph api

---
 src/lsst/cmservice/common/graph.py         | 39 +++++++++++++-
 src/lsst/cmservice/routers/v2/campaigns.py | 60 ++++++++++++++++++++--
 tests/v2/test_graph.py                     | 23 +++++++--
 3 files changed, 111 insertions(+), 11 deletions(-)

diff --git a/src/lsst/cmservice/common/graph.py b/src/lsst/cmservice/common/graph.py
index 42086aafb..184c20917 100644
--- a/src/lsst/cmservice/common/graph.py
+++ b/src/lsst/cmservice/common/graph.py
@@ -1,4 +1,5 @@
 from collections.abc import Iterable, Mapping, MutableSet, Sequence
+from typing import Literal
 
 import networkx as nx
 from sqlalchemy import select
@@ -39,14 +40,31 @@ async def graph_from_edge_list(
 
 async def graph_from_edge_list_v2(
     edges: Sequence[Edge],
-    node_type: type[Node],
     session: AnyAsyncSession,
+    node_type: type[Node] = Node,
+    node_view: Literal["simple", "model"] = "model",
 ) -> nx.DiGraph:
     """Given a sequence of Edges, create a directed graph for these
     edges with nodes derived from database lookups of the related objects.
+
+    Parameters
+    ----------
+    edges: Sequence[Edge]
+        The list of edges forming the graph
+
+    node_type: type
+        The pydantic or sqlmodel class representing the graph node model
+
+    node_view: "simple" or "model"
+        Whether the node metadata in the graph should be simplified (dict) or
+        using the full expunged model form.
+
+    session
+        An async database session
     """
     g = nx.DiGraph()
     g.add_edges_from([(e.source, e.target) for e in edges])
+    relabel_mapping = {}
 
     # The graph understands the nodes in terms of the IDs used in the edges,
     # but we want to hydrate the entire Node model for subsequent users of this
@@ -59,7 +77,19 @@ async def graph_from_edge_list_v2(
         # SQLAlchemy baggage along, so we expunge it from the session before
         # adding it to the graph.
         session.expunge(db_node)
-        g.nodes[node]["model"] = db_node
+        if node_view == "simple":
+            # 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]["status"] = db_node.status.name
+            g.nodes[node]["kind"] = db_node.kind.name
+            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
@@ -68,6 +98,11 @@ async def graph_from_edge_list_v2(
 def graph_to_dict(g: nx.DiGraph) -> Mapping:
     """Renders a networkx directed graph to a mapping format suitable for JSON
     serialization.
+
+    Notes
+    -----
+    The "edges" attribute name in the node link data is "edges" instead of the
+    default "links".
     """
     return nx.node_link_data(g, edges="edges")
 
diff --git a/src/lsst/cmservice/routers/v2/campaigns.py b/src/lsst/cmservice/routers/v2/campaigns.py
index dfcb80339..3e615d8c7 100644
--- a/src/lsst/cmservice/routers/v2/campaigns.py
+++ b/src/lsst/cmservice/routers/v2/campaigns.py
@@ -4,7 +4,7 @@
 representing campaign objects within CM-Service.
 """
 
-from collections.abc import Sequence
+from collections.abc import Mapping, Sequence
 from typing import TYPE_CHECKING, Annotated
 from uuid import UUID, uuid5
 
@@ -13,6 +13,7 @@
 from sqlmodel import col, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
+from ...common.graph import graph_from_edge_list_v2, graph_to_dict
 from ...common.logging import LOGGER
 from ...db.campaigns_v2 import Campaign, CampaignUpdate, Edge, Node
 from ...db.manifests_v2 import CampaignManifest
@@ -40,7 +41,9 @@ async def read_campaign_collection(
     limit: Annotated[int, Query(le=100)] = 10,
     offset: Annotated[int, Query()] = 0,
 ) -> Sequence[Campaign]:
-    """..."""
+    """A paginated API returning a list of all Campaigns known to the
+    application.
+    """
     try:
         campaigns = await session.exec(select(Campaign).offset(offset).limit(limit))
 
@@ -187,7 +190,9 @@ async def read_campaign_node_collection(
     limit: Annotated[int, Query(le=100)] = 10,
     offset: Annotated[int, Query()] = 0,
 ) -> Sequence[Node]:
-    # This is a convenience api that could also be `/nodes?campaign=...
+    """A paginated API returning a list of all Nodes in the namespace of a
+    single Campaign.
+    """
 
     # The input could be a campaign UUID or it could be a literal name.
     # TODO this could just as well be a campaign query with a join to nodes
@@ -222,7 +227,10 @@ async def read_campaign_edge_collection(
     *,
     resolve_names: bool = False,
 ) -> Sequence[Edge]:
-    # This is a convenience api that could also be `/edges?campaign=...
+    """A paginated API returning a list of all Edges in the namespace of a
+    single Campaign. This list of Edges can be used to construct the Campaign
+    graph.
+    """
 
     # The input could be a campaign UUID or it could be a literal name.
     # This is why raw SQL is better than ORMs
@@ -301,6 +309,7 @@ async def create_campaign_resource(
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
     manifest: CampaignManifest,
 ) -> Campaign:
+    """An API to create a Campaign from an appropriate Manifest."""
     # Create a campaign spec from the manifest, delegating the creation of new
     # dynamic fields to the model validation method, -OR- create new dynamic
     # fields here.
@@ -333,3 +342,46 @@ async def create_campaign_resource(
     )
 
     return campaign
+
+
+@router.get(
+    "/{campaign_name_or_id}/graph",
+    status_code=200,
+    summary="Construct and return a Campaign's graph of nodes",
+)
+async def read_campaign_graph(
+    request: Request,
+    response: Response,
+    campaign_name_or_id: str,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+) -> Mapping:
+    """Reads the graph resource for a campaign and returns its JSON represent-
+    ation as serialized by the ``networkx.node_link_data()` function, i.e, the
+    "node-link format".
+    """
+
+    # The input could be a campaign UUID or it could be a literal name.
+    campaign_id: UUID | None
+    try:
+        campaign_id = UUID(campaign_name_or_id)
+    except ValueError:
+        s = select(Campaign.id).where(Campaign.name == campaign_name_or_id)
+        campaign_id = (await session.exec(s)).one_or_none()
+
+    if campaign_id is None:
+        raise HTTPException(status_code=404, detail="No such campaign found.")
+
+    # Fetch the Edges for the campaign
+    statement = select(Edge).filter_by(namespace=campaign_id)
+    edges = (await session.exec(statement)).all()
+
+    # Organize the edges into a graph. The graph nodes are annotated with their
+    # current database attributes.
+    # TODO it makes sense for the graph to include expunged Nodes in the meta-
+    # data for campaign processing, but for the purposes of this api route,
+    # only the most relevant information should be associated with each node,
+    # e.g., its name, status, id, and its URL
+    graph = await graph_from_edge_list_v2(edges=edges, node_type=Node, session=session, node_view="simple")
+
+    response.headers["Self"] = ""
+    return graph_to_dict(graph)
diff --git a/tests/v2/test_graph.py b/tests/v2/test_graph.py
index dce353d67..3f57d3444 100644
--- a/tests/v2/test_graph.py
+++ b/tests/v2/test_graph.py
@@ -11,7 +11,7 @@
 from lsst.cmservice.common.enums import StatusEnum
 from lsst.cmservice.common.graph import graph_from_edge_list_v2, processable_graph_nodes, validate_graph
 from lsst.cmservice.common.types import AnyAsyncSession
-from lsst.cmservice.db.campaigns_v2 import Edge, Node
+from lsst.cmservice.db.campaigns_v2 import Edge
 
 pytestmark = pytest.mark.asyncio(loop_scope="module")
 """All tests in this module will run in the same event loop."""
@@ -132,7 +132,7 @@ async def test_build_and_walk_graph(
     ```
     """
     edge_list = [Edge.model_validate(edge) for edge in (await aclient.get(test_campaign)).json()]
-    graph = await graph_from_edge_list_v2(edge_list, Node, session)
+    graph = await graph_from_edge_list_v2(edge_list, session)
 
     # the START node should be the only processable Node
     for node in processable_graph_nodes(graph):
@@ -146,7 +146,7 @@ async def test_build_and_walk_graph(
 
     # Repeat the graph building and traversal, this time expecting a single
     # node that is not "START"
-    graph = await graph_from_edge_list_v2(edge_list, Node, session)
+    graph = await graph_from_edge_list_v2(edge_list, session)
     for node in processable_graph_nodes(graph):
         assert node.name != "START"
         assert node.status is StatusEnum.waiting
@@ -158,7 +158,7 @@ async def test_build_and_walk_graph(
 
     # Repeat the graph building and traversal, this time expecting a pair of
     # nodes processable in parallel
-    graph = await graph_from_edge_list_v2(edge_list, Node, session)
+    graph = await graph_from_edge_list_v2(edge_list, session)
     count = 0
     for node in processable_graph_nodes(graph):
         count += 1
@@ -172,7 +172,7 @@ async def test_build_and_walk_graph(
     assert count == 2
 
     # Finally, expect the END node
-    graph = await graph_from_edge_list_v2(edge_list, Node, session)
+    graph = await graph_from_edge_list_v2(edge_list, session)
     for node in processable_graph_nodes(graph):
         assert node.name == "END"
         assert node.status is StatusEnum.waiting
@@ -215,3 +215,16 @@ def test_validate_graph() -> None:
     # remove the unneeded node
     g.remove_node("CC")
     assert validate_graph(g, "A", "F")
+
+
+async def test_campaign_graph_route(aclient: AsyncClient, test_campaign: str) -> None:
+    """Tests the acquisition of a serialized graph from a REST endpoint and
+    the subsequent reconstruction of a valid graph from the node-link data.
+    """
+    graph_url = test_campaign.replace("/edges", "/graph")
+    x = await aclient.get(graph_url)
+    assert x.is_success
+
+    # Test reconstruction of the serialized graph
+    graph = nx.node_link_graph(x.json(), edges="edges")
+    assert validate_graph(graph)

From 4a6923a5fd62f2b6c0cf314cb91275409f892a9c Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Fri, 27 Jun 2025 14:51:17 -0500
Subject: [PATCH 26/37] feat(jsonpatch): implement RFC7396 json patch function

---
 src/lsst/cmservice/common/jsonpatch.py | 32 ++++++++++++++++++++++++--
 tests/common/test_jsonpatch.py         | 16 ++++++++++++-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/lsst/cmservice/common/jsonpatch.py b/src/lsst/cmservice/common/jsonpatch.py
index b57ce69af..5c0768060 100644
--- a/src/lsst/cmservice/common/jsonpatch.py
+++ b/src/lsst/cmservice/common/jsonpatch.py
@@ -3,7 +3,7 @@
 """
 
 import operator
-from collections.abc import MutableMapping, MutableSequence
+from collections.abc import Mapping, MutableMapping, MutableSequence
 from functools import reduce
 from typing import TYPE_CHECKING, Any, Literal
 
@@ -51,7 +51,7 @@ def apply_json_patch[T: MutableMapping](op: JSONPatch, o: T) -> T:
       numeric, e.g., {"1": "first", "2": "second"}
     - Unsupported: JSON pointer values that refer to an entire object, e.g.,
       "" -- the JSON Patch must have a root element ("/") per the model.
-    - Unsupported: JSON pointer values taht refer to a nameless object, e.g.,
+    - Unsupported: JSON pointer values that refer to a nameless object, e.g.,
       "/" -- JSON allows object keys to be the empty string ("") but this is
       disallowed by the application.
     """
@@ -222,3 +222,31 @@ def apply_json_patch[T: MutableMapping](op: JSONPatch, o: T) -> T:
             raise JSONPatchError(f"Unknown JSON Patch operation: {op.op}")
 
     return o
+
+
+def apply_json_merge[T: MutableMapping](patch: Any, o: T) -> T:
+    """Applies a patch to a mapping object as per the RFC7396 JSON Merge Patch.
+
+    Notably, this operation may only target a ``MutableMapping`` as an analogue
+    of a JSON object. This means that any keyed value in a Mapping may be
+    replaced, added, or removed by a JSON Merge. This is not appropriate for
+    patches that need to perform more tactical updates, such as modifying
+    elements of a ``Sequence``.
+
+    This function does not allow setting a field value in the target to `None`;
+    instead, any `None` value in a patch is an instruction to remove that
+    field from the target completely.
+
+    This function differs from the RFC in the following ways: it will not
+    replace the entire target object with a new mapping (i.e., the target must
+    be a Mapping).
+    """
+    if isinstance(patch, Mapping):
+        for k, v in patch.items():
+            if v is None:
+                _ = o.pop(k, None)
+            else:
+                o[k] = apply_json_merge(v, o.get(k, {}))
+        return o
+    else:
+        return patch
diff --git a/tests/common/test_jsonpatch.py b/tests/common/test_jsonpatch.py
index 73e823914..912bdc3d9 100644
--- a/tests/common/test_jsonpatch.py
+++ b/tests/common/test_jsonpatch.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from lsst.cmservice.common.jsonpatch import JSONPatch, JSONPatchError, apply_json_patch
+from lsst.cmservice.common.jsonpatch import JSONPatch, JSONPatchError, apply_json_merge, apply_json_patch
 
 
 @pytest.fixture
@@ -148,3 +148,17 @@ def test_jsonpatch_test(target_object: dict[str, Any]) -> None:
     op = JSONPatch(op="test", path="/spec/a_list/-", value="bob_alice")
     with pytest.raises(JSONPatchError):
         _ = apply_json_patch(op, target_object)
+
+
+def test_json_merge_patch(target_object: dict[str, Any]) -> None:
+    """Tests the RFC7396 JSON Merge patch function."""
+
+    patch = {
+        "metadata": {"owner": None, "pilot": "bob_loblaw"},
+        "spec": {"new_key": {"new_key": "new_value"}},
+    }
+    new_object = apply_json_merge(patch, target_object)
+
+    assert new_object["metadata"]["pilot"] == "bob_loblaw"
+    assert "owner" not in new_object["metadata"]
+    assert new_object["spec"]["new_key"]["new_key"] == "new_value"

From 8f5f5dfdb1e2d0821dfebae8897b8fdf6741c7e9 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Fri, 27 Jun 2025 15:48:15 -0500
Subject: [PATCH 27/37] fix(node) - Include link metadata response headers when
 updating Nodes

---
 src/lsst/cmservice/routers/v2/nodes.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/lsst/cmservice/routers/v2/nodes.py b/src/lsst/cmservice/routers/v2/nodes.py
index 11014633d..846d5b2a4 100644
--- a/src/lsst/cmservice/routers/v2/nodes.py
+++ b/src/lsst/cmservice/routers/v2/nodes.py
@@ -177,7 +177,7 @@ async def update_node_resource(
     A Node's name, id, kind, or namespace may not be modified by this
     method, and attempts to do so will produce a 4XX client error.
 
-    This PATCH endpoint supports RFC6902 json-patch and RFCrequests.
+    This PATCH endpoint supports RFC6902 json-patch requests.
 
     Notes
     -----
@@ -232,5 +232,9 @@ async def update_node_resource(
     session.add(new_manifest_db)
     await session.commit()
 
-    # TODO response headers
+    response.headers["Self"] = request.url_for("read_node_resource", node_name=new_manifest_db.id).__str__()
+    response.headers["Campaign"] = request.url_for(
+        "read_campaign_resource", campaign_name=new_manifest_db.namespace
+    ).__str__()
+
     return new_manifest_db

From 515d266dd6d7df5fcf66278b568b7f66c1b87f51 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Tue, 8 Jul 2025 14:38:17 -0500
Subject: [PATCH 28/37] feat(api): Include order in paginated queries - add
 crtime to element metadata - add manifests route for campaigns

---
 src/lsst/cmservice/routers/v2/campaigns.py | 84 +++++++++++++++++-----
 src/lsst/cmservice/routers/v2/edges.py     |  5 +-
 src/lsst/cmservice/routers/v2/manifests.py | 17 ++++-
 src/lsst/cmservice/routers/v2/nodes.py     | 12 +++-
 tests/v2/test_manifest_routes.py           |  7 ++
 5 files changed, 100 insertions(+), 25 deletions(-)

diff --git a/src/lsst/cmservice/routers/v2/campaigns.py b/src/lsst/cmservice/routers/v2/campaigns.py
index 3e615d8c7..71ab74966 100644
--- a/src/lsst/cmservice/routers/v2/campaigns.py
+++ b/src/lsst/cmservice/routers/v2/campaigns.py
@@ -15,7 +15,8 @@
 
 from ...common.graph import graph_from_edge_list_v2, graph_to_dict
 from ...common.logging import LOGGER
-from ...db.campaigns_v2 import Campaign, CampaignUpdate, Edge, Node
+from ...common.timestamp import element_time
+from ...db.campaigns_v2 import Campaign, CampaignUpdate, Edge, Manifest, Node
 from ...db.manifests_v2 import CampaignManifest
 from ...db.session import db_session_dependency
 
@@ -42,10 +43,16 @@ async def read_campaign_collection(
     offset: Annotated[int, Query()] = 0,
 ) -> Sequence[Campaign]:
     """A paginated API returning a list of all Campaigns known to the
-    application.
+    application, from newest to oldest.
     """
     try:
-        campaigns = await session.exec(select(Campaign).offset(offset).limit(limit))
+        statement = (
+            select(Campaign)
+            .order_by(Campaign.metadata_["crtime"].desc().nulls_last())
+            .offset(offset)
+            .limit(limit)
+        )
+        campaigns = await session.exec(statement)
 
         response.headers["Next"] = str(
             request.url_for("read_campaign_collection").include_query_params(
@@ -95,6 +102,9 @@ async def read_campaign_resource(
         response.headers["Edges"] = str(
             request.url_for("read_campaign_edge_collection", campaign_name=campaign.id)
         )
+        response.headers["Manifests"] = str(
+            request.url_for("read_campaign_manifest_collection", campaign_name=campaign.id)
+        )
         return campaign
     else:
         raise HTTPException(status_code=404)
@@ -196,22 +206,60 @@ async def read_campaign_node_collection(
 
     # The input could be a campaign UUID or it could be a literal name.
     # TODO this could just as well be a campaign query with a join to nodes
-    s = select(Node)
+    statement = select(Node).order_by(Node.metadata_["crtime"].asc().nulls_last())
+
     try:
         if campaign_id := UUID(campaign_name):
-            s = s.where(Node.namespace == campaign_id)
+            statement = statement.where(Node.namespace == campaign_id)
     except ValueError:
         # FIXME get an id from a name
         raise HTTPException(status_code=422, detail="campaign_name must be a uuid")
-    s = s.offset(offset).limit(limit)
-    nodes = await session.exec(s)
+    statement = statement.offset(offset).limit(limit)
+    nodes = await session.exec(statement)
     response.headers["Next"] = str(
         request.url_for(
             "read_campaign_node_collection",
-            campaign_name=campaign_name,
+            campaign_name=campaign_id,
         ).include_query_params(offset=(offset + limit), limit=limit),
     )
-    # TODO Previous
+    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign_id))
+    return nodes.all()
+
+
+@router.get(
+    "/{campaign_name}/manifests",
+    summary="Get campaign Manifests",
+)
+async def read_campaign_manifest_collection(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    campaign_name: str,
+    limit: Annotated[int, Query(le=100)] = 10,
+    offset: Annotated[int, Query()] = 0,
+) -> Sequence[Manifest]:
+    """A paginated API returning a list of all Manifests in the namespace of a
+    single Campaign.
+    """
+
+    # The input could be a campaign UUID or it could be a literal name.
+    statement = select(Manifest).order_by(Manifest.metadata_["crtime"].asc().nulls_last())
+
+    try:
+        if campaign_id := UUID(campaign_name):
+            statement = statement.where(Manifest.namespace == campaign_id)
+    except ValueError:
+        # FIXME get an id from a name
+        raise HTTPException(status_code=422, detail="campaign_name must be a uuid")
+    statement = statement.offset(offset).limit(limit)
+    nodes = await session.exec(statement)
+    response.headers["Next"] = str(
+        request.url_for(
+            "read_campaign_manifest_collection",
+            campaign_name=campaign_id,
+        ).include_query_params(offset=(offset + limit), limit=limit),
+    )
+    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign_id))
     return nodes.all()
 
 
@@ -252,7 +300,7 @@ async def read_campaign_edge_collection(
             .join_from(Edge, target_nodes, Edge.target == target_nodes.id)
         )
     else:
-        s = select(Edge)
+        s = select(Edge).order_by(col(Edge.name).asc().nulls_last())
     try:
         if campaign_id := UUID(campaign_name):
             s = s.where(Edge.namespace == campaign_id)
@@ -260,6 +308,8 @@ async def read_campaign_edge_collection(
         # FIXME get an id from a name
         raise HTTPException(status_code=422, detail="campaign_name must be a uuid")
     edges = await session.exec(s)
+
+    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign_id))
     return edges.all()
 
 
@@ -313,10 +363,12 @@ async def create_campaign_resource(
     # Create a campaign spec from the manifest, delegating the creation of new
     # dynamic fields to the model validation method, -OR- create new dynamic
     # fields here.
+    campaign_metadata = manifest.metadata_.model_dump()
+    campaign_metadata |= {"crtime": element_time()}
     campaign = Campaign.model_validate(
         dict(
-            name=manifest.metadata_.name,
-            metadata_=manifest.metadata_.model_dump(),
+            name=campaign_metadata.pop("name"),
+            metadata_=campaign_metadata,
             # owner = ...  # TODO Get username from gafaelfawr # noqa: ERA001
         )
     )
@@ -376,12 +428,8 @@ async def read_campaign_graph(
     edges = (await session.exec(statement)).all()
 
     # Organize the edges into a graph. The graph nodes are annotated with their
-    # current database attributes.
-    # TODO it makes sense for the graph to include expunged Nodes in the meta-
-    # data for campaign processing, but for the purposes of this api route,
-    # only the most relevant information should be associated with each node,
-    # e.g., its name, status, id, and its URL
+    # current database attributes according to the "simple" node view.
     graph = await graph_from_edge_list_v2(edges=edges, node_type=Node, session=session, node_view="simple")
 
-    response.headers["Self"] = ""
+    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign_id))
     return graph_to_dict(graph)
diff --git a/src/lsst/cmservice/routers/v2/edges.py b/src/lsst/cmservice/routers/v2/edges.py
index 20b35faae..d96857966 100644
--- a/src/lsst/cmservice/routers/v2/edges.py
+++ b/src/lsst/cmservice/routers/v2/edges.py
@@ -9,7 +9,7 @@
 from uuid import UUID, uuid5
 
 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
@@ -46,7 +46,8 @@ async def read_edges_collection(
     For campaign-scoped edges, one should use the /campaigns/{}/edges route.
     """
     try:
-        edges = await session.exec(select(Edge).offset(offset).limit(limit))
+        statement = select(Edge).order_by(col(Edge.name).desc()).offset(offset).limit(limit)
+        edges = await session.exec(statement)
         response.headers["Next"] = (
             request.url_for("read_edges_collection")
             .include_query_params(offset=(offset + limit), limit=limit)
diff --git a/src/lsst/cmservice/routers/v2/manifests.py b/src/lsst/cmservice/routers/v2/manifests.py
index 308f4a33e..32be3106b 100644
--- a/src/lsst/cmservice/routers/v2/manifests.py
+++ b/src/lsst/cmservice/routers/v2/manifests.py
@@ -14,6 +14,7 @@
 
 from ...common.jsonpatch import JSONPatch, JSONPatchError, apply_json_patch
 from ...common.logging import LOGGER
+from ...common.timestamp import element_time
 from ...db.campaigns_v2 import Campaign, Manifest, _default_campaign_namespace
 from ...db.manifests_v2 import ManifestModel
 from ...db.session import db_session_dependency
@@ -51,7 +52,13 @@ async def read_manifest_collection(
             )
         )
     try:
-        nodes = await session.exec(select(Manifest).offset(offset).limit(limit))
+        statement = (
+            select(Manifest)
+            .order_by(Manifest.metadata_["crtime"].desc().nulls_last())
+            .offset(offset)
+            .limit(limit)
+        )
+        nodes = await session.exec(statement)
         return nodes.all()
     except Exception as msg:
         logger.exception()
@@ -150,13 +157,16 @@ async def create_one_or_more_manifests(
         _previous = (await session.exec(s)).one_or_none()
         _version = _previous.version if _previous else manifest.metadata_.version
         _version += 1
+
+        _manifest_metadata = manifest.metadata_.model_dump()
+        _manifest_metadata |= {"crtime": element_time()}
         _manifest = Manifest(
             id=uuid5(_namespace_uuid, f"{_name}.{_version}"),
-            name=_name,
+            name=_manifest_metadata.pop("name"),
             namespace=_namespace_uuid,
             kind=manifest.kind,
             version=_version,
-            metadata_=manifest.metadata_.model_dump(),
+            metadata_=_manifest_metadata,
             spec=manifest.spec.model_dump(),
         )
 
@@ -240,6 +250,7 @@ async def update_manifest_resource(
             )
 
     # create Manifest from new_manifest, add to session, and commit
+    new_manifest["metadata"] |= {"crtime": element_time()}
     new_manifest_db = Manifest.model_validate(new_manifest)
     session.add(new_manifest_db)
     await session.commit()
diff --git a/src/lsst/cmservice/routers/v2/nodes.py b/src/lsst/cmservice/routers/v2/nodes.py
index 846d5b2a4..59b95619e 100644
--- a/src/lsst/cmservice/routers/v2/nodes.py
+++ b/src/lsst/cmservice/routers/v2/nodes.py
@@ -14,6 +14,7 @@
 
 from ...common.jsonpatch import JSONPatch, JSONPatchError, apply_json_patch
 from ...common.logging import LOGGER
+from ...common.timestamp import element_time
 from ...db.campaigns_v2 import Campaign, Node
 from ...db.manifests_v2 import NodeManifest
 from ...db.session import db_session_dependency
@@ -47,7 +48,10 @@ async def read_nodes_collection(
     For campaign-scoped nodes, one should use the /campaigns/{}/nodes route.
     """
     try:
-        nodes = await session.exec(select(Node).offset(offset).limit(limit))
+        statement = (
+            select(Node).order_by(Node.metadata_["crtime"].desc().nulls_last()).offset(offset).limit(limit)
+        )
+        nodes = await session.exec(statement)
         response.headers["Next"] = (
             request.url_for("read_nodes_collection")
             .include_query_params(offset=(offset + limit), limit=limit)
@@ -136,12 +140,15 @@ async def create_node_resource(
 
     node_version = previous_node.version if previous_node else node_version
     node_version += 1
+    node_metadata = manifest.metadata_.model_dump()
+    node_metadata |= {"crtime": element_time()}
     node = Node(
         id=uuid5(node_namespace_uuid, f"{node_name}.{node_version}"),
-        name=node_name,
+        name=node_metadata.pop("name"),
         namespace=node_namespace_uuid,
         version=node_version,
         configuration=manifest.spec.model_dump(),
+        metadata_=node_metadata,
     )
 
     # Put the node in the database
@@ -228,6 +235,7 @@ async def update_node_resource(
             )
 
     # create Manifest from new_manifest, add to session, and commit
+    new_manifest["metadata"] |= {"crtime": element_time()}
     new_manifest_db = Node.model_validate(new_manifest)
     session.add(new_manifest_db)
     await session.commit()
diff --git a/tests/v2/test_manifest_routes.py b/tests/v2/test_manifest_routes.py
index 0c4144e11..8f3b60ee7 100644
--- a/tests/v2/test_manifest_routes.py
+++ b/tests/v2/test_manifest_routes.py
@@ -131,6 +131,13 @@ async def test_load_manifests(aclient: AsyncClient) -> None:
     assert len(manifests) == 3
     assert manifests[-1]["spec"]["one"] == 1
 
+    # Get all the loaded manifests from the campaign route
+    x = await aclient.get(f"/cm-service/v2/campaigns/{campaign_id}/manifests")
+    assert x.is_success
+    manifests = x.json()
+    assert len(manifests) == 2
+    assert manifests[-1]["spec"]["one"] == 1
+
 
 async def test_patch_manifest(aclient: AsyncClient) -> None:
     """Tests partial update of manifests and single resource retrieval."""

From 273383a2e0f74b4368c17c6386bcab0adf0be8b4 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Tue, 1 Jul 2025 10:28:37 -0500
Subject: [PATCH 29/37] chore(test): update test fixtures - move campaign test
 fixture to module conftest - scope campaign test fixture to function - add
 auto fixture for patched config

---
 tests/v2/conftest.py   | 104 +++++++++++++++++++++++++++++++++++++++++
 tests/v2/test_graph.py | 100 ---------------------------------------
 2 files changed, 104 insertions(+), 100 deletions(-)

diff --git a/tests/v2/conftest.py b/tests/v2/conftest.py
index ccd19505c..4bd61136f 100644
--- a/tests/v2/conftest.py
+++ b/tests/v2/conftest.py
@@ -32,6 +32,14 @@ def monkeypatch_module() -> Generator[pytest.MonkeyPatch]:
         yield mp
 
 
+@pytest.fixture(scope="module", autouse=True)
+def patched_config(monkeypatch_module: pytest.MonkeyPatch, tmp_path_factory: pytest.TempPathFactory) -> None:
+    """Fixture which monkeypatches configuration settings"""
+    monkeypatch_module.setattr(
+        target=config.bps, name="artifact_path", value=tmp_path_factory.mktemp("output")
+    )
+
+
 @pytest_asyncio.fixture(scope="module", loop_scope="module")
 async def rawdb(monkeypatch_module: pytest.MonkeyPatch) -> AsyncGenerator[DatabaseSessionDependency]:
     """Test fixture for a postgres container.
@@ -150,3 +158,99 @@ def get_session_override() -> AnyAsyncSession:
     ) as aclient:
         yield aclient
     app.dependency_overrides.clear()
+
+
+@pytest_asyncio.fixture(scope="function", loop_scope="module")
+async def test_campaign(aclient: AsyncClient) -> AsyncGenerator[str]:
+    """Fixture managing a test campaign with two (additional) nodes."""
+    campaign_name = uuid4().hex[-8:]
+    node_ids = []
+
+    x = await aclient.post(
+        "/cm-service/v2/campaigns",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "campaign",
+            "metadata": {"name": campaign_name},
+            "spec": {},
+        },
+    )
+    campaign_edge_url = x.headers["Edges"]
+    campaign = x.json()
+
+    # create a trio of nodes for the campaign
+    for _ in range(3):
+        x = await aclient.post(
+            "/cm-service/v2/nodes",
+            json={
+                "apiVersion": "io.lsst.cmservice/v1",
+                "kind": "node",
+                "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+                "spec": {},
+            },
+        )
+        node = x.json()
+        node_ids.append(node["name"])
+
+    # Create edges between each campaign node with parallelization
+    _ = await aclient.post(
+        "/cm-service/v2/edges",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+            "spec": {
+                "source": "START",
+                "target": node_ids[0],
+            },
+        },
+    )
+    _ = await aclient.post(
+        "/cm-service/v2/edges",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+            "spec": {
+                "source": node_ids[0],
+                "target": node_ids[1],
+            },
+        },
+    )
+    _ = await aclient.post(
+        "/cm-service/v2/edges",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+            "spec": {
+                "source": node_ids[0],
+                "target": node_ids[2],
+            },
+        },
+    )
+    _ = await aclient.post(
+        "/cm-service/v2/edges",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+            "spec": {
+                "source": node_ids[1],
+                "target": "END",
+            },
+        },
+    )
+    _ = await aclient.post(
+        "/cm-service/v2/edges",
+        json={
+            "apiVersion": "io.lsst.cmservice/v1",
+            "kind": "edge",
+            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
+            "spec": {
+                "source": node_ids[2],
+                "target": "END",
+            },
+        },
+    )
+    yield campaign_edge_url
diff --git a/tests/v2/test_graph.py b/tests/v2/test_graph.py
index 3f57d3444..491571f82 100644
--- a/tests/v2/test_graph.py
+++ b/tests/v2/test_graph.py
@@ -1,11 +1,7 @@
 """Tests graph operations using v2 objects"""
 
-from collections.abc import AsyncGenerator
-from uuid import uuid4
-
 import networkx as nx
 import pytest
-import pytest_asyncio
 from httpx import AsyncClient
 
 from lsst.cmservice.common.enums import StatusEnum
@@ -17,102 +13,6 @@
 """All tests in this module will run in the same event loop."""
 
 
-@pytest_asyncio.fixture(scope="module", loop_scope="module")
-async def test_campaign(aclient: AsyncClient) -> AsyncGenerator[str]:
-    """Fixture managing a test campaign with two (additional) nodes."""
-    campaign_name = uuid4().hex[-8:]
-    node_ids = []
-
-    x = await aclient.post(
-        "/cm-service/v2/campaigns",
-        json={
-            "apiVersion": "io.lsst.cmservice/v1",
-            "kind": "campaign",
-            "metadata": {"name": campaign_name},
-            "spec": {},
-        },
-    )
-    campaign_edge_url = x.headers["Edges"]
-    campaign = x.json()
-
-    # create a trio of nodes for the campaign
-    for _ in range(3):
-        x = await aclient.post(
-            "/cm-service/v2/nodes",
-            json={
-                "apiVersion": "io.lsst.cmservice/v1",
-                "kind": "node",
-                "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
-                "spec": {},
-            },
-        )
-        node = x.json()
-        node_ids.append(node["name"])
-
-    # Create edges between each campaign node with parallelization
-    _ = await aclient.post(
-        "/cm-service/v2/edges",
-        json={
-            "apiVersion": "io.lsst.cmservice/v1",
-            "kind": "edge",
-            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
-            "spec": {
-                "source": "START",
-                "target": node_ids[0],
-            },
-        },
-    )
-    _ = await aclient.post(
-        "/cm-service/v2/edges",
-        json={
-            "apiVersion": "io.lsst.cmservice/v1",
-            "kind": "edge",
-            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
-            "spec": {
-                "source": node_ids[0],
-                "target": node_ids[1],
-            },
-        },
-    )
-    _ = await aclient.post(
-        "/cm-service/v2/edges",
-        json={
-            "apiVersion": "io.lsst.cmservice/v1",
-            "kind": "edge",
-            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
-            "spec": {
-                "source": node_ids[0],
-                "target": node_ids[2],
-            },
-        },
-    )
-    _ = await aclient.post(
-        "/cm-service/v2/edges",
-        json={
-            "apiVersion": "io.lsst.cmservice/v1",
-            "kind": "edge",
-            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
-            "spec": {
-                "source": node_ids[1],
-                "target": "END",
-            },
-        },
-    )
-    _ = await aclient.post(
-        "/cm-service/v2/edges",
-        json={
-            "apiVersion": "io.lsst.cmservice/v1",
-            "kind": "edge",
-            "metadata": {"name": uuid4().hex[-8:], "namespace": campaign["id"]},
-            "spec": {
-                "source": node_ids[2],
-                "target": "END",
-            },
-        },
-    )
-    yield campaign_edge_url
-
-
 async def test_build_and_walk_graph(
     aclient: AsyncClient, session: AnyAsyncSession, test_campaign: str
 ) -> None:

From 3920ee4c19b48c031773289d95de66f6eeca6f42 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Mon, 30 Jun 2025 11:30:07 -0500
Subject: [PATCH 30/37] feat(transitions) - Implement Campaign/Node FSM using
 pytransitions - Establish daemon v2 iteration loop - Establish E2E FSM and
 Daemon tests - machines get their own sessions - add config flags for daemon
 v2 campaign/node processing

---
 src/lsst/cmservice/common/daemon_v2.py  | 165 +++++++++
 src/lsst/cmservice/common/enums.py      |  15 +
 src/lsst/cmservice/config.py            |  20 ++
 src/lsst/cmservice/daemon.py            |   6 +-
 src/lsst/cmservice/db/campaigns_v2.py   |  39 +-
 src/lsst/cmservice/machines/__init__.py |   0
 src/lsst/cmservice/machines/abc.py      | 255 +++++++++++++
 src/lsst/cmservice/machines/node.py     | 455 ++++++++++++++++++++++++
 tests/v2/conftest.py                    |   3 +
 tests/v2/test_daemon.py                 | 149 ++++++++
 tests/v2/test_machines.py               | 174 +++++++++
 11 files changed, 1266 insertions(+), 15 deletions(-)
 create mode 100644 src/lsst/cmservice/common/daemon_v2.py
 create mode 100644 src/lsst/cmservice/machines/__init__.py
 create mode 100644 src/lsst/cmservice/machines/abc.py
 create mode 100644 src/lsst/cmservice/machines/node.py
 create mode 100644 tests/v2/test_daemon.py
 create mode 100644 tests/v2/test_machines.py

diff --git a/src/lsst/cmservice/common/daemon_v2.py b/src/lsst/cmservice/common/daemon_v2.py
new file mode 100644
index 000000000..50ff84df7
--- /dev/null
+++ b/src/lsst/cmservice/common/daemon_v2.py
@@ -0,0 +1,165 @@
+import pickle
+from asyncio import Task as AsyncTask
+from asyncio import TaskGroup
+from collections.abc import Mapping
+
+from sqlmodel import col, select
+from sqlmodel.ext.asyncio.session import AsyncSession
+from transitions import Event
+
+from ..common import graph, timestamp
+from ..common.enums import StatusEnum
+from ..config import config
+from ..db.campaigns_v2 import Campaign, Edge, Machine, Node, Task
+from ..machines.node import NodeMachine, node_machine_factory
+from .logging import LOGGER
+
+logger = LOGGER.bind(module=__name__)
+
+
+async def consider_campaigns(session: AsyncSession) -> None:
+    """In Phase One, the daemon considers campaigns. Campaigns subject to
+    consideration have a non-terminal prepared status (ready or running), and
+    optionally tagged with a priority value lower than the daemon's own
+    priority.
+
+    For any campaigns thus discovered, the daemon then constructs a graph
+    from the campaign's Edges, and starting at the START node, walks the graph
+    until a Node is found that requires attention. Each Node found is added to
+    the Tasks table as a queue item.
+    """
+    c_statement = (
+        select(Campaign.id)
+        .where(col(Campaign.status).in_((StatusEnum.ready, StatusEnum.running)))
+        .with_for_update(key_share=True, skip_locked=True)
+    )
+    campaigns = (await session.exec(c_statement)).all()
+
+    for campaign_id in campaigns:
+        logger.info("Daemon considering campaign", id=campaign_id)
+
+        # Fetch the Edges for the campaign
+        e_statement = select(Edge).filter_by(namespace=campaign_id)
+        edges = (await session.exec(e_statement)).all()
+        campaign_graph = await graph.graph_from_edge_list_v2(edges=edges, session=session)
+
+        for node in graph.processable_graph_nodes(campaign_graph):
+            logger.info("Daemon considering node", id=str(node.id))
+            node_task = Task(
+                namespace=campaign_id,
+                node=node.id,
+                status=node.status.next_status(),
+                previous_status=node.status,
+            )
+            session.add(node_task)
+
+    await session.commit()
+
+
+async def consider_nodes(session: AsyncSession) -> None:
+    """In Phase Two, the daemon considers Nodes. Nodes subject to consideration
+    are only those Nodes found on the Tasks table that have a priority lower
+    than the daemon's own priority, and share the daemon's site affinity.
+
+    For each node considered by the daemon, the Node's FSM is loaded from the
+    Machines table, or creates one if needed. The daemon uses methods on the
+    Node's Stateful Model to evolve the state of the Node.
+
+    After handling, the Node's FSM is serialized and the Node is updated with
+    new values as necessary. The Task is not returned to the Task table.
+    """
+    statement = select(Task).with_for_update(skip_locked=True)
+    # TODO add filter criteria for priority and site affinity
+    tasks = (await session.exec(statement)).all()
+
+    # Using a TaskGroup context manager means all "tasks" added to the group
+    # are awaited when the CM exits, giving us concurrency for all the nodes
+    # being considered in the current iteration.
+    async with TaskGroup() as tg:
+        for task in tasks:
+            node = await session.get_one(Node, task.node)
+
+            # the task's status field is the target status for the node, so the
+            # daemon intends to evolve the node machine to that state.
+            try:
+                assert node.status is task.previous_status
+            except AssertionError:
+                logger.error("Node status out of sync with Machine", id=str(node.id))
+                continue
+
+            # Expunge the node from *this* session because it will be added to
+            # whatever session the node_machine acquires during its transition
+            session.expunge(node)
+
+            node_machine: NodeMachine
+            node_machine_pickle: Machine | None
+            if node.machine is None:
+                # create a new machine for the node
+                node_machine = node_machine_factory(node.kind)(o=node)
+                node_machine_pickle = None
+            else:
+                # unpickle the node's machine and rehydrate the Stateful Model
+                node_machine_pickle = await session.get_one(Machine, node.machine)
+                node_machine = (pickle.loads(node_machine_pickle.state)).model
+                node_machine.node = node
+                # discard the pickled machine from this session and context
+                session.expunge(node_machine_pickle)
+                del node_machine_pickle
+
+            # check possible triggers for state
+            # TODO how to pick the "best" trigger from multiple available?
+            # - Add a caller-backed conditional to the triggers, to identify
+            # .  triggers the daemon is "allowed" to use
+            # - Determine the "desired" trigger from the task (source, dest)
+            if (trigger := trigger_for_transition(task, node_machine.machine.events)) is None:
+                logger.warning(
+                    "No trigger available for desired state transition",
+                    source=task.previous_status,
+                    dest=task.status,
+                )
+                continue
+
+            # Add the node transition trigger method to the task group
+            # TODO give this a name and a callback
+            task_ = tg.create_task(node_machine.trigger(trigger), name=str(node.id))
+            task_.add_done_callback(task_runner_callback)
+
+            # wrap up - the task is removed from the db.
+            await session.delete(task)
+            await session.commit()
+
+
+async def daemon_iteration(session: AsyncSession) -> None:
+    """A single iteraton of the CM daemon's work loop, which is carried out in
+    two phases: Campaigns and Nodes.
+    """
+    iteration_start = timestamp.now_utc()
+    logger.debug("Daemon V2 Iteration: %s", iteration_start)
+    if config.daemon.process_campaigns:
+        await consider_campaigns(session)
+    if config.daemon.process_nodes:
+        await consider_nodes(session)
+    await session.close()
+
+
+def trigger_for_transition(task: Task, events: Mapping[str, Event]) -> str | None:
+    """Determine the trigger name for transition that matches the desired state
+    tuple as indicated on a Task.
+    """
+
+    for trigger, event in events.items():
+        for transition_list in event.transitions.values():
+            for transition in transition_list:
+                if all(
+                    [
+                        transition.source == task.previous_status.name,
+                        transition.dest == task.status.name,
+                    ]
+                ):
+                    return trigger
+    return None
+
+
+def task_runner_callback(task: AsyncTask):
+    """Callback function for `asyncio.TaskGroup` tasks."""
+    logger.info("Transition complete", id=task.get_name())
diff --git a/src/lsst/cmservice/common/enums.py b/src/lsst/cmservice/common/enums.py
index 50d07f331..8371b3f02 100644
--- a/src/lsst/cmservice/common/enums.py
+++ b/src/lsst/cmservice/common/enums.py
@@ -178,6 +178,17 @@ def is_processable_script(self) -> bool:
         """Is this a processable state for an elememnt"""
         return self.value >= StatusEnum.waiting.value and self.value <= StatusEnum.running.value
 
+    def next_status(self) -> StatusEnum:
+        """If the status is on the "happy" path, return the next status along
+        that path, otherwise return the failed status.
+        """
+        happy_path = [StatusEnum.waiting, StatusEnum.ready, StatusEnum.running, StatusEnum.accepted]
+        if self in happy_path:
+            i = happy_path.index(self)
+            return happy_path[i + 1]
+        else:
+            return StatusEnum.failed
+
 
 class TaskStatusEnum(enum.Enum):
     """Defines possible outcomes for Pipetask tasks"""
@@ -295,6 +306,10 @@ class ManifestKind(enum.Enum):
     campaign = enum.auto()
     node = enum.auto()
     edge = enum.auto()
+    # Node kinds
+    grouped_step = enum.auto()
+    step_group = enum.auto()
+    collect_groups = enum.auto()
     # Legacy kinds
     specification = enum.auto()
     spec_block = enum.auto()
diff --git a/src/lsst/cmservice/config.py b/src/lsst/cmservice/config.py
index 099bc8810..73ed94c9c 100644
--- a/src/lsst/cmservice/config.py
+++ b/src/lsst/cmservice/config.py
@@ -522,6 +522,26 @@ class DaemonConfiguration(BaseModel):
         ),
     )
 
+    v1_enabled: bool = Field(
+        default=True,
+        description="Whether the v1 daemon is enabled and included in the event loop.",
+    )
+
+    v2_enabled: bool = Field(
+        default=False,
+        description="Whether the v2 daemon is enabled and included in the event loop.",
+    )
+
+    process_campaigns: bool = Field(
+        default=True,
+        description="Whether the v2 daemon processes Campaigns in the event loop.",
+    )
+
+    process_nodes: bool = Field(
+        default=True,
+        description="Whether the v2 daemon processes Nodes in the event loop.",
+    )
+
 
 class NotificationConfiguration(BaseModel):
     """Configurations for notifications.
diff --git a/src/lsst/cmservice/daemon.py b/src/lsst/cmservice/daemon.py
index 4d226ad97..d7e407896 100644
--- a/src/lsst/cmservice/daemon.py
+++ b/src/lsst/cmservice/daemon.py
@@ -11,6 +11,7 @@
 from . import __version__
 from .common.butler import BUTLER_FACTORY  # noqa: F401
 from .common.daemon import daemon_iteration
+from .common.daemon_v2 import daemon_iteration as daemon_iteration_v2
 from .common.logging import LOGGER
 from .common.panda import get_panda_token
 from .config import config
@@ -56,7 +57,10 @@ async def main_loop(app: FastAPI) -> None:
     while True:
         _iteration_count += 1
         logger.info("Daemon starting iteration.")
-        await daemon_iteration(session)
+        if config.daemon.v1_enabled:
+            await daemon_iteration(session)
+        if config.daemon.v2_enabled:
+            await daemon_iteration_v2(session)
         _iteration_time = current_time()
         logger.info(f"Daemon completed {_iteration_count} iterations at {_iteration_time}.")
         _next_wakeup = _iteration_time + sleep_time
diff --git a/src/lsst/cmservice/db/campaigns_v2.py b/src/lsst/cmservice/db/campaigns_v2.py
index 8350f43aa..d8902c8e0 100644
--- a/src/lsst/cmservice/db/campaigns_v2.py
+++ b/src/lsst/cmservice/db/campaigns_v2.py
@@ -2,15 +2,16 @@
 
 from datetime import datetime
 from typing import Any
-from uuid import NAMESPACE_DNS, UUID, uuid5
+from uuid import NAMESPACE_DNS, UUID, uuid4, uuid5
 
 from pydantic import AliasChoices, ValidationInfo, model_validator
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.ext.mutable import MutableDict, MutableList
 from sqlalchemy.types import PickleType
-from sqlmodel import Column, Enum, Field, MetaData, SQLModel, String
+from sqlmodel import Column, DateTime, Enum, Field, MetaData, SQLModel, String
 
 from ..common.enums import ManifestKind, StatusEnum
+from ..common.timestamp import now_utc
 from ..common.types import KindField, StatusField
 from ..config import config
 
@@ -57,7 +58,7 @@ class CampaignBase(BaseSQLModel):
     name: str
     namespace: UUID
     owner: str | None = Field(default=None)
-    status: StatusField | None = Field(
+    status: StatusField = Field(
         default=StatusEnum.waiting,
         sa_column=Column("status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)),
     )
@@ -169,8 +170,8 @@ class Edge(EdgeBase, table=True):
 class MachineBase(BaseSQLModel):
     """machines_v2 db table."""
 
-    id: UUID = Field(primary_key=True)
-    state: Any | None = Field(sa_column=Column("state", PickleType))
+    id: UUID = Field(primary_key=True, default_factory=uuid4)
+    state: Any = Field(sa_column=Column("state", PickleType))
 
 
 class Machine(MachineBase, table=True):
@@ -203,16 +204,25 @@ class Task(BaseSQLModel, table=True):
 
     __tablename__: str = "tasks_v2"  # type: ignore[misc]
 
-    id: UUID = Field(primary_key=True)
+    id: UUID = Field(primary_key=True, default_factory=uuid4)
     namespace: UUID = Field(foreign_key="campaigns_v2.id")
     node: UUID = Field(foreign_key="nodes_v2.id")
-    priority: int
-    created_at: datetime
-    last_processed_at: datetime
-    finished_at: datetime
-    wms_id: str
-    site_affinity: list[str] = Field(
-        sa_column=Column("site_affinity", MutableList.as_mutable(postgresql.ARRAY(String())))
+    priority: int | None = Field(default=None)
+    created_at: datetime = Field(
+        default_factory=now_utc,
+        sa_column=Column(DateTime(timezone=True)),
+    )
+    last_processed_at: datetime | None = Field(
+        default=None,
+        sa_column=Column(DateTime(timezone=True)),
+    )
+    finished_at: datetime | None = Field(
+        default=None,
+        sa_column=Column(DateTime(timezone=True)),
+    )
+    wms_id: str | None = Field(default=None)
+    site_affinity: list[str] | None = Field(
+        default=None, sa_column=Column("site_affinity", MutableList.as_mutable(postgresql.ARRAY(String())))
     )
     status: StatusField = Field(
         sa_column=Column("status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)),
@@ -225,7 +235,7 @@ class Task(BaseSQLModel, table=True):
 
 
 class ActivityLogBase(BaseSQLModel):
-    id: UUID = Field(primary_key=True)
+    id: UUID = Field(primary_key=True, default_factory=uuid4)
     namespace: UUID = Field(foreign_key="campaigns_v2.id")
     node: UUID = Field(foreign_key="nodes_v2.id")
     operator: str
@@ -240,6 +250,7 @@ class ActivityLogBase(BaseSQLModel):
         ),
     )
     detail: dict = jsonb_column("detail")
+    metadata_: dict = jsonb_column("metadata", aliases=["metadata", "metadata_"])
 
 
 class ActivityLog(ActivityLogBase, table=True):
diff --git a/src/lsst/cmservice/machines/__init__.py b/src/lsst/cmservice/machines/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/lsst/cmservice/machines/abc.py b/src/lsst/cmservice/machines/abc.py
new file mode 100644
index 000000000..23f345377
--- /dev/null
+++ b/src/lsst/cmservice/machines/abc.py
@@ -0,0 +1,255 @@
+"""Abstract Base Classes used by Stateful Model and/or Machine classes.
+
+These primarily exist and are used to satisfy static type checkers that are
+otherwise unaware of any dynamic methods added to Stateful Model classes by
+a Machine instance.
+
+Notes
+-----
+These ABCs were generated automatically by `transitions.experimental.utils.
+generate_base_model and simplified and/or modified for use by the application.
+
+These ABCs do not use abstractclasses because the implmentations will not be
+available to static type checkers (i.e., they only exist at runtime).
+
+These ABCs may implement methods that are not used by application, i.e., that
+involve states that are not referenced by any transition.
+"""
+
+from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING, Any
+
+from transitions import EventData, Machine
+from transitions.extensions.asyncio import AsyncMachine
+
+from ..common.enums import ManifestKind, StatusEnum
+from ..db.campaigns_v2 import Campaign, Node
+
+if TYPE_CHECKING:
+    from sqlmodel.ext.asyncio.session import AsyncSession
+
+type AnyStatefulObject = Campaign | Node
+type AnyMachine = Machine | AsyncMachine
+
+
+class StatefulModel(ABC):
+    """Base ABC for a Stateful Model, where the Machine will override abstract
+    methods and properties when it is created.
+    """
+
+    __kind__ = [ManifestKind.other]
+    state: StatusEnum
+    session: "AsyncSession | None"
+    machine: AnyMachine
+
+    @abstractmethod
+    def __init__(
+        self, *args: Any, o: AnyStatefulObject, initial_state: StatusEnum = StatusEnum.waiting, **kwargs: Any
+    ) -> None: ...
+
+    @abstractmethod
+    async def error_handler(self, event: EventData) -> None: ...
+
+    @abstractmethod
+    async def prepare_activity_log(self, event: EventData) -> None: ...
+
+    @abstractmethod
+    async def update_persistent_status(self, event: EventData) -> None: ...
+
+    @abstractmethod
+    async def finalize(self, event: EventData) -> None: ...
+
+    async def may_trigger(self, trigger_name: str) -> bool:
+        raise NotImplementedError("Must be overridden by a Machine")
+
+    async def trigger(self, trigger_name: str) -> bool:
+        raise NotImplementedError("Must be overridden by a Machine")
+
+    async def resume(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_resume(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def force(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_force(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def pause(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_pause(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def start(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_start(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def unblock(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_unblock(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def unprepare(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_unprepare(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def stop(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_stop(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def retry(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_retry(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def finish(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_finish(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def block(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_block(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def prepare(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_prepare(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def fail(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_fail(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_overdue(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_overdue(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_overdue(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_failed(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_failed(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_failed(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_rejected(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_rejected(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_rejected(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_blocked(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_blocked(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_blocked(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_paused(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_paused(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_paused(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_rescuable(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_rescuable(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_rescuable(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_waiting(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_waiting(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_waiting(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_ready(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_ready(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_ready(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_prepared(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_prepared(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_prepared(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_running(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_running(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_running(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_reviewable(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_reviewable(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_reviewable(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_accepted(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_accepted(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_accepted(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def is_rescued(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def to_rescued(self) -> bool:
+        raise NotImplementedError("This should be overridden")
+
+    async def may_to_rescued(self) -> bool:
+        raise NotImplementedError("This should be overridden")
diff --git a/src/lsst/cmservice/machines/node.py b/src/lsst/cmservice/machines/node.py
new file mode 100644
index 000000000..92b19981b
--- /dev/null
+++ b/src/lsst/cmservice/machines/node.py
@@ -0,0 +1,455 @@
+# ruff: noqa
+"""Module for state machine implementations related to Nodes."""
+
+import inspect
+import pickle
+import shutil
+import sys
+from collections.abc import Mapping
+from functools import cache
+from os.path import expandvars
+from typing import Any, TYPE_CHECKING
+from uuid import uuid4, uuid5
+
+from anyio import Path
+from fastapi.concurrency import run_in_threadpool
+from sqlmodel.ext.asyncio.session import AsyncSession
+from transitions import EventData
+from transitions.extensions.asyncio import AsyncEvent, AsyncMachine
+
+from ..common import timestamp
+from ..common.enums import ManifestKind, StatusEnum
+from ..common.logging import LOGGER
+from ..config import config
+from ..db.campaigns_v2 import ActivityLog, Machine, Node
+from ..db.session import get_async_session
+from .abc import StatefulModel
+
+logger = LOGGER.bind(module=__name__)
+
+
+TRANSITIONS = [
+    # The critical/happy path of state evolution from waiting to accepted
+    {
+        "trigger": "prepare",
+        "source": StatusEnum.waiting,
+        "dest": StatusEnum.ready,
+    },
+    {
+        "trigger": "start",
+        "source": StatusEnum.ready,
+        "dest": StatusEnum.running,
+        "conditions": "is_startable",
+    },
+    {
+        "trigger": "finish",
+        "source": StatusEnum.running,
+        "dest": StatusEnum.accepted,
+        "conditions": "is_done_running",
+    },
+    # The bad transitions
+    {"trigger": "block", "source": StatusEnum.running, "dest": StatusEnum.blocked},
+    {"trigger": "fail", "source": StatusEnum.running, "dest": StatusEnum.failed},
+    # User-initiated transitions
+    {"trigger": "pause", "source": StatusEnum.running, "dest": StatusEnum.paused},
+    {"trigger": "unblock", "source": StatusEnum.blocked, "dest": StatusEnum.running},
+    {"trigger": "resume", "source": StatusEnum.paused, "dest": StatusEnum.running},
+    {"trigger": "force", "source": StatusEnum.failed, "dest": StatusEnum.accepted},
+    # Inverse transitions, i.e., rollbacks
+    {"trigger": "unprepare", "source": StatusEnum.ready, "dest": StatusEnum.waiting},
+    {"trigger": "stop", "source": StatusEnum.paused, "dest": StatusEnum.ready},
+    {"trigger": "retry", "source": StatusEnum.failed, "dest": StatusEnum.ready},
+]
+"""Transitions available to a Node, expressed as source-destination pairs
+with a named trigger-verb.
+"""
+
+
+class NodeMachine(StatefulModel):
+    """General state model for a Node in a Campaign Graph."""
+
+    __kind__ = [ManifestKind.node]
+    node: Node | None
+    machine: AsyncMachine
+    activity_log_entry: ActivityLog | None = None
+    session: AsyncSession | None = None
+
+    def __init__(
+        self, *args: Any, o: Node, initial_state: StatusEnum = StatusEnum.waiting, **kwargs: Any
+    ) -> None:
+        self.node = o
+        self.machine = AsyncMachine(
+            model=self,
+            states=StatusEnum,
+            transitions=TRANSITIONS,
+            initial=initial_state,
+            auto_transitions=False,
+            prepare_event=["prepare_session", "prepare_activity_log"],
+            after_state_change="update_persistent_status",
+            finalize_event="finalize",
+            on_exception="error_handler",
+            send_event=True,
+            model_override=True,
+        )
+        self.post_init()
+
+    def post_init(self):
+        """Additional initialization method called at the end of ``__init__``,
+        as a convenenience to child classes.
+        """
+        pass
+
+    def __getstate__(self) -> dict:
+        """Prepares the stateful model for serialization, as with pickle."""
+        # Remove members that are not picklable or should not be included
+        # in the pickle
+        state = self.__dict__.copy()
+        del state["session"]
+        del state["node"]
+        del state["activity_log_entry"]
+        return state
+
+    async def error_handler(self, event: EventData) -> None:
+        """Error handler function for the Stateful Model, called by the Machine
+        if any exception is raised in a callback function.
+        """
+        if event.error is None:
+            return
+
+        logger.exception(event.error)
+        if self.activity_log_entry is not None:
+            self.activity_log_entry.detail["trigger"] = event.event.name
+            self.activity_log_entry.detail["error"] = str(event.error)
+
+        # Auto-transition on error
+        match event.event:
+            case AsyncEvent(name="finish"):
+                # TODO if we need to distinguish between types of failures,
+                #      e.g., fail vs block, we'd have to inspect the error here
+                await self.trigger("fail")
+            case _:
+                ...
+
+    async def prepare_session(self, event: EventData) -> None:
+        """Prepares the machine by acquiring a database session."""
+        # This positive assertion concerning the ORM member will prevent
+        # any callback from proceeding if no such member is defined, but type
+        # checkers don't know this, which is why it repeated in a TYPE_CHECKING
+        # guard in each method that accesses the ORM member.
+        assert self.node is not None, "Stateful Model must have a Node member."
+
+        logger.debug("Preparing session for transition", id=str(self.node.id))
+        if self.session is not None:
+            await self.session.close()
+        else:
+            self.session = await get_async_session()
+
+    async def prepare_activity_log(self, event: EventData) -> None:
+        """Callback method invoked by the Machine before every state-change."""
+        if TYPE_CHECKING:
+            assert self.node is not None
+
+        if self.activity_log_entry is not None:
+            return None
+
+        logger.debug("Preparing activity log for transition", id=str(self.node.id))
+
+        from_state = StatusEnum[event.transition.source] if event.transition else self.state
+        to_state = (
+            StatusEnum[event.transition.dest] if event.transition and event.transition.dest else self.state
+        )
+
+        self.activity_log_entry = ActivityLog(
+            id=uuid4(),
+            namespace=self.node.namespace,
+            node=self.node.id,
+            operator="daemon",
+            from_status=from_state,
+            to_status=to_state,
+            detail={},
+            metadata_={},
+        )
+
+    async def update_persistent_status(self, event: EventData) -> None:
+        """Callback method invoked by the Machine after every state-change."""
+        # Update activity log entry with new state and timestamp
+        if TYPE_CHECKING:
+            assert self.node is not None, "Stateful Model must have a Node member."
+            assert self.session is not None
+        logger.debug("Updating the ORM instance after transition.", id=str(self.node.id))
+
+        if self.activity_log_entry is not None:
+            self.activity_log_entry.to_status = self.state
+            self.activity_log_entry.detail["finished_at"] = timestamp.element_time()
+
+        # Ensure database record for transitioned object is updated
+        self.node = await self.session.merge(self.node, load=False)
+        self.node.status = self.state
+        await self.session.commit()
+
+    async def finalize(self, event: EventData) -> None:
+        """Callback method invoked by the Machine unconditionally at the end
+        of every callback chain.
+        """
+        if TYPE_CHECKING:
+            assert self.node is not None, "Stateful Model must have a Node member."
+            assert self.session is not None
+
+        # The activity log entry is added to the db. For failed transitions it
+        # may include error detail. For other transitions it is not necessary
+        # to log every attempt, so if no callback has registered any detail
+        # for the log entry it is not persisted.
+        if self.activity_log_entry is None:
+            return
+        elif not len(self.activity_log_entry.detail):
+            return
+
+        # ensure the orm instance is in the session
+        if self.node not in self.session:
+            self.node = await self.session.merge(self.node, load=False)
+
+        # flush the activity log entry to the db
+        try:
+            logger.debug("Finalizing the activity log after transition.", id=str(self.node.id))
+            self.session.add(self.activity_log_entry)
+            await self.session.commit()
+        except Exception:
+            logger.exception()
+            await self.session.rollback()
+        finally:
+            self.session.expunge(self.activity_log_entry)
+            self.activity_log_entry = None
+
+        # create or update a machine entry in the db
+        new_machine = Machine.model_validate(
+            dict(id=self.node.machine or uuid4(), state=pickle.dumps(self.machine))
+        )
+        try:
+            logger.debug("Serializing the state machine after transition.", id=str(self.node.id))
+            await self.session.merge(new_machine)
+            self.node.machine = new_machine.id
+            await self.session.commit()
+        except Exception:
+            logger.exception()
+            await self.session.rollback()
+        finally:
+            self.session.expunge(new_machine)
+
+        await self.session.close()
+        self.session = None
+
+    async def is_startable(self, event: EventData) -> bool:
+        """Conditional method called to check whether a ``start`` trigger may
+        be called.
+        """
+        return True
+
+    async def is_done_running(self, event: EventData) -> bool:
+        """Conditional method called to check whether a ``finish`` trigger may
+        be called.
+        """
+        return True
+
+
+class StartMachine(NodeMachine):
+    """Conceptually, a campaign's START node may participate in activities like
+    any other kind of node, even though its purpose is to provide a solid well-
+    known root to the campaign graph. Some activities assigned to the Campaign
+    Machine could also be modeled as belonging to the START node instead. The
+    END node could serve a similar purpose.
+    """
+
+    __kind__ = [ManifestKind.node]
+
+    def post_init(self) -> None:
+        """Post init, set class-specific callback triggers."""
+        self.machine.before_prepare("do_prepare")
+        self.machine.before_unprepare("do_unprepare")
+        self.machine.before_start("do_start")
+
+    async def do_prepare(self, event: EventData) -> None:
+        """Action method invoked when executing the "prepare" transition.
+
+        For a Campaign to enter the ready state, the machine must consider:
+
+        Conditions
+        ----------
+        - the campaign's graph is valid.
+
+        Callbacks
+        ---------
+        - artifact directory is created and writable.
+        """
+        if TYPE_CHECKING:
+            assert self.node is not None
+
+        logger.info("Preparing START node", id=str(self.node.id))
+
+        artifact_location = Path(expandvars(config.bps.artifact_path)) / str(self.node.namespace)
+        await artifact_location.mkdir(parents=False, exist_ok=True)
+
+    async def do_unprepare(self, event: EventData) -> None:
+        if TYPE_CHECKING:
+            assert self.node is not None
+
+        logger.info("Unpreparing START node", id=str(self.node.id))
+        artifact_location = Path(expandvars(config.bps.artifact_path)) / str(self.node.namespace)
+        await run_in_threadpool(shutil.rmtree, artifact_location)
+
+    async def do_start(self, event: EventData) -> None:
+        """Callback invoked when entering the "running" state.
+
+        There is no particular work performed when a campaign enters a running
+        state other than to update the record's entry in the database which
+        acts as a flag to an executor to signal that a campaign's graph Nodes
+        may now be evolved.
+        """
+        if TYPE_CHECKING:
+            assert self.node is not None
+
+        logger.debug("Starting START Node for Campaign", id=str(self.node.id))
+        return None
+
+
+class StepMachine(NodeMachine):
+    """Specific state model for a Node of kind GroupedStep.
+
+    The Step-Nodes may be the most involved state models, as the logic that
+    must execute during each transition is complex. The behaviors are generally
+    the same as the "scripts" associated with a Step/Group/Job in the legacy
+    CM implementation.
+
+    A summary of the logic at each transition:
+
+    - prepare
+        - determine number of groups and group membership
+        - create new Manifest for each Group
+    - start
+        - create new StepGroup Nodes (reading prepared Manifests)
+        - create new StepCollect Node
+        - create edges
+    - finish
+        - (condition) campaign graph is valid
+    - unprepare (rollback)
+        - no particular action taken, but know that on the next use of "prepare"
+          new versions of the group manifests may be created.
+
+    Failure modes may include
+        - Butler errors (can't query for group membership)
+        - Bad inputs (group membership rules don't make sense)
+    """
+
+    __kind__ = [ManifestKind.grouped_step]
+
+    def __init__(
+        self, *args: Any, o: Node, initial_state: StatusEnum = StatusEnum.waiting, **kwargs: Any
+    ) -> None:
+        super().__init__(*args, o, initial_state, **kwargs)
+        self.machine.before_prepare("do_prepare")
+        self.machine.before_start("do_start")
+        self.machine.before_unprepare("do_unprepare")
+        self.machine.before_finish("do_finish")
+
+    async def do_prepare(self, event: EventData) -> None: ...
+
+    async def do_unprepare(self, event: EventData) -> None: ...
+
+    async def do_start(self, event: EventData) -> None: ...
+
+    async def do_finish(self, event: EventData) -> None: ...
+
+    async def is_successful(self, event: EventData) -> bool:
+        """Checks whether the WMS job is finished or not based on the result of
+        a bps-report or similar. Returns a True value if the batch is done and
+        good, a False value if it is still running. Raises an exception in any
+        other terminal WMS state (HELD or FAILED).
+
+        ```
+        bps_report: WmsStatusReport = get_wms_status_from_bps(...)
+
+        match bps_report:
+           case WmsStatusReport(wms_status="FINISHED"):
+                return True
+           case WmsStatusReport(wms_status="HELD"):
+                raise WmsBlockedError()
+           case WmsStatusReport(wms_status="FAILED"):
+                raise WmsFailedError()
+           case WmsStatusReport(wms_status="RUNNING"):
+                return False
+        ```
+        """
+        return True
+
+
+class GroupMachine(NodeMachine):
+    """Specific state model for a Node of kind StepGroup.
+
+    A summary of the logic at each transition:
+
+    - prepare
+        - create artifact output directory
+        - collect all relevant configuration Manifests
+        - render bps workflow artifacts
+        - create butler in collection(s)
+
+    - start
+        - bps submit
+        - (after_start) determine bps submit directory
+
+    - finish
+        - (condition) bps report == done
+        - create butler out collection(s)
+
+    - fail
+        - read/parse bps output logs
+
+    - stop (rollback)
+        - bps cancel
+
+    - unprepare (rollback)
+        - remove artifact output directory
+        - Butler collections are not modified (paint-over pattern)
+
+    Failure modes may include:
+        - Unwritable artifact output directory
+        - Manifests insufficient to render bps workflow artifacts
+        - Butler errors
+        - BPS or other middleware errors
+    """
+
+    __kind__ = [ManifestKind.step_group]
+
+    ...
+
+
+class StepCollectMachine(NodeMachine):
+    """Specific state model for a Node of kind StepCollect.
+
+    - prepare
+        - create step output chained butler collection
+
+    - start
+        - (condition) ancestor output collections exist in butler?
+        - add each ancestor output collection to step output chain
+
+    - finish
+        - (condition) all ancestor output collections in chain
+    """
+
+    __kind__ = [ManifestKind.collect_groups]
+
+    ...
+
+
+@cache
+def node_machine_factory(kind: ManifestKind) -> type[NodeMachine]:
+    """Returns the Stateful Model for a node based on its kind, by matching
+    the ``__kind__`` attribute of available classes in this module.
+
+    TODO: May "construct" new classes from multiple matches, but this is not
+    yet necessary.
+    """
+    for _, o in inspect.getmembers(sys.modules[__name__], inspect.isclass):
+        if issubclass(o, NodeMachine) and kind in o.__kind__:
+            return o
+    return NodeMachine
diff --git a/tests/v2/conftest.py b/tests/v2/conftest.py
index 4bd61136f..e409b7dd5 100644
--- a/tests/v2/conftest.py
+++ b/tests/v2/conftest.py
@@ -101,6 +101,9 @@ async def testdb(rawdb: DatabaseSessionDependency) -> AsyncGenerator[DatabaseSes
                 namespace=str(NAMESPACE_DNS),
                 name="DEFAULT",
                 owner="root",
+                status="accepted",
+                metadata={},
+                configuration={},
             )
         )
         await aconn.commit()
diff --git a/tests/v2/test_daemon.py b/tests/v2/test_daemon.py
new file mode 100644
index 000000000..17d602604
--- /dev/null
+++ b/tests/v2/test_daemon.py
@@ -0,0 +1,149 @@
+"""tests for the v2 daemon"""
+
+from urllib.parse import urlparse
+from uuid import uuid5
+
+import pytest
+from sqlmodel import select
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+from lsst.cmservice.common.daemon_v2 import consider_campaigns, consider_nodes
+from lsst.cmservice.common.enums import StatusEnum
+from lsst.cmservice.db.campaigns_v2 import Campaign, Node, Task
+
+pytestmark = pytest.mark.asyncio(loop_scope="module")
+"""All tests in this module will run in the same event loop."""
+
+
+async def test_daemon_campaign(
+    caplog: pytest.LogCaptureFixture, test_campaign: str, session: AsyncSession
+) -> None:
+    """Tests the handling of campaigns during daemon iteration, which is
+    primarily done by checking side effects. This test assesses a test campaign
+    with three nodes and asserts that node(s) are added to the Task table in
+    the correct order and that as they enter an accepted state the daemon can
+    continue to traverse the campaign graph and visit more nodes until the
+    END node is reached.
+    """
+
+    # At first, the test_campaign in a waiting state is not subject to daemon
+    # consideration
+    caplog.clear()
+    await consider_campaigns(session)
+
+    # extract the test campaign id from the fixture url
+    campaign_id = urlparse(test_campaign).path.split("/")[-2:][0]
+
+    campaign = await session.get_one(Campaign, campaign_id)
+    assert campaign.status is not None
+    x = campaign.status
+    assert x is StatusEnum.waiting
+
+    # check the next state in the happy path and set the campaign status
+    # (i.e., without using the Campaign FSM)
+    assert campaign.status.next_status() is StatusEnum.ready
+    campaign.status = campaign.status.next_status()
+    await session.commit()
+
+    # now the daemon should consider the prepared campaign
+    caplog.clear()
+    await consider_campaigns(session)
+    assert "considering campaign" in caplog.records[0].message
+    assert "considering node" in caplog.records[1].message
+
+    # A task should now be in the task table
+    tasks = (await session.exec(select(Task))).all()
+    assert len(tasks) == 1
+
+    # Fetch the node, set it to a terminal status, and consider the campaign
+    # again
+    node = await session.get_one(Node, tasks[0].node)
+    assert node.name == "START"
+    node.status = StatusEnum.accepted
+    await session.commit()
+
+    caplog.clear()
+    await consider_campaigns(session)
+    tasks = (await session.exec(select(Task))).all()
+    # One additional task should be in the table now
+    assert len(tasks) == 2
+    node = await session.get_one(Node, tasks[-1].node)
+    node.status = StatusEnum.accepted
+    await session.commit()
+
+    # The next assessment should produce two nodes to be handled in parallel
+    caplog.clear()
+    await consider_campaigns(session)
+    tasks = (await session.exec(select(Task))).all()
+    # Two additional tasks should be in the table now
+    assert len(tasks) == 4
+
+    node = await session.get_one(Node, tasks[-1].node)
+    node.status = StatusEnum.accepted
+    node = await session.get_one(Node, tasks[-2].node)
+    node.status = StatusEnum.accepted
+    await session.commit()
+
+    # The next assessment should produce the END node
+    caplog.clear()
+    await consider_campaigns(session)
+    tasks = (await session.exec(select(Task))).all()
+    # One additional task should be in the table now
+    assert len(tasks) == 5
+    node = await session.get_one(Node, tasks[-1].node)
+    assert node.name == "END"
+    node.status = StatusEnum.accepted
+    await session.commit()
+
+
+async def test_daemon_node(
+    caplog: pytest.LogCaptureFixture, test_campaign: str, session: AsyncSession
+) -> None:
+    # set the campaign to running (without involving a campaign machine)
+    campaign_id = urlparse(url=test_campaign).path.split("/")[-2:][0]
+    campaign = await session.get_one(Campaign, campaign_id)
+    campaign.status = StatusEnum.running
+    await session.commit()
+
+    # after the equivalent of a single iteration, the test campaign's START
+    # Node will be on the task list with a transition from waiting->ready.
+    await consider_campaigns(session)
+    await consider_nodes(session)
+
+    # As we continue to iterate the daemon over the campaign's 5 nodes
+    # (including its START and END), each node in the graph is evolved.
+    # To simulate this, we'll pull the END node from the database and wait
+    # until it is in its terminal "accepted" state.
+    end_node = await session.get_one(Node, uuid5(campaign.id, "END.1"))
+
+    # set up a release valve to stave off infinite loops in case things don't
+    # go well. This should take 11 iterations (4 nodes * 3 transitions, one of
+    # which is already done.)
+    i = 12
+    while end_node.status is not StatusEnum.accepted:
+        i -= 1
+        await consider_campaigns(session)
+        await consider_nodes(session)
+        # the end node is expunged from the session as a side effect when the
+        # graph is built
+        session.add(end_node)
+        await session.refresh(end_node, attribute_names=["status"])
+        if not i:
+            raise RuntimeError("Node evolution took too long")
+    ...
+
+
+def test_dynamic_node_machine() -> None:
+    """Test the dynamic resolution of a ``NodeMachine`` class based on a Node's
+    ``kind`` attribute.
+    """
+    from lsst.cmservice.common.enums import ManifestKind
+    from lsst.cmservice.machines.node import GroupMachine, NodeMachine, node_machine_factory
+
+    k = ManifestKind.node
+    x = node_machine_factory(k)
+    assert x is NodeMachine
+
+    k = ManifestKind.step_group
+    x = node_machine_factory(k)
+    assert x is GroupMachine
diff --git a/tests/v2/test_machines.py b/tests/v2/test_machines.py
new file mode 100644
index 000000000..641753b99
--- /dev/null
+++ b/tests/v2/test_machines.py
@@ -0,0 +1,174 @@
+"""Tests for State Machines."""
+
+import pickle
+from unittest.mock import patch
+from urllib.parse import urlparse
+from uuid import UUID, uuid4, uuid5
+
+import pytest
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+from lsst.cmservice.common.enums import StatusEnum
+from lsst.cmservice.db.campaigns_v2 import Machine, Node
+from lsst.cmservice.machines.node import NodeMachine, StartMachine
+
+pytestmark = pytest.mark.asyncio(loop_scope="module")
+"""All tests in this module will run in the same event loop."""
+
+
+async def test_node_machine(test_campaign: str, session: AsyncSession) -> None:
+    """Test the critical/happy path of a node state machine."""
+
+    # extract the test campaign id from the fixture url and determine the START
+    # node id
+    campaign_id = urlparse(url=test_campaign).path.split("/")[-2:][0]
+    node_id = uuid5(UUID(campaign_id), "START.1")
+
+    node = await session.get_one(Node, node_id)
+    x = node.status
+    assert x is StatusEnum.waiting
+
+    node_machine = StartMachine(o=node)
+    assert node_machine.is_waiting()
+    assert await node_machine.may_prepare()
+
+    did_prepare = await node_machine.prepare()
+    assert did_prepare
+    assert await node_machine.may_start()
+
+    await session.refresh(node, attribute_names=["status"])
+    x = node.status
+    assert x is StatusEnum.ready
+
+    did_start = await node_machine.start()
+    assert did_start
+    assert await node_machine.may_pause()
+    assert await node_machine.may_finish()
+
+    await session.refresh(node, attribute_names=["status"])
+    x = node.status
+    assert x is StatusEnum.running
+
+    did_finish = await node_machine.trigger("finish")
+    assert did_finish
+    await session.refresh(node, attribute_names=["status"])
+    x = node.status
+    assert x is StatusEnum.accepted
+
+    await session.close()
+
+
+async def test_bad_transition(test_campaign: str, session: AsyncSession) -> None:
+    """Forces a state transition to raise an exception and tests the generation
+    of an activity log record.
+    """
+    # extract the test campaign id from the fixture url
+    campaign_id = urlparse(url=test_campaign).path.split("/")[-2:][0]
+    node_id = uuid5(UUID(campaign_id), "START.1")
+
+    node = await session.get_one(Node, node_id)
+    x = node.status
+    assert x is StatusEnum.waiting
+    node_machine = StartMachine(o=node)
+
+    with patch(
+        "lsst.cmservice.machines.node.StartMachine.do_prepare",
+        side_effect=RuntimeError("Error: unknown error"),
+    ):
+        assert await node_machine.may_trigger("prepare")
+        assert not await node_machine.trigger("prepare")
+
+    assert await node_machine.prepare()
+    assert await node_machine.start()
+
+    # test the automatic transition to failure when an exception is raised in
+    # the success check conditional callback
+    with patch(
+        "lsst.cmservice.machines.node.StartMachine.is_done_running",
+        side_effect=RuntimeError("Error: WMS execution failure"),
+    ):
+        await node_machine.may_finish()
+
+    # Both the state machine and db object should reflect the failed state
+    assert node_machine.is_failed()
+    await session.refresh(node, attribute_names=["status"])
+    x = node.status
+    assert x is StatusEnum.failed
+
+    # retry by rolling back to ready
+    assert await node_machine.may_retry()
+    await node_machine.trigger("retry")
+
+    assert node_machine.is_ready()
+    await session.refresh(node, attribute_names=["status"])
+    x = node.status
+    assert x is StatusEnum.ready
+
+    # start and finish without further error
+    assert await node_machine.start()
+    assert await node_machine.finish()
+
+    await session.refresh(node, attribute_names=["status"])
+    x = node.status
+    assert x is StatusEnum.accepted
+    await session.close()
+
+
+async def test_machine_pickle(test_campaign: str, session: AsyncSession) -> None:
+    """Tests the serialization of a state machine in and out of a pickle."""
+    # extract the test campaign id from the fixture url
+    campaign_id = urlparse(url=test_campaign).path.split("/")[-2:][0]
+    node_id = uuid5(UUID(campaign_id), "START.1")
+
+    node = await session.get_one(Node, node_id)
+    x = node.status
+    assert x is StatusEnum.waiting
+    node_machine = NodeMachine(o=node)
+
+    # evolve the machine to "prepared"
+    await node_machine.prepare()
+    assert node_machine.state is StatusEnum.ready
+
+    # pickles can go to the database
+    machine_pickle = pickle.dumps(node_machine.machine)
+    machine_db = Machine.model_validate(dict(id=uuid4(), state=machine_pickle))
+
+    # campaigns can have a reference to their machine, but the machine ids are
+    # not necessarily deterministic (i.e., they do not have to be namespaced.)
+    session.add(machine_db)
+    await session.commit()
+    node.machine = machine_db.id
+    await session.commit()
+    await session.refresh(node, attribute_names=["status", "machine"])
+
+    await session.close()
+    del node_machine
+    del node
+    del machine_db
+    del machine_pickle
+
+    # get new objects from the database
+    new_node = await session.get_one(Node, node_id)
+    machine_unpickle = await session.get_one(Machine, new_node.machine)
+
+    # Before pickling, the stateful model had the machine as its `.machine`
+    # member, and the machine itself had the stateful model as its `.model`
+    # member. To get back where we started, we would want to use the unpickled
+    # machine's `.model` attribute as our first-class named object, then re-
+    # assign any members we had to disasssociate before pickling
+    assert machine_unpickle.state is not None
+    new_node_machine: NodeMachine = (pickle.loads(machine_unpickle.state)).model
+    new_node_machine.node = new_node
+
+    # test the rehydrated machine and continue to evolve it
+    assert new_node_machine.state == new_node.status
+
+    await new_node_machine.start()
+    await session.refresh(new_node, attribute_names=["status"])
+    assert new_node_machine.state == new_node.status
+
+    await new_node_machine.finish()
+    await session.refresh(new_node, attribute_names=["status"])
+    assert new_node_machine.state == new_node.status
+
+    await session.close()

From 0f58afd290839ba41f93a1be822c1633aa7e6ffc Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Wed, 9 Jul 2025 10:20:44 -0500
Subject: [PATCH 31/37] feat(campaign): patch status change - validate graph
 and affect status update in background task - update fastapi session override
 in tests - add activity log route for campaigns - implement campaign status
 updates via PATCH and FSM

---
 src/lsst/cmservice/common/daemon_v2.py     |   2 +-
 src/lsst/cmservice/common/graph.py         |   3 +-
 src/lsst/cmservice/machines/abc.py         |   2 +-
 src/lsst/cmservice/machines/campaign.py    | 216 +++++++++++++++++++++
 src/lsst/cmservice/machines/node.py        |   2 +-
 src/lsst/cmservice/machines/tasks.py       |  91 +++++++++
 src/lsst/cmservice/routers/v2/campaigns.py |  94 ++++++---
 tests/v2/conftest.py                       |   9 +-
 tests/v2/test_campaign_routes.py           |  31 ++-
 tests/v2/test_daemon.py                    |   7 +-
 tests/v2/test_machines.py                  |  58 +++++-
 11 files changed, 478 insertions(+), 37 deletions(-)
 create mode 100644 src/lsst/cmservice/machines/campaign.py
 create mode 100644 src/lsst/cmservice/machines/tasks.py

diff --git a/src/lsst/cmservice/common/daemon_v2.py b/src/lsst/cmservice/common/daemon_v2.py
index 50ff84df7..f86e73b1e 100644
--- a/src/lsst/cmservice/common/daemon_v2.py
+++ b/src/lsst/cmservice/common/daemon_v2.py
@@ -160,6 +160,6 @@ def trigger_for_transition(task: Task, events: Mapping[str, Event]) -> str | Non
     return None
 
 
-def task_runner_callback(task: AsyncTask):
+def task_runner_callback(task: AsyncTask) -> None:
     """Callback function for `asyncio.TaskGroup` tasks."""
     logger.info("Transition complete", id=task.get_name())
diff --git a/src/lsst/cmservice/common/graph.py b/src/lsst/cmservice/common/graph.py
index 184c20917..2f34bfbe9 100644
--- a/src/lsst/cmservice/common/graph.py
+++ b/src/lsst/cmservice/common/graph.py
@@ -1,5 +1,6 @@
 from collections.abc import Iterable, Mapping, MutableSet, Sequence
 from typing import Literal
+from uuid import UUID
 
 import networkx as nx
 from sqlalchemy import select
@@ -107,7 +108,7 @@ def graph_to_dict(g: nx.DiGraph) -> Mapping:
     return nx.node_link_data(g, edges="edges")
 
 
-def validate_graph(g: nx.DiGraph, source: str = "START", sink: str = "END") -> bool:
+def validate_graph(g: nx.DiGraph, source: UUID | str = "START", sink: UUID | str = "END") -> bool:
     """Validates a graph by asserting by traversal that a complete and correct
     path exists between `source` and `sink` nodes.
 
diff --git a/src/lsst/cmservice/machines/abc.py b/src/lsst/cmservice/machines/abc.py
index 23f345377..12de677fa 100644
--- a/src/lsst/cmservice/machines/abc.py
+++ b/src/lsst/cmservice/machines/abc.py
@@ -62,7 +62,7 @@ async def finalize(self, event: EventData) -> None: ...
     async def may_trigger(self, trigger_name: str) -> bool:
         raise NotImplementedError("Must be overridden by a Machine")
 
-    async def trigger(self, trigger_name: str) -> bool:
+    async def trigger(self, trigger_name: str, **kwargs: Any) -> bool:
         raise NotImplementedError("Must be overridden by a Machine")
 
     async def resume(self) -> bool:
diff --git a/src/lsst/cmservice/machines/campaign.py b/src/lsst/cmservice/machines/campaign.py
new file mode 100644
index 000000000..1d387cc5f
--- /dev/null
+++ b/src/lsst/cmservice/machines/campaign.py
@@ -0,0 +1,216 @@
+"""Module for state machine implementations related to Campaigns.
+
+A Campaign state machine should be a simple one, since a Campaign itself does
+not need to implement much in the way of Actions or Triggers. A campaign's
+status should generally reflect the "worst-case" status of any of Nodes active
+in its namespace.
+
+Since a campaign is mostly a container, the critical path of its state machine
+should focus on validity and completeness of its graph, while providing useful
+information about the overall campaign progress to pilots and other users.
+"""
+
+from typing import TYPE_CHECKING, Any
+from uuid import uuid4, uuid5
+
+from sqlmodel import select
+from transitions import EventData
+from transitions.extensions.asyncio import AsyncMachine
+
+from ..common import timestamp
+from ..common.enums import ManifestKind, StatusEnum
+from ..common.graph import graph_from_edge_list_v2, validate_graph
+from ..common.logging import LOGGER
+from ..common.timestamp import element_time
+from ..db.campaigns_v2 import ActivityLog, Campaign, Edge, Node
+from .node import NodeMachine
+
+logger = LOGGER.bind(module=__name__)
+
+
+TRANSITIONS = [
+    # The critical/happy path of state evolution from waiting to accepted
+    {
+        "trigger": "start",
+        "source": StatusEnum.waiting,
+        "dest": StatusEnum.running,
+        "conditions": "has_valid_graph",
+    },
+    {
+        "trigger": "finish",
+        "source": StatusEnum.running,
+        "dest": StatusEnum.accepted,
+        "conditions": "is_successful",
+    },
+    # User-initiated transitions
+    {"trigger": "pause", "source": StatusEnum.running, "dest": StatusEnum.paused},
+    {
+        "trigger": "resume",
+        "source": StatusEnum.paused,
+        "dest": StatusEnum.running,
+        "conditions": "has_valid_graph",
+    },
+]
+"""Transitions available to a Campaign, expressed as source-destination pairs
+with a named trigger-verb.
+"""
+
+
+class InvalidCampaignGraphError(Exception): ...
+
+
+class CampaignMachine(NodeMachine):
+    """Class representing the stateful structure of a Campaign State Machine,
+    including callbacks and actions to be executed during transitions.
+    """
+
+    __kind__ = [ManifestKind.campaign]
+    campaign: Campaign | None
+
+    def __init__(
+        self, *args: Any, o: Campaign, initial_state: StatusEnum = StatusEnum.waiting, **kwargs: Any
+    ) -> None:
+        self.node = Node(id=uuid5(o.id, "START.1"), name="START", namespace=o.id, version=1)
+        self.campaign = o
+        self.machine = AsyncMachine(
+            model=self,
+            states=StatusEnum,
+            transitions=TRANSITIONS,
+            initial=initial_state,
+            auto_transitions=False,
+            prepare_event=["prepare_session", "prepare_activity_log"],
+            after_state_change="update_persistent_status",
+            finalize_event="finalize",
+            on_exception="error_handler",
+            send_event=True,
+            model_override=True,
+        )
+
+    async def error_handler(self, event: EventData) -> None:
+        """Error handler function for the Stateful Model, called by the Machine
+        if any exception is raised in a callback function.
+        """
+        if TYPE_CHECKING:
+            assert self.campaign is not None
+
+        if event.error is None:
+            return
+
+        logger.exception(event.error, id=self.campaign.id)
+        if self.activity_log_entry is not None:
+            self.activity_log_entry.detail["trigger"] = event.event.name
+            self.activity_log_entry.detail["error"] = str(event.error)
+
+    async def prepare_activity_log(self, event: EventData) -> None:
+        """Callback method invoked by the Machine before every state-change."""
+
+        if TYPE_CHECKING:
+            assert self.node is not None
+            assert self.campaign 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
+
+        from_state = StatusEnum[event.transition.source] if event.transition else self.state
+        to_state = (
+            StatusEnum[event.transition.dest] if event.transition and event.transition.dest else self.state
+        )
+
+        self.activity_log_entry = ActivityLog(
+            id=uuid4(),
+            namespace=self.campaign.id,
+            node=self.node.id,
+            operator=event.kwargs.get("operator", "daemon"),
+            from_status=from_state,
+            to_status=to_state,
+            detail={},
+            metadata_={"request_id": event.kwargs.get("request_id")},
+        )
+
+    async def update_persistent_status(self, event: EventData) -> None:
+        """Callback method invoked by the Machine after every state-change."""
+        # Update activity log entry with new state and timestamp
+        if TYPE_CHECKING:
+            assert self.campaign is not None
+            assert self.session is not None
+
+        if self.activity_log_entry is not None:
+            self.activity_log_entry.to_status = self.state
+            self.activity_log_entry.detail["finished_at"] = timestamp.element_time()
+
+        # Ensure database record for transitioned object is updated
+        self.campaign = await self.session.merge(self.campaign, load=False)
+        self.campaign.status = self.state
+        self.campaign.metadata_["mtime"] = element_time()
+        await self.session.commit()
+
+    async def finalize(self, event: EventData) -> None:
+        """Callback method invoked by the Machine unconditionally at the end
+        of every callback chain.
+        """
+        if TYPE_CHECKING:
+            assert self.campaign is not None
+            assert self.session is not None
+
+        # The activity log entry is added to the db. For failed transitions it
+        # may include error detail. For other transitions it is not necessary
+        # to log every attempt, so if no callback has registered any detail
+        # for the log entry it is not persisted.
+        if self.activity_log_entry is None:
+            return
+        elif not len(self.activity_log_entry.detail):
+            return
+
+        try:
+            self.session.add(self.activity_log_entry)
+            await self.session.commit()
+        except Exception:
+            logger.exception()
+            await self.session.rollback()
+        finally:
+            self.session.expunge(self.activity_log_entry)
+
+        await self.session.close()
+        self.session = None
+        self.activity_log_entry = None
+
+    async def is_successful(self, event: EventData) -> bool:
+        """A conditional method associated with a transition.
+
+        This callback should assert that the campaign is in a complete and
+        accepted state by the virtue of all its Nodes also being in a complete
+        and accepted state. The campaign's "END" node is used as a proxy
+        for this assertion, because by the rules of the campaign's graph, the
+        "END" node may only be reached if all other nodes have been success-
+        fully evolved by an executor.
+        """
+        if TYPE_CHECKING:
+            assert self.campaign is not None
+            assert self.session is not None
+        end_node = await self.session.get_one(Node, uuid5(self.campaign.id, "END.1"))
+        logger.info(f"Checking whether campaign {self.campaign.name} is finished.", end_node=end_node.status)
+        return end_node.status is StatusEnum.accepted
+
+    async def has_valid_graph(self, event: EventData) -> bool:
+        """A conditional method associated with a transition.
+
+        This callback asserts that the campaign graph is valid as a condition
+        that must be met before the campaign may transition to a "ready" state.
+        """
+        if TYPE_CHECKING:
+            assert self.campaign is not None
+            assert self.session is not None
+
+        edges = await self.session.exec(select(Edge).where(Edge.namespace == self.campaign.id))
+        graph = await graph_from_edge_list_v2(edges.all(), self.session)
+        source = uuid5(self.campaign.id, "START.1")
+        sink = uuid5(self.campaign.id, "END.1")
+        graph_is_valid = validate_graph(graph, source, sink)
+        if not graph_is_valid:
+            raise InvalidCampaignGraphError("Invalid campaign graph")
+        return graph_is_valid
diff --git a/src/lsst/cmservice/machines/node.py b/src/lsst/cmservice/machines/node.py
index 92b19981b..673774572 100644
--- a/src/lsst/cmservice/machines/node.py
+++ b/src/lsst/cmservice/machines/node.py
@@ -93,7 +93,7 @@ def __init__(
         )
         self.post_init()
 
-    def post_init(self):
+    def post_init(self) -> None:
         """Additional initialization method called at the end of ``__init__``,
         as a convenenience to child classes.
         """
diff --git a/src/lsst/cmservice/machines/tasks.py b/src/lsst/cmservice/machines/tasks.py
new file mode 100644
index 000000000..d0e80afbc
--- /dev/null
+++ b/src/lsst/cmservice/machines/tasks.py
@@ -0,0 +1,91 @@
+"""Background task implementations for FSM-related operations performed via
+API routes.
+"""
+
+from typing import TYPE_CHECKING
+from uuid import UUID, uuid5
+
+from sqlmodel import select
+
+from ..common.enums import StatusEnum
+from ..common.graph import graph_from_edge_list_v2, validate_graph
+from ..common.logging import LOGGER
+from ..db.campaigns_v2 import Campaign, Edge
+from ..db.session import db_session_dependency
+from .campaign import CampaignMachine
+
+logger = LOGGER.bind(module=__name__)
+
+
+async def change_campaign_state_fsm(campaign: Campaign, desired_state: StatusEnum, request_id: UUID) -> None:
+    """A Background Task to affect a state change in a Campaign, using an
+    FSM by triggering based on one of a handful of possible user-initiated
+    state changes, as by PATCHing a campaign using the REST API.
+    """
+
+    logger.info(
+        "Updating campaign state",
+        campaign=str(campaign.id),
+        request_id=str(request_id),
+        dest=desired_state.name,
+    )
+    # Establish an FSM for the Campaign initialized to the current status
+    campaign_machine = CampaignMachine(o=campaign, initial_state=campaign.status)
+
+    trigger: str
+    match (campaign.status, desired_state):
+        case (StatusEnum.waiting, StatusEnum.running):
+            trigger = "start"
+        case (StatusEnum.running, StatusEnum.paused):
+            trigger = "pause"
+        case (StatusEnum.paused, StatusEnum.running):
+            trigger = "resume"
+        case _:
+            logger.warning(
+                "Invalid campaign transition requested",
+                id=str(campaign.id),
+                source=campaign.status,
+                dest=desired_state,
+            )
+            return None
+
+    await campaign_machine.trigger(trigger, request_id=str(request_id))
+
+
+async def change_campaign_state(campaign_id: UUID, desired_state: StatusEnum) -> None:
+    """A Background Task to affect a state change in a Campaign, not using an
+    FSM but by switching behavior on one of a handful of possible user-init-
+    iated state changes, as by PATCHing a campaign using the REST API.
+    """
+    if TYPE_CHECKING:
+        assert db_session_dependency.sessionmaker is not None
+
+    async with db_session_dependency.sessionmaker() as session:
+        # get the campaign instance from the db
+        campaign = await session.get_one(Campaign, campaign_id)
+
+        # TODO send notifications when appropriate
+        match desired_state:
+            case StatusEnum.running:
+                if campaign.status in [StatusEnum.waiting, StatusEnum.paused]:
+                    edges = await session.exec(select(Edge).where(Edge.namespace == campaign_id))
+                    graph = await graph_from_edge_list_v2(edges.all(), session)
+                    source = uuid5(campaign_id, "START.1")
+                    sink = uuid5(campaign_id, "END.1")
+                    if validate_graph(graph, source, sink):
+                        campaign.status = desired_state
+                    else:
+                        logger.warning("Invalid campaign graph, cannot begin running", id=str(campaign_id))
+                else:
+                    pass
+            case StatusEnum.paused:
+                # Noop if the campaign is already paused; this will not mark
+                # the session instance as dirty
+                campaign.status = desired_state
+            case _:
+                logger.warning(
+                    "Invalid state requested for campaign", id=str(campaign_id), state=desired_state.name
+                )
+                pass
+
+        await session.commit()
diff --git a/src/lsst/cmservice/routers/v2/campaigns.py b/src/lsst/cmservice/routers/v2/campaigns.py
index 71ab74966..cad66f723 100644
--- a/src/lsst/cmservice/routers/v2/campaigns.py
+++ b/src/lsst/cmservice/routers/v2/campaigns.py
@@ -6,9 +6,9 @@
 
 from collections.abc import Mapping, Sequence
 from typing import TYPE_CHECKING, Annotated
-from uuid import UUID, uuid5
+from uuid import UUID, uuid4, uuid5
 
-from fastapi import APIRouter, Depends, HTTPException, Query, Request, Response
+from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Query, Request, Response
 from sqlalchemy.orm import aliased
 from sqlmodel import col, select
 from sqlmodel.ext.asyncio.session import AsyncSession
@@ -16,9 +16,10 @@
 from ...common.graph import graph_from_edge_list_v2, graph_to_dict
 from ...common.logging import LOGGER
 from ...common.timestamp import element_time
-from ...db.campaigns_v2 import Campaign, CampaignUpdate, Edge, Manifest, Node
+from ...db.campaigns_v2 import ActivityLog, Campaign, CampaignUpdate, Edge, Manifest, Node
 from ...db.manifests_v2 import CampaignManifest
 from ...db.session import db_session_dependency
+from ...machines.tasks import change_campaign_state_fsm as change_campaign_state
 
 # TODO should probably bind a logger to the fastapi app or something
 logger = LOGGER.bind(module=__name__)
@@ -119,28 +120,27 @@ async def update_campaign_resource(
     request: Request,
     response: Response,
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    background_tasks: BackgroundTasks,
     campaign_name: str,
     patch_data: CampaignUpdate,
 ) -> Campaign:
     """Partial update method for campaigns.
 
     Should primarily be used to set the status of a campaign, e.g., from
-    waiting->ready, in order to trigger any validation rules contained in that
-    transition.
-
-    Another common use case would be to set status to "paused".
-
-    This could be used to update a campaign's metadata, but otherwise the
-    status is the only field available for modification, and even then there is
-    not an imperative "change the status" command, rather a request to evolve
-    the state of a campaign from A to B, which may or may not be successful.
-
-    Rather than manipulating the campaign's record, a change to status should
-    instead create a work item for the task processing queue for an executor
-    to discover and attempt to act upon. Barring that, the work should be
-    delegated to a Background Task. This is why the method returns a 202; the
-    user needs to check back "later" to see if the requested state change has
-    occurred.
+    waiting->running or running->paused.
+
+    Rather than directly manipulating the campaign's record, a change to status
+    uses a Background Task, which may or may not perform the requested update.
+    This is why the method returns a 202; the user needs to check back "later"
+    to see if the requested state change has occurred.
+
+    Note
+    ----
+    For patching a Campaign status, this API accepts only RFC7396 "Merge-Patch"
+    updates with the appropriate request header set.
+
+    This route returns the Campaign subject to the PATCH, which may or may not
+    reflect all the requested updates (subject to background task resolution).
     """
     use_rfc7396 = False
     use_rfc6902 = False
@@ -170,12 +170,23 @@ async def update_campaign_resource(
     if campaign is None:
         raise HTTPException(status_code=404, detail="No such campaign")
 
-    # update the campaign with the patch data
-    update_data = patch_data.model_dump(exclude_unset=True)
+    # update the campaign with the patch data as a Merge operation
+    update_data = patch_data.model_dump(exclude={"status"}, exclude_unset=True)
     campaign.sqlmodel_update(update_data)
-    session.add(campaign)
     await session.commit()
-    await session.refresh(campaign)
+    session.expunge(campaign)
+
+    # If the patch data is requesting a status change, we will not affect that
+    # directly, but defer it to a background task
+    if patch_data.status is not None:
+        # TODO implement middleware to assign a request_id to every request
+        request_id = uuid4()
+        background_tasks.add_task(change_campaign_state, campaign, patch_data.status, request_id)
+        response.headers["StatusUpdate"] = (
+            f"""{request.url_for("read_campaign_activity_log", campaign_name_or_id=campaign.id)}"""
+            f"""?request-id={request_id}"""
+        ).strip()
+
     # set the response headers
     if campaign is not None:
         response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign.id))
@@ -433,3 +444,40 @@ async def read_campaign_graph(
 
     response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign_id))
     return graph_to_dict(graph)
+
+
+@router.get(
+    "/{campaign_name_or_id}/logs",
+    status_code=200,
+    summary="Obtain a collection of Activity Log records for a Campaign.",
+)
+async def read_campaign_activity_log(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    campaign_name_or_id: str,
+    request_id: Annotated[str | None, Query(validation_alias="request_id", alias="request-id")] = None,
+) -> Sequence[ActivityLog]:
+    """Returns the collection of Activity Log resources associated with a
+    Campaign by its namespace. Optionally, a ``?request-id=...`` query param
+    may constrain entries to specific client requests.
+    """
+
+    # The input could be a campaign UUID or it could be a literal name.
+    campaign_id: UUID | None
+    try:
+        campaign_id = UUID(campaign_name_or_id)
+    except ValueError:
+        s = select(Campaign.id).where(Campaign.name == campaign_name_or_id)
+        campaign_id = (await session.exec(s)).one_or_none()
+
+    if campaign_id is None:
+        raise HTTPException(status_code=404, detail="No such campaign found.")
+
+    # Fetch the Activity Log entries for the campaign
+    statement = select(ActivityLog).where(ActivityLog.namespace == campaign_id)
+    if request_id is not None:
+        statement = statement.filter(ActivityLog.metadata_["request_id"].astext == request_id)
+    logs = (await session.exec(statement)).all()
+
+    return logs
diff --git a/tests/v2/conftest.py b/tests/v2/conftest.py
index e409b7dd5..d2cf57c13 100644
--- a/tests/v2/conftest.py
+++ b/tests/v2/conftest.py
@@ -38,6 +38,7 @@ def patched_config(monkeypatch_module: pytest.MonkeyPatch, tmp_path_factory: pyt
     monkeypatch_module.setattr(
         target=config.bps, name="artifact_path", value=tmp_path_factory.mktemp("output")
     )
+    monkeypatch_module.setattr(target=config.db, name="echo", value=False)
 
 
 @pytest_asyncio.fixture(scope="module", loop_scope="module")
@@ -145,15 +146,17 @@ def get_session_override() -> AnyAsyncSession:
 
 
 @pytest_asyncio.fixture(name="aclient", scope="module", loop_scope="module")
-async def async_client_fixture(session: AnyAsyncSession) -> AsyncGenerator[AsyncClient]:
+async def async_client_fixture(testdb: DatabaseSessionDependency) -> AsyncGenerator[AsyncClient]:
     """Test fixture for an HTTPX async test client with dependency injection
     overriden.
     """
     main_ = importlib.import_module("lsst.cmservice.main")
     app: FastAPI = getattr(main_, "app")
 
-    def get_session_override() -> AnyAsyncSession:
-        return session
+    async def get_session_override() -> AsyncGenerator[AnyAsyncSession]:
+        assert testdb.sessionmaker is not None
+        async with testdb.sessionmaker() as session:
+            yield session
 
     app.dependency_overrides[db_session_dependency] = get_session_override
     async with AsyncClient(
diff --git a/tests/v2/test_campaign_routes.py b/tests/v2/test_campaign_routes.py
index 75a514055..db8b98c1f 100644
--- a/tests/v2/test_campaign_routes.py
+++ b/tests/v2/test_campaign_routes.py
@@ -122,7 +122,7 @@ async def test_create_campaign(aclient: AsyncClient) -> None:
     assert len(edges) == 0
 
 
-async def test_patch_campaign(aclient: AsyncClient) -> None:
+async def test_patch_campaign(aclient: AsyncClient, caplog: pytest.LogCaptureFixture) -> None:
     # Create a new campaign with spec data
     campaign_name = uuid4().hex[-8:]
     x = await aclient.post(
@@ -160,15 +160,29 @@ async def test_patch_campaign(aclient: AsyncClient) -> None:
     assert y.status_code == 501
 
     # Update the campaign using RFC7396 and campaign id
+    caplog.clear()
     y = await aclient.patch(
         campaign_url,
-        json={"status": "ready", "owner": "bob_loblaw"},
+        json={"status": "running", "owner": "bob_loblaw"},
         headers={"Content-Type": "application/merge-patch+json"},
     )
     assert y.is_success
+    # Obtain the Status Update URL from the response headers
+    status_update_url = y.headers["StatusUpdate"]
+
+    # Check the updates are as expected
     updated_campaign = y.json()
     assert updated_campaign["owner"] == "bob_loblaw"
-    assert updated_campaign["status"] == "ready"
+    # the status update will not be applied
+    assert updated_campaign["status"] == "waiting"
+
+    # we should see a failed transition in the log
+    log_entry_found = False
+    for r in caplog.records:
+        if "Invalid campaign graph" in r.message:
+            log_entry_found = True
+            break
+    assert log_entry_found
 
     # Update the campaign again using RFC7396, ensuring only a single field
     # is patched, using campaign name
@@ -180,4 +194,13 @@ async def test_patch_campaign(aclient: AsyncClient) -> None:
     assert y.is_success
     updated_campaign = y.json()
     assert updated_campaign["owner"] == "alice_bob"
-    assert updated_campaign["status"] == "ready"
+    # the previous status update will not be successful
+    assert updated_campaign["status"] == "waiting"
+
+    # The (failed) attempt to resume a campaign with a broken graph should
+    # produce an error detail at the reported location, i.e., at the logs
+    # API with a request-id query param.
+    y = await aclient.get(status_update_url)
+    assert y.is_success
+    activity_log_entry = y.json()[0]
+    assert activity_log_entry["detail"] == {"error": "Invalid campaign graph", "trigger": "start"}
diff --git a/tests/v2/test_daemon.py b/tests/v2/test_daemon.py
index 17d602604..61a157fc3 100644
--- a/tests/v2/test_daemon.py
+++ b/tests/v2/test_daemon.py
@@ -48,8 +48,11 @@ async def test_daemon_campaign(
     # now the daemon should consider the prepared campaign
     caplog.clear()
     await consider_campaigns(session)
-    assert "considering campaign" in caplog.records[0].message
-    assert "considering node" in caplog.records[1].message
+    found_log_messages = 0
+    for r in caplog.records:
+        if any(["considering campaign" in r.message, "considering node" in r.message]):
+            found_log_messages += 1
+    assert found_log_messages == 2
 
     # A task should now be in the task table
     tasks = (await session.exec(select(Task))).all()
diff --git a/tests/v2/test_machines.py b/tests/v2/test_machines.py
index 641753b99..1ede1822a 100644
--- a/tests/v2/test_machines.py
+++ b/tests/v2/test_machines.py
@@ -1,16 +1,19 @@
 """Tests for State Machines."""
 
 import pickle
+import random
 from unittest.mock import patch
 from urllib.parse import urlparse
 from uuid import UUID, uuid4, uuid5
 
 import pytest
+from httpx import AsyncClient
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 from lsst.cmservice.common.enums import StatusEnum
-from lsst.cmservice.db.campaigns_v2 import Machine, Node
+from lsst.cmservice.db.campaigns_v2 import Campaign, Machine, Node
 from lsst.cmservice.machines.node import NodeMachine, StartMachine
+from lsst.cmservice.machines.tasks import change_campaign_state_fsm as change_campaign_state
 
 pytestmark = pytest.mark.asyncio(loop_scope="module")
 """All tests in this module will run in the same event loop."""
@@ -172,3 +175,56 @@ async def test_machine_pickle(test_campaign: str, session: AsyncSession) -> None
     assert new_node_machine.state == new_node.status
 
     await session.close()
+
+
+async def test_change_campaign_state(
+    session: AsyncSession, aclient: AsyncClient, test_campaign: str, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Tests that the campaign state change background task sets a campaign
+    status when it is supposed to, and does not when it is not.
+    """
+    # the test_campaign fixture produces a valid graph so it should be possible
+    # to set the campaign to running, then paused
+    # extract the test campaign id from the fixture url
+    edge_list = (await aclient.get(test_campaign)).json()
+
+    campaign_id = urlparse(test_campaign).path.split("/")[-2:][0]
+    campaign = await session.get_one(Campaign, campaign_id)
+
+    x = (await aclient.get(f"/cm-service/v2/campaigns/{campaign_id}")).json()
+    assert x["status"] == "waiting"
+
+    await change_campaign_state(campaign, StatusEnum.running, uuid4())
+    await session.refresh(campaign, attribute_names=["status"])
+    await session.commit()
+
+    x = (await aclient.get(f"/cm-service/v2/campaigns/{campaign_id}")).json()
+    assert x["status"] == "running"
+
+    await change_campaign_state(campaign, StatusEnum.paused, uuid4())
+    await session.refresh(campaign, attribute_names=["status"])
+    await session.commit()
+
+    x = (await aclient.get(f"/cm-service/v2/campaigns/{campaign_id}")).json()
+    assert x["status"] == "paused"
+
+    # Break the graph by removing an edge from the campaign, and try to enter
+    # the running state
+    edge_to_remove = random.choice(edge_list)["id"]
+    x = await aclient.delete(f"/cm-service/v2/edges/{edge_to_remove}")
+
+    caplog.clear()
+    await change_campaign_state(campaign, StatusEnum.running, uuid4())
+    await session.refresh(campaign, attribute_names=["status"])
+    await session.commit()
+
+    x = (await aclient.get(f"/cm-service/v2/campaigns/{campaign_id}")).json()
+    assert x["status"] == "paused"
+
+    # Check log messages
+    log_entry_found = False
+    for r in caplog.records:
+        if "Invalid campaign graph" in r.message:
+            log_entry_found = True
+            break
+    assert log_entry_found

From fad107622074fd67b9a80d16849098df56c97247 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Wed, 9 Jul 2025 17:55:44 -0500
Subject: [PATCH 32/37] - feat(api): Add activity logs router - chore: refactor
 test fixtures - fix: improve session hygiene in tests - chore: denormalize
 timestamp columns for activitylog - fix: FSM finalize based on activitylog
 finished_at instead of detail - fix: handle full lifecycle of session in
 session factory - feat(daemon): refactor task callbacks as modular callables
 - fix(daemon): set submitted_at and finished_at for tasks instead of deleting
 - fix(graph): use session.get() instead of select() - fix: allow null node in
 activty log

---
 .../versions/1da92a1c740f_create_v2_tables.py |  7 +-
 src/lsst/cmservice/common/daemon_v2.py        | 70 +++++++++++----
 src/lsst/cmservice/common/graph.py            |  5 +-
 src/lsst/cmservice/db/campaigns_v2.py         | 50 ++++++++---
 src/lsst/cmservice/db/session.py              | 16 +++-
 src/lsst/cmservice/machines/campaign.py       | 11 +--
 src/lsst/cmservice/machines/node.py           | 23 +++--
 src/lsst/cmservice/machines/tasks.py          | 50 +----------
 src/lsst/cmservice/routers/v2/__init__.py     |  2 +
 src/lsst/cmservice/routers/v2/activity_log.py | 88 +++++++++++++++++++
 src/lsst/cmservice/routers/v2/campaigns.py    |  2 +-
 tests/v2/conftest.py                          | 70 +++++++--------
 tests/v2/test_machines.py                     |  2 +-
 tests/v2/test_misc_routes.py                  | 27 ++++++
 14 files changed, 280 insertions(+), 143 deletions(-)
 create mode 100644 src/lsst/cmservice/routers/v2/activity_log.py
 create mode 100644 tests/v2/test_misc_routes.py

diff --git a/alembic/versions/1da92a1c740f_create_v2_tables.py b/alembic/versions/1da92a1c740f_create_v2_tables.py
index 127ee5604..27fac9815 100644
--- a/alembic/versions/1da92a1c740f_create_v2_tables.py
+++ b/alembic/versions/1da92a1c740f_create_v2_tables.py
@@ -178,7 +178,7 @@ def upgrade() -> None:
         sa.Column("node", postgresql.UUID(), nullable=False),
         sa.Column("priority", postgresql.INTEGER(), nullable=True),
         sa.Column("created_at", postgresql.TIMESTAMP(timezone=True), nullable=False),
-        sa.Column("last_processed_at", postgresql.TIMESTAMP(timezone=True), nullable=True),
+        sa.Column("submitted_at", postgresql.TIMESTAMP(timezone=True), nullable=True),
         sa.Column("finished_at", postgresql.TIMESTAMP(timezone=True), nullable=True),
         sa.Column("wms_id", postgresql.VARCHAR(), nullable=True),
         sa.Column("site_affinity", postgresql.ARRAY(postgresql.VARCHAR()), nullable=True),
@@ -201,8 +201,10 @@ def upgrade() -> None:
         "activity_log_v2",
         sa.Column("id", postgresql.UUID(), nullable=False),
         sa.Column("namespace", postgresql.UUID(), nullable=False),
-        sa.Column("node", postgresql.UUID(), sa.ForeignKey(nodes_v2.c.id), nullable=False),
+        sa.Column("node", postgresql.UUID(), sa.ForeignKey(nodes_v2.c.id), nullable=True),
         sa.Column("operator", postgresql.VARCHAR(), nullable=False, default="root"),
+        sa.Column("created_at", postgresql.TIMESTAMP(timezone=True), nullable=False),
+        sa.Column("finished_at", postgresql.TIMESTAMP(timezone=True), nullable=True),
         sa.Column("from_status", ENUM_COLUMN_AS_VARCHAR, nullable=False),
         sa.Column("to_status", ENUM_COLUMN_AS_VARCHAR, nullable=False),
         sa.Column(
@@ -219,6 +221,7 @@ def upgrade() -> None:
             default=dict,
             server_default=sa.text("'{}'::json"),
         ),
+        sa.PrimaryKeyConstraint("id"),
         if_not_exists=True,
     )
 
diff --git a/src/lsst/cmservice/common/daemon_v2.py b/src/lsst/cmservice/common/daemon_v2.py
index f86e73b1e..cab2d9448 100644
--- a/src/lsst/cmservice/common/daemon_v2.py
+++ b/src/lsst/cmservice/common/daemon_v2.py
@@ -1,8 +1,10 @@
 import pickle
 from asyncio import Task as AsyncTask
-from asyncio import TaskGroup
-from collections.abc import Mapping
+from asyncio import TaskGroup, create_task
+from collections.abc import Awaitable, Mapping
+from uuid import UUID, uuid5
 
+from sqlalchemy.dialects.postgresql import insert
 from sqlmodel import col, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 from transitions import Event
@@ -11,6 +13,7 @@
 from ..common.enums import StatusEnum
 from ..config import config
 from ..db.campaigns_v2 import Campaign, Edge, Machine, Node, Task
+from ..db.session import get_async_session
 from ..machines.node import NodeMachine, node_machine_factory
 from .logging import LOGGER
 
@@ -45,13 +48,16 @@ async def consider_campaigns(session: AsyncSession) -> None:
 
         for node in graph.processable_graph_nodes(campaign_graph):
             logger.info("Daemon considering node", id=str(node.id))
+            desired_state = node.status.next_status()
             node_task = Task(
+                id=uuid5(node.id, desired_state.name),
                 namespace=campaign_id,
                 node=node.id,
-                status=node.status.next_status(),
+                status=desired_state,
                 previous_status=node.status,
             )
-            session.add(node_task)
+            statement = insert(node_task.__table__).values(**node_task.model_dump()).on_conflict_do_nothing()  # type: ignore[attr-defined]
+            await session.exec(statement)  # type: ignore[call-overload]
 
     await session.commit()
 
@@ -68,21 +74,24 @@ async def consider_nodes(session: AsyncSession) -> None:
     After handling, the Node's FSM is serialized and the Node is updated with
     new values as necessary. The Task is not returned to the Task table.
     """
-    statement = select(Task).with_for_update(skip_locked=True)
+    # Select and lock unsubmitted tasks
+    statement = select(Task).where(col(Task.submitted_at).is_(None))
     # TODO add filter criteria for priority and site affinity
-    tasks = (await session.exec(statement)).all()
+    statement = statement.with_for_update(skip_locked=True)
+
+    cm_tasks = (await session.exec(statement)).all()
 
     # Using a TaskGroup context manager means all "tasks" added to the group
     # are awaited when the CM exits, giving us concurrency for all the nodes
     # being considered in the current iteration.
     async with TaskGroup() as tg:
-        for task in tasks:
-            node = await session.get_one(Node, task.node)
+        for cm_task in cm_tasks:
+            node = await session.get_one(Node, cm_task.node)
 
             # the task's status field is the target status for the node, so the
             # daemon intends to evolve the node machine to that state.
             try:
-                assert node.status is task.previous_status
+                assert node.status is cm_task.previous_status
             except AssertionError:
                 logger.error("Node status out of sync with Machine", id=str(node.id))
                 continue
@@ -111,21 +120,20 @@ async def consider_nodes(session: AsyncSession) -> None:
             # - Add a caller-backed conditional to the triggers, to identify
             # .  triggers the daemon is "allowed" to use
             # - Determine the "desired" trigger from the task (source, dest)
-            if (trigger := trigger_for_transition(task, node_machine.machine.events)) is None:
+            if (trigger := trigger_for_transition(cm_task, node_machine.machine.events)) is None:
                 logger.warning(
                     "No trigger available for desired state transition",
-                    source=task.previous_status,
-                    dest=task.status,
+                    source=cm_task.previous_status,
+                    dest=cm_task.status,
                 )
                 continue
 
             # Add the node transition trigger method to the task group
-            # TODO give this a name and a callback
-            task_ = tg.create_task(node_machine.trigger(trigger), name=str(node.id))
-            task_.add_done_callback(task_runner_callback)
+            task = tg.create_task(node_machine.trigger(trigger), name=str(cm_task.id))
+            task.add_done_callback(task_runner_callback)
 
-            # wrap up - the task is removed from the db.
-            await session.delete(task)
+            # wrap up - update the task and commit
+            cm_task.submitted_at = timestamp.now_utc()
             await session.commit()
 
 
@@ -160,6 +168,30 @@ def trigger_for_transition(task: Task, events: Mapping[str, Event]) -> str | Non
     return None
 
 
-def task_runner_callback(task: AsyncTask) -> None:
+async def finalize_runner_callback(context: AsyncTask) -> None:
+    """Callback function for finalizing the CM Task runner."""
+
+    # Using the task name as the ID of a task, get the object and update its
+    # finished_at column. Alternately, we could delete the task from the table
+    # now.
+    logger.info("Finalizing CM Task", id=context.get_name())
+    session = await get_async_session()
+
+    cm_task = await session.get_one(Task, UUID(context.get_name()))
+    cm_task.finished_at = timestamp.now_utc()
+    await session.commit()
+    await session.close()
+
+
+def task_runner_callback(context: AsyncTask) -> None:
     """Callback function for `asyncio.TaskGroup` tasks."""
-    logger.info("Transition complete", id=task.get_name())
+    if (exc := context.exception()) is not None:
+        logger.error(exc)
+        return
+
+    logger.info("Transition complete", id=context.get_name())
+    callbacks: set[Awaitable] = set()
+    # TODO: notification callback
+    finalizer = create_task(finalize_runner_callback(context))
+    finalizer.add_done_callback(callbacks.discard)
+    callbacks.add(finalizer)
diff --git a/src/lsst/cmservice/common/graph.py b/src/lsst/cmservice/common/graph.py
index 2f34bfbe9..d9401a6d8 100644
--- a/src/lsst/cmservice/common/graph.py
+++ b/src/lsst/cmservice/common/graph.py
@@ -3,7 +3,6 @@
 from uuid import UUID
 
 import networkx as nx
-from sqlalchemy import select
 
 from ..db import Script, ScriptDependency, Step, StepDependency
 from ..db.campaigns_v2 import Edge, Node
@@ -71,9 +70,7 @@ async def graph_from_edge_list_v2(
     # but we want to hydrate the entire Node model for subsequent users of this
     # graph to reference without dipping back to the Database.
     for node in g.nodes:
-        s = select(Node).where(Node.id == node)
-        db_node: Node = (await session.execute(s)).scalars().one()
-
+        db_node = await session.get_one(Node, node)
         # This Node is going on an adventure where it does not need to drag its
         # SQLAlchemy baggage along, so we expunge it from the session before
         # adding it to the graph.
diff --git a/src/lsst/cmservice/db/campaigns_v2.py b/src/lsst/cmservice/db/campaigns_v2.py
index d8902c8e0..7946a1356 100644
--- a/src/lsst/cmservice/db/campaigns_v2.py
+++ b/src/lsst/cmservice/db/campaigns_v2.py
@@ -47,6 +47,8 @@ def jsonb_column(name: str, aliases: list[str] | None = None) -> Any:
 
 
 class BaseSQLModel(SQLModel):
+    """Shared base SQL model for all tables."""
+
     __table_args__ = {"schema": config.db.table_schema}
     metadata = metadata
 
@@ -64,6 +66,7 @@ class CampaignBase(BaseSQLModel):
     )
     metadata_: dict = jsonb_column("metadata", aliases=["metadata", "metadata_"])
     configuration: dict = jsonb_column("configuration", aliases=["configuration", "data", "spec"])
+    machine: UUID | None = Field(foreign_key="machines_v2.id", default=None, ondelete="CASCADE")
 
     @model_validator(mode="before")
     @classmethod
@@ -86,8 +89,6 @@ class Campaign(CampaignBase, table=True):
 
     __tablename__: str = "campaigns_v2"  # type: ignore[misc]
 
-    machine: UUID | None = Field(foreign_key="machines_v2.id", default=None, ondelete="CASCADE")
-
 
 class CampaignUpdate(BaseSQLModel):
     """Model representing updatable fields for a PATCH operation on a Campaign
@@ -121,6 +122,7 @@ def __hash__(self) -> int:
     )
     metadata_: dict = jsonb_column("metadata", aliases=["metadata", "metadata_"])
     configuration: dict = jsonb_column("configuration", aliases=["configuration", "data", "spec"])
+    machine: UUID | None = Field(foreign_key="machines_v2.id", default=None, ondelete="CASCADE")
 
     @model_validator(mode="before")
     @classmethod
@@ -143,8 +145,6 @@ def custom_model_validator(cls, data: Any, info: ValidationInfo) -> Any:
 class Node(NodeBase, table=True):
     __tablename__: str = "nodes_v2"  # type: ignore[misc]
 
-    machine: UUID | None = Field(foreign_key="machines_v2.id", default=None, ondelete="CASCADE")
-
 
 class EdgeBase(BaseSQLModel):
     """edges_v2 db table"""
@@ -204,19 +204,29 @@ class Task(BaseSQLModel, table=True):
 
     __tablename__: str = "tasks_v2"  # type: ignore[misc]
 
-    id: UUID = Field(primary_key=True, default_factory=uuid4)
-    namespace: UUID = Field(foreign_key="campaigns_v2.id")
-    node: UUID = Field(foreign_key="nodes_v2.id")
+    id: UUID = Field(
+        default_factory=uuid4,
+        primary_key=True,
+        description="A hash of the related Node ID and target status, as a UUID5.",
+    )
+    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(
+        description="The `datetime` (UTC) at which this Task was first added to the queue",
         default_factory=now_utc,
         sa_column=Column(DateTime(timezone=True)),
     )
-    last_processed_at: datetime | None = Field(
+    submitted_at: datetime | 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(
+        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."
+        ),
         default=None,
         sa_column=Column(DateTime(timezone=True)),
     )
@@ -225,9 +235,11 @@ class Task(BaseSQLModel, table=True):
         default=None, sa_column=Column("site_affinity", MutableList.as_mutable(postgresql.ARRAY(String())))
     )
     status: StatusField = Field(
+        description="The 'target' status to which this Task will attempt to transition the Node",
         sa_column=Column("status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)),
     )
     previous_status: StatusField = Field(
+        description="The 'original' status from which this Task will attempt to transition the Node",
         sa_column=Column(
             "previous_status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)
         ),
@@ -236,15 +248,31 @@ class Task(BaseSQLModel, table=True):
 
 class ActivityLogBase(BaseSQLModel):
     id: UUID = Field(primary_key=True, default_factory=uuid4)
-    namespace: UUID = Field(foreign_key="campaigns_v2.id")
-    node: UUID = Field(foreign_key="nodes_v2.id")
-    operator: str
+    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(
+        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(
+        description="The `datetime` in UTC at which this log entry was finalized.",
+        default=None,
+        sa_column=Column(DateTime(timezone=True), nullable=True),
+    )
     to_status: StatusField = Field(
+        description=(
+            "The `target` state to which this activity tried to transition. "
+            "This may be the same as `from_status` in cases where no transition was attempted "
+            "(such as for a conditional check)."
+        ),
         sa_column=Column(
             "to_status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)
         ),
     )
     from_status: StatusField = Field(
+        description="The `original` state from which this activity tried to transition",
         sa_column=Column(
             "from_status", Enum(StatusEnum, length=20, native_enum=False, create_constraint=False)
         ),
diff --git a/src/lsst/cmservice/db/session.py b/src/lsst/cmservice/db/session.py
index 9a1f12c04..e4cb5f5b2 100644
--- a/src/lsst/cmservice/db/session.py
+++ b/src/lsst/cmservice/db/session.py
@@ -7,8 +7,11 @@
 from sqlalchemy.pool import AsyncAdaptedQueuePool, Pool
 from sqlmodel.ext.asyncio.session import AsyncSession
 
+from ..common.logging import LOGGER
 from ..config import config
 
+logger = LOGGER.bind(module=__name__)
+
 
 class DatabaseSessionDependency:
     """A database session manager class designed to manage an async sqlalchemy
@@ -61,7 +64,8 @@ async def initialize(
         self.sessionmaker = async_sessionmaker(self.engine, class_=AsyncSession, expire_on_commit=False)
 
     async def __call__(self) -> AsyncGenerator[AsyncSession]:
-        """Yields a database session.
+        """Yields a database session, rolls it back on error and closes it on
+        completion.
 
         Yields
         -------
@@ -72,7 +76,14 @@ async def __call__(self) -> AsyncGenerator[AsyncSession]:
             raise RuntimeError("Async sessionmaker is not initialized")
 
         async with self.sessionmaker() as session:
-            yield session
+            try:
+                yield session
+            except Exception:
+                logger.exception()
+                await session.rollback()
+                raise
+            finally:
+                await session.close()
 
     async def aclose(self) -> None:
         """Shut down the database engine."""
@@ -88,4 +99,5 @@ async def aclose(self) -> None:
 
 # FIXME not sure why this pattern
 async def get_async_session() -> AsyncSession:
+    """Get a new session from the current database session factory."""
     return await anext(db_session_dependency())
diff --git a/src/lsst/cmservice/machines/campaign.py b/src/lsst/cmservice/machines/campaign.py
index 1d387cc5f..442b31f3f 100644
--- a/src/lsst/cmservice/machines/campaign.py
+++ b/src/lsst/cmservice/machines/campaign.py
@@ -11,7 +11,7 @@
 """
 
 from typing import TYPE_CHECKING, Any
-from uuid import uuid4, uuid5
+from uuid import uuid5
 
 from sqlmodel import select
 from transitions import EventData
@@ -70,7 +70,6 @@ class CampaignMachine(NodeMachine):
     def __init__(
         self, *args: Any, o: Campaign, initial_state: StatusEnum = StatusEnum.waiting, **kwargs: Any
     ) -> None:
-        self.node = Node(id=uuid5(o.id, "START.1"), name="START", namespace=o.id, version=1)
         self.campaign = o
         self.machine = AsyncMachine(
             model=self,
@@ -100,12 +99,12 @@ async def error_handler(self, event: EventData) -> None:
         if self.activity_log_entry is not None:
             self.activity_log_entry.detail["trigger"] = event.event.name
             self.activity_log_entry.detail["error"] = str(event.error)
+            self.activity_log_entry.finished_at = timestamp.now_utc()
 
     async def prepare_activity_log(self, event: EventData) -> None:
         """Callback method invoked by the Machine before every state-change."""
 
         if TYPE_CHECKING:
-            assert self.node is not None
             assert self.campaign is not None
 
         # TODO the activity log doesn't really support campaign-level entries
@@ -122,9 +121,7 @@ async def prepare_activity_log(self, event: EventData) -> None:
         )
 
         self.activity_log_entry = ActivityLog(
-            id=uuid4(),
             namespace=self.campaign.id,
-            node=self.node.id,
             operator=event.kwargs.get("operator", "daemon"),
             from_status=from_state,
             to_status=to_state,
@@ -141,7 +138,7 @@ async def update_persistent_status(self, event: EventData) -> None:
 
         if self.activity_log_entry is not None:
             self.activity_log_entry.to_status = self.state
-            self.activity_log_entry.detail["finished_at"] = timestamp.element_time()
+            self.activity_log_entry.finished_at = timestamp.now_utc()
 
         # Ensure database record for transitioned object is updated
         self.campaign = await self.session.merge(self.campaign, load=False)
@@ -163,7 +160,7 @@ async def finalize(self, event: EventData) -> None:
         # for the log entry it is not persisted.
         if self.activity_log_entry is None:
             return
-        elif not len(self.activity_log_entry.detail):
+        elif self.activity_log_entry.finished_at is None:
             return
 
         try:
diff --git a/src/lsst/cmservice/machines/node.py b/src/lsst/cmservice/machines/node.py
index 673774572..c84c46431 100644
--- a/src/lsst/cmservice/machines/node.py
+++ b/src/lsst/cmservice/machines/node.py
@@ -1,15 +1,13 @@
-# ruff: noqa
 """Module for state machine implementations related to Nodes."""
 
 import inspect
 import pickle
 import shutil
 import sys
-from collections.abc import Mapping
 from functools import cache
 from os.path import expandvars
-from typing import Any, TYPE_CHECKING
-from uuid import uuid4, uuid5
+from typing import TYPE_CHECKING, Any
+from uuid import uuid4
 
 from anyio import Path
 from fastapi.concurrency import run_in_threadpool
@@ -95,7 +93,7 @@ def __init__(
 
     def post_init(self) -> None:
         """Additional initialization method called at the end of ``__init__``,
-        as a convenenience to child classes.
+        as a convenience to child classes.
         """
         pass
 
@@ -120,6 +118,7 @@ async def error_handler(self, event: EventData) -> None:
         if self.activity_log_entry is not None:
             self.activity_log_entry.detail["trigger"] = event.event.name
             self.activity_log_entry.detail["error"] = str(event.error)
+            self.activity_log_entry.finished_at = timestamp.now_utc()
 
         # Auto-transition on error
         match event.event:
@@ -160,7 +159,6 @@ async def prepare_activity_log(self, event: EventData) -> None:
         )
 
         self.activity_log_entry = ActivityLog(
-            id=uuid4(),
             namespace=self.node.namespace,
             node=self.node.id,
             operator="daemon",
@@ -180,7 +178,7 @@ async def update_persistent_status(self, event: EventData) -> None:
 
         if self.activity_log_entry is not None:
             self.activity_log_entry.to_status = self.state
-            self.activity_log_entry.detail["finished_at"] = timestamp.element_time()
+            self.activity_log_entry.finished_at = timestamp.now_utc()
 
         # Ensure database record for transitioned object is updated
         self.node = await self.session.merge(self.node, load=False)
@@ -189,7 +187,9 @@ async def update_persistent_status(self, event: EventData) -> None:
 
     async def finalize(self, event: EventData) -> None:
         """Callback method invoked by the Machine unconditionally at the end
-        of every callback chain.
+        of every callback chain. During this callback, if the activity log
+        indicates that change has occurred, it is written to the db and the
+        machine is serialized to the Machines table for later use.
         """
         if TYPE_CHECKING:
             assert self.node is not None, "Stateful Model must have a Node member."
@@ -197,11 +197,10 @@ async def finalize(self, event: EventData) -> None:
 
         # The activity log entry is added to the db. For failed transitions it
         # may include error detail. For other transitions it is not necessary
-        # to log every attempt, so if no callback has registered any detail
-        # for the log entry it is not persisted.
+        # to log every attempt.
         if self.activity_log_entry is None:
             return
-        elif not len(self.activity_log_entry.detail):
+        elif self.activity_log_entry.finished_at is None:
             return
 
         # ensure the orm instance is in the session
@@ -331,7 +330,7 @@ class StepMachine(NodeMachine):
     - finish
         - (condition) campaign graph is valid
     - unprepare (rollback)
-        - no particular action taken, but know that on the next use of "prepare"
+        - no action taken, but know that on the next use of "prepare"
           new versions of the group manifests may be created.
 
     Failure modes may include
diff --git a/src/lsst/cmservice/machines/tasks.py b/src/lsst/cmservice/machines/tasks.py
index d0e80afbc..93c74604d 100644
--- a/src/lsst/cmservice/machines/tasks.py
+++ b/src/lsst/cmservice/machines/tasks.py
@@ -2,22 +2,17 @@
 API routes.
 """
 
-from typing import TYPE_CHECKING
-from uuid import UUID, uuid5
-
-from sqlmodel import select
+from uuid import UUID
 
 from ..common.enums import StatusEnum
-from ..common.graph import graph_from_edge_list_v2, validate_graph
 from ..common.logging import LOGGER
-from ..db.campaigns_v2 import Campaign, Edge
-from ..db.session import db_session_dependency
+from ..db.campaigns_v2 import Campaign
 from .campaign import CampaignMachine
 
 logger = LOGGER.bind(module=__name__)
 
 
-async def change_campaign_state_fsm(campaign: Campaign, desired_state: StatusEnum, request_id: UUID) -> None:
+async def change_campaign_state(campaign: Campaign, desired_state: StatusEnum, request_id: UUID) -> None:
     """A Background Task to affect a state change in a Campaign, using an
     FSM by triggering based on one of a handful of possible user-initiated
     state changes, as by PATCHing a campaign using the REST API.
@@ -50,42 +45,3 @@ async def change_campaign_state_fsm(campaign: Campaign, desired_state: StatusEnu
             return None
 
     await campaign_machine.trigger(trigger, request_id=str(request_id))
-
-
-async def change_campaign_state(campaign_id: UUID, desired_state: StatusEnum) -> None:
-    """A Background Task to affect a state change in a Campaign, not using an
-    FSM but by switching behavior on one of a handful of possible user-init-
-    iated state changes, as by PATCHing a campaign using the REST API.
-    """
-    if TYPE_CHECKING:
-        assert db_session_dependency.sessionmaker is not None
-
-    async with db_session_dependency.sessionmaker() as session:
-        # get the campaign instance from the db
-        campaign = await session.get_one(Campaign, campaign_id)
-
-        # TODO send notifications when appropriate
-        match desired_state:
-            case StatusEnum.running:
-                if campaign.status in [StatusEnum.waiting, StatusEnum.paused]:
-                    edges = await session.exec(select(Edge).where(Edge.namespace == campaign_id))
-                    graph = await graph_from_edge_list_v2(edges.all(), session)
-                    source = uuid5(campaign_id, "START.1")
-                    sink = uuid5(campaign_id, "END.1")
-                    if validate_graph(graph, source, sink):
-                        campaign.status = desired_state
-                    else:
-                        logger.warning("Invalid campaign graph, cannot begin running", id=str(campaign_id))
-                else:
-                    pass
-            case StatusEnum.paused:
-                # Noop if the campaign is already paused; this will not mark
-                # the session instance as dirty
-                campaign.status = desired_state
-            case _:
-                logger.warning(
-                    "Invalid state requested for campaign", id=str(campaign_id), state=desired_state.name
-                )
-                pass
-
-        await session.commit()
diff --git a/src/lsst/cmservice/routers/v2/__init__.py b/src/lsst/cmservice/routers/v2/__init__.py
index 938b69d99..4a0d14c12 100644
--- a/src/lsst/cmservice/routers/v2/__init__.py
+++ b/src/lsst/cmservice/routers/v2/__init__.py
@@ -1,6 +1,7 @@
 from fastapi import APIRouter
 
 from . import (
+    activity_log,
     campaigns,
     edges,
     manifests,
@@ -11,6 +12,7 @@
     prefix="/v2",
 )
 
+router.include_router(activity_log.router)
 router.include_router(campaigns.router)
 router.include_router(edges.router)
 router.include_router(manifests.router)
diff --git a/src/lsst/cmservice/routers/v2/activity_log.py b/src/lsst/cmservice/routers/v2/activity_log.py
new file mode 100644
index 000000000..6c4fa9312
--- /dev/null
+++ b/src/lsst/cmservice/routers/v2/activity_log.py
@@ -0,0 +1,88 @@
+"""http routers for accessing the activity log."""
+
+from collections.abc import Sequence
+from datetime import datetime
+from typing import Annotated
+from uuid import UUID
+
+from fastapi import APIRouter, Depends, HTTPException, Query, Request, Response
+from sqlmodel import select
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+from ...common.logging import LOGGER
+from ...db.campaigns_v2 import ActivityLog
+from ...db.session import db_session_dependency
+
+# TODO should probably bind a logger to the fastapi app or something
+logger = LOGGER.bind(module=__name__)
+
+
+# Build the router
+router = APIRouter(
+    prefix="/logs",
+    tags=["logs", "v2"],
+)
+
+
+@router.get(
+    "/",
+    summary="Get a list of Activity Log entries",
+)
+async def read_activity_collection(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    limit: Annotated[int, Query(le=100)] = 10,
+    offset: Annotated[int, Query()] = 0,
+    node: Annotated[UUID | None, Query(description="ID of a Node")] = None,
+    campaign: Annotated[UUID | None, Query(description="ID of a Campaign")] = None,
+    pilot: Annotated[str | None, Query(description="String name of a pilot")] = None,
+    since: Annotated[
+        datetime | None, Query(description="Datetime of earliest log, in any format pydantic can validate")
+    ] = None,
+) -> Sequence[ActivityLog]:
+    """A paginated API returning a list of all Activity Logs known to the
+    application, with query parameters allowing some constraints.
+    """
+    statement = select(ActivityLog)
+
+    # Add predicates for query parameters
+    if node is not None:
+        statement = statement.where(ActivityLog.node == node)
+    if campaign is not None:
+        statement = statement.where(ActivityLog.namespace == campaign)
+    if pilot is not None:
+        statement = statement.where(ActivityLog.operator == pilot)
+    if since is not None:
+        statement = statement.where(ActivityLog.finished_at >= since)  # type: ignore[operator]
+
+    statement = statement.offset(offset).limit(limit)
+    activity_logs = (await session.exec(statement)).all()
+    return activity_logs
+
+
+@router.get(
+    "/{activity_log_id}",
+    summary="Get single activity log detail",
+)
+async def read_activity_resource(
+    request: Request,
+    response: Response,
+    session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    activity_log_id: UUID,
+) -> ActivityLog:
+    """Fetch a single activity log from the database given the log's ID"""
+
+    activity_log = await session.get(ActivityLog, activity_log_id)
+    # 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)
+        )
+        response.headers["Node"] = str(request.url_for("read_node_resource", node_name=activity_log.node))
+        response.headers["Self"] = str(
+            request.url_for("read_activity_resource", activity_log_id=activity_log_id)
+        )
+        return activity_log
+    else:
+        raise HTTPException(status_code=404)
diff --git a/src/lsst/cmservice/routers/v2/campaigns.py b/src/lsst/cmservice/routers/v2/campaigns.py
index cad66f723..2b765b24d 100644
--- a/src/lsst/cmservice/routers/v2/campaigns.py
+++ b/src/lsst/cmservice/routers/v2/campaigns.py
@@ -19,7 +19,7 @@
 from ...db.campaigns_v2 import ActivityLog, Campaign, CampaignUpdate, Edge, Manifest, Node
 from ...db.manifests_v2 import CampaignManifest
 from ...db.session import db_session_dependency
-from ...machines.tasks import change_campaign_state_fsm as change_campaign_state
+from ...machines.tasks import change_campaign_state
 
 # TODO should probably bind a logger to the fastapi app or something
 logger = LOGGER.bind(module=__name__)
diff --git a/tests/v2/conftest.py b/tests/v2/conftest.py
index d2cf57c13..8c12f4e93 100644
--- a/tests/v2/conftest.py
+++ b/tests/v2/conftest.py
@@ -2,13 +2,12 @@
 
 import importlib
 import os
-from collections.abc import AsyncGenerator, Generator
+from collections.abc import AsyncGenerator, Callable, Generator
 from typing import TYPE_CHECKING
 from uuid import NAMESPACE_DNS, uuid4
 
 import pytest
 import pytest_asyncio
-from fastapi.testclient import TestClient
 from httpx import ASGITransport, AsyncClient
 from sqlalchemy import insert
 from sqlalchemy.pool import NullPool
@@ -115,50 +114,45 @@ async def testdb(rawdb: DatabaseSessionDependency) -> AsyncGenerator[DatabaseSes
         await aconn.commit()
 
 
-@pytest_asyncio.fixture(name="session", scope="module", loop_scope="module")
-async def session_fixture(testdb: DatabaseSessionDependency) -> AsyncGenerator[AnyAsyncSession]:
-    """Test fixture for an async database session"""
-    assert testdb.engine is not None
-    assert testdb.sessionmaker is not None
-    async with testdb.sessionmaker() as session:
-        try:
-            yield session
-        finally:
-            await session.close()
-    await testdb.engine.dispose()
-
-
-def client_fixture(session: AnyAsyncSession) -> Generator[TestClient]:
-    """Test fixture for a FastAPI test client with dependency injection
-    overriden.
-    """
+@pytest_asyncio.fixture(name="session_factory", scope="module", loop_scope="module")
+async def session_factory_fixture(
+    testdb: DatabaseSessionDependency,
+) -> Callable[..., AsyncGenerator[AnyAsyncSession]]:
+    """Test fixture for providing an AsyncSession Factory."""
 
-    def get_session_override() -> AnyAsyncSession:
-        return session
+    async def session_factory() -> AsyncGenerator[AnyAsyncSession]:
+        assert testdb.engine is not None
+        assert testdb.sessionmaker is not None
+        async with testdb.sessionmaker() as session:
+            try:
+                yield session
+            finally:
+                await session.close()
+        await testdb.engine.dispose()
 
-    main_ = importlib.import_module("lsst.cmservice.main")
-    app: FastAPI = getattr(main_, "app")
+    return session_factory
 
-    app.dependency_overrides[db_session_dependency] = get_session_override
-    client = TestClient(app)
-    yield client
-    app.dependency_overrides.clear()
+
+@pytest_asyncio.fixture(name="session", scope="module", loop_scope="module")
+async def session_fixture(session_factory: Callable) -> AsyncGenerator[AnyAsyncSession]:
+    """Test fixture for an async database session, useful for tests that need
+    a database session directly.
+    """
+    async for session in session_factory():
+        yield session
 
 
 @pytest_asyncio.fixture(name="aclient", scope="module", loop_scope="module")
-async def async_client_fixture(testdb: DatabaseSessionDependency) -> AsyncGenerator[AsyncClient]:
-    """Test fixture for an HTTPX async test client with dependency injection
-    overriden.
+async def async_client_fixture(
+    session_factory: Callable, testdb: DatabaseSessionDependency
+) -> AsyncGenerator[AsyncClient]:
+    """Test fixture for an HTTPX async test client backed by a FastAPI app with
+    its dependency injections overriden by factory fixtures.
     """
     main_ = importlib.import_module("lsst.cmservice.main")
     app: FastAPI = getattr(main_, "app")
+    app.dependency_overrides[db_session_dependency] = session_factory
 
-    async def get_session_override() -> AsyncGenerator[AnyAsyncSession]:
-        assert testdb.sessionmaker is not None
-        async with testdb.sessionmaker() as session:
-            yield session
-
-    app.dependency_overrides[db_session_dependency] = get_session_override
     async with AsyncClient(
         follow_redirects=True, transport=ASGITransport(app), base_url="http://test"
     ) as aclient:
@@ -168,7 +162,9 @@ async def get_session_override() -> AsyncGenerator[AnyAsyncSession]:
 
 @pytest_asyncio.fixture(scope="function", loop_scope="module")
 async def test_campaign(aclient: AsyncClient) -> AsyncGenerator[str]:
-    """Fixture managing a test campaign with two (additional) nodes."""
+    """Fixture managing a test campaign with three (additional) nodes, which
+    yields the URL for the campaign's edges endpoint.
+    """
     campaign_name = uuid4().hex[-8:]
     node_ids = []
 
diff --git a/tests/v2/test_machines.py b/tests/v2/test_machines.py
index 1ede1822a..d7af2f256 100644
--- a/tests/v2/test_machines.py
+++ b/tests/v2/test_machines.py
@@ -13,7 +13,7 @@
 from lsst.cmservice.common.enums import StatusEnum
 from lsst.cmservice.db.campaigns_v2 import Campaign, Machine, Node
 from lsst.cmservice.machines.node import NodeMachine, StartMachine
-from lsst.cmservice.machines.tasks import change_campaign_state_fsm as change_campaign_state
+from lsst.cmservice.machines.tasks import change_campaign_state
 
 pytestmark = pytest.mark.asyncio(loop_scope="module")
 """All tests in this module will run in the same event loop."""
diff --git a/tests/v2/test_misc_routes.py b/tests/v2/test_misc_routes.py
new file mode 100644
index 000000000..e880487a3
--- /dev/null
+++ b/tests/v2/test_misc_routes.py
@@ -0,0 +1,27 @@
+"""Tests for miscellaneous routes."""
+
+from uuid import uuid4
+
+import pytest
+from httpx import AsyncClient
+
+pytestmark = pytest.mark.asyncio(loop_scope="module")
+"""All tests in this module will run in the same event loop."""
+
+
+async def test_activity_log_routes(
+    aclient: AsyncClient, caplog: pytest.LogCaptureFixture, test_campaign: str
+) -> None:
+    """Tests the activity log multipurpose collection route, ensuring that
+    query parameters behave as expected to generate executable SQL to satisfy
+    the request.
+    """
+    # Test multiple query parameters at once
+    y = await aclient.get(
+        f"/cm-service/v2/logs?pilot=bobloblaw&campaign={uuid4()}&node={uuid4()}&since=1989-06-03T12:34:56Z"
+    )
+    assert y.is_success
+
+    # Test a different datetime format
+    y = await aclient.get("/cm-service/v2/logs?pilot=bobloblaw&since=946684800")
+    assert y.is_success

From c12fc6dc07c4ca51219a6ca06677dcbd9122c9f6 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Thu, 10 Jul 2025 15:38:37 -0500
Subject: [PATCH 33/37] chore(machine): Improve consistency between subclasses

---
 src/lsst/cmservice/common/daemon_v2.py  |  2 +-
 src/lsst/cmservice/machines/abc.py      | 14 +++---
 src/lsst/cmservice/machines/campaign.py | 46 ++++++-------------
 src/lsst/cmservice/machines/node.py     | 61 ++++++++++++-------------
 tests/v2/test_machines.py               | 26 +++++++----
 5 files changed, 67 insertions(+), 82 deletions(-)

diff --git a/src/lsst/cmservice/common/daemon_v2.py b/src/lsst/cmservice/common/daemon_v2.py
index cab2d9448..1251c7047 100644
--- a/src/lsst/cmservice/common/daemon_v2.py
+++ b/src/lsst/cmservice/common/daemon_v2.py
@@ -110,7 +110,7 @@ async def consider_nodes(session: AsyncSession) -> None:
                 # unpickle the node's machine and rehydrate the Stateful Model
                 node_machine_pickle = await session.get_one(Machine, node.machine)
                 node_machine = (pickle.loads(node_machine_pickle.state)).model
-                node_machine.node = node
+                node_machine.db_model = node
                 # discard the pickled machine from this session and context
                 session.expunge(node_machine_pickle)
                 del node_machine_pickle
diff --git a/src/lsst/cmservice/machines/abc.py b/src/lsst/cmservice/machines/abc.py
index 12de677fa..8d64454e7 100644
--- a/src/lsst/cmservice/machines/abc.py
+++ b/src/lsst/cmservice/machines/abc.py
@@ -17,16 +17,14 @@
 """
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
+from sqlmodel.ext.asyncio.session import AsyncSession
 from transitions import EventData, Machine
 from transitions.extensions.asyncio import AsyncMachine
 
 from ..common.enums import ManifestKind, StatusEnum
-from ..db.campaigns_v2 import Campaign, Node
-
-if TYPE_CHECKING:
-    from sqlmodel.ext.asyncio.session import AsyncSession
+from ..db.campaigns_v2 import ActivityLog, Campaign, Node
 
 type AnyStatefulObject = Campaign | Node
 type AnyMachine = Machine | AsyncMachine
@@ -38,9 +36,11 @@ class StatefulModel(ABC):
     """
 
     __kind__ = [ManifestKind.other]
-    state: StatusEnum
-    session: "AsyncSession | None"
+    activity_log_entry: ActivityLog | None = None
+    db_model: AnyStatefulObject | None
     machine: AnyMachine
+    state: StatusEnum
+    session: AsyncSession | None = None
 
     @abstractmethod
     def __init__(
diff --git a/src/lsst/cmservice/machines/campaign.py b/src/lsst/cmservice/machines/campaign.py
index 442b31f3f..31ae9f4db 100644
--- a/src/lsst/cmservice/machines/campaign.py
+++ b/src/lsst/cmservice/machines/campaign.py
@@ -21,7 +21,6 @@
 from ..common.enums import ManifestKind, StatusEnum
 from ..common.graph import graph_from_edge_list_v2, validate_graph
 from ..common.logging import LOGGER
-from ..common.timestamp import element_time
 from ..db.campaigns_v2 import ActivityLog, Campaign, Edge, Node
 from .node import NodeMachine
 
@@ -65,12 +64,11 @@ class CampaignMachine(NodeMachine):
     """
 
     __kind__ = [ManifestKind.campaign]
-    campaign: Campaign | None
 
     def __init__(
         self, *args: Any, o: Campaign, initial_state: StatusEnum = StatusEnum.waiting, **kwargs: Any
     ) -> None:
-        self.campaign = o
+        self.db_model = o
         self.machine = AsyncMachine(
             model=self,
             states=StatusEnum,
@@ -90,12 +88,12 @@ async def error_handler(self, event: EventData) -> None:
         if any exception is raised in a callback function.
         """
         if TYPE_CHECKING:
-            assert self.campaign is not None
+            assert self.db_model is not None
 
         if event.error is None:
             return
 
-        logger.exception(event.error, id=self.campaign.id)
+        logger.exception(event.error, id=self.db_model.id)
         if self.activity_log_entry is not None:
             self.activity_log_entry.detail["trigger"] = event.event.name
             self.activity_log_entry.detail["error"] = str(event.error)
@@ -105,7 +103,7 @@ async def prepare_activity_log(self, event: EventData) -> None:
         """Callback method invoked by the Machine before every state-change."""
 
         if TYPE_CHECKING:
-            assert self.campaign is not None
+            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-
@@ -121,7 +119,7 @@ async def prepare_activity_log(self, event: EventData) -> None:
         )
 
         self.activity_log_entry = ActivityLog(
-            namespace=self.campaign.id,
+            namespace=self.db_model.id,
             operator=event.kwargs.get("operator", "daemon"),
             from_status=from_state,
             to_status=to_state,
@@ -129,29 +127,12 @@ async def prepare_activity_log(self, event: EventData) -> None:
             metadata_={"request_id": event.kwargs.get("request_id")},
         )
 
-    async def update_persistent_status(self, event: EventData) -> None:
-        """Callback method invoked by the Machine after every state-change."""
-        # Update activity log entry with new state and timestamp
-        if TYPE_CHECKING:
-            assert self.campaign is not None
-            assert self.session is not None
-
-        if self.activity_log_entry is not None:
-            self.activity_log_entry.to_status = self.state
-            self.activity_log_entry.finished_at = timestamp.now_utc()
-
-        # Ensure database record for transitioned object is updated
-        self.campaign = await self.session.merge(self.campaign, load=False)
-        self.campaign.status = self.state
-        self.campaign.metadata_["mtime"] = element_time()
-        await self.session.commit()
-
     async def finalize(self, event: EventData) -> None:
         """Callback method invoked by the Machine unconditionally at the end
         of every callback chain.
         """
         if TYPE_CHECKING:
-            assert self.campaign is not None
+            assert self.db_model is not None
             assert self.session is not None
 
         # The activity log entry is added to the db. For failed transitions it
@@ -171,6 +152,7 @@ async def finalize(self, event: EventData) -> None:
             await self.session.rollback()
         finally:
             self.session.expunge(self.activity_log_entry)
+            self.activity_log_entry = None
 
         await self.session.close()
         self.session = None
@@ -187,10 +169,10 @@ async def is_successful(self, event: EventData) -> bool:
         fully evolved by an executor.
         """
         if TYPE_CHECKING:
-            assert self.campaign is not None
+            assert self.db_model is not None
             assert self.session is not None
-        end_node = await self.session.get_one(Node, uuid5(self.campaign.id, "END.1"))
-        logger.info(f"Checking whether campaign {self.campaign.name} is finished.", end_node=end_node.status)
+        end_node = await self.session.get_one(Node, uuid5(self.db_model.id, "END.1"))
+        logger.info(f"Checking whether campaign {self.db_model.name} is finished.", end_node=end_node.status)
         return end_node.status is StatusEnum.accepted
 
     async def has_valid_graph(self, event: EventData) -> bool:
@@ -200,13 +182,13 @@ async def has_valid_graph(self, event: EventData) -> bool:
         that must be met before the campaign may transition to a "ready" state.
         """
         if TYPE_CHECKING:
-            assert self.campaign is not None
+            assert self.db_model is not None
             assert self.session is not None
 
-        edges = await self.session.exec(select(Edge).where(Edge.namespace == self.campaign.id))
+        edges = await self.session.exec(select(Edge).where(Edge.namespace == self.db_model.id))
         graph = await graph_from_edge_list_v2(edges.all(), self.session)
-        source = uuid5(self.campaign.id, "START.1")
-        sink = uuid5(self.campaign.id, "END.1")
+        source = uuid5(self.db_model.id, "START.1")
+        sink = uuid5(self.db_model.id, "END.1")
         graph_is_valid = validate_graph(graph, source, sink)
         if not graph_is_valid:
             raise InvalidCampaignGraphError("Invalid campaign graph")
diff --git a/src/lsst/cmservice/machines/node.py b/src/lsst/cmservice/machines/node.py
index c84c46431..cc36bfdbe 100644
--- a/src/lsst/cmservice/machines/node.py
+++ b/src/lsst/cmservice/machines/node.py
@@ -11,13 +11,13 @@
 
 from anyio import Path
 from fastapi.concurrency import run_in_threadpool
-from sqlmodel.ext.asyncio.session import AsyncSession
 from transitions import EventData
 from transitions.extensions.asyncio import AsyncEvent, AsyncMachine
 
 from ..common import timestamp
 from ..common.enums import ManifestKind, StatusEnum
 from ..common.logging import LOGGER
+from ..common.timestamp import element_time
 from ..config import config
 from ..db.campaigns_v2 import ActivityLog, Machine, Node
 from ..db.session import get_async_session
@@ -67,15 +67,11 @@ class NodeMachine(StatefulModel):
     """General state model for a Node in a Campaign Graph."""
 
     __kind__ = [ManifestKind.node]
-    node: Node | None
-    machine: AsyncMachine
-    activity_log_entry: ActivityLog | None = None
-    session: AsyncSession | None = None
 
     def __init__(
         self, *args: Any, o: Node, initial_state: StatusEnum = StatusEnum.waiting, **kwargs: Any
     ) -> None:
-        self.node = o
+        self.db_model = o
         self.machine = AsyncMachine(
             model=self,
             states=StatusEnum,
@@ -103,7 +99,7 @@ def __getstate__(self) -> dict:
         # in the pickle
         state = self.__dict__.copy()
         del state["session"]
-        del state["node"]
+        del state["db_model"]
         del state["activity_log_entry"]
         return state
 
@@ -135,9 +131,9 @@ async def prepare_session(self, event: EventData) -> None:
         # any callback from proceeding if no such member is defined, but type
         # checkers don't know this, which is why it repeated in a TYPE_CHECKING
         # guard in each method that accesses the ORM member.
-        assert self.node is not None, "Stateful Model must have a Node member."
+        assert self.db_model is not None, "Stateful Model must have a Node member."
 
-        logger.debug("Preparing session for transition", id=str(self.node.id))
+        logger.debug("Preparing session for transition", id=str(self.db_model.id))
         if self.session is not None:
             await self.session.close()
         else:
@@ -146,12 +142,12 @@ async def prepare_session(self, event: EventData) -> None:
     async def prepare_activity_log(self, event: EventData) -> None:
         """Callback method invoked by the Machine before every state-change."""
         if TYPE_CHECKING:
-            assert self.node is not None
+            assert self.db_model is not None
 
         if self.activity_log_entry is not None:
             return None
 
-        logger.debug("Preparing activity log for transition", id=str(self.node.id))
+        logger.debug("Preparing activity log for transition", id=str(self.db_model.id))
 
         from_state = StatusEnum[event.transition.source] if event.transition else self.state
         to_state = (
@@ -159,8 +155,8 @@ async def prepare_activity_log(self, event: EventData) -> None:
         )
 
         self.activity_log_entry = ActivityLog(
-            namespace=self.node.namespace,
-            node=self.node.id,
+            namespace=self.db_model.namespace,
+            node=self.db_model.id,
             operator="daemon",
             from_status=from_state,
             to_status=to_state,
@@ -172,17 +168,18 @@ async def update_persistent_status(self, event: EventData) -> None:
         """Callback method invoked by the Machine after every state-change."""
         # Update activity log entry with new state and timestamp
         if TYPE_CHECKING:
-            assert self.node is not None, "Stateful Model must have a Node member."
+            assert self.db_model is not None, "Stateful Model must have a Node member."
             assert self.session is not None
-        logger.debug("Updating the ORM instance after transition.", id=str(self.node.id))
+        logger.debug("Updating the ORM instance after transition.", id=str(self.db_model.id))
 
         if self.activity_log_entry is not None:
             self.activity_log_entry.to_status = self.state
             self.activity_log_entry.finished_at = timestamp.now_utc()
 
         # Ensure database record for transitioned object is updated
-        self.node = await self.session.merge(self.node, load=False)
-        self.node.status = self.state
+        self.db_model = await self.session.merge(self.db_model, load=False)
+        self.db_model.status = self.state
+        self.db_model.metadata_["mtime"] = element_time()
         await self.session.commit()
 
     async def finalize(self, event: EventData) -> None:
@@ -192,7 +189,7 @@ async def finalize(self, event: EventData) -> None:
         machine is serialized to the Machines table for later use.
         """
         if TYPE_CHECKING:
-            assert self.node is not None, "Stateful Model must have a Node member."
+            assert self.db_model is not None
             assert self.session is not None
 
         # The activity log entry is added to the db. For failed transitions it
@@ -204,12 +201,12 @@ async def finalize(self, event: EventData) -> None:
             return
 
         # ensure the orm instance is in the session
-        if self.node not in self.session:
-            self.node = await self.session.merge(self.node, load=False)
+        if self.db_model not in self.session:
+            self.db_model = await self.session.merge(self.db_model, load=False)
 
         # flush the activity log entry to the db
         try:
-            logger.debug("Finalizing the activity log after transition.", id=str(self.node.id))
+            logger.debug("Finalizing the activity log after transition.", id=str(self.db_model.id))
             self.session.add(self.activity_log_entry)
             await self.session.commit()
         except Exception:
@@ -221,12 +218,12 @@ async def finalize(self, event: EventData) -> None:
 
         # create or update a machine entry in the db
         new_machine = Machine.model_validate(
-            dict(id=self.node.machine or uuid4(), state=pickle.dumps(self.machine))
+            dict(id=self.db_model.machine or uuid4(), state=pickle.dumps(self.machine))
         )
         try:
-            logger.debug("Serializing the state machine after transition.", id=str(self.node.id))
+            logger.debug("Serializing the state machine after transition.", id=str(self.db_model.id))
             await self.session.merge(new_machine)
-            self.node.machine = new_machine.id
+            self.db_model.machine = new_machine.id
             await self.session.commit()
         except Exception:
             logger.exception()
@@ -280,19 +277,19 @@ async def do_prepare(self, event: EventData) -> None:
         - artifact directory is created and writable.
         """
         if TYPE_CHECKING:
-            assert self.node is not None
+            assert self.db_model is not None
 
-        logger.info("Preparing START node", id=str(self.node.id))
+        logger.info("Preparing START node", id=str(self.db_model.id))
 
-        artifact_location = Path(expandvars(config.bps.artifact_path)) / str(self.node.namespace)
+        artifact_location = Path(expandvars(config.bps.artifact_path)) / str(self.db_model.namespace)
         await artifact_location.mkdir(parents=False, exist_ok=True)
 
     async def do_unprepare(self, event: EventData) -> None:
         if TYPE_CHECKING:
-            assert self.node is not None
+            assert self.db_model is not None
 
-        logger.info("Unpreparing START node", id=str(self.node.id))
-        artifact_location = Path(expandvars(config.bps.artifact_path)) / str(self.node.namespace)
+        logger.info("Unpreparing START node", id=str(self.db_model.id))
+        artifact_location = Path(expandvars(config.bps.artifact_path)) / str(self.db_model.namespace)
         await run_in_threadpool(shutil.rmtree, artifact_location)
 
     async def do_start(self, event: EventData) -> None:
@@ -304,9 +301,9 @@ async def do_start(self, event: EventData) -> None:
         may now be evolved.
         """
         if TYPE_CHECKING:
-            assert self.node is not None
+            assert self.db_model is not None
 
-        logger.debug("Starting START Node for Campaign", id=str(self.node.id))
+        logger.debug("Starting START Node for Campaign", id=str(self.db_model.id))
         return None
 
 
diff --git a/tests/v2/test_machines.py b/tests/v2/test_machines.py
index d7af2f256..cf7626695 100644
--- a/tests/v2/test_machines.py
+++ b/tests/v2/test_machines.py
@@ -30,6 +30,7 @@ async def test_node_machine(test_campaign: str, session: AsyncSession) -> None:
     node = await session.get_one(Node, node_id)
     x = node.status
     assert x is StatusEnum.waiting
+    await session.commit()
 
     node_machine = StartMachine(o=node)
     assert node_machine.is_waiting()
@@ -42,6 +43,7 @@ async def test_node_machine(test_campaign: str, session: AsyncSession) -> None:
     await session.refresh(node, attribute_names=["status"])
     x = node.status
     assert x is StatusEnum.ready
+    await session.commit()
 
     did_start = await node_machine.start()
     assert did_start
@@ -51,14 +53,14 @@ async def test_node_machine(test_campaign: str, session: AsyncSession) -> None:
     await session.refresh(node, attribute_names=["status"])
     x = node.status
     assert x is StatusEnum.running
+    await session.commit()
 
     did_finish = await node_machine.trigger("finish")
     assert did_finish
     await session.refresh(node, attribute_names=["status"])
     x = node.status
     assert x is StatusEnum.accepted
-
-    await session.close()
+    await session.commit()
 
 
 async def test_bad_transition(test_campaign: str, session: AsyncSession) -> None:
@@ -72,8 +74,9 @@ async def test_bad_transition(test_campaign: str, session: AsyncSession) -> None
     node = await session.get_one(Node, node_id)
     x = node.status
     assert x is StatusEnum.waiting
-    node_machine = StartMachine(o=node)
+    await session.commit()
 
+    node_machine = StartMachine(o=node)
     with patch(
         "lsst.cmservice.machines.node.StartMachine.do_prepare",
         side_effect=RuntimeError("Error: unknown error"),
@@ -97,6 +100,7 @@ async def test_bad_transition(test_campaign: str, session: AsyncSession) -> None
     await session.refresh(node, attribute_names=["status"])
     x = node.status
     assert x is StatusEnum.failed
+    await session.commit()
 
     # retry by rolling back to ready
     assert await node_machine.may_retry()
@@ -106,6 +110,7 @@ async def test_bad_transition(test_campaign: str, session: AsyncSession) -> None
     await session.refresh(node, attribute_names=["status"])
     x = node.status
     assert x is StatusEnum.ready
+    await session.commit()
 
     # start and finish without further error
     assert await node_machine.start()
@@ -114,7 +119,7 @@ async def test_bad_transition(test_campaign: str, session: AsyncSession) -> None
     await session.refresh(node, attribute_names=["status"])
     x = node.status
     assert x is StatusEnum.accepted
-    await session.close()
+    await session.commit()
 
 
 async def test_machine_pickle(test_campaign: str, session: AsyncSession) -> None:
@@ -126,8 +131,9 @@ async def test_machine_pickle(test_campaign: str, session: AsyncSession) -> None
     node = await session.get_one(Node, node_id)
     x = node.status
     assert x is StatusEnum.waiting
-    node_machine = NodeMachine(o=node)
+    await session.commit()
 
+    node_machine = NodeMachine(o=node)
     # evolve the machine to "prepared"
     await node_machine.prepare()
     assert node_machine.state is StatusEnum.ready
@@ -139,10 +145,8 @@ async def test_machine_pickle(test_campaign: str, session: AsyncSession) -> None
     # campaigns can have a reference to their machine, but the machine ids are
     # not necessarily deterministic (i.e., they do not have to be namespaced.)
     session.add(machine_db)
-    await session.commit()
     node.machine = machine_db.id
     await session.commit()
-    await session.refresh(node, attribute_names=["status", "machine"])
 
     await session.close()
     del node_machine
@@ -161,20 +165,21 @@ async def test_machine_pickle(test_campaign: str, session: AsyncSession) -> None
     # assign any members we had to disasssociate before pickling
     assert machine_unpickle.state is not None
     new_node_machine: NodeMachine = (pickle.loads(machine_unpickle.state)).model
-    new_node_machine.node = new_node
+    new_node_machine.db_model = new_node
 
     # test the rehydrated machine and continue to evolve it
     assert new_node_machine.state == new_node.status
+    await session.commit()
 
     await new_node_machine.start()
     await session.refresh(new_node, attribute_names=["status"])
     assert new_node_machine.state == new_node.status
+    await session.commit()
 
     await new_node_machine.finish()
     await session.refresh(new_node, attribute_names=["status"])
     assert new_node_machine.state == new_node.status
-
-    await session.close()
+    await session.commit()
 
 
 async def test_change_campaign_state(
@@ -190,6 +195,7 @@ async def test_change_campaign_state(
 
     campaign_id = urlparse(test_campaign).path.split("/")[-2:][0]
     campaign = await session.get_one(Campaign, campaign_id)
+    await session.commit()
 
     x = (await aclient.get(f"/cm-service/v2/campaigns/{campaign_id}")).json()
     assert x["status"] == "waiting"

From a9020f6153ef4429305830e59e2d35c354800db9 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Fri, 11 Jul 2025 10:03:39 -0500
Subject: [PATCH 34/37] chore(session): refactor db session - rename "session
 manager" class as "database manager" - replace "get_async_session" function
 with calls to sessionmaker().

---
 src/lsst/cmservice/common/daemon_v2.py   | 15 ++++++++-------
 src/lsst/cmservice/db/session.py         | 16 +++++-----------
 src/lsst/cmservice/handlers/functions.py |  8 +++++---
 src/lsst/cmservice/machines/node.py      |  5 +++--
 tests/v2/conftest.py                     | 10 +++++-----
 tests/v2/test_db.py                      |  6 +++---
 6 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/lsst/cmservice/common/daemon_v2.py b/src/lsst/cmservice/common/daemon_v2.py
index 1251c7047..2612d98f2 100644
--- a/src/lsst/cmservice/common/daemon_v2.py
+++ b/src/lsst/cmservice/common/daemon_v2.py
@@ -2,6 +2,7 @@
 from asyncio import Task as AsyncTask
 from asyncio import TaskGroup, create_task
 from collections.abc import Awaitable, Mapping
+from typing import TYPE_CHECKING
 from uuid import UUID, uuid5
 
 from sqlalchemy.dialects.postgresql import insert
@@ -13,7 +14,7 @@
 from ..common.enums import StatusEnum
 from ..config import config
 from ..db.campaigns_v2 import Campaign, Edge, Machine, Node, Task
-from ..db.session import get_async_session
+from ..db.session import db_session_dependency
 from ..machines.node import NodeMachine, node_machine_factory
 from .logging import LOGGER
 
@@ -174,13 +175,13 @@ async def finalize_runner_callback(context: AsyncTask) -> None:
     # Using the task name as the ID of a task, get the object and update its
     # finished_at column. Alternately, we could delete the task from the table
     # now.
-    logger.info("Finalizing CM Task", id=context.get_name())
-    session = await get_async_session()
+    if TYPE_CHECKING:
+        assert db_session_dependency.sessionmaker is not None
 
-    cm_task = await session.get_one(Task, UUID(context.get_name()))
-    cm_task.finished_at = timestamp.now_utc()
-    await session.commit()
-    await session.close()
+    logger.info("Finalizing CM Task", id=context.get_name())
+    async with db_session_dependency.sessionmaker.begin() as session:
+        cm_task = await session.get_one(Task, UUID(context.get_name()))
+        cm_task.finished_at = timestamp.now_utc()
 
 
 def task_runner_callback(context: AsyncTask) -> None:
diff --git a/src/lsst/cmservice/db/session.py b/src/lsst/cmservice/db/session.py
index e4cb5f5b2..e912e24ad 100644
--- a/src/lsst/cmservice/db/session.py
+++ b/src/lsst/cmservice/db/session.py
@@ -13,11 +13,11 @@
 logger = LOGGER.bind(module=__name__)
 
 
-class DatabaseSessionDependency:
+class DatabaseManager:
     """A database session manager class designed to manage an async sqlalchemy
     engine and produce sessions.
 
-    A module-level instance of this class is created, and when called, a new
+    A module-level instance of this class is created, and when called a new
     async session is yielded.
     """
 
@@ -35,7 +35,7 @@ async def initialize(
         *,
         use_async: bool = True,
     ) -> None:
-        """Initialize the session dependency.
+        """Initialize the database manager.
 
         Parameters
         ----------
@@ -93,11 +93,5 @@ async def aclose(self) -> None:
             self.engine = None
 
 
-db_session_dependency = DatabaseSessionDependency()
-"""A module-level instance of the session manager"""
-
-
-# FIXME not sure why this pattern
-async def get_async_session() -> AsyncSession:
-    """Get a new session from the current database session factory."""
-    return await anext(db_session_dependency())
+db_session_dependency = DatabaseManager()
+"""A module-level instance of the database manager"""
diff --git a/src/lsst/cmservice/handlers/functions.py b/src/lsst/cmservice/handlers/functions.py
index ff6c93e51..d3451bd58 100644
--- a/src/lsst/cmservice/handlers/functions.py
+++ b/src/lsst/cmservice/handlers/functions.py
@@ -24,7 +24,7 @@
 from ..db.pipetask_error import PipetaskError
 from ..db.pipetask_error_type import PipetaskErrorType
 from ..db.product_set import ProductSet
-from ..db.session import get_async_session
+from ..db.session import db_session_dependency
 from ..db.spec_block import SpecBlock
 from ..db.specification import Specification
 from ..db.step import Step
@@ -393,7 +393,8 @@ async def force_accept_node(
     """
     local_session = False
     if session is None:
-        session = await get_async_session()
+        assert db_session_dependency.sessionmaker is not None
+        session = db_session_dependency.sessionmaker()
         local_session = True
 
     the_node = await db_class.get_row(session, node)
@@ -444,7 +445,8 @@ async def render_campaign_steps(
     """
     local_session = False
     if session is None:
-        session = await get_async_session()
+        assert db_session_dependency.sessionmaker is not None
+        session = db_session_dependency.sessionmaker()
         local_session = True
     if isinstance(campaign, int):
         campaign = await Campaign.get_row(session, campaign)
diff --git a/src/lsst/cmservice/machines/node.py b/src/lsst/cmservice/machines/node.py
index cc36bfdbe..cecf0a47a 100644
--- a/src/lsst/cmservice/machines/node.py
+++ b/src/lsst/cmservice/machines/node.py
@@ -20,7 +20,7 @@
 from ..common.timestamp import element_time
 from ..config import config
 from ..db.campaigns_v2 import ActivityLog, Machine, Node
-from ..db.session import get_async_session
+from ..db.session import db_session_dependency
 from .abc import StatefulModel
 
 logger = LOGGER.bind(module=__name__)
@@ -137,7 +137,8 @@ async def prepare_session(self, event: EventData) -> None:
         if self.session is not None:
             await self.session.close()
         else:
-            self.session = await get_async_session()
+            assert db_session_dependency.sessionmaker is not None
+            self.session = db_session_dependency.sessionmaker()
 
     async def prepare_activity_log(self, event: EventData) -> None:
         """Callback method invoked by the Machine before every state-change."""
diff --git a/tests/v2/conftest.py b/tests/v2/conftest.py
index 8c12f4e93..44905d3ea 100644
--- a/tests/v2/conftest.py
+++ b/tests/v2/conftest.py
@@ -17,7 +17,7 @@
 from lsst.cmservice.common.types import AnyAsyncSession
 from lsst.cmservice.config import config
 from lsst.cmservice.db.campaigns_v2 import metadata
-from lsst.cmservice.db.session import DatabaseSessionDependency, db_session_dependency
+from lsst.cmservice.db.session import DatabaseManager, db_session_dependency
 
 if TYPE_CHECKING:
     from fastapi import FastAPI
@@ -41,7 +41,7 @@ def patched_config(monkeypatch_module: pytest.MonkeyPatch, tmp_path_factory: pyt
 
 
 @pytest_asyncio.fixture(scope="module", loop_scope="module")
-async def rawdb(monkeypatch_module: pytest.MonkeyPatch) -> AsyncGenerator[DatabaseSessionDependency]:
+async def rawdb(monkeypatch_module: pytest.MonkeyPatch) -> AsyncGenerator[DatabaseManager]:
     """Test fixture for a postgres container.
 
     A scoped ephemeral container will be created for the test if the env var
@@ -82,7 +82,7 @@ async def rawdb(monkeypatch_module: pytest.MonkeyPatch) -> AsyncGenerator[Databa
 
 
 @pytest_asyncio.fixture(scope="module", loop_scope="module")
-async def testdb(rawdb: DatabaseSessionDependency) -> AsyncGenerator[DatabaseSessionDependency]:
+async def testdb(rawdb: DatabaseManager) -> AsyncGenerator[DatabaseManager]:
     """Test fixture for a migrated postgres container.
 
     This fixture creates all the database objects defined for the ORM metadata
@@ -116,7 +116,7 @@ async def testdb(rawdb: DatabaseSessionDependency) -> AsyncGenerator[DatabaseSes
 
 @pytest_asyncio.fixture(name="session_factory", scope="module", loop_scope="module")
 async def session_factory_fixture(
-    testdb: DatabaseSessionDependency,
+    testdb: DatabaseManager,
 ) -> Callable[..., AsyncGenerator[AnyAsyncSession]]:
     """Test fixture for providing an AsyncSession Factory."""
 
@@ -144,7 +144,7 @@ async def session_fixture(session_factory: Callable) -> AsyncGenerator[AnyAsyncS
 
 @pytest_asyncio.fixture(name="aclient", scope="module", loop_scope="module")
 async def async_client_fixture(
-    session_factory: Callable, testdb: DatabaseSessionDependency
+    session_factory: Callable, testdb: DatabaseManager
 ) -> AsyncGenerator[AsyncClient]:
     """Test fixture for an HTTPX async test client backed by a FastAPI app with
     its dependency injections overriden by factory fixtures.
diff --git a/tests/v2/test_db.py b/tests/v2/test_db.py
index 7995f52f2..c55fe8a42 100644
--- a/tests/v2/test_db.py
+++ b/tests/v2/test_db.py
@@ -6,11 +6,11 @@
 from sqlmodel import select
 
 from lsst.cmservice.db.campaigns_v2 import Campaign, Machine, _default_campaign_namespace
-from lsst.cmservice.db.session import DatabaseSessionDependency
+from lsst.cmservice.db.session import DatabaseManager
 
 
 @pytest.mark.asyncio
-async def test_create_campaigns_v2(testdb: DatabaseSessionDependency) -> None:
+async def test_create_campaigns_v2(testdb: DatabaseManager) -> None:
     """Tests the campaigns_v2 table by creating and updating a Campaign."""
 
     assert testdb.sessionmaker is not None
@@ -55,7 +55,7 @@ async def test_create_campaigns_v2(testdb: DatabaseSessionDependency) -> None:
 
 
 @pytest.mark.asyncio
-async def test_create_machines_v2(testdb: DatabaseSessionDependency) -> None:
+async def test_create_machines_v2(testdb: DatabaseManager) -> None:
     """Tests the machines_v2 table by storing + retrieving a pickled object."""
 
     assert testdb.sessionmaker is not None

From 451c5e543398b1a0566ab87d7f03c54d70c12427 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Tue, 15 Jul 2025 08:55:03 -0500
Subject: [PATCH 35/37] 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

---
 src/lsst/cmservice/common/graph.py            |   4 +-
 src/lsst/cmservice/db/campaigns_v2.py         |  28 ++-
 src/lsst/cmservice/db/manifests_v2.py         |  48 ++---
 src/lsst/cmservice/machines/campaign.py       |   5 -
 src/lsst/cmservice/routers/v2/activity_log.py |   6 +-
 src/lsst/cmservice/routers/v2/campaigns.py    | 195 +++++++++---------
 src/lsst/cmservice/routers/v2/edges.py        |  16 +-
 src/lsst/cmservice/routers/v2/manifests.py    |  42 ++--
 src/lsst/cmservice/routers/v2/nodes.py        |  25 ++-
 tests/v2/test_node_routes.py                  |   9 +-
 10 files changed, 196 insertions(+), 182 deletions(-)

diff --git a/src/lsst/cmservice/common/graph.py b/src/lsst/cmservice/common/graph.py
index d9401a6d8..b206034c6 100644
--- a/src/lsst/cmservice/common/graph.py
+++ b/src/lsst/cmservice/common/graph.py
@@ -79,9 +79,10 @@ 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
@@ -89,7 +90,6 @@ async def graph_from_edge_list_v2(
     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
 
 
diff --git a/src/lsst/cmservice/db/campaigns_v2.py b/src/lsst/cmservice/db/campaigns_v2.py
index 7946a1356..b2968f06e 100644
--- a/src/lsst/cmservice/db/campaigns_v2.py
+++ b/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),
diff --git a/src/lsst/cmservice/db/manifests_v2.py b/src/lsst/cmservice/db/manifests_v2.py
index af3cfde28..22947dd2e 100644
--- a/src/lsst/cmservice/db/manifests_v2.py
+++ b/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]):
diff --git a/src/lsst/cmservice/machines/campaign.py b/src/lsst/cmservice/machines/campaign.py
index 31ae9f4db..55cff74b6 100644
--- a/src/lsst/cmservice/machines/campaign.py
+++ b/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
 
diff --git a/src/lsst/cmservice/routers/v2/activity_log.py b/src/lsst/cmservice/routers/v2/activity_log.py
index 6c4fa9312..e9650efcb 100644
--- a/src/lsst/cmservice/routers/v2/activity_log.py
+++ b/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(
diff --git a/src/lsst/cmservice/routers/v2/campaigns.py b/src/lsst/cmservice/routers/v2/campaigns.py
index 2b765b24d..86352a14c 100644
--- a/src/lsst/cmservice/routers/v2/campaigns.py
+++ b/src/lsst/cmservice/routers/v2/campaigns.py
@@ -9,6 +9,8 @@
 from uuid import UUID, uuid4, uuid5
 
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Query, Request, Response
+from pydantic import UUID5
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import aliased
 from sqlmodel import col, select
 from sqlmodel.ext.asyncio.session import AsyncSession
@@ -73,14 +75,14 @@ async def read_campaign_collection(
 
 
 @router.get(
-    "/{campaign_name}",
+    "/{campaign_name_or_id}",
     summary="Get campaign detail",
 )
 async def read_campaign_resource(
     request: Request,
     response: Response,
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
-    campaign_name: str,
+    campaign_name_or_id: str,
 ) -> Campaign:
     """Fetch a single campaign from the database given either the campaign id
     or its name.
@@ -88,23 +90,25 @@ async def read_campaign_resource(
     s = select(Campaign)
     # The input could be a campaign UUID or it could be a literal name.
     try:
-        if campaign_id := UUID(campaign_name):
+        if campaign_id := UUID(campaign_name_or_id):
             s = s.where(Campaign.id == campaign_id)
     except ValueError:
-        s = s.where(Campaign.name == campaign_name)
+        s = s.where(Campaign.name == campaign_name_or_id)
 
     campaign = (await session.exec(s)).one_or_none()
     # set the response headers
     if campaign is not None:
-        response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign.id))
+        response.headers["Self"] = str(
+            request.url_for("read_campaign_resource", campaign_name_or_id=campaign.id)
+        )
         response.headers["Nodes"] = str(
-            request.url_for("read_campaign_node_collection", campaign_name=campaign.id)
+            request.url_for("read_campaign_node_collection", campaign_id=campaign.id)
         )
         response.headers["Edges"] = str(
-            request.url_for("read_campaign_edge_collection", campaign_name=campaign.id)
+            request.url_for("read_campaign_edge_collection", campaign_id=campaign.id)
         )
         response.headers["Manifests"] = str(
-            request.url_for("read_campaign_manifest_collection", campaign_name=campaign.id)
+            request.url_for("read_campaign_manifest_collection", campaign_id=campaign.id)
         )
         return campaign
     else:
@@ -183,31 +187,33 @@ async def update_campaign_resource(
         request_id = uuid4()
         background_tasks.add_task(change_campaign_state, campaign, patch_data.status, request_id)
         response.headers["StatusUpdate"] = (
-            f"""{request.url_for("read_campaign_activity_log", campaign_name_or_id=campaign.id)}"""
+            f"""{request.url_for("read_campaign_activity_log", campaign_name=campaign.id)}"""
             f"""?request-id={request_id}"""
         ).strip()
 
     # set the response headers
     if campaign is not None:
-        response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign.id))
+        response.headers["Self"] = str(
+            request.url_for("read_campaign_resource", campaign_name_or_id=campaign.id)
+        )
         response.headers["Nodes"] = str(
-            request.url_for("read_campaign_node_collection", campaign_name=campaign.id)
+            request.url_for("read_campaign_node_collection", campaign_id=campaign.id)
         )
         response.headers["Edges"] = str(
-            request.url_for("read_campaign_edge_collection", campaign_name=campaign.id)
+            request.url_for("read_campaign_edge_collection", campaign_id=campaign.id)
         )
     return campaign
 
 
 @router.get(
-    "/{campaign_name}/nodes",
+    "/{campaign_id}/nodes",
     summary="Get campaign Nodes",
 )
 async def read_campaign_node_collection(
     request: Request,
     response: Response,
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
-    campaign_name: str,
+    campaign_id: UUID5,
     limit: Annotated[int, Query(le=100)] = 10,
     offset: Annotated[int, Query()] = 0,
 ) -> Sequence[Node]:
@@ -215,37 +221,34 @@ async def read_campaign_node_collection(
     single Campaign.
     """
 
-    # The input could be a campaign UUID or it could be a literal name.
-    # TODO this could just as well be a campaign query with a join to nodes
-    statement = select(Node).order_by(Node.metadata_["crtime"].asc().nulls_last())
+    statement = (
+        select(Node)
+        .where(Node.namespace == campaign_id)
+        .order_by(Node.metadata_["crtime"].asc().nulls_last())
+        .offset(offset)
+        .limit(limit)
+    )
 
-    try:
-        if campaign_id := UUID(campaign_name):
-            statement = statement.where(Node.namespace == campaign_id)
-    except ValueError:
-        # FIXME get an id from a name
-        raise HTTPException(status_code=422, detail="campaign_name must be a uuid")
-    statement = statement.offset(offset).limit(limit)
     nodes = await session.exec(statement)
     response.headers["Next"] = str(
         request.url_for(
             "read_campaign_node_collection",
-            campaign_name=campaign_id,
+            campaign_id=campaign_id,
         ).include_query_params(offset=(offset + limit), limit=limit),
     )
-    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign_id))
+    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name_or_id=campaign_id))
     return nodes.all()
 
 
 @router.get(
-    "/{campaign_name}/manifests",
+    "/{campaign_id}/manifests",
     summary="Get campaign Manifests",
 )
 async def read_campaign_manifest_collection(
     request: Request,
     response: Response,
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
-    campaign_name: str,
+    campaign_id: UUID5,
     limit: Annotated[int, Query(le=100)] = 10,
     offset: Annotated[int, Query()] = 0,
 ) -> Sequence[Manifest]:
@@ -253,36 +256,34 @@ async def read_campaign_manifest_collection(
     single Campaign.
     """
 
-    # The input could be a campaign UUID or it could be a literal name.
-    statement = select(Manifest).order_by(Manifest.metadata_["crtime"].asc().nulls_last())
+    statement = (
+        select(Manifest)
+        .where(Manifest.namespace == campaign_id)
+        .order_by(Manifest.metadata_["crtime"].asc().nulls_last())
+        .offset(offset)
+        .limit(limit)
+    )
 
-    try:
-        if campaign_id := UUID(campaign_name):
-            statement = statement.where(Manifest.namespace == campaign_id)
-    except ValueError:
-        # FIXME get an id from a name
-        raise HTTPException(status_code=422, detail="campaign_name must be a uuid")
-    statement = statement.offset(offset).limit(limit)
     nodes = await session.exec(statement)
     response.headers["Next"] = str(
         request.url_for(
             "read_campaign_manifest_collection",
-            campaign_name=campaign_id,
+            campaign_id=campaign_id,
         ).include_query_params(offset=(offset + limit), limit=limit),
     )
-    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign_id))
+    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name_or_id=campaign_id))
     return nodes.all()
 
 
 @router.get(
-    "/{campaign_name}/edges",
+    "/{campaign_id}/edges",
     summary="Get campaign Edges",
 )
 async def read_campaign_edge_collection(
     request: Request,
     response: Response,
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
-    campaign_name: str,
+    campaign_id: UUID5,
     *,
     resolve_names: bool = False,
 ) -> Sequence[Edge]:
@@ -291,41 +292,33 @@ async def read_campaign_edge_collection(
     graph.
     """
 
-    # The input could be a campaign UUID or it could be a literal name.
-    # This is why raw SQL is better than ORMs
-    # This is probably better off as two queries instead of a "complicated"
-    # join.
     if resolve_names:
         source_nodes = aliased(Node, name="source")
         target_nodes = aliased(Node, name="target")
-        s = (
-            select(
+        statement = (
+            select(  # type: ignore[call-overload]
                 col(Edge.id).label("id"),
                 col(Edge.name).label("name"),
                 col(Edge.namespace).label("namespace"),
                 col(source_nodes.name).label("source"),
                 col(target_nodes.name).label("target"),
                 col(Edge.configuration).label("configuration"),
-            )  # type: ignore
+            )
             .join_from(Edge, source_nodes, Edge.source == source_nodes.id)
             .join_from(Edge, target_nodes, Edge.target == target_nodes.id)
         )
     else:
-        s = select(Edge).order_by(col(Edge.name).asc().nulls_last())
-    try:
-        if campaign_id := UUID(campaign_name):
-            s = s.where(Edge.namespace == campaign_id)
-    except ValueError:
-        # FIXME get an id from a name
-        raise HTTPException(status_code=422, detail="campaign_name must be a uuid")
-    edges = await session.exec(s)
+        statement = select(Edge).order_by(col(Edge.name).asc().nulls_last())
+
+    statement = statement.where(Edge.namespace == campaign_id)
+    edges = await session.exec(statement)
 
-    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign_id))
+    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name_or_id=campaign_id))
     return edges.all()
 
 
 @router.delete(
-    "/{campaign_name}/edges/{edge_name}",
+    "/{campaign_id}/edges/{edge_name}",
     summary="Delete campaign edge",
     status_code=204,
 )
@@ -333,16 +326,10 @@ async def delete_campaign_edge_resource(
     request: Request,
     response: Response,
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
-    campaign_name: str,
+    campaign_id: UUID5,
     edge_name: str,
 ) -> None:
-    """Delete an edge resource from the campaign, using either name or id."""
-    # If the campaign name is not a uuid, find the appropriate id
-    try:
-        campaign_id = UUID(campaign_name)
-    except ValueError:
-        # FIXME get an id from a name
-        raise HTTPException(status_code=422, detail="campaign_name must be a uuid")
+    """Delete an edge resource from the campaign."""
 
     try:
         edge_id = UUID(edge_name)
@@ -370,52 +357,66 @@ async def create_campaign_resource(
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
     manifest: CampaignManifest,
 ) -> Campaign:
-    """An API to create a Campaign from an appropriate Manifest."""
-    # Create a campaign spec from the manifest, delegating the creation of new
-    # dynamic fields to the model validation method, -OR- create new dynamic
-    # fields here.
-    campaign_metadata = manifest.metadata_.model_dump()
-    campaign_metadata |= {"crtime": element_time()}
+    """An API to create a Campaign from an appropriate Manifest.
+
+    If a duplicate campaign is created, the route returns the original campaign
+    from the database with a 409 (conflict) status code.
+    """
+
     campaign = Campaign.model_validate(
         dict(
-            name=campaign_metadata.pop("name"),
-            metadata_=campaign_metadata,
+            name=manifest.metadata_.name,
+            metadata_=manifest.metadata_.model_dump(),
             # owner = ...  # TODO Get username from gafaelfawr # noqa: ERA001
         )
     )
 
     # A new campaign comes with a START and END node
-    start_node = Node.model_validate(dict(name="START", namespace=campaign.id))
-    end_node = Node.model_validate(dict(name="END", namespace=campaign.id))
+    start_node = Node.model_validate(
+        dict(name="START", namespace=campaign.id, metadata_={"crtime": element_time()})
+    )
+    end_node = Node.model_validate(
+        dict(name="END", namespace=campaign.id, metadata_={"crtime": element_time()})
+    )
 
-    # Put the campaign in the database
-    session.add(campaign)
-    session.add(start_node)
-    session.add(end_node)
-    await session.commit()
-    await session.refresh(campaign)
+    try:
+        # Put the campaign in the database
+        session.add(campaign)
+        session.add(start_node)
+        session.add(end_node)
+        await session.commit()
+    except IntegrityError:
+        # campaign already exists in the database, set the conflict status
+        # response but allow the response to proceed
+        logger.exception()
+        await session.rollback()
+        campaign = await session.get_one(Campaign, campaign.id)
+        response.status_code = 409
+    except Exception as e:
+        logger.exception()
+        raise HTTPException(status_code=500, detail=str(e))
 
     # set the response headers
-    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign.id))
-    response.headers["Nodes"] = str(
-        request.url_for("read_campaign_node_collection", campaign_name=campaign.id)
-    )
-    response.headers["Edges"] = str(
-        request.url_for("read_campaign_edge_collection", campaign_name=campaign.id)
+    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name_or_id=campaign.id))
+    response.headers["Nodes"] = str(request.url_for("read_campaign_node_collection", campaign_id=campaign.id))
+    response.headers["Edges"] = str(request.url_for("read_campaign_edge_collection", campaign_id=campaign.id))
+    response.headers["Graph"] = str(request.url_for("read_campaign_graph", campaign_name=campaign.id))
+    response.headers["Activity"] = str(
+        request.url_for("read_campaign_activity_log", campaign_name=campaign.id)
     )
 
     return campaign
 
 
 @router.get(
-    "/{campaign_name_or_id}/graph",
+    "/{campaign_name}/graph",
     status_code=200,
     summary="Construct and return a Campaign's graph of nodes",
 )
 async def read_campaign_graph(
     request: Request,
     response: Response,
-    campaign_name_or_id: str,
+    campaign_name: str,
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
 ) -> Mapping:
     """Reads the graph resource for a campaign and returns its JSON represent-
@@ -426,9 +427,9 @@ async def read_campaign_graph(
     # The input could be a campaign UUID or it could be a literal name.
     campaign_id: UUID | None
     try:
-        campaign_id = UUID(campaign_name_or_id)
+        campaign_id = UUID(campaign_name)
     except ValueError:
-        s = select(Campaign.id).where(Campaign.name == campaign_name_or_id)
+        s = select(Campaign.id).where(Campaign.name == campaign_name)
         campaign_id = (await session.exec(s)).one_or_none()
 
     if campaign_id is None:
@@ -442,12 +443,12 @@ async def read_campaign_graph(
     # current database attributes according to the "simple" node view.
     graph = await graph_from_edge_list_v2(edges=edges, node_type=Node, session=session, node_view="simple")
 
-    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name=campaign_id))
+    response.headers["Self"] = str(request.url_for("read_campaign_resource", campaign_name_or_id=campaign_id))
     return graph_to_dict(graph)
 
 
 @router.get(
-    "/{campaign_name_or_id}/logs",
+    "/{campaign_name}/logs",
     status_code=200,
     summary="Obtain a collection of Activity Log records for a Campaign.",
 )
@@ -455,7 +456,7 @@ async def read_campaign_activity_log(
     request: Request,
     response: Response,
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
-    campaign_name_or_id: str,
+    campaign_name: str,
     request_id: Annotated[str | None, Query(validation_alias="request_id", alias="request-id")] = None,
 ) -> Sequence[ActivityLog]:
     """Returns the collection of Activity Log resources associated with a
@@ -466,9 +467,9 @@ async def read_campaign_activity_log(
     # The input could be a campaign UUID or it could be a literal name.
     campaign_id: UUID | None
     try:
-        campaign_id = UUID(campaign_name_or_id)
+        campaign_id = UUID(campaign_name)
     except ValueError:
-        s = select(Campaign.id).where(Campaign.name == campaign_name_or_id)
+        s = select(Campaign.id).where(Campaign.name == campaign_name)
         campaign_id = (await session.exec(s)).one_or_none()
 
     if campaign_id is None:
diff --git a/src/lsst/cmservice/routers/v2/edges.py b/src/lsst/cmservice/routers/v2/edges.py
index d96857966..80bfccdf3 100644
--- a/src/lsst/cmservice/routers/v2/edges.py
+++ b/src/lsst/cmservice/routers/v2/edges.py
@@ -95,10 +95,10 @@ async def read_edge_resource(
     response.headers["Source"] = request.url_for("read_node_resource", node_name=edge.source).__str__()
     response.headers["Target"] = request.url_for("read_node_resource", node_name=edge.target).__str__()
     response.headers["Campaign"] = request.url_for(
-        "read_campaign_resource", campaign_name=edge.namespace
+        "read_campaign_resource", campaign_name_or_id=edge.namespace
     ).__str__()
     response.headers["Graph"] = request.url_for(
-        "read_campaign_edge_collection", campaign_name=edge.namespace
+        "read_campaign_edge_collection", campaign_id=edge.namespace
     ).__str__()
     return edge
 
@@ -135,13 +135,12 @@ async def create_edge_resource(
     target_node = manifest.spec.target
 
     # A edge must exist in the namespace of an existing campaign
-    edge_namespace: str = manifest.metadata_.namespace
     try:
-        edge_namespace_uuid: UUID | None = UUID(edge_namespace)
+        edge_namespace_uuid: UUID | None = UUID(manifest.metadata_.namespace)
     except ValueError:
         # get the campaign ID by its name to use as a namespace
         edge_namespace_uuid = (
-            await session.exec(select(Campaign.id).where(Campaign.name == edge_namespace))
+            await session.exec(select(Campaign.id).where(Campaign.name == manifest.metadata_.namespace))
         ).one_or_none()
 
     # it is an error if the provided namespace (campaign) does not exist
@@ -168,7 +167,8 @@ async def create_edge_resource(
         namespace=edge_namespace_uuid,
         source=uuid5(edge_namespace_uuid, source_node),
         target=uuid5(edge_namespace_uuid, target_node),
-        configuration=manifest.spec.model_dump(),
+        metadata_=manifest.metadata_.model_dump(exclude_none=True),
+        configuration=manifest.spec.model_dump(exclude_none=True),
     )
 
     # The merge operation is effectively an upsert should an edge matching the
@@ -180,10 +180,10 @@ async def create_edge_resource(
     response.headers["Source"] = request.url_for("read_node_resource", node_name=edge.source).__str__()
     response.headers["Target"] = request.url_for("read_node_resource", node_name=edge.target).__str__()
     response.headers["Campaign"] = request.url_for(
-        "read_campaign_resource", campaign_name=edge.namespace
+        "read_campaign_resource", campaign_name_or_id=edge.namespace
     ).__str__()
     response.headers["Graph"] = request.url_for(
-        "read_campaign_edge_collection", campaign_name=edge.namespace
+        "read_campaign_edge_collection", campaign_id=edge.namespace
     ).__str__()
     return edge
 
diff --git a/src/lsst/cmservice/routers/v2/manifests.py b/src/lsst/cmservice/routers/v2/manifests.py
index 32be3106b..b83a9b1df 100644
--- a/src/lsst/cmservice/routers/v2/manifests.py
+++ b/src/lsst/cmservice/routers/v2/manifests.py
@@ -15,7 +15,7 @@
 from ...common.jsonpatch import JSONPatch, JSONPatchError, apply_json_patch
 from ...common.logging import LOGGER
 from ...common.timestamp import element_time
-from ...db.campaigns_v2 import Campaign, Manifest, _default_campaign_namespace
+from ...db.campaigns_v2 import Campaign, Manifest
 from ...db.manifests_v2 import ManifestModel
 from ...db.session import db_session_dependency
 
@@ -125,23 +125,21 @@ async def create_one_or_more_manifests(
 
         # A manifest must exist in the namespace of an existing campaign
         # or the default namespace
-        _namespace: str | None = manifest.metadata_.namespace
-        if _namespace is None:
-            _namespace_uuid = _default_campaign_namespace
-        else:
-            try:
-                _namespace_uuid = UUID(_namespace)
-            except ValueError:
-                # get the campaign ID by its name to use as a namespace
-                # it is an error if the namespace/campaign does not exist
-                # FIXME but this could also be handled by FK constraints
-                if (
-                    _campaign_id := (
-                        await session.exec(select(Campaign.id).where(Campaign.name == _namespace))
-                    ).one_or_none()
-                ) is None:
-                    raise HTTPException(status_code=422, detail="Requested namespace does not exist.")
-                _namespace_uuid = _campaign_id
+        _namespace = manifest.metadata_.namespace
+
+        try:
+            _namespace_uuid = UUID(_namespace)
+        except ValueError:
+            # get the campaign ID by its name to use as a namespace
+            # it is an error if the namespace/campaign does not exist
+            # FIXME but this could also be handled by FK constraints
+            if (
+                _campaign_id := (
+                    await session.exec(select(Campaign.id).where(Campaign.name == _namespace))
+                ).one_or_none()
+            ) is None:
+                raise HTTPException(status_code=422, detail="Requested namespace does not exist.")
+            _namespace_uuid = _campaign_id
 
         # A manifest must be a new version if name+namespace already exists
         # check db for manifest as name+namespace, get version and increment
@@ -158,16 +156,14 @@ async def create_one_or_more_manifests(
         _version = _previous.version if _previous else manifest.metadata_.version
         _version += 1
 
-        _manifest_metadata = manifest.metadata_.model_dump()
-        _manifest_metadata |= {"crtime": element_time()}
         _manifest = Manifest(
             id=uuid5(_namespace_uuid, f"{_name}.{_version}"),
-            name=_manifest_metadata.pop("name"),
+            name=manifest.metadata_.name,
             namespace=_namespace_uuid,
             kind=manifest.kind,
             version=_version,
-            metadata_=_manifest_metadata,
-            spec=manifest.spec.model_dump(),
+            metadata_=manifest.metadata_.model_dump(exclude_none=True),
+            spec=manifest.spec.model_dump(exclude_none=True),
         )
 
         # Put the node in the database
diff --git a/src/lsst/cmservice/routers/v2/nodes.py b/src/lsst/cmservice/routers/v2/nodes.py
index 59b95619e..67e5a91be 100644
--- a/src/lsst/cmservice/routers/v2/nodes.py
+++ b/src/lsst/cmservice/routers/v2/nodes.py
@@ -9,6 +9,7 @@
 from uuid import UUID, uuid5
 
 from fastapi import APIRouter, Depends, HTTPException, Query, Request, Response
+from pydantic import UUID5
 from sqlmodel import col, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
@@ -77,6 +78,7 @@ async def read_node_resource(
     response: Response,
     node_name: str,
     session: Annotated[AsyncSession, Depends(db_session_dependency)],
+    campaign_id: Annotated[UUID5 | None, Query(validation_alias="campaign_id", alias="campaign-id")] = None,
 ) -> Node:
     """Fetch a single node from the database given either the node id
     or its name.
@@ -87,14 +89,21 @@ async def read_node_resource(
         if node_id := UUID(node_name):
             s = s.where(Node.id == node_id)
     except ValueError:
-        s = s.where(Node.name == node_name)
+        # node name by itself is not sufficient to identity a single node in
+        # the database, so we must also constrain the request with the campaign
+        # namespace or raise an error.
+        if campaign_id is None:
+            raise HTTPException(
+                status_code=400, detail="Cannot locate Node by name alone. Try including `?campaign-id=...`"
+            )
+        s = s.where(Node.name == node_name).where(Node.namespace == campaign_id)
 
     node = (await session.exec(s)).one_or_none()
     if node is None:
         raise HTTPException(status_code=404)
     response.headers["Self"] = request.url_for("read_node_resource", node_name=node.id).__str__()
     response.headers["Campaign"] = request.url_for(
-        "read_campaign_resource", campaign_name=node.namespace
+        "read_campaign_resource", campaign_name_or_id=node.namespace
     ).__str__()
     return node
 
@@ -140,15 +149,13 @@ async def create_node_resource(
 
     node_version = previous_node.version if previous_node else node_version
     node_version += 1
-    node_metadata = manifest.metadata_.model_dump()
-    node_metadata |= {"crtime": element_time()}
     node = Node(
         id=uuid5(node_namespace_uuid, f"{node_name}.{node_version}"),
-        name=node_metadata.pop("name"),
+        name=node_name,
         namespace=node_namespace_uuid,
         version=node_version,
-        configuration=manifest.spec.model_dump(),
-        metadata_=node_metadata,
+        configuration=manifest.spec.model_dump(exclude_none=True),
+        metadata_=manifest.metadata_.model_dump(exclude_none=True),
     )
 
     # Put the node in the database
@@ -157,7 +164,7 @@ async def create_node_resource(
     await session.refresh(node)
     response.headers["Self"] = request.url_for("read_node_resource", node_name=node.id).__str__()
     response.headers["Campaign"] = request.url_for(
-        "read_campaign_resource", campaign_name=node.namespace
+        "read_campaign_resource", campaign_name_or_id=node.namespace
     ).__str__()
     return node
 
@@ -242,7 +249,7 @@ async def update_node_resource(
 
     response.headers["Self"] = request.url_for("read_node_resource", node_name=new_manifest_db.id).__str__()
     response.headers["Campaign"] = request.url_for(
-        "read_campaign_resource", campaign_name=new_manifest_db.namespace
+        "read_campaign_resource", campaign_name_or_id=new_manifest_db.namespace
     ).__str__()
 
     return new_manifest_db
diff --git a/tests/v2/test_node_routes.py b/tests/v2/test_node_routes.py
index 4ee5a2ddb..b087f38ad 100644
--- a/tests/v2/test_node_routes.py
+++ b/tests/v2/test_node_routes.py
@@ -70,6 +70,7 @@ async def test_node_negative(aclient: AsyncClient) -> None:
 async def test_node_lifecycle(aclient: AsyncClient) -> None:
     """Tests node lifecycle."""
     campaign_name = uuid4().hex[:8]
+    node_name = uuid4().hex[:8]
 
     # Create a campaign for edges. Campaigns come with START and END nodes.
     x = await aclient.post(
@@ -88,7 +89,7 @@ async def test_node_lifecycle(aclient: AsyncClient) -> None:
         "/cm-service/v2/nodes",
         json={
             "kind": "node",
-            "metadata": {"name": uuid4().hex[8:], "namespace": campaign_id},
+            "metadata": {"name": node_name, "namespace": campaign_id},
             "spec": {
                 "handler": "lsst.cmservice.handlers.element_handler.ElementHandler",
                 "pipeline_yaml": "${DRP_PIPE_DIR}/pipelines/HSC/DRP-RC2.yaml#step1",
@@ -108,6 +109,12 @@ async def test_node_lifecycle(aclient: AsyncClient) -> None:
     assert node["version"] == 1
     node_url = x.headers["Self"]
 
+    # Get a node using its name (fail) and its name+namespace (succeed)
+    x = await aclient.get("/cm-service/v2/nodes/{node_name}")
+    assert x.is_client_error
+    x = await aclient.get(f"/cm-service/v2/nodes/{node_name}?campaign-id={campaign_id}")
+    assert x.is_success
+
     # Edit a Node using RFC6902 json-patch
     x = await aclient.patch(
         node_url,

From 3b25a57f7f703f191369e44f39414b96cf424301 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Wed, 6 Aug 2025 12:45:41 -0500
Subject: [PATCH 36/37] 0.5.0

Automatically generated by python-semantic-release
---
 src/lsst/cmservice/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lsst/cmservice/__init__.py b/src/lsst/cmservice/__init__.py
index 7d78d4378..7f5039908 100644
--- a/src/lsst/cmservice/__init__.py
+++ b/src/lsst/cmservice/__init__.py
@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.4.0"
+__version__ = "0.5.0"

From 860c5f672f2af504528a8c5cc2093fa867cf33c9 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Wed, 6 Aug 2025 12:48:26 -0500
Subject: [PATCH 37/37] fix(web_app): session typing

---
 src/lsst/cmservice/web_app/app.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lsst/cmservice/web_app/app.py b/src/lsst/cmservice/web_app/app.py
index f5c660033..68e1451df 100644
--- a/src/lsst/cmservice/web_app/app.py
+++ b/src/lsst/cmservice/web_app/app.py
@@ -417,7 +417,7 @@ async def update_element_data_dict(
 
 @web_app.post("/collections/{element_id}/{element_type}/update")
 async def update_collections_htmx(
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     element_id: int,
     element_type: int,
     request: Request,
@@ -484,7 +484,7 @@ async def remove_new_field(element_id: int, element_type: int, field_id: str) ->
 
 @web_app.post("/data-dict/{element_id}/{element_type}/update")
 async def update_data_dict_htmx(
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     element_id: int,
     element_type: int,
     request: Request,
@@ -524,7 +524,7 @@ async def update_data_dict_htmx(
 
 @web_app.post("/child-config/{element_id}/{element_type}/update")
 async def update_child_config_htmx(
-    session: Annotated[async_scoped_session, Depends(db_session_dependency)],
+    session: Annotated[AnyAsyncSession, Depends(db_session_dependency)],
     element_id: int,
     element_type: int,
     request: Request,