orchestrator-core 4.0.0rc5__py3-none-any.whl → 4.0.1__py3-none-any.whl

orchestrator/__init__.py

@@ -13,7 +13,7 @@
 
 """This is the orchestrator workflow engine."""
 
-__version__ = "4.0.0rc5"
+__version__ = "4.0.1"
 
 from orchestrator.app import OrchestratorCore
 from orchestrator.settings import app_settings

orchestrator/migrations/helpers.py

@@ -24,6 +24,19 @@ from pydantic_forms.types import UUIDstr
 logger = structlog.get_logger(__name__)
 
 
+def has_table_column(table_name: str, column_name: str, conn: sa.engine.Connection) -> bool:
+    """Checks if the specified column exists in a given table.
+
+    :param table_name: Name of the database table
+    :param column_name: Name of the column to check
+    :param conn: SQLAlchemy database Connection
+    :return: True if column exists, False otherwise
+    """
+    inspector = sa.inspect(conn.engine)
+    columns = inspector.get_columns(table_name)
+    return any(col["name"] == column_name for col in columns)
+
+
 def get_resource_type_id_by_name(conn: sa.engine.Connection, name: str) -> UUID:
     result = conn.execute(
         sa.text("SELECT resource_type_id FROM resource_types WHERE resource_types.resource_type=:name"), {"name": name}
@@ -79,8 +92,9 @@ def insert_resource_type(conn: sa.engine.Connection, resource_type: str, descrip
     """Create a new resource types."""
     conn.execute(
         sa.text(
-            """INSERT INTO resource_types (resource_type, description) VALUES
-    (:resource_type, :description) ON CONFLICT DO NOTHING;"""
+            """INSERT INTO resource_types (resource_type, description)
+               VALUES (:resource_type, :description)
+               ON CONFLICT DO NOTHING;"""
         ),
         {
             "resource_type": resource_type,
@@ -144,27 +158,41 @@ def create_workflow(conn: sa.engine.Connection, workflow: dict) -> None:
     if not workflow.get("is_task", False):
         workflow["is_task"] = False
 
-    conn.execute(
-        sa.text(
-            """
+    if has_table_column(table_name="workflows", column_name="is_task", conn=conn):
+        query = """
                 WITH new_workflow AS (
-                INSERT INTO workflows(name, target, is_task, description)
-                    VALUES (:name, :target, :is_task, :description)
-                    ON CONFLICT DO NOTHING
-                    RETURNING workflow_id)
+                    INSERT INTO workflows (name, target, is_task, description)
+                        VALUES (:name, :target, :is_task, :description)
+                        ON CONFLICT DO NOTHING
+                        RETURNING workflow_id)
                 INSERT
                 INTO products_workflows (product_id, workflow_id)
-                SELECT
-                p.product_id,
-                nw.workflow_id
+                SELECT p.product_id,
+                       nw.workflow_id
                 FROM products AS p
-                    CROSS JOIN new_workflow AS nw
-                                WHERE p.product_type = :product_type
-                ON CONFLICT DO NOTHING
-            """
-        ),
-        workflow,
-    )
+                         CROSS JOIN new_workflow AS nw
+                WHERE p.product_type = :product_type
+                ON CONFLICT DO NOTHING \
+                """
+    else:
+        # Remove is_task from workflow dict and insert SQL
+        workflow = {k: v for k, v in workflow.items() if k != "is_task"}
+        query = """
+                WITH new_workflow AS (
+                    INSERT INTO workflows (name, target, description)
+                        VALUES (:name, :target, :description)
+                        ON CONFLICT DO NOTHING
+                        RETURNING workflow_id)
+                INSERT
+                INTO products_workflows (product_id, workflow_id)
+                SELECT p.product_id, nw.workflow_id
+                FROM products AS p
+                         CROSS JOIN new_workflow AS nw
+                WHERE p.product_type = :product_type
+                ON CONFLICT DO NOTHING \
+                """
+
+    conn.execute(sa.text(query), workflow)
 
 
 def create_task(conn: sa.engine.Connection, task: dict) -> None:
@@ -183,18 +211,22 @@ def create_task(conn: sa.engine.Connection, task: dict) -> None:
         }
         >>> create_workflow(conn, task)
     """
-
-    conn.execute(
-        sa.text(
-            """
+    if has_table_column(table_name="workflows", column_name="is_task", conn=conn):
+        query = """
                 INSERT INTO workflows(name, target, is_task, description)
-                    VALUES (:name, 'SYSTEM', TRUE, :description)
-                    ON CONFLICT DO NOTHING
-                    RETURNING workflow_id
-            """
-        ),
-        task,
-    )
+                VALUES (:name, 'SYSTEM', TRUE, :description)
+                ON CONFLICT DO NOTHING
+                RETURNING workflow_id \
+                """
+    else:
+        query = """
+                INSERT INTO workflows(name, target, description)
+                VALUES (:name, 'SYSTEM', :description)
+                ON CONFLICT DO NOTHING
+                RETURNING workflow_id
+                """
+
+    conn.execute(sa.text(query), task)
 
 
 def create_workflows(conn: sa.engine.Connection, new: dict) -> None:
@@ -222,26 +254,40 @@ def create_workflows(conn: sa.engine.Connection, new: dict) -> None:
         if not workflow.get("is_task", False):
             workflow["is_task"] = False
 
-        conn.execute(
-            sa.text(
-                """
-                WITH new_workflow AS (
-                    INSERT INTO workflows(workflow_id, name, target, is_task, description)
-                    VALUES (:workflow_id, :name, :target, :is_task, :description)
-                    RETURNING workflow_id)
-                INSERT
-                INTO products_workflows (product_id, workflow_id)
-                SELECT
-                p.product_id,
-                nw.workflow_id
-                FROM products AS p
-                    CROSS JOIN new_workflow AS nw
-                        WHERE p.tag = :tag
-                        AND p.name LIKE :search_phrase
-            """
-            ),
-            workflow,
-        )
+        if has_table_column(table_name="workflows", column_name="is_task", conn=conn):
+            query = """
+                    WITH new_workflow AS (
+                        INSERT INTO workflows (workflow_id, name, target, is_task, description)
+                            VALUES (:workflow_id, :name, :target, :is_task, :description)
+                            RETURNING workflow_id)
+                    INSERT
+                    INTO products_workflows (product_id, workflow_id)
+                    SELECT p.product_id,
+                           nw.workflow_id
+                    FROM products AS p
+                             CROSS JOIN new_workflow AS nw
+                    WHERE p.tag = :tag
+                      AND p.name LIKE :search_phrase
+                    """
+        else:
+            # Remove is_task from workflow dict and insert SQL
+            workflow = {k: v for k, v in workflow.items() if k != "is_task"}
+            query = """
+                    WITH new_workflow AS (
+                        INSERT INTO workflows (workflow_id, name, target, description)
+                            VALUES (:workflow_id, :name, :target, :description)
+                            RETURNING workflow_id)
+                    INSERT
+                    INTO products_workflows (product_id, workflow_id)
+                    SELECT p.product_id,
+                           nw.workflow_id
+                    FROM products AS p
+                             CROSS JOIN new_workflow AS nw
+                    WHERE p.tag = :tag
+                      AND p.name LIKE :search_phrase
+                    """
+
+        conn.execute(sa.text(query), workflow)
 
 
 def create_fixed_inputs(conn: sa.engine.Connection, product_id: UUID | UUIDstr, new: dict) -> dict[str, str]:
@@ -272,13 +318,13 @@ def create_fixed_inputs(conn: sa.engine.Connection, product_id: UUID | UUIDstr,
     """
     insert_fixed_input_with_id = sa.text(
         """INSERT INTO fixed_inputs (fixed_input_id, name, value, created_at, product_id)
-        VALUES (:fixed_input_id, :key, :value, now(), :product_id)
-        ON CONFLICT DO NOTHING;"""
+           VALUES (:fixed_input_id, :key, :value, now(), :product_id)
+           ON CONFLICT DO NOTHING;"""
     )
     insert_fixed_input_without_id = sa.text(
         """INSERT INTO fixed_inputs (name, value, created_at, product_id)
-        VALUES (:key, :value, now(), :product_id)
-        ON CONFLICT DO NOTHING;"""
+           VALUES (:key, :value, now(), :product_id)
+           ON CONFLICT DO NOTHING;"""
     )
 
     uuids = {}
@@ -339,7 +385,7 @@ def create_products(conn: sa.engine.Connection, new: dict) -> dict[str, UUIDstr]
                 INSERT INTO products (product_id, name, description, product_type, tag, status, created_at)
                 VALUES (:product_id, :name, :description, :product_type, :tag, :status, now())
                 ON CONFLICT DO NOTHING;
-            """
+                """
             ),
             product,
         )
@@ -390,7 +436,7 @@ def create_product_blocks(conn: sa.engine.Connection, new: dict) -> dict[str, UU
                 INSERT INTO product_blocks (product_block_id, name, description, tag, status, created_at)
                 VALUES (:product_block_id, :name, :description, :tag, :status, now())
                 ON CONFLICT DO NOTHING;
-            """
+                """
             ),
             product_block,
         )
@@ -455,13 +501,13 @@ def create_resource_types_for_product_blocks(conn: sa.engine.Connection, new: di
     """
     insert_resource_type_with_id = sa.text(
         """INSERT INTO resource_types (resource_type_id, resource_type, description)
-        VALUES (:resource_type_id, :resource_type, :description)
-        ON CONFLICT DO NOTHING;"""
+           VALUES (:resource_type_id, :resource_type, :description)
+           ON CONFLICT DO NOTHING;"""
     )
     insert_resource_type_without_id = sa.text(
         """INSERT INTO resource_types (resource_type, description)
-        VALUES (:resource_type, :description)
-        ON CONFLICT DO NOTHING;"""
+           VALUES (:resource_type, :description)
+           ON CONFLICT DO NOTHING;"""
     )
 
     resource_type_ids = []
@@ -485,25 +531,20 @@ def create_resource_types_for_product_blocks(conn: sa.engine.Connection, new: di
         conn.execute(
             sa.text(
                 """
-                WITH resource_type_ids AS (
-                    SELECT resource_types.resource_type_id
-                    FROM   resource_types
-                    WHERE  resource_types.resource_type = ANY(:new_resource_types)
-                ), service_attach_point AS (
-                    SELECT product_blocks.product_block_id
-                    FROM   product_blocks
-                    WHERE  product_blocks.name = :product_block_name
-                )
+                WITH resource_type_ids AS (SELECT resource_types.resource_type_id
+                                           FROM resource_types
+                                           WHERE resource_types.resource_type = ANY (:new_resource_types)),
+                     service_attach_point AS (SELECT product_blocks.product_block_id
+                                              FROM product_blocks
+                                              WHERE product_blocks.name = :product_block_name)
 
-                INSERT INTO
-                    product_block_resource_types (product_block_id, resource_type_id)
-                SELECT
-                    service_attach_point.product_block_id,
-                    resource_type_ids.resource_type_id
-                FROM
-                    service_attach_point
-                CROSS JOIN
-                    resource_type_ids
+                INSERT
+                INTO product_block_resource_types (product_block_id, resource_type_id)
+                SELECT service_attach_point.product_block_id,
+                       resource_type_ids.resource_type_id
+                FROM service_attach_point
+                         CROSS JOIN
+                     resource_type_ids
                 """
             ),
             {
@@ -666,16 +707,17 @@ def add_products_to_workflow_by_product_tag(
     conn.execute(
         sa.text(
             """
-                WITH workflow AS (
-                    SELECT workflow_id FROM workflows WHERE name=:workflow_name
-                )
-                INSERT INTO products_workflows (product_id, workflow_id)
-                SELECT
-                    p.product_id,
-                    nw.workflow_id
-                FROM products AS p
-                    CROSS JOIN workflow AS nw
-                    WHERE p.tag=:product_tag AND name LIKE :product_name_like
+            WITH workflow AS (SELECT workflow_id
+                              FROM workflows
+                              WHERE name = :workflow_name)
+            INSERT
+            INTO products_workflows (product_id, workflow_id)
+            SELECT p.product_id,
+                   nw.workflow_id
+            FROM products AS p
+                     CROSS JOIN workflow AS nw
+            WHERE p.tag = :product_tag
+              AND name LIKE :product_name_like
             """
         ),
         {
@@ -708,13 +750,15 @@ def remove_products_from_workflow_by_product_tag(
     conn.execute(
         sa.text(
             """
-                DELETE FROM products_workflows
-                WHERE workflow_id = (
-                    SELECT workflow_id FROM workflows where name=:workflow_name
-                ) AND product_id IN (
-                    SELECT product_id FROM products
-                    WHERE tag=:product_tag AND name LIKE :product_name_like
-                )
+            DELETE
+            FROM products_workflows
+            WHERE workflow_id = (SELECT workflow_id
+                                 FROM workflows
+                                 where name = :workflow_name)
+              AND product_id IN (SELECT product_id
+                                 FROM products
+                                 WHERE tag = :product_tag
+                                   AND name LIKE :product_name_like)
             """
         ),
         {
@@ -746,8 +790,8 @@ def add_product_block_relation_between_products_by_id(
     conn.execute(
         sa.text(
             """
-                INSERT INTO product_block_relations (in_use_by_id, depends_on_id)
-                VALUES (:in_use_by_id, :depends_on_id)
+            INSERT INTO product_block_relations (in_use_by_id, depends_on_id)
+            VALUES (:in_use_by_id, :depends_on_id)
             """
         ),
         {
@@ -778,8 +822,10 @@ def remove_product_block_relation_between_products_by_id(
     conn.execute(
         sa.text(
             """
-                DELETE FROM product_block_relations
-                WHERE in_use_by_id=:in_use_by_id AND depends_on_id=:depends_on_id
+            DELETE
+            FROM product_block_relations
+            WHERE in_use_by_id = :in_use_by_id
+              AND depends_on_id = :depends_on_id
             """
         ),
         {
@@ -829,11 +875,13 @@ def delete_resource_types_from_product_blocks(conn: sa.engine.Connection, delete
     for product_block_name, resource_types in delete.items():
         conn.execute(
             sa.text(
-                """DELETE FROM product_block_resource_types
-                   USING resource_types
-                   WHERE product_block_id = (SELECT product_block_id FROM product_blocks WHERE name=:product_block_name) AND
-                     resource_types.resource_type_id = product_block_resource_types.resource_type_id AND
-                     resource_types.resource_type = ANY(:obsolete_resource_types)"""
+                """DELETE
+                   FROM product_block_resource_types
+                       USING resource_types
+                   WHERE
+                       product_block_id = (SELECT product_block_id FROM product_blocks WHERE name = :product_block_name)
+                     AND resource_types.resource_type_id = product_block_resource_types.resource_type_id
+                     AND resource_types.resource_type = ANY (:obsolete_resource_types)"""
             ),
             {
                 "product_block_name": product_block_name,
@@ -855,10 +903,11 @@ def delete_resource_types(conn: sa.engine.Connection, delete: Iterable) -> None:
     """
     conn.execute(
         sa.text(
-            """DELETE FROM product_block_resource_types
-               USING resource_types
+            """DELETE
+               FROM product_block_resource_types
+                   USING resource_types
                WHERE resource_types.resource_type_id = product_block_resource_types.resource_type_id
-                 AND resource_types.resource_type = ANY(:obsolete)"""
+                 AND resource_types.resource_type = ANY (:obsolete)"""
         ),
         {"obsolete": tuple(delete)},
     )
@@ -866,7 +915,14 @@ def delete_resource_types(conn: sa.engine.Connection, delete: Iterable) -> None:
 
 
 def delete_products_by_tag(conn: sa.engine.Connection, name: str) -> None:
-    conn.execute(sa.text("""DELETE FROM products p WHERE p.name=:name"""), {"name": name})
+    conn.execute(
+        sa.text(
+            """DELETE
+                            FROM products p
+                            WHERE p.name = :name"""
+        ),
+        {"name": name},
+    )
 
 
 def delete_product(conn: sa.engine.Connection, name: str) -> None:
@@ -884,16 +940,14 @@ def delete_product(conn: sa.engine.Connection, name: str) -> None:
         sa.text(
             """
             WITH deleted_p AS (
-                DELETE FROM products WHERE name=:name
-                RETURNING  product_id
-            ),
-            deleted_p_pb AS (
-                DELETE FROM product_product_blocks WHERE product_id IN (SELECT product_id FROM deleted_p)
-            ),
-            deleted_pb_rt AS (
-                DELETE FROM products_workflows WHERE product_id IN (SELECT product_id FROM deleted_p)
-            )
-            SELECT * from deleted_p;
+                DELETE FROM products WHERE name = :name
+                    RETURNING product_id),
+                 deleted_p_pb AS (
+                     DELETE FROM product_product_blocks WHERE product_id IN (SELECT product_id FROM deleted_p)),
+                 deleted_pb_rt AS (
+                     DELETE FROM products_workflows WHERE product_id IN (SELECT product_id FROM deleted_p))
+            SELECT *
+            from deleted_p;
             """
         ),
         {"name": name},
@@ -915,16 +969,14 @@ def delete_product_block(conn: sa.engine.Connection, name: str) -> None:
         sa.text(
             """
             WITH deleted_pb AS (
-                DELETE FROM product_blocks WHERE name=:name
-                RETURNING  product_block_id
-            ),
-            deleted_p_pb AS (
-                DELETE FROM product_product_blocks WHERE product_block_id IN (SELECT product_block_id FROM deleted_pb)
-            ),
-            deleted_pb_rt AS (
-                DELETE FROM product_block_resource_types WHERE product_block_id IN (SELECT product_block_id FROM deleted_pb)
-            )
-            SELECT * from deleted_pb;
+                DELETE FROM product_blocks WHERE name = :name
+                    RETURNING product_block_id),
+                 deleted_p_pb AS (
+                     DELETE FROM product_product_blocks WHERE product_block_id IN (SELECT product_block_id FROM deleted_pb)),
+                 deleted_pb_rt AS (
+                     DELETE FROM product_block_resource_types WHERE product_block_id IN (SELECT product_block_id FROM deleted_pb))
+            SELECT *
+            from deleted_pb;
             """
         ),
         {"name": name},
@@ -948,9 +1000,9 @@ def delete_workflow(conn: sa.engine.Connection, name: str) -> None:
     conn.execute(
         sa.text(
             """
-                DELETE
-                FROM workflows
-                WHERE name = :name;
+            DELETE
+            FROM workflows
+            WHERE name = :name;
             """
         ),
         {"name": name},
@@ -972,13 +1024,12 @@ def delete_resource_type(conn: sa.engine.Connection, resource_type: str) -> None
         sa.text(
             """
             WITH deleted_pb AS (
-                DELETE FROM resource_types WHERE resource_type=:resource_type
-                RETURNING  resource_type_id
-            ),
-            deleted_pb_rt AS (
-                DELETE FROM product_block_resource_types WHERE resource_type_id IN (SELECT resource_type_id FROM deleted_pb)
-            )
-            SELECT * from deleted_pb;
+                DELETE FROM resource_types WHERE resource_type = :resource_type
+                    RETURNING resource_type_id),
+                 deleted_pb_rt AS (
+                     DELETE FROM product_block_resource_types WHERE resource_type_id IN (SELECT resource_type_id FROM deleted_pb))
+            SELECT *
+            from deleted_pb;
             """
         ),
         {"resource_type": resource_type},
@@ -1058,19 +1109,20 @@ def convert_resource_type_relations_to_instance_relations(
         sa.text(
             """
             INSERT INTO subscription_instance_relations (in_use_by_id, depends_on_id, order_id, domain_model_attr)
-            WITH dependencies AS (
-                SELECT siv.value AS subscription_id, siv.subscription_instance_id AS in_use_by_instance_id, si.product_block_id
-                FROM subscription_instance_values AS siv
-                LEFT JOIN subscription_instances AS si on siv.subscription_instance_id = si.subscription_instance_id
-                WHERE siv.resource_type_id=:resource_type_id
-            )
-            SELECT
-                in_use_by_instance_id AS in_use_by_id,
-                sii.subscription_instance_id AS depends_on_id,
-                (row_number() OVER (PARTITION BY in_use_by_instance_id) - 1) AS order_id,
-                :domain_model_attr AS domain_model_attr
+            WITH dependencies AS (SELECT siv.value                    AS subscription_id,
+                                         siv.subscription_instance_id AS in_use_by_instance_id,
+                                         si.product_block_id
+                                  FROM subscription_instance_values AS siv
+                                           LEFT JOIN subscription_instances AS si
+                                                     on siv.subscription_instance_id = si.subscription_instance_id
+                                  WHERE siv.resource_type_id = :resource_type_id)
+            SELECT in_use_by_instance_id                                        AS in_use_by_id,
+                   sii.subscription_instance_id                                 AS depends_on_id,
+                   (row_number() OVER (PARTITION BY in_use_by_instance_id) - 1) AS order_id,
+                   :domain_model_attr                                           AS domain_model_attr
             FROM subscription_instances AS sii
-            INNER JOIN dependencies AS dep ON sii.subscription_id=uuid(dep.subscription_id) ON CONFLICT DO NOTHING
+                     INNER JOIN dependencies AS dep ON sii.subscription_id = uuid(dep.subscription_id)
+            ON CONFLICT DO NOTHING
             """
         ),
         {
@@ -1083,8 +1135,9 @@ def convert_resource_type_relations_to_instance_relations(
         conn.execute(
             sa.text(
                 """
-                DELETE FROM subscription_instance_values
-                WHERE resource_type_id=:resource_type_id
+                DELETE
+                FROM subscription_instance_values
+                WHERE resource_type_id = :resource_type_id
                 """
             ),
             {"resource_type_id": resource_type_id},
@@ -1114,14 +1167,15 @@ def convert_instance_relations_to_resource_type_relations_by_domain_model_attr(
     conn.execute(
         sa.text(
             """
-                INSERT INTO subscription_instance_values (subscription_instance_id, resource_type_id, value)
-                WITH instance_relations AS (
-                    SELECT in_use_by_id, depends_on_id FROM subscription_instance_relations
-                    WHERE domain_model_attr=:domain_model_attr
-                )
-                SELECT ir.in_use_by_id AS subscription_instance_id, :resource_type_id AS resource_type_id, si.subscription_id AS value
-                from subscription_instances as si
-                inner join instance_relations as ir on si.subscription_instance_id=ir.depends_on_id
+            INSERT INTO subscription_instance_values (subscription_instance_id, resource_type_id, value)
+            WITH instance_relations AS (SELECT in_use_by_id, depends_on_id
+                                        FROM subscription_instance_relations
+                                        WHERE domain_model_attr = :domain_model_attr)
+            SELECT ir.in_use_by_id    AS subscription_instance_id,
+                   :resource_type_id  AS resource_type_id,
+                   si.subscription_id AS value
+            from subscription_instances as si
+                     inner join instance_relations as ir on si.subscription_instance_id = ir.depends_on_id
             """
         ),
         {
@@ -1144,10 +1198,12 @@ def backfill_resource_type_with_default(
         sa.text(
             """
             INSERT INTO subscription_instance_values (subscription_instance_id, resource_type_id, value)
-            SELECT si.subscription_instance_id AS subscription_instance_id, :resource_type_id AS resource_type_id, :value AS value
+            SELECT si.subscription_instance_id AS subscription_instance_id,
+                   :resource_type_id           AS resource_type_id,
+                   :value                      AS value
             FROM subscription_instances AS si
-                JOIN product_blocks pb on si.product_block_id = pb.product_block_id
-                WHERE pb.name = :product_block_name;
+                     JOIN product_blocks pb on si.product_block_id = pb.product_block_id
+            WHERE pb.name = :product_block_name;
             """
         ),
         {
@@ -1162,6 +1218,10 @@ def remove_resource_type_from_subscription_instance(conn: sa.engine.Connection,
     resource_type_id = get_resource_type_id_by_name(conn, resource_type_name)
 
     conn.execute(
-        sa.text("""DELETE FROM subscription_instance_values WHERE resource_type_id=:resource_type_id"""),
+        sa.text(
+            """DELETE
+                   FROM subscription_instance_values
+                   WHERE resource_type_id = :resource_type_id"""
+        ),
         {"resource_type_id": resource_type_id},
     )

orchestrator/migrations/templates/alembic.ini.j2

@@ -6,8 +6,7 @@ file_template = %%(year)d-%%(month).2d-%%(day).2d_%%(rev)s_%%(slug)s
 
 # set to 'true' to run the environment during
 # the 'revision' command, regardless of autogenerate
-# revision_environment = false
-script_location = {{ migrations_dir }}
+script_location = %(here)s/{{ migrations_dir }}
 version_locations = %(here)s/{{ migrations_dir }}/versions/schema
 # Logging configuration
 [loggers]

orchestrator/migrations/templates/env.py.j2

@@ -1,9 +1,7 @@
-import logging
-import os
+import structlog
 from alembic import context
 from sqlalchemy import engine_from_config, pool
 
-import orchestrator
 from orchestrator.db.database import BaseModel
 from orchestrator.settings import app_settings
 
@@ -11,11 +9,10 @@ from orchestrator.settings import app_settings
 # access to the values within the .ini file in use.
 config = context.config
 
-# Interpret the config file for Python logging.
-# This line sets up loggers basically.
-logger = logging.getLogger("alembic.env")
+# Setup logging
+logger = structlog.get_logger()
 
-config.set_main_option("sqlalchemy.url", app_settings.DATABASE_URI)
+config.set_main_option("sqlalchemy.url", str(app_settings.DATABASE_URI))
 
 # add your model's MetaData object here
 # for 'autogenerate' support

orchestrator/services/celery.py

@@ -72,8 +72,8 @@ def _celery_start_process(
 def _celery_resume_process(
     process: ProcessTable,
     *,
-    user_inputs: list[State] | None,
-    user: str | None,
+    user_inputs: list[State] | None = None,
+    user: str | None = None,
     **kwargs: Any,
 ) -> UUID:
     """Client side call of Celery."""

{orchestrator_core-4.0.0rc5.dist-info → orchestrator_core-4.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 4.0.0rc5
+Version: 4.0.1
 Summary: This is the orchestrator workflow engine.
 Requires-Python: >=3.11,<3.14
 Classifier: Intended Audience :: Information Technology
@@ -49,17 +49,17 @@ Requires-Dist: pytz==2025.2
 Requires-Dist: redis==5.1.1
 Requires-Dist: schedule==1.1.0
 Requires-Dist: semver==3.0.4
-Requires-Dist: sentry-sdk[fastapi]~=2.27.0
-Requires-Dist: SQLAlchemy==2.0.40
+Requires-Dist: sentry-sdk[fastapi]~=2.28.0
+Requires-Dist: SQLAlchemy==2.0.41
 Requires-Dist: SQLAlchemy-Utils==0.41.2
 Requires-Dist: structlog
-Requires-Dist: typer==0.15.3
+Requires-Dist: typer==0.15.4
 Requires-Dist: uvicorn[standard]~=0.34.0
 Requires-Dist: nwa-stdlib~=1.9.0
 Requires-Dist: oauth2-lib~=2.4.0
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: strawberry-graphql>=0.246.2
-Requires-Dist: pydantic-forms>=1.4.0, <=2.0.0
+Requires-Dist: pydantic-forms>=1.4.0, <=2.1.0
 Requires-Dist: celery~=5.5.1 ; extra == "celery"
 Requires-Dist: toml ; extra == "dev"
 Requires-Dist: bumpversion ; extra == "dev"

{orchestrator_core-4.0.0rc5.dist-info → orchestrator_core-4.0.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-orchestrator/__init__.py,sha256=IM3ibXEFMEN_qpwa2Fr0n64tbz9uYe21MjKDu5SanHs,1066
+orchestrator/__init__.py,sha256=amioWXwUtHG21kSVqsajhHV08ntganqtFHTU9Kukg48,1063
 orchestrator/app.py,sha256=7UrXKjBKNSEaSSXAd5ww_RdMFhFqE4yvfj8faS2MzAA,12089
 orchestrator/exception_handlers.py,sha256=UsW3dw8q0QQlNLcV359bIotah8DYjMsj2Ts1LfX4ClY,1268
 orchestrator/log_config.py,sha256=1tPRX5q65e57a6a_zEii_PFK8SzWT0mnA5w2sKg4hh8,1853
@@ -210,10 +210,10 @@ orchestrator/metrics/subscriptions.py,sha256=vC1O8VmTq5oJxNrn5CU99Rf8cxzdyhc7tXb
 orchestrator/migrations/README,sha256=heMzebYwlGhnE8_4CWJ4LS74WoEZjBy-S-mIJRxAEKI,39
 orchestrator/migrations/alembic.ini,sha256=kMoADqhGeubU8xanILNaqm4oixLy9m4ngYtdGpZcc7I,873
 orchestrator/migrations/env.py,sha256=M_cPoAL2axuuup5fvMy8I_WTPHEw0RbPEHkhZ3QEGoE,3740
-orchestrator/migrations/helpers.py,sha256=xwi1Z-0MMZJ1Bk-HXkb6f_RU7BmO3ajK5a4qqO94elc,44068
+orchestrator/migrations/helpers.py,sha256=OcdwDbox9P-Gx7eeSKgPI_qZco1QGCXgJQAbfwa3Nm8,47515
 orchestrator/migrations/script.py.mako,sha256=607Zrgp-Z-m9WGLt4wewN1QDOmHeifxcePUdADkSZyM,510
-orchestrator/migrations/templates/alembic.ini.j2,sha256=jA-QykVparwWSNt5XDP0Zk7epLOhK7D87Af-i2shJV4,905
-orchestrator/migrations/templates/env.py.j2,sha256=RfLAQItZ56Jlzwi6LJfBo92m1-th_bdfkFKD1mwTZIE,2821
+orchestrator/migrations/templates/alembic.ini.j2,sha256=8v7UbKvOiWEbEKQa-Au3uONKUuYx6aflulYanZX6r2I,883
+orchestrator/migrations/templates/env.py.j2,sha256=LIt0ildZTZvNEx3imhy4GNzfFi_rPZg-8H7rGgrBOP8,2717
 orchestrator/migrations/templates/helpers.py.j2,sha256=3MWNMICGrcQFObyBQefL-FPjoVKUgP0QIlbk4TdMZds,98
 orchestrator/migrations/versions/schema/2020-10-19_3323bcb934e7_fix_tsv_triggers.py,sha256=ufe6OFUELNpx6N2663bvdwgB4lP-v71fuMuJtx9CmJc,2698
 orchestrator/migrations/versions/schema/2020-10-19_a76b9185b334_add_generic_workflows_to_core.py,sha256=EHj87IXucruyB8KuxEWcc7JK1NIizZ5Jzmj-bzY0t1Y,1265
@@ -260,7 +260,7 @@ orchestrator/schemas/subscription.py,sha256=-jXyHZIed9Xlia18ksSDyenblNN6Q2yM2FlG
 orchestrator/schemas/subscription_descriptions.py,sha256=Ft_jw1U0bf9Z0U8O4OWfLlcl0mXCVT_qYVagBP3GbIQ,1262
 orchestrator/schemas/workflow.py,sha256=VqQ9XfV4fVd6MjY0LRRQzWBJHmlPsAamWfTwDx1cZkg,2102
 orchestrator/services/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
-orchestrator/services/celery.py,sha256=ezw7IxkIZbmaRJt-9_Iwvn86TJV3Y3DTHI7Qjh0-r9s,5075
+orchestrator/services/celery.py,sha256=SmAUsN755yE7cZ3og92qTvPPeRIpdEKlbaLih7o38h8,5089
 orchestrator/services/fixed_inputs.py,sha256=kyz7s2HLzyDulvcq-ZqefTw1om86COvyvTjz0_5CmgI,876
 orchestrator/services/input_state.py,sha256=HF7wl9fWdaAW8pdCCqbuYoKyNj8dY0g8Ff8vXis8z5A,2211
 orchestrator/services/process_broadcast_thread.py,sha256=D44YbjF8mRqGuznkRUV4SoRn1J0lfy_x1H508GnSVlU,4649
@@ -307,7 +307,7 @@ orchestrator/workflows/tasks/resume_workflows.py,sha256=MzJqlSXUvKStkT7NGzxZyRlf
 orchestrator/workflows/tasks/validate_product_type.py,sha256=paG-NAY1bdde3Adt8zItkcBKf5Pxw6f5ngGW6an6dYU,3192
 orchestrator/workflows/tasks/validate_products.py,sha256=GZJBoFF-WMphS7ghMs2-gqvV2iL1F0POhk0uSNt93n0,8510
 orchestrator/workflows/translations/en-GB.json,sha256=ST53HxkphFLTMjFHonykDBOZ7-P_KxksktZU3GbxLt0,846
-orchestrator_core-4.0.0rc5.dist-info/licenses/LICENSE,sha256=b-aA5OZQuuBATmLKo_mln8CQrDPPhg3ghLzjPjLn4Tg,11409
-orchestrator_core-4.0.0rc5.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-orchestrator_core-4.0.0rc5.dist-info/METADATA,sha256=t7Xg52BnrdljCIrN0zoottzQaOtzlJo6tTspaBIEPRs,5073
-orchestrator_core-4.0.0rc5.dist-info/RECORD,,
+orchestrator_core-4.0.1.dist-info/licenses/LICENSE,sha256=b-aA5OZQuuBATmLKo_mln8CQrDPPhg3ghLzjPjLn4Tg,11409
+orchestrator_core-4.0.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+orchestrator_core-4.0.1.dist-info/METADATA,sha256=hZAgEHN9fviU95h0Let76rdZJz9JRlpMZ_xhg9l8q0s,5070
+orchestrator_core-4.0.1.dist-info/RECORD,,