Deprecate Productions Table

Author: tcjennings

alembic/versions/7bac827dd8cb_deprecate_productions.py

@@ -0,0 +1,33 @@
+"""Deprecate Productions
+
+Revision ID: 7bac827dd8cb
+Revises: cef0ebaa8241
+Create Date: 2025-03-18 21:14:09.976660+00:00
+
+"""
+
+from collections.abc import Sequence
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "7bac827dd8cb"
+down_revision: str | None = "cef0ebaa8241"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # Remove production-related indexes
+    op.drop_index(op.f("ix_campaign_parent_id"), table_name="campaign", if_exists=True)
+    op.drop_index(op.f("ix_production_name"), table_name="production", if_exists=True)
+
+    # Remove FK constraint and parent id column from campaigns table
+    op.drop_constraint(constraint_name="campaign_parent_id_fkey", table_name="campaign", type_="foreignkey")
+    op.drop_column(table_name="campaign", column_name="parent_id")
+
+    # Drop the productions table
+    op.drop_table("production", if_exists=True)
+
+
+def downgrade() -> None: ...

alembic/versions/92053b1ad093_separate_out_most_tables_and_indices_v0_1_4.py

@@ -88,8 +88,8 @@ def downgrade() -> None:
     op.drop_index(op.f("ix_step_name"), table_name="step")
     op.drop_index(op.f("ix_campaign_spec_id"), table_name="campaign")
     op.drop_index(op.f("ix_campaign_spec_block_id"), table_name="campaign")
-    op.drop_index(op.f("ix_campaign_parent_id"), table_name="campaign")
+    op.drop_index(op.f("ix_campaign_parent_id"), table_name="campaign", if_exists=True)
     op.drop_index(op.f("ix_campaign_name"), table_name="campaign")
     op.drop_index(op.f("ix_specification_name"), table_name="specification")
     op.drop_index(op.f("ix_spec_block_name"), table_name="spec_block")
-    op.drop_index(op.f("ix_production_name"), table_name="production")
+    op.drop_index(op.f("ix_production_name"), table_name="production", if_exists=True)

src/lsst/cmservice/cli/campaign.py

@@ -25,7 +25,6 @@ def campaign_group() -> None:
     options.collections(),
     options.spec_aliases(),
     options.handler(),
-    options.parent_name(),
     options.spec_name(),
     options.spec_block_name(),
     options.spec_block_assoc_name(),
@@ -88,8 +87,6 @@ def action() -> None:
 
 get_row_by_fullname = wrappers.get_row_by_fullname_command(get_command, sub_client, DbClass)
 
-get_parent = wrappers.get_element_parent_command(get_command, sub_client, db.Production)
-
 get_spec_block = wrappers.get_spec_block_command(get_command, sub_client)
 
 get_specification = wrappers.get_specification_command(get_command, sub_client)

src/lsst/cmservice/cli/client.py

@@ -9,7 +9,6 @@
 from .pipetask_error import pipetask_error_group
 from .pipetask_error_type import pipetask_error_type_group
 from .product_set import product_set_group
-from .production import production_group
 from .queue import queue_group
 from .script import script_group
 from .script_dependency import script_dependency_group
@@ -34,7 +33,6 @@
         pipetask_error_group,
         pipetask_error_type_group,
         product_set_group,
-        production_group,
         queue_group,
         script_group,
         script_dependency_group,

src/lsst/cmservice/cli/production.py

@@ -64,5 +64,5 @@ def daemon(
     client: CMClient,
     row_id: int,
 ) -> None:
-    """Update a production"""
+    """Update a queue"""
     client.queue.daemon(row_id)

src/lsst/cmservice/cli/queue.py

@@ -27,7 +27,6 @@
 from .pipetask_error_types import CMPipetaskErrorTypeClient
 from .pipetask_errors import CMPipetaskErrorClient
 from .product_sets import CMProductSetClient
-from .productions import CMProductionClient
 from .queues import CMQueueClient
 from .script_dependencies import CMScriptDependencyClient
 from .script_errors import CMScriptErrorClient
@@ -49,7 +48,6 @@
     "CMPipetaskErrorTypeClient",
     "CMPipetaskErrorClient",
     "CMProductSetClient",
-    "CMProductionClient",
     "CMQueueClient",
     "CMScriptDependencyClient",
     "CMScriptErrorClient",

src/lsst/cmservice/client/__init__.py

@@ -15,7 +15,6 @@
 from .pipetask_error_types import CMPipetaskErrorTypeClient
 from .pipetask_errors import CMPipetaskErrorClient
 from .product_sets import CMProductSetClient
-from .productions import CMProductionClient
 from .queues import CMQueueClient
 from .script_dependencies import CMScriptDependencyClient
 from .script_errors import CMScriptErrorClient
@@ -48,7 +47,6 @@ def __init__(self: CMClient) -> None:
             client_kwargs["cookies"] = cookies
         self._client = httpx.Client(**client_kwargs)
 
-        self.production = CMProductionClient(self)
         self.campaign = CMCampaignClient(self)
         self.step = CMStepClient(self)
         self.group = CMGroupClient(self)

src/lsst/cmservice/client/client.py

@@ -284,22 +284,9 @@ def campaign_cl(
         with open(campaign_yaml, encoding="utf-8") as fin:
             config_data = yaml.safe_load(fin)
 
-        try:
-            prod_config = config_data["Production"]
-        except KeyError as msg:
-            raise CMYamlParseError(
-                f"Could not find 'Production' tag in {campaign_yaml}",
-            ) from msg
-        try:
-            parent_name = prod_config["name"]
-        except KeyError as msg:
-            raise CMYamlParseError(
-                f"Could not find 'name' tag in {campaign_yaml}#Production",
-            ) from msg
-
         try:
             camp_config = config_data["Campaign"]
-            camp_config["parent_name"] = parent_name
+            camp_config["parent_name"] = "DEFAULT"
         except KeyError as msg:
             raise CMYamlParseError(
                 f"Could not find 'Campaign' tag in {campaign_yaml}",
@@ -308,7 +295,7 @@ def campaign_cl(
         assert isinstance(camp_config, dict)
 
         # flush out config_data with kwarg overrides
-        for key in ["name", "parent_name", "spec_name", "handler"]:
+        for key in ["name", "spec_name", "handler"]:
             val = kwargs.get(key, None)
             if val:
                 camp_config[key] = val
@@ -332,10 +319,6 @@ def campaign_cl(
         else:
             self.specification_cl(yaml_file, allow_update=allow_update)
 
-        production = self._parent.production.get_row_by_name(parent_name)
-        if not production:  # pragma: no cover
-            self._parent.production.create(name=parent_name)
-
         spec_name = camp_config["spec_name"]
         camp_config["spec_block_assoc_name"] = f"{spec_name}#campaign"