fix(bps)

- Add "final_job" field to BPS manifest and template.
- Add "aux_sections" field to BPS manifest and template.
- Add additional descriptions to BPS

Author: tcjennings

src/lsst/cmservice/models/manifests/bps.py

@@ -18,11 +18,38 @@ class BpsSpec(ManifestSpec):
     """
 
     pipeline_yaml: str | None = Field(default=None)
-    variables: dict[str, str] | None = Field(default=None)
+    variables: dict[str, str] | None = Field(
+        default=None,
+        description=(
+            "A mapping of name-value string pairs used to define addtional "
+            "top-level BPS variables. Note that the values are quoted in the "
+            "output."
+        ),
+    )
     include_files: list[str] | None = Field(default=None)
-    literals: dict[str, str] | None = Field(default=None)
-    environment: dict[str, str] | None = Field(default=None)
-    payload: dict[str, str] | None = Field(default=None)
+    literals: dict[str, str] | None = Field(
+        default=None,
+        description=(
+            "A mapping of name-value string pairs used to define addtional "
+            "top-level BPS literals. Note that the values are not quoted in the "
+            "output."
+        ),
+    )
+    environment: dict[str, str] | None = Field(
+        default=None,
+        description=(
+            "A mapping of name-value string pairs used to defined additional "
+            "values under the `environment` heading."
+        ),
+    )
+    payload: dict[str, str] | None = Field(
+        default=None,
+        description=(
+            "A mapping of name-value string pairs used to define BPS payload "
+            "options. Note that these values are generated from other configuration "
+            "sources at runtime."
+        ),
+    )
     extra_init_options: str | None = Field(
         default=None, description="Options added to the end of pipetaskinit"
     )
@@ -33,7 +60,22 @@ class BpsSpec(ManifestSpec):
         default=None, description="Options added to the end of pipetask command to run a quantum"
     )
     extra_update_qgraph_options: str | None = Field(default=None)
-    clustering: dict[str, Any] | None = Field(default=None)
+    clustering: dict[str, Any] | None = Field(
+        default=None,
+        description=(
+            "A mapping of clustering directives, added as literal YAML under the `clustering` heading."
+        ),
+    )
+    final_job: dict[str, Any] | None = Field(
+        default=None,
+        description=("A mapping of finalJob directives, added as literal YAML under the `finalJob` heading."),
+    )
+    aux_sections: dict[str, dict[str, Any]] | None = Field(
+        default=None,
+        description=(
+            "A mapping of arbitrary top-level mapping sections to be added as additional literal YAML."
+        ),
+    )
 
 
 class BpsManifest(LibraryManifest[BpsSpec]): ...

src/lsst/cmservice/templates/bps_submit_yaml.j2

@@ -85,6 +85,21 @@ clustering:
   {{ bps.clustering | toyaml | indent(2) -}}
 {# BLANK LINE #}
 {%- endif%}
+{%- if bps.final_job %}
+########################################
+# FINALJOB CONFIGURATION
+########################################
+finalJob:
+  {{ bps.final_job | toyaml | indent(2) -}}
+{# BLANK LINE #}
+{%- endif%}
+{%- if bps.aux_sections %}
+########################################
+# AUXILIARY CONFIGURATION
+########################################
+{{ bps.aux_sections | toyaml -}}
+{# BLANK LINE #}
+{%- endif%}
 ########################################
 # SITE WMS CONFIGURATION
 ########################################