feat(campaign): Use namespaced names for campaign specblocks

Author: tcjennings

src/lsst/cmservice/cli/load.py

@@ -4,9 +4,12 @@
 
 from .. import db
 from ..client.client import CMClient
+from ..common.logging import LOGGER
 from . import options
 from .wrappers import output_pydantic_list, output_pydantic_object
 
+logger = LOGGER.bind(module=__name__)
+
 
 @click.group(name="load")
 def load_group() -> None:
@@ -17,14 +20,14 @@ def load_group() -> None:
 @options.cmclient()
 @options.output()
 @options.yaml_file()
+@options.namespace()
 @options.allow_update()
 def specification(
     client: CMClient,
     output: options.OutputEnum | None,
     **kwargs: Any,
 ) -> None:
     """Load a Specification from a yaml file"""
-
     result = client.load.specification_cl(**kwargs)
     specifications = result.get("Specification", [])
     spec_blocks = result.get("SpecBlock", [])
@@ -43,24 +46,17 @@ def specification(
 @options.output()
 @options.campaign_yaml()
 @options.yaml_file()
-@options.name()
-@options.parent_name()
-@options.spec_name()
-@options.spec_block_name()
-@options.handler()
-@options.data()
-@options.child_config()
-@options.collections()
-@options.spec_aliases()
-@options.allow_update()
 def campaign(
     client: CMClient,
     output: options.OutputEnum | None,
     **kwargs: Any,
 ) -> None:
     """Load a Specification from a yaml file and make a Campaign"""
-    result = client.load.campaign_cl(**kwargs)
-    output_pydantic_object(result, output, db.Campaign.col_names_for_table)
+    try:
+        result = client.load.campaign_cl(**kwargs)
+        output_pydantic_object(result, output, db.Campaign.col_names_for_table)
+    except Exception:
+        logger.exception()
 
 
 @load_group.command()

src/lsst/cmservice/cli/options.py

@@ -8,6 +8,7 @@
 
 from ..client.client import CMClient
 from ..common.enums import (
+    DEFAULT_NAMESPACE,
     ErrorActionEnum,
     ErrorFlavorEnum,
     ErrorSourceEnum,
@@ -40,6 +41,7 @@
     "handler",
     "n_expected",
     "name",
+    "namespace",
     "node_type",
     "parent_name",
     "parent_id",
@@ -190,7 +192,7 @@ class OutputEnum(Enum):
 campaign_yaml = PartialOption(
     "--campaign_yaml",
     type=str,
-    help="Path to campaign yaml file",
+    help="Path to campaign yaml ('start') file",
 )
 
 
@@ -339,6 +341,14 @@ class OutputEnum(Enum):
 name = PartialOption("--name", type=str, help="Name of object")
 
 
+namespace = PartialOption(
+    "--namespace",
+    type=click.UUID,
+    default=DEFAULT_NAMESPACE,
+    help="Namespace for objects",
+)
+
+
 node_type = PartialOption(
     "--node_type",
     type=EnumChoice(NodeTypeEnum),
@@ -483,7 +493,7 @@ class OutputEnum(Enum):
 yaml_file = PartialOption(
     "--yaml_file",
     type=str,
-    help="Path to yaml file",
+    help="Path to yaml file containing spec blocks and other specifications or manifests",
 )