orchestrator-core 3.2.3__py3-none-any.whl → 4.0.0rc2__py3-none-any.whl

orchestrator/__init__.py

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

orchestrator/api/api_v1/endpoints/subscription_customer_descriptions.py

@@ -28,7 +28,6 @@ from orchestrator.domain.customer_description import (
 from orchestrator.schemas import SubscriptionDescriptionBaseSchema, SubscriptionDescriptionSchema
 from orchestrator.schemas.subscription_descriptions import UpdateSubscriptionDescriptionSchema
 from orchestrator.utils.errors import StaleDataError
-from orchestrator.utils.redis import delete_from_redis
 
 router = APIRouter()
 
@@ -55,7 +54,6 @@ def delete_subscription_customer_descriptions(_id: UUID) -> None:
     description = db.session.get(SubscriptionCustomerDescriptionTable, _id)
     if description:
         delete(SubscriptionCustomerDescriptionTable, _id)
-        delete_from_redis(description.subscription_id)
 
 
 @router.get("/{_id}", response_model=SubscriptionDescriptionSchema)

orchestrator/cli/generator/templates/new_product_migration.j2

@@ -63,24 +63,28 @@ new_workflows = [
     {
         "name": "create_{{ product.variable }}",
         "target": Target.CREATE,
+        "is_task": False,
         "description": "Create {{ product.name }}",
         "product_type": "{{ product.type }}",
     },
     {
         "name": "modify_{{ product.variable }}",
         "target": Target.MODIFY,
+        "is_task": False,
         "description": "Modify {{ product.name }}",
         "product_type": "{{ product.type }}",
     },
     {
         "name": "terminate_{{ product.variable }}",
         "target": Target.TERMINATE,
+        "is_task": False,
         "description": "Terminate {{ product.name }}",
         "product_type": "{{ product.type }}",
     },
     {
         "name": "validate_{{ product.variable }}",
-        "target": Target.SYSTEM,
+        "target": Target.VALIDATE,
+        "is_task": True,
         "description": "Validate {{ product.name }}",
         "product_type": "{{ product.type }}",
     },

orchestrator/cli/migrate_tasks.py

@@ -150,22 +150,22 @@ def create_tasks_migration_wizard() -> tuple[list[dict], list[dict]]:
         - list of task items to add in the migration
         - list of task items to delete in the migration
     """
-    database_tasks = {
-        task.name: task for task in list(db.session.scalars(select(WorkflowTable))) if task.target == Target.SYSTEM
-    }
+    database_tasks = {task.name: task for task in list(db.session.scalars(select(WorkflowTable))) if task.is_task}
     registered_wf_instances = {
         task: cast(Workflow, get_workflow(task)) for task in orchestrator.workflows.ALL_WORKFLOWS.keys()
     }
 
+    is_task = [Target.SYSTEM, Target.VALIDATE]
+
     registered_tasks = dict(
         filter(
-            lambda task: task[1].target == Target.SYSTEM and task[0] in database_tasks.keys(),
+            lambda task: task[1].target in is_task and task[0] in database_tasks.keys(),
             registered_wf_instances.items(),
         )
     )
     available_tasks = dict(
         filter(
-            lambda task: task[1].target == Target.SYSTEM and task[0] not in database_tasks.keys(),
+            lambda task: task[1].target in is_task and task[0] not in database_tasks.keys(),
             registered_wf_instances.items(),
         )
     )

orchestrator/cli/migrate_workflows.py

@@ -11,7 +11,6 @@ import orchestrator.workflows
 from orchestrator.cli.helpers.input_helpers import _enumerate_menu_keys, _prompt_user_menu, get_user_input
 from orchestrator.cli.helpers.print_helpers import COLOR, noqa_print, print_fmt, str_fmt
 from orchestrator.db import ProductTable, WorkflowTable, db
-from orchestrator.targets import Target
 from orchestrator.workflows import LazyWorkflowInstance, get_workflow
 
 # Workflows are registered via migrations with product type. For every product with the given product_type, there will be an entry in products_workflows.
@@ -183,7 +182,7 @@ def create_workflows_migration_wizard() -> tuple[list[dict], list[dict]]:
     """
     database_workflows = list(db.session.scalars(select(WorkflowTable)))
     registered_workflows = orchestrator.workflows.ALL_WORKFLOWS
-    system_workflow_names = {wf.name for wf in database_workflows if wf.target == Target.SYSTEM}
+    system_workflow_names = {wf.name for wf in database_workflows if wf.is_task}
     registered_non_system_workflows = {k: v for k, v in registered_workflows.items() if k not in system_workflow_names}
 
     unregistered_workflows = [wf for wf in database_workflows if wf.name not in registered_workflows.keys()]

orchestrator/db/models.py

@@ -400,7 +400,7 @@ class WorkflowTable(BaseModel):
     workflow_id = mapped_column(UUIDType, server_default=text("uuid_generate_v4()"), primary_key=True)
     name = mapped_column(String(), nullable=False, unique=True)
     target = mapped_column(String(), nullable=False)
-    description = mapped_column(Text(), nullable=True)
+    description = mapped_column(Text(), nullable=False)
     created_at = mapped_column(UtcTimestamp, nullable=False, server_default=text("current_timestamp()"))
     deleted_at = mapped_column(UtcTimestamp, deferred=True)
 
@@ -412,6 +412,8 @@ class WorkflowTable(BaseModel):
     )
     processes = relationship("ProcessTable", cascade="all, delete-orphan", back_populates="workflow")
 
+    is_task = mapped_column(Boolean, nullable=False, server_default=text("false"))
+
     @staticmethod
     def select() -> Select:
         return (

orchestrator/domain/base.py

@@ -1294,27 +1294,13 @@ class SubscriptionModel(DomainModel):
     # Some common functions shared by from_other_product and from_subscription
     @classmethod
     def _get_subscription(cls: type[S], subscription_id: UUID | UUIDstr) -> SubscriptionTable | None:
-        from orchestrator.settings import app_settings
 
         if not isinstance(subscription_id, UUID | UUIDstr):
             raise TypeError(f"subscription_id is of type {type(subscription_id)} instead of UUID | UUIDstr")
 
-        if app_settings.ENABLE_SUBSCRIPTION_MODEL_OPTIMIZATIONS:
-            # TODO #900 remove toggle and make this path the default
-            loaders = [
-                joinedload(SubscriptionTable.product).selectinload(ProductTable.fixed_inputs),
-            ]
-
-        else:
-            loaders = [
-                selectinload(SubscriptionTable.instances)
-                .joinedload(SubscriptionInstanceTable.product_block)
-                .selectinload(ProductBlockTable.resource_types),
-                selectinload(SubscriptionTable.instances).selectinload(
-                    SubscriptionInstanceTable.in_use_by_block_relations
-                ),
-                selectinload(SubscriptionTable.instances).selectinload(SubscriptionInstanceTable.values),
-            ]
+        loaders = [
+            joinedload(SubscriptionTable.product).selectinload(ProductTable.fixed_inputs),
+        ]
 
         return db.session.get(SubscriptionTable, subscription_id, options=loaders)
 
@@ -1394,7 +1380,6 @@ class SubscriptionModel(DomainModel):
     def from_subscription(cls: type[S], subscription_id: UUID | UUIDstr) -> S:
         """Use a subscription_id to return required fields of an existing subscription."""
         from orchestrator.domain.context_cache import get_from_cache, store_in_cache
-        from orchestrator.settings import app_settings
 
         if cached_model := get_from_cache(subscription_id):
             return cast(S, cached_model)
@@ -1421,12 +1406,7 @@ class SubscriptionModel(DomainModel):
 
         fixed_inputs = {fi.name: fi.value for fi in subscription.product.fixed_inputs}
 
-        instances: dict[str, Any]
-        if app_settings.ENABLE_SUBSCRIPTION_MODEL_OPTIMIZATIONS:
-            # TODO #900 remove toggle and make this path the default
-            instances = cls._load_root_instances(subscription_id)
-        else:
-            instances = cls._load_instances(subscription.instances, status, match_domain_attr=False)
+        instances = cls._load_root_instances(subscription_id)
 
         try:
             model = cls(

orchestrator/domain/customer_description.py

@@ -21,7 +21,6 @@ from sqlalchemy import select
 from orchestrator.api.models import delete
 from orchestrator.db import SubscriptionCustomerDescriptionTable, db
 from orchestrator.utils.errors import StaleDataError
-from orchestrator.utils.redis import delete_subscription_from_redis
 from orchestrator.utils.validate_data_version import validate_data_version
 from orchestrator.websocket import invalidate_subscription_cache
 
@@ -38,7 +37,6 @@ def get_customer_description_by_customer_subscription(
     return db.session.scalars(stmt).one_or_none()
 
 
-@delete_subscription_from_redis()
 async def create_subscription_customer_description(
     customer_id: str, subscription_id: UUID, description: str
 ) -> SubscriptionCustomerDescriptionTable:
@@ -53,7 +51,6 @@ async def create_subscription_customer_description(
     return customer_description
 
 
-@delete_subscription_from_redis()
 async def update_subscription_customer_description(
     customer_description: SubscriptionCustomerDescriptionTable,
     description: str,
@@ -70,7 +67,6 @@ async def update_subscription_customer_description(
     return customer_description
 
 
-@delete_subscription_from_redis()
 async def delete_subscription_customer_description_by_customer_subscription(
     customer_id: str, subscription_id: UUID
 ) -> SubscriptionCustomerDescriptionTable | None:

orchestrator/graphql/mutations/customer_description.py

@@ -60,7 +60,7 @@ async def resolve_remove_customer_description(
     )
     if not description:
         return NotFoundError(message="Customer description not found")
-    return CustomerDescription.from_pydantic(description)
+    return CustomerDescription.from_pydantic(description)  # type: ignore
 
 
 @strawberry.type(description="Customer subscription description mutations")

orchestrator/migrations/helpers.py

@@ -135,18 +135,21 @@ def create_workflow(conn: sa.engine.Connection, workflow: dict) -> None:
         >>> workflow = {
             "name": "workflow_name",
             "target": "SYSTEM",
+            "is_task": False,
             "description": "workflow description",
             "product_type": "product_type",
         }
         >>> create_workflow(conn, workflow)
     """
+    if not workflow.get("is_task", False):
+        workflow["is_task"] = False
 
     conn.execute(
         sa.text(
             """
                 WITH new_workflow AS (
-                INSERT INTO workflows(name, target, description)
-                    VALUES (:name, :target, :description)
+                INSERT INTO workflows(name, target, is_task, description)
+                    VALUES (:name, :target, :is_task, :description)
                     ON CONFLICT DO NOTHING
                     RETURNING workflow_id)
                 INSERT
@@ -184,8 +187,8 @@ def create_task(conn: sa.engine.Connection, task: dict) -> None:
     conn.execute(
         sa.text(
             """
-                INSERT INTO workflows(name, target, description)
-                    VALUES (:name, 'SYSTEM', :description)
+                INSERT INTO workflows(name, target, is_task, description)
+                    VALUES (:name, 'SYSTEM', TRUE, :description)
                     ON CONFLICT DO NOTHING
                     RETURNING workflow_id
             """
@@ -206,6 +209,7 @@ def create_workflows(conn: sa.engine.Connection, new: dict) -> None:
                 "workflow_name": {
                     "workflow_id": "f2702074-3203-454c-b298-6dfa7675423d",
                     "target": "CREATE",
+                    "is_task": False,
                     "description": "Workflow description",
                     "tag": "ProductBlockName1",
                     "search_phrase": "Search Phrase%",
@@ -214,12 +218,16 @@ def create_workflows(conn: sa.engine.Connection, new: dict) -> None:
     """
     for name, workflow in new.items():
         workflow["name"] = name
+
+        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, description)
-                    VALUES (:workflow_id, :name, :target, :description)
+                    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)

orchestrator/migrations/versions/schema/2025-02-20_68d14db1b8da_make_workflow_description_mandatory.py

@@ -0,0 +1,33 @@
+"""Make workflow description mandatory.
+
+Revision ID: 68d14db1b8da
+Revises: bac6be6f2b4f
+Create Date: 2025-02-20 16:39:34.889953
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from structlog import get_logger
+
+logger = get_logger(__name__)
+
+# revision identifiers, used by Alembic.
+revision = "68d14db1b8da"
+down_revision = "fc5c993a4b4a"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    try:
+        op.alter_column("workflows", "description", existing_type=sa.TEXT(), nullable=False)
+    except sa.exc.IntegrityError:
+        logger.error(
+            "Unable to execute migrations due to missing descriptions in workflow table, please create a migration to backfill this column."
+        )
+        raise
+
+
+def downgrade() -> None:
+    op.alter_column("workflows", "description", existing_type=sa.TEXT(), nullable=True)

orchestrator/migrations/versions/schema/2025-05-08_161918133bec_add_is_task_to_workflow.py

@@ -0,0 +1,28 @@
+"""Add is_task to workflow.
+
+Revision ID: 161918133bec
+Revises: 68d14db1b8da
+Create Date: 2025-05-08 11:25:51.966410
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "161918133bec"
+down_revision = "68d14db1b8da"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("workflows", sa.Column("is_task", sa.Boolean(), server_default=sa.text("false"), nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("workflows", "is_task")
+    # ### end Alembic commands ###

orchestrator/schedules/validate_subscriptions.py

@@ -22,7 +22,7 @@ from orchestrator.services.subscriptions import (
     get_subscriptions_on_product_table_in_sync,
 )
 from orchestrator.services.workflows import (
-    get_system_product_workflows_for_subscription,
+    get_validation_product_workflows_for_subscription,
     start_validation_workflow_for_workflows,
 )
 from orchestrator.settings import app_settings
@@ -42,9 +42,9 @@ def validate_subscriptions() -> None:
         subscriptions = get_subscriptions_on_product_table_in_sync()
 
     for subscription in subscriptions:
-        system_product_workflows = get_system_product_workflows_for_subscription(subscription)
+        validation_product_workflows = get_validation_product_workflows_for_subscription(subscription)
 
-        if not system_product_workflows:
+        if not validation_product_workflows:
             logger.warning(
                 "SubscriptionTable has no validation workflow",
                 subscription=subscription,
@@ -52,4 +52,4 @@ def validate_subscriptions() -> None:
             )
             break
 
-        start_validation_workflow_for_workflows(subscription=subscription, workflows=system_product_workflows)
+        start_validation_workflow_for_workflows(subscription=subscription, workflows=validation_product_workflows)

orchestrator/schemas/workflow.py

@@ -24,6 +24,7 @@ from orchestrator.targets import Target
 class WorkflowBaseSchema(OrchestratorBaseModel):
     name: str
     target: Target
+    is_task: bool = False
     description: str | None = None
     created_at: datetime | None = None
 

orchestrator/services/celery.py

@@ -24,7 +24,7 @@ from orchestrator.api.error_handling import raise_status
 from orchestrator.db import ProcessTable, db
 from orchestrator.services.input_state import store_input_state
 from orchestrator.services.processes import create_process, delete_process
-from orchestrator.targets import Target
+from orchestrator.services.workflows import get_workflow_by_name
 from orchestrator.workflows import get_workflow
 from pydantic_forms.types import State
 
@@ -51,7 +51,11 @@ def _celery_start_process(
     if not workflow:
         raise_status(HTTPStatus.NOT_FOUND, "Workflow does not exist")
 
-    task_name = NEW_TASK if workflow.target == Target.SYSTEM else NEW_WORKFLOW
+    wf_table = get_workflow_by_name(workflow.name)
+    if not wf_table:
+        raise_status(HTTPStatus.NOT_FOUND, "Workflow in Database does not exist")
+
+    task_name = NEW_TASK if wf_table.is_task else NEW_WORKFLOW
     trigger_task = get_celery_task(task_name)
     pstat = create_process(workflow_key, user_inputs, user)
     try:
@@ -80,7 +84,11 @@ def _celery_resume_process(
     last_process_status = process.last_status
     workflow = pstat.workflow
 
-    task_name = RESUME_TASK if workflow.target == Target.SYSTEM else RESUME_WORKFLOW
+    wf_table = get_workflow_by_name(workflow.name)
+    if not workflow or not wf_table:
+        raise_status(HTTPStatus.NOT_FOUND, "Workflow does not exist")
+
+    task_name = RESUME_TASK if wf_table.is_task else RESUME_WORKFLOW
     trigger_task = get_celery_task(task_name)
 
     user_inputs = user_inputs or [{}]

orchestrator/services/processes.py

@@ -34,7 +34,6 @@ from orchestrator.services.input_state import store_input_state
 from orchestrator.services.settings import get_engine_settings_for_update
 from orchestrator.services.workflows import get_workflow_by_name
 from orchestrator.settings import ExecutorType, app_settings
-from orchestrator.targets import Target
 from orchestrator.types import BroadcastFunc
 from orchestrator.utils.datetime import nowtz
 from orchestrator.utils.errors import error_state_to_dict
@@ -108,7 +107,7 @@ def _db_create_process(stat: ProcessStat) -> None:
         workflow_id=wf_table.workflow_id,
         last_status=ProcessStatus.CREATED,
         created_by=stat.current_user,
-        is_task=stat.workflow.target == Target.SYSTEM,
+        is_task=wf_table.is_task,
     )
     db.session.add(p)
     db.session.commit()
@@ -441,6 +440,7 @@ def create_process(
     }
 
     try:
+
         state = post_form(workflow.initial_input_form, initial_state, user_inputs)
     except FormValidationError:
         logger.exception("Validation errors", user_inputs=user_inputs)

orchestrator/services/subscriptions.py

@@ -505,6 +505,7 @@ TARGET_DEFAULT_USABLE_MAP: dict[Target, list[str]] = {
     Target.MODIFY: ["active"],
     Target.TERMINATE: ["active", "provisioning"],
     Target.SYSTEM: ["active"],
+    Target.VALIDATE: ["active"],
 }
 
 WF_USABLE_MAP: dict[str, list[str]] = {}
@@ -530,6 +531,7 @@ def subscription_workflows(subscription: SubscriptionTable) -> dict[str, Any]:
         ...     "modify": [],
         ...     "terminate": [],
         ...     "system": [],
+        ...     "validate": [],
         ... }
 
     """
@@ -549,9 +551,10 @@ def subscription_workflows(subscription: SubscriptionTable) -> dict[str, Any]:
         "modify": [],
         "terminate": [],
         "system": [],
+        "validate": [],
     }
     for workflow in subscription.product.workflows:
-        if workflow.name in WF_USABLE_WHILE_OUT_OF_SYNC or workflow.target == Target.SYSTEM:
+        if workflow.name in WF_USABLE_WHILE_OUT_OF_SYNC or workflow.is_task:
             # validations and modify note are also possible with: not in sync or locked relations
             workflow_json = {"name": workflow.name, "description": workflow.description}
         else:
@@ -605,7 +608,6 @@ def build_domain_model(subscription_model: SubscriptionModel) -> dict:
 
 def build_extended_domain_model(subscription_model: SubscriptionModel) -> dict:
     """Create a subscription dict from the SubscriptionModel with additional keys."""
-    from orchestrator.settings import app_settings
 
     stmt = select(SubscriptionCustomerDescriptionTable).where(
         SubscriptionCustomerDescriptionTable.subscription_id == subscription_model.subscription_id
@@ -615,27 +617,12 @@ def build_extended_domain_model(subscription_model: SubscriptionModel) -> dict:
     with cache_subscription_models():
         subscription = subscription_model.model_dump()
 
-    def inject_in_use_by_ids(path_to_block: str) -> None:
-        if not (in_use_by_subs := getattr_in(subscription_model, f"{path_to_block}.in_use_by")):
-            return
-
-        in_use_by_ids = [obj.in_use_by_id for obj in in_use_by_subs.col]
-        in_use_by_relations = [convert_to_in_use_by_relation(instance) for instance in in_use_by_subs]
-        update_in(subscription, f"{path_to_block}.in_use_by_ids", in_use_by_ids)
-        update_in(subscription, f"{path_to_block}.in_use_by_relations", in_use_by_relations)
-
-    if app_settings.ENABLE_SUBSCRIPTION_MODEL_OPTIMIZATIONS:
-        # TODO #900 remove toggle and make this path the default
-        # query all subscription instances and inject the in_use_by_ids/in_use_by_relations into the subscription dict.
-        instance_to_in_use_by = {
-            instance.subscription_instance_id: instance.in_use_by
-            for instance in eagerload_all_subscription_instances_only_inuseby(subscription_model.subscription_id)
-        }
-        inject_in_use_by_ids_v2(subscription, instance_to_in_use_by)
-    else:
-        # find all product blocks, check if they have in_use_by and inject the in_use_by_ids into the subscription dict.
-        for path in product_block_paths(subscription):
-            inject_in_use_by_ids(path)
+    # query all subscription instances and inject the in_use_by_ids/in_use_by_relations into the subscription dict.
+    instance_to_in_use_by = {
+        instance.subscription_instance_id: instance.in_use_by
+        for instance in eagerload_all_subscription_instances_only_inuseby(subscription_model.subscription_id)
+    }
+    inject_in_use_by_ids_v2(subscription, instance_to_in_use_by)
 
     subscription["customer_descriptions"] = customer_descriptions
 

orchestrator/services/workflows.py

@@ -39,6 +39,7 @@ def _to_workflow_schema(workflow: WorkflowTable, include_steps: bool = False) ->
         workflow_id=workflow.workflow_id,
         name=workflow.name,
         target=workflow.target,
+        is_task=workflow.is_task,
         description=workflow.description,
         created_at=workflow.created_at,
         **extra_kwargs,
@@ -63,10 +64,10 @@ def get_workflow_by_name(workflow_name: str) -> WorkflowTable | None:
     return db.session.scalar(select(WorkflowTable).where(WorkflowTable.name == workflow_name))
 
 
-def get_system_product_workflows_for_subscription(
+def get_validation_product_workflows_for_subscription(
     subscription: SubscriptionTable,
 ) -> list:
-    return [workflow.name for workflow in subscription.product.workflows if workflow.target == Target.SYSTEM]
+    return [workflow.name for workflow in subscription.product.workflows if workflow.target == Target.VALIDATE]
 
 
 def start_validation_workflow_for_workflows(
@@ -78,9 +79,12 @@ def start_validation_workflow_for_workflows(
     result = []
 
     for workflow_name in workflows:
-        default = TARGET_DEFAULT_USABLE_MAP[Target.SYSTEM]
-        usable_when = WF_USABLE_MAP.get(workflow_name, default)
+        target_system = TARGET_DEFAULT_USABLE_MAP[Target.SYSTEM]
+        system_usable_when = WF_USABLE_MAP.get(workflow_name, target_system)
+        target_validate = TARGET_DEFAULT_USABLE_MAP[Target.VALIDATE]
+        validate_usable_when = WF_USABLE_MAP.get(workflow_name, target_validate)
 
+        usable_when = system_usable_when + validate_usable_when
         if subscription.status in usable_when and (
             product_type_filter is None or subscription.product.product_type == product_type_filter
         ):

orchestrator/settings.py

@@ -55,7 +55,6 @@ class AppSettings(BaseSettings):
     MAIL_PORT: int = 25
     MAIL_STARTTLS: bool = False
     CACHE_URI: RedisDsn = "redis://localhost:6379/0"  # type: ignore
-    CACHE_DOMAIN_MODELS: bool = False
     CACHE_HMAC_SECRET: str | None = None  # HMAC signing key, used when pickling results in the cache
     REDIS_RETRY_COUNT: NonNegativeInt = Field(
         2, description="Number of retries for redis connection errors/timeouts, 0 to disable"
@@ -87,9 +86,6 @@ class AppSettings(BaseSettings):
     ENABLE_GRAPHQL_STATS_EXTENSION: bool = False
     VALIDATE_OUT_OF_SYNC_SUBSCRIPTIONS: bool = False
     FILTER_BY_MODE: Literal["partial", "exact"] = "exact"
-    ENABLE_SUBSCRIPTION_MODEL_OPTIMIZATIONS: bool = (
-        True  # True=ignore cache + optimized DB queries; False=use cache + unoptimized DB queries. Remove in #900
-    )
 
 
 app_settings = AppSettings()

orchestrator/targets.py

@@ -22,3 +22,4 @@ class Target(strEnum):
     MODIFY = "MODIFY"
     TERMINATE = "TERMINATE"
     SYSTEM = "SYSTEM"
+    VALIDATE = "VALIDATE"

orchestrator/utils/get_subscription_dict.py

@@ -2,15 +2,11 @@ from uuid import UUID
 
 from orchestrator.domain.base import SubscriptionModel
 from orchestrator.services.subscriptions import _generate_etag, build_domain_model, build_extended_domain_model
-from orchestrator.utils.redis import from_redis
 
 
 async def get_subscription_dict(subscription_id: UUID, inject_inuseby: bool = True) -> tuple[dict, str]:
     """Helper function to get subscription dict by uuid from db or cache."""
 
-    if cached_model := from_redis(subscription_id):
-        return cached_model  # type: ignore
-
     subscription_model = SubscriptionModel.from_subscription(subscription_id)
 
     if not inject_inuseby:

orchestrator/utils/redis.py

@@ -10,11 +10,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import functools
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
-from os import getenv
-from typing import Any, Callable
+from typing import Any
 from uuid import UUID
 
 from anyio import CancelScope, get_cancelled_exc_class
@@ -22,9 +20,7 @@ from redis.asyncio import Redis as AIORedis
 from redis.asyncio.client import Pipeline, PubSub
 from structlog import get_logger
 
-from orchestrator.services.subscriptions import _generate_etag
 from orchestrator.settings import app_settings
-from orchestrator.utils.json import PY_JSON_TYPES, json_dumps, json_loads
 from orchestrator.utils.redis_client import (
     create_redis_asyncio_client,
     create_redis_client,
@@ -37,52 +33,6 @@ cache = create_redis_client(app_settings.CACHE_URI)
 ONE_WEEK = 3600 * 24 * 7
 
 
-def caching_models_enabled() -> bool:
-    return getenv("AIOCACHE_DISABLE", "0") == "0" and app_settings.CACHE_DOMAIN_MODELS
-
-
-def to_redis(subscription: dict[str, Any]) -> str | None:
-    if caching_models_enabled():
-        logger.info("Setting cache for subscription", subscription=subscription["subscription_id"])
-        etag = _generate_etag(subscription)
-        cache.set(f"orchestrator:domain:{subscription['subscription_id']}", json_dumps(subscription), ex=ONE_WEEK)
-        cache.set(f"orchestrator:domain:etag:{subscription['subscription_id']}", etag, ex=ONE_WEEK)
-        return etag
-
-    logger.warning("Caching disabled, not caching subscription", subscription=subscription["subscription_id"])
-    return None
-
-
-def from_redis(subscription_id: UUID) -> tuple[PY_JSON_TYPES, str] | None:
-    log = logger.bind(subscription_id=subscription_id)
-
-    if app_settings.ENABLE_SUBSCRIPTION_MODEL_OPTIMIZATIONS:
-        # TODO #900 remove toggle and remove usage of this function in get_subscription_dict
-        log.info("Using SubscriptionModel optimization, not loading subscription from redis cache")
-        return None
-
-    if caching_models_enabled():
-        log.debug("Try to retrieve subscription from cache")
-        obj = cache.get(f"orchestrator:domain:{subscription_id}")
-        etag = cache.get(f"orchestrator:domain:etag:{subscription_id}")
-        if obj and etag:
-            log.info("Retrieved subscription from cache")
-            return json_loads(obj), etag.decode("utf-8")
-        log.info("Subscription not found in cache")
-        return None
-    log.warning("Caching disabled, not loading subscription")
-    return None
-
-
-def delete_from_redis(subscription_id: UUID) -> None:
-    if caching_models_enabled():
-        logger.info("Deleting subscription object from cache", subscription_id=subscription_id)
-        cache.delete(f"orchestrator:domain:{subscription_id}")
-        cache.delete(f"orchestrator:domain:etag:{subscription_id}")
-    else:
-        logger.warning("Caching disabled, not deleting subscription", subscription=subscription_id)
-
-
 def default_get_subscription_id(data: Any) -> UUID:
     if hasattr(data, "subscription_id"):
         return data.subscription_id
@@ -91,22 +41,6 @@ def default_get_subscription_id(data: Any) -> UUID:
     return data
 
 
-def delete_subscription_from_redis(
-    extract_fn: Callable[..., UUID] = default_get_subscription_id,
-) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
-    def _delete_subscription_from_redis(func: Callable[..., Any]) -> Callable[..., Any]:
-        @functools.wraps(func)
-        async def wrapper(*args: tuple, **kwargs: dict[str, Any]) -> Any:
-            data = await func(*args, **kwargs)
-            key = extract_fn(data)
-            delete_from_redis(key)
-            return data
-
-        return wrapper
-
-    return _delete_subscription_from_redis
-
-
 async def delete_keys_matching_pattern(_cache: AIORedis, pattern: str, chunksize: int = 5000) -> int:
     """Delete all keys matching the given pattern.
 

orchestrator/workflows/modify_note.py

@@ -13,11 +13,10 @@
 from orchestrator.db import db
 from orchestrator.forms import SubmitFormPage
 from orchestrator.services import subscriptions
-from orchestrator.settings import app_settings
 from orchestrator.targets import Target
 from orchestrator.utils.json import to_serializable
-from orchestrator.workflow import StepList, conditional, done, init, step, workflow
-from orchestrator.workflows.steps import cache_domain_models, store_process_subscription
+from orchestrator.workflow import StepList, done, init, step, workflow
+from orchestrator.workflows.steps import store_process_subscription
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
 from pydantic_forms.types import FormGenerator, State, UUIDstr
 from pydantic_forms.validators import LongText
@@ -54,11 +53,4 @@ def store_subscription_note(subscription_id: UUIDstr, note: str) -> State:
 
 @workflow("Modify Note", initial_input_form=wrap_modify_initial_input_form(initial_input_form), target=Target.MODIFY)
 def modify_note() -> StepList:
-    push_subscriptions = conditional(lambda _: app_settings.CACHE_DOMAIN_MODELS)
-    return (
-        init
-        >> store_process_subscription(Target.MODIFY)
-        >> store_subscription_note
-        >> push_subscriptions(cache_domain_models)
-        >> done
-    )
+    return init >> store_process_subscription(Target.MODIFY) >> store_subscription_note >> done

orchestrator/workflows/steps.py

@@ -11,22 +11,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from copy import deepcopy
-from typing import Any
-from uuid import UUID
 
 import structlog
 from pydantic import ValidationError
 
 from orchestrator.db import db
 from orchestrator.db.models import ProcessSubscriptionTable
-from orchestrator.domain.base import ProductBlockModel, SubscriptionModel
+from orchestrator.domain.base import SubscriptionModel
 from orchestrator.services.settings import reset_search_index
-from orchestrator.services.subscriptions import build_extended_domain_model, get_subscription
+from orchestrator.services.subscriptions import get_subscription
 from orchestrator.targets import Target
 from orchestrator.types import SubscriptionLifecycle
 from orchestrator.utils.json import to_serializable
-from orchestrator.utils.redis import delete_from_redis, to_redis
-from orchestrator.websocket import sync_invalidate_subscription_cache
 from orchestrator.workflow import Step, step
 from pydantic_forms.types import State, UUIDstr
 
@@ -138,86 +134,6 @@ def set_status(status: SubscriptionLifecycle) -> Step:
     return _set_status
 
 
-@step("Remove domain model from cache")
-def remove_domain_model_from_cache(
-    workflow_name: str, subscription: SubscriptionModel | None = None, subscription_id: UUID | None = None
-) -> State:
-    """Remove the domain model from the cache if it exists.
-
-    Args:
-        workflow_name: The workflow name
-        subscription: Subscription Model
-        subscription_id: The subscription id
-
-    Returns:
-        State
-
-    """
-
-    if not (subscription or subscription_id):
-        logger.warning("No subscription found in this workflow", workflow_name=workflow_name)
-        return {"deleted_subscription_id": None}
-    if subscription:
-        delete_from_redis(subscription.subscription_id)
-    elif subscription_id:
-        delete_from_redis(subscription_id)
-
-    return {"deleted_subscription_id": subscription_id or subscription.subscription_id}  # type: ignore[union-attr]
-
-
-@step("Cache Subscription and related subscriptions")
-def cache_domain_models(workflow_name: str, subscription: SubscriptionModel | None = None) -> State:  # noqa: C901
-    """Attempt to cache all Subscriptions once they have been touched once.
-
-    Args:
-        workflow_name: The Workflow Name
-        subscription:  The Subscription if it exists.
-
-    Returns:
-        Returns State.
-
-    """
-    cached_subscription_ids: set[UUID] = set()
-    if not subscription:
-        logger.warning("No subscription found in this workflow", workflow_name=workflow_name)
-        return {"cached_subscription_ids": cached_subscription_ids}
-
-    def _cache_other_subscriptions(product_block: ProductBlockModel) -> None:
-        for field in product_block.model_fields:
-            # subscription_instance is a ProductBlockModel or an arbitrary type
-            subscription_instance: ProductBlockModel | Any = getattr(product_block, field)
-            # If subscription_instance is a list, we need to step into it and loop.
-            if isinstance(subscription_instance, list):
-                for item in subscription_instance:
-                    if isinstance(item, ProductBlockModel):
-                        _cache_other_subscriptions(item)
-
-            # If subscription_instance is a ProductBlockModel check the owner_subscription_id to decide the cache
-            elif isinstance(subscription_instance, ProductBlockModel):
-                _cache_other_subscriptions(subscription_instance)
-                if not subscription_instance.owner_subscription_id == subscription.subscription_id:
-                    cached_subscription_ids.add(subscription_instance.owner_subscription_id)
-
-    for field in subscription.model_fields:
-        # There always is a single Root Product Block, it cannot be a list, so no need to check.
-        instance: ProductBlockModel | Any = getattr(subscription, field)
-        if isinstance(instance, ProductBlockModel):
-            _cache_other_subscriptions(instance)
-
-    # Cache all the sub subscriptions
-    for subscription_id in cached_subscription_ids:
-        subscription_model = SubscriptionModel.from_subscription(subscription_id)
-        to_redis(build_extended_domain_model(subscription_model))
-        sync_invalidate_subscription_cache(subscription.subscription_id, invalidate_all=False)
-
-    # Cache the main subscription
-    to_redis(build_extended_domain_model(subscription))
-    cached_subscription_ids.add(subscription.subscription_id)
-    sync_invalidate_subscription_cache(subscription.subscription_id)
-
-    return {"cached_subscription_ids": cached_subscription_ids}
-
-
 @step("Refresh subscription search index")
 def refresh_subscription_search_index() -> State:
     try:

orchestrator/workflows/tasks/validate_product_type.py

@@ -22,7 +22,7 @@ from orchestrator.services.subscriptions import (
     get_subscriptions_on_product_table_in_sync,
 )
 from orchestrator.services.workflows import (
-    get_system_product_workflows_for_subscription,
+    get_validation_product_workflows_for_subscription,
     start_validation_workflow_for_workflows,
 )
 from orchestrator.targets import Target
@@ -62,7 +62,7 @@ def validate_product_type(product_type: str) -> State:
     subscriptions = get_subscriptions_on_product_table_in_sync()
 
     for subscription in subscriptions:
-        system_product_workflows = get_system_product_workflows_for_subscription(
+        system_product_workflows = get_validation_product_workflows_for_subscription(
             subscription=subscription,
         )
 

orchestrator/workflows/tasks/validate_products.py

@@ -105,13 +105,10 @@ def check_that_products_have_create_modify_and_terminate_workflows() -> State:
     product_data = get_products(filters=[ProductTable.status == "active"])
 
     workflows_not_complete: list = []
+    targets = ["CREATE", "TERMINATE", "MODIFY", "VALIDATE"]
     for product in product_data:
-        workflows = {
-            c.target
-            for c in product.workflows
-            if c.target in ["CREATE", "TERMINATE", "MODIFY", "SYSTEM"] and c.name != "modify_note"
-        }
-        if len(workflows) < 4:
+        workflows = {c.target for c in product.workflows if c.target in targets and c.name != "modify_note"}
+        if len(workflows) < len(targets):
             workflows_not_complete.append(product.name)
 
     # Do not raise an error but only report it in the `State` to allow exceptions.

orchestrator/workflows/utils.py

@@ -24,16 +24,13 @@ from oauth2_lib.fastapi import OIDCUserModel
 from orchestrator.db import ProductTable, SubscriptionTable, db
 from orchestrator.forms.validators import ProductId
 from orchestrator.services import subscriptions
-from orchestrator.settings import app_settings
 from orchestrator.targets import Target
 from orchestrator.types import SubscriptionLifecycle
 from orchestrator.utils.errors import StaleDataError
-from orchestrator.utils.redis import caching_models_enabled
 from orchestrator.utils.state import form_inject_args
 from orchestrator.utils.validate_data_version import validate_data_version
-from orchestrator.workflow import Step, StepList, Workflow, begin, conditional, done, init, make_workflow, step
+from orchestrator.workflow import Step, StepList, Workflow, begin, done, init, make_workflow, step
 from orchestrator.workflows.steps import (
-    cache_domain_models,
     refresh_subscription_search_index,
     resync,
     set_status,
@@ -198,8 +195,6 @@ modify_initial_input_form_generator = None
 
 validate_initial_input_form_generator = wrap_modify_initial_input_form(modify_initial_input_form_generator)
 
-push_domain_models = conditional(lambda _: caching_models_enabled())
-
 
 def create_workflow(
     description: str,
@@ -228,7 +223,6 @@ def create_workflow(
             >> (additional_steps or StepList())
             >> set_status(status)
             >> resync
-            >> push_domain_models(cache_domain_models)
             >> refresh_subscription_search_index
             >> done
         )
@@ -270,11 +264,9 @@ def modify_workflow(
             init
             >> store_process_subscription(Target.MODIFY)
             >> unsync
-            >> push_domain_models(cache_domain_models)
             >> f()
             >> (additional_steps or StepList())
             >> resync
-            >> push_domain_models(cache_domain_models)
             >> refresh_subscription_search_index
             >> done
         )
@@ -316,12 +308,10 @@ def terminate_workflow(
             init
             >> store_process_subscription(Target.TERMINATE)
             >> unsync
-            >> push_domain_models(cache_domain_models)
             >> f()
             >> (additional_steps or StepList())
             >> set_status(SubscriptionLifecycle.TERMINATED)
             >> resync
-            >> push_domain_models(cache_domain_models)
             >> refresh_subscription_search_index
             >> done
         )
@@ -352,19 +342,9 @@ def validate_workflow(description: str) -> Callable[[Callable[[], StepList]], Wo
     """
 
     def _validate_workflow(f: Callable[[], StepList]) -> Workflow:
-        push_subscriptions = conditional(lambda _: app_settings.CACHE_DOMAIN_MODELS)
-        steplist = (
-            init
-            >> store_process_subscription(Target.SYSTEM)
-            >> unsync_unchecked
-            >> push_subscriptions(cache_domain_models)
-            >> f()
-            >> resync
-            >> push_subscriptions(cache_domain_models)
-            >> done
-        )
+        steplist = init >> store_process_subscription(Target.SYSTEM) >> unsync_unchecked >> f() >> resync >> done
 
-        return make_workflow(f, description, validate_initial_input_form_generator, Target.SYSTEM, steplist)
+        return make_workflow(f, description, validate_initial_input_form_generator, Target.VALIDATE, steplist)
 
     return _validate_workflow
 

{orchestrator_core-3.2.3.dist-info → orchestrator_core-4.0.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 3.2.3
+Version: 4.0.0rc2
 Summary: This is the orchestrator workflow engine.
 Requires-Python: >=3.11,<3.14
 Classifier: Intended Audience :: Information Technology
@@ -35,24 +35,24 @@ Requires-Dist: deprecated
 Requires-Dist: deepmerge==2.0
 Requires-Dist: fastapi~=0.115.2
 Requires-Dist: fastapi-etag==0.4.0
-Requires-Dist: more-itertools~=10.6.0
+Requires-Dist: more-itertools~=10.7.0
 Requires-Dist: itsdangerous
 Requires-Dist: Jinja2==3.1.6
-Requires-Dist: orjson==3.10.16
+Requires-Dist: orjson==3.10.18
 Requires-Dist: psycopg2-binary==2.9.10
 Requires-Dist: pydantic[email]~=2.8.2
-Requires-Dist: pydantic-settings~=2.8.0
+Requires-Dist: pydantic-settings~=2.9.1
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: python-rapidjson>=1.18,<1.21
 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.25.1
+Requires-Dist: sentry-sdk[fastapi]~=2.27.0
 Requires-Dist: SQLAlchemy==2.0.40
 Requires-Dist: SQLAlchemy-Utils==0.41.2
 Requires-Dist: structlog
-Requires-Dist: typer==0.15.2
+Requires-Dist: typer==0.15.3
 Requires-Dist: uvicorn[standard]~=0.34.0
 Requires-Dist: nwa-stdlib~=1.9.0
 Requires-Dist: oauth2-lib~=2.4.0

{orchestrator_core-3.2.3.dist-info → orchestrator_core-4.0.0rc2.dist-info}/RECORD

@@ -1,11 +1,11 @@
-orchestrator/__init__.py,sha256=SAG1EbiZw8m_0wbefpfPXZ_rYgoIoLssZr_HdgxQShI,1063
+orchestrator/__init__.py,sha256=_4qDYGxoCurHceKtJMPSdPiXXCzkD0XpCJiQy6gBP5g,1066
 orchestrator/app.py,sha256=VN54_Zsx5x_3ym8aFadATg67a4J5lv8H-pxnPlR3RkM,11668
 orchestrator/exception_handlers.py,sha256=UsW3dw8q0QQlNLcV359bIotah8DYjMsj2Ts1LfX4ClY,1268
 orchestrator/log_config.py,sha256=1tPRX5q65e57a6a_zEii_PFK8SzWT0mnA5w2sKg4hh8,1853
 orchestrator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 orchestrator/security.py,sha256=iXFxGxab54aav7oHEKLAVkTgrQMJGHy6IYLojEnD7gI,2422
-orchestrator/settings.py,sha256=MTG7gnmbQYwUjAnhvX4Y3MEqmX8vIpAEC0lhDafa1zw,4039
-orchestrator/targets.py,sha256=ykjTGK7CozFaltNaxQcK90P4Cc1Qvf-W8dFztxtZhRQ,776
+orchestrator/settings.py,sha256=21BT1SviPllSL4-M1Qc-8zdgF_Sh7p79WC8sR_AmTmE,3826
+orchestrator/targets.py,sha256=WizBgnp8hWX9YLFUIju7ewSubiwQqinCvyiYNcXHbHI,802
 orchestrator/types.py,sha256=qzs7xx5AYRmKbpYRyJJP3wuDb0W0bcAzefCN0RWLAco,15459
 orchestrator/version.py,sha256=b58e08lxs47wUNXv0jXFO_ykpksmytuzEXD4La4W-NQ,1366
 orchestrator/workflow.py,sha256=T_3Z1PrlF70C16ehAthKRF1hd3jpwV-MREDVxSLfxOw,44063
@@ -22,7 +22,7 @@ orchestrator/api/api_v1/endpoints/product_blocks.py,sha256=kZ6ywIOsS_S2qGq7RvZ4K
 orchestrator/api/api_v1/endpoints/products.py,sha256=BfFtwu9dZXEQbtKxYj9icc73GKGvAGMR5ytyf41nQlQ,3081
 orchestrator/api/api_v1/endpoints/resource_types.py,sha256=gGyuaDyOD0TAVoeFGaGmjDGnQ8eQQArOxKrrk4MaDzA,2145
 orchestrator/api/api_v1/endpoints/settings.py,sha256=QPBwrRGqBlYHNRnADKQ5hpj74X2DB5lROu8KwVnyN_0,6226
-orchestrator/api/api_v1/endpoints/subscription_customer_descriptions.py,sha256=Elu4DVJoNtUFq_b3pG1Ws8StrUIo_jTViff2TJqe6ZU,3398
+orchestrator/api/api_v1/endpoints/subscription_customer_descriptions.py,sha256=1_6LtgQleoq3M6z_W-Qz__Bj3OFUweoPrUqHMwSH6AM,3288
 orchestrator/api/api_v1/endpoints/subscriptions.py,sha256=EwkWBztI9xSMPkol49SM5csECthyu7HC38AhuW7pWUE,8724
 orchestrator/api/api_v1/endpoints/translations.py,sha256=dIWh_fCnZZUxJoGiNeJ49DK_xpf75IpR_0EIMSvzIvY,963
 orchestrator/api/api_v1/endpoints/user.py,sha256=RyI32EXVu6I-IxWjz0XB5zQWzzLL60zKXLgLqLH02xU,1827
@@ -33,8 +33,8 @@ orchestrator/cli/database.py,sha256=qig-WqUtiDITz4KePxzcqZtC0FPTWRs_3l19qQpqIGA,
 orchestrator/cli/generate.py,sha256=SBaYfRijXPF9r3VxarPKTiDzDcB6GBMMQvecQIb_ZLQ,7377
 orchestrator/cli/main.py,sha256=GC_kxa9OZ-Y0ig_klfWc6ysOQuPVTUmTmDRj3m8cJHA,983
 orchestrator/cli/migrate_domain_models.py,sha256=OhjNuIheytgShpMYCZ18leNUzk17ExhtkCqx7Ww03R8,20371
-orchestrator/cli/migrate_tasks.py,sha256=Fmcwuv8rI1Z_qEiL_kmOWCUq7rNIgnlntUc37phadN8,7249
-orchestrator/cli/migrate_workflows.py,sha256=-_nsKUcVa14-Ug3aSppU9yk-oWlK411SX33WqzD1p4M,8979
+orchestrator/cli/migrate_tasks.py,sha256=bju8XColjSZD0v3rS4kl-24dLr8En_H4-6enBmqd494,7255
+orchestrator/cli/migrate_workflows.py,sha256=nxUpx0vgEIc_8aJrjAyrw3E9Dt8JmaamTts8oiQ4vHY,8923
 orchestrator/cli/migration_helpers.py,sha256=C5tpkP5WEBr7G9S-1k1hgSI8ili6xd9Z5ygc9notaK0,4110
 orchestrator/cli/scheduler.py,sha256=iCKBWYUwQIYTDqKQ9rMVvs2sNiAzE-J2SkV170TPP2g,1896
 orchestrator/cli/domain_gen_helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -83,7 +83,7 @@ orchestrator/cli/generator/templates/lazy_workflow_instance.j2,sha256=BYB6LwE19O
 orchestrator/cli/generator/templates/list_definitions.j2,sha256=XS-F5XXy4HOdsZ-xahprwxfhU0UaiF4VeopkIxfoado,277
 orchestrator/cli/generator/templates/macros.j2,sha256=fEODRym4gLfL40w9OelXFMDtAjtzmN5nccWDk86oTNI,904
 orchestrator/cli/generator/templates/modify_product.j2,sha256=M1WDMmPwfXpUcuZUa-H5GnlKAr1t_xCQliLa66FI-YU,5057
-orchestrator/cli/generator/templates/new_product_migration.j2,sha256=d67I9haNkKdzWzNT0f1S6-UhG86fOWEohF0Al7NmXmA,3023
+orchestrator/cli/generator/templates/new_product_migration.j2,sha256=XTeOmv8nVNfGXx6pfSGVwRk282Xx3lnw-7bkpHkd-Tk,3128
 orchestrator/cli/generator/templates/product.j2,sha256=gcN1poWRuGWbsLrQv0Z8SXO6MGuXBHBr33UvQtqsF8E,1241
 orchestrator/cli/generator/templates/product_block.j2,sha256=X5ynyBG39UiYekPHms7IkSHmxq2j-2OrhAYsFaRqktU,2454
 orchestrator/cli/generator/templates/shared_forms.j2,sha256=tXbauuMMExwHLYLJVkmAJ74SSFriXlwpOyd04jwWE0k,545
@@ -106,7 +106,7 @@ orchestrator/db/database.py,sha256=MU_w_e95ho2dVb2JDnt_KFYholx___XDkiQXbc8wCkI,1
 orchestrator/db/helpers.py,sha256=L8kEdnSSNGnUpZhdeGx2arCodakWN8vSpKdfjoLuHdY,831
 orchestrator/db/listeners.py,sha256=UBPYcH0FE3a7aZQu_D0O_JMXpXIRYXC0gjSAvlv5GZo,1142
 orchestrator/db/loaders.py,sha256=ez6JzQ3IKVkC_oLAkVlIIiI8Do7hXbdcPKCvUSLxRog,7962
-orchestrator/db/models.py,sha256=V7m-XOVzo_Kj_B-M46Ybr1zlbfXjbN64sQ3C-rz7PQE,27217
+orchestrator/db/models.py,sha256=92lkqI4u3Si2tEMSTnMb5Uv08CSjqkgotgyEYqLvFeI,27302
 orchestrator/db/filters/__init__.py,sha256=RUj6P0XxEBhYj0SN5wH5-Vf_Wt_ilZR_n9DSar5m9oM,371
 orchestrator/db/filters/filters.py,sha256=55RtpQwM2rhrk4A6CCSeSXoo-BT9GnQoNTryA8CtLEg,5020
 orchestrator/db/filters/process.py,sha256=xvGhyfo_MZ1xhLvFC6yULjcT4mJk0fKc1glJIYgsWLE,4018
@@ -142,9 +142,9 @@ orchestrator/distlock/managers/__init__.py,sha256=ImIkNsrXcyE7-NgRWqEhUXUuUzda9K
 orchestrator/distlock/managers/memory_distlock_manager.py,sha256=HWQafcVKBF-Cka_wukZZ1GM69AWPVOpJPje3quIebQ8,3114
 orchestrator/distlock/managers/redis_distlock_manager.py,sha256=DXtMhC8qtxiFO6xU9qYXHZQnCLjlmGBpeyfLA0vbRP0,3369
 orchestrator/domain/__init__.py,sha256=20DhXQPKY0g3rTgCkRlNDY58sLviToOVF8NPoex9WJc,936
-orchestrator/domain/base.py,sha256=26UbHKXqI99w8SyS-Kjj4DF8IbgPNOh8iDPP6e3GEsA,70996
+orchestrator/domain/base.py,sha256=jjMxJvt0GyaTff_z490lmkqDCtitkh0oA4GygB60n4s,69939
 orchestrator/domain/context_cache.py,sha256=vT1a01MBSBIaokoShK9KwjItd7abNmz7cXaF67VRZK8,2508
-orchestrator/domain/customer_description.py,sha256=v7o6TTN4oc6bWHZU-jCT-fUYvkeYahbpXOwlKXofuI8,3360
+orchestrator/domain/customer_description.py,sha256=RU_pcgCIZjjFfDsY45lfV0z6ATlS1NXtB0E7eH3UcYQ,3190
 orchestrator/domain/helpers.py,sha256=D9O2duhCAZGmm39u-9ggvU-X2JsCbIS607kF77-r8QM,2549
 orchestrator/domain/lifecycle.py,sha256=kGR0AFVOSUBlzdhgRr11CUnF26wbBYIjz8uKb_qPCg0,2922
 orchestrator/domain/subscription_instance_transform.py,sha256=j_d49dFcSss0dl-BHS-ev2faLbE0y8hLvCfrzui6C74,4360
@@ -165,7 +165,7 @@ orchestrator/graphql/extensions/model_cache.py,sha256=1uhMRjBs9eK7zJ1Y6P6BopX068
 orchestrator/graphql/extensions/stats.py,sha256=pGhEBQg45XvqZhRobcrCSGwt5AGmR3gflsm1dYiIg5g,2018
 orchestrator/graphql/loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 orchestrator/graphql/loaders/subscriptions.py,sha256=31zE2WC7z-tPIUmVpU1QWOJvNbLvF7sYgY7JAQ6OPJg,1856
-orchestrator/graphql/mutations/customer_description.py,sha256=37yX92fE1Sc51O9i-gP8JfD3HdsvpR3TtbgYqKtGC-w,3343
+orchestrator/graphql/mutations/customer_description.py,sha256=zm_X1yvWl4qC97_rYUYSF-1q1gFrQX6fDrzQKhguDYs,3359
 orchestrator/graphql/mutations/start_process.py,sha256=8vLVvmBwL1ujbZJoI_8YE3VAgI-J2RTzgrTZJC8THZ4,1576
 orchestrator/graphql/resolvers/__init__.py,sha256=EEw9NO4LAryfrpkLlgsNQ9rytKd0usBDx95OURRV6sg,1031
 orchestrator/graphql/resolvers/customer.py,sha256=tq06MtMoaqFwqn3YQvSv0VmROW7QJZRJp1ykO4tUhck,934
@@ -205,7 +205,7 @@ orchestrator/graphql/utils/to_graphql_result_page.py,sha256=8ObkJP8reVf-TQOQVPKv
 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=7r286N3MFHJhSc-59okj_UO2VoU8L_4QBWfvABMzZAw,43779
+orchestrator/migrations/helpers.py,sha256=xwi1Z-0MMZJ1Bk-HXkb6f_RU7BmO3ajK5a4qqO94elc,44068
 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
@@ -231,15 +231,17 @@ orchestrator/migrations/versions/schema/2024-09-27_460ec6748e37_add_uuid_search_
 orchestrator/migrations/versions/schema/2025-01-08_4c5859620539_add_version_column_to_subscription.py,sha256=xAhe74U0ZiVRo9Z8Uq7491RBbATMMUnYpTBjbG-BYL0,1690
 orchestrator/migrations/versions/schema/2025-01-19_4fjdn13f83ga_add_validate_product_type_task.py,sha256=O0GfCISIDnyohGf3Ot_2HKedGRbMqLVox6t7Wd3PMvo,894
 orchestrator/migrations/versions/schema/2025-02-12_bac6be6f2b4f_added_input_state_table.py,sha256=RZpLkWP1yekeZ68feO5v4LZYluKvnnIKRNDCE4tI9HM,1753
+orchestrator/migrations/versions/schema/2025-02-20_68d14db1b8da_make_workflow_description_mandatory.py,sha256=uh5J2bR_UERqlNrDjDBSfiAdEfI9YQzgR9-t9ordFOo,847
 orchestrator/migrations/versions/schema/2025-03-06_42b3d076a85b_subscription_instance_as_json_function.py,sha256=jtwDFOh-NlE31aH5dFmbynb23TZN6Mkzevxx-KLP7KE,776
 orchestrator/migrations/versions/schema/2025-03-06_42b3d076a85b_subscription_instance_as_json_function.sql,sha256=hPldk0DAesUbHv3Qd_N7U-cAk-t1wIgxt4FOA120gQ8,1776
 orchestrator/migrations/versions/schema/2025-04-09_fc5c993a4b4a_add_cascade_constraint_on_processes_.py,sha256=6kHRNSZxUze2jy7b8uRvkt5mzsax10Z-Z3lsACtPLRM,1067
+orchestrator/migrations/versions/schema/2025-05-08_161918133bec_add_is_task_to_workflow.py,sha256=VLFDHFYRWn5ktUba0KuSPWyvjYJdfN1WypWmOPqIW18,721
 orchestrator/schedules/__init__.py,sha256=JnnaglfK1qYUBKI6Dd9taV-tCZIPlAdAkHtnkJDMXxY,1066
 orchestrator/schedules/resume_workflows.py,sha256=kSotzTAXjX7p9fpSYiGOpuxuTQfv54eRFAe0YSG0DHc,832
 orchestrator/schedules/scheduling.py,sha256=ehtwgpbvMOk1jhn-hHgVzg_9wLJkI6l3mRY3DcO9ZVY,1526
 orchestrator/schedules/task_vacuum.py,sha256=eovnuKimU8SFRw1IF62MsAVFSdgeeV1u57kapUbz8As,821
 orchestrator/schedules/validate_products.py,sha256=YMr7ASSqdXM6pd6oZu0kr8mfmH8If16MzprrsHdN_ZU,1234
-orchestrator/schedules/validate_subscriptions.py,sha256=YYcU2iGf8Ga_s577kgpKdhQV4p7wCEHGYvUf8FCvBvQ,2022
+orchestrator/schedules/validate_subscriptions.py,sha256=9SYvsn4BJ5yo_1nu555hWjl5XffTx7QMaRhH5oOjM9E,2042
 orchestrator/schemas/__init__.py,sha256=YDyZ0YBvzB4ML9oDBCBPGnBvf680zFFgUzg7X0tYBRY,2326
 orchestrator/schemas/base.py,sha256=Vc444LetsINLRhG2SxW9Bq01hOzChPOhQWCImQTr-As,930
 orchestrator/schemas/engine_settings.py,sha256=LF8al7tJssiilb5A4emPtUYo0tVDSaT1Lvo_DN_ttrY,1296
@@ -251,21 +253,21 @@ orchestrator/schemas/product_block.py,sha256=kCqvm6qadHpegMr9aWI_fYX-T7mS-5S-ldP
 orchestrator/schemas/resource_type.py,sha256=VDju4XywcDDLxdpbWU62RTvR9QF8x_GRrpTlN_NE8uI,1064
 orchestrator/schemas/subscription.py,sha256=-jXyHZIed9Xlia18ksSDyenblNN6Q2yM2FlGELyJ458,3423
 orchestrator/schemas/subscription_descriptions.py,sha256=Ft_jw1U0bf9Z0U8O4OWfLlcl0mXCVT_qYVagBP3GbIQ,1262
-orchestrator/schemas/workflow.py,sha256=w-CaRPp9AAddhnd8o_0jPaey1Vnnh-s-A5s5kWlR2pI,1977
+orchestrator/schemas/workflow.py,sha256=gBpLXttgU3cSkVyEqr5ji4yBskl-n7QNmEerUr9UXt0,2003
 orchestrator/services/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
-orchestrator/services/celery.py,sha256=W37UNc4hbUS2SKjVmawsnF5wukmEfIdipsTESv_EOTw,4768
+orchestrator/services/celery.py,sha256=ezw7IxkIZbmaRJt-9_Iwvn86TJV3Y3DTHI7Qjh0-r9s,5075
 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
-orchestrator/services/processes.py,sha256=JXVa9E3NtcuFlUggK3LhjHilSAlF-4kTyCCHROakAJA,30554
+orchestrator/services/processes.py,sha256=rTH6zLNsun3qDCPguz2LYS87MQR_LJREIPrgkGS6kwk,30494
 orchestrator/services/products.py,sha256=BP4KyE8zO-8z7Trrs5T6zKBOw53S9BfBJnHWI3p6u5Y,1943
 orchestrator/services/resource_types.py,sha256=_QBy_JOW_X3aSTqH0CuLrq4zBJL0p7Q-UDJUcuK2_qc,884
 orchestrator/services/settings.py,sha256=u-834F4KWloXS8zi7R9mp-D3cjl-rbVjKJRU35IqhXo,2723
 orchestrator/services/subscription_relations.py,sha256=9C126TUfFvyBe7y4x007kH_dvxJ9pZ1zSnaWeH6HC5k,12261
-orchestrator/services/subscriptions.py,sha256=u1qkCk7FuniJseQjnuDWiIlqy9ok4SY8nWUyLeJ11No,28068
+orchestrator/services/subscriptions.py,sha256=nr2HI89nC0lYjzTh2j-lEQ5cPQK43LNZv3gvP6jbepw,27189
 orchestrator/services/tasks.py,sha256=NjPkuauQoh9UJDcjA7OcKFgPk0i6NoKdDO7HlpGbBJ8,6575
 orchestrator/services/translations.py,sha256=GyP8soUFGej8AS8uulBsk10CCK6Kwfjv9AHMFm3ElQY,1713
-orchestrator/services/workflows.py,sha256=oH7klit4kv2NGo-BACWA0ZtajVMSJAxG5m-kM6TXIMI,3742
+orchestrator/services/workflows.py,sha256=iEkt2OBuTwkDru4V6ZSKatnw0b96ZdPV-VQqeZ9EOgU,4015
 orchestrator/utils/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
 orchestrator/utils/crypt.py,sha256=18eNamYWMllPkxyRtWIde3FDr3rSF74R5SAL6WsCj9Y,5584
 orchestrator/utils/datetime.py,sha256=a1WQ_yvu7MA0TiaRpC5avwbOSFdrj4eMrV4a7I2sD5Q,1477
@@ -275,11 +277,11 @@ orchestrator/utils/enrich_process.py,sha256=o_QSy5Q4wn1SMHhzVOw6bp7uhDXr7GhAIWRD
 orchestrator/utils/errors.py,sha256=6FxvXrITmRjP5bYnJJ3CxjAwA5meNjRAVYouz4TWKkU,4653
 orchestrator/utils/fixed_inputs.py,sha256=pnL6I_19VMp_Bny8SYjSzVFNvTFDyeCxFFOWGhTnDiQ,2665
 orchestrator/utils/functional.py,sha256=X1MDNwHmkU3-8mFb21m31HGlcfc5TygliXR0sXN3-rU,8304
-orchestrator/utils/get_subscription_dict.py,sha256=EoSlFUXer_Kc5G0PjDPeujugZ76kKoPrjRr4Mg4HrzY,839
+orchestrator/utils/get_subscription_dict.py,sha256=hctkFvD3U6LpygNwz2uesRMdnXSY-PaohBqPATsi9r4,694
 orchestrator/utils/get_updated_properties.py,sha256=egVZ0R5LNJ4e51Z8SXlU8cmb4tXxG-xb1d7OKwh-7xI,1322
 orchestrator/utils/helpers.py,sha256=NjUF3IvWdnLulliP8-JQvGGGpHrh0vs0Vm092ynw-ss,3212
 orchestrator/utils/json.py,sha256=7386sdqkrKYyy4sbn5NscwctH_v1hLyw5172P__rU3g,8341
-orchestrator/utils/redis.py,sha256=E5uPFCOlS1n_jv0xoaS1fuLnVv-shQn0K1hzpVwUWZY,7303
+orchestrator/utils/redis.py,sha256=BjUNmrKx8YVyJIucl2mhXubK6WV-49OnAU6rPMOZpM0,4469
 orchestrator/utils/redis_client.py,sha256=9rhsvedjK_CyClAjUicQyge0mVIViATqKFGZyjBY3XA,1384
 orchestrator/utils/search_query.py,sha256=ji5LHtrzohGz6b1IG41cnPdpWXzLEzz4SGWgHly_yfU,16205
 orchestrator/utils/state.py,sha256=RYKVlvKDBfsBdDk9wHjZKBTlQJbV4SqtCotAlTA2-bI,14021
@@ -290,17 +292,17 @@ orchestrator/websocket/websocket_manager.py,sha256=hwlG9FDXcNU42jDNNsPMQLIyrvEpG
 orchestrator/websocket/managers/broadcast_websocket_manager.py,sha256=fwoSgTjkHJ2GmsLTU9dqQpAA9i8b1McPu7gLNzxtfG4,5401
 orchestrator/websocket/managers/memory_websocket_manager.py,sha256=lF5EEx1iFMCGEkTbItTDr88NENMSaSeG1QrJ7teoPkY,3324
 orchestrator/workflows/__init__.py,sha256=NzIGGI-8SNAwCk2YqH6sHhEWbgAY457ntDwjO15N8v4,4131
-orchestrator/workflows/modify_note.py,sha256=X70qQtC0ITp5IE5OR8j5Op57k3ol1S9txnhDbZTICao,2416
+orchestrator/workflows/modify_note.py,sha256=l6QtijRPv8gnHxzwTz_4nWIPcZ0FcKQh_yFbtjYEDMg,2163
 orchestrator/workflows/removed_workflow.py,sha256=V0Da5TEdfLdZZKD38ig-MTp3_IuE7VGqzHHzvPYQmLI,909
-orchestrator/workflows/steps.py,sha256=yAb6XZaRhR2mKV4_yo-4hSYMTknbMD27-pNGMfjVzi0,9802
-orchestrator/workflows/utils.py,sha256=fLayx_oggM8PdYnyukHSJE3R9u-X2zYY1WRMCELUY74,14545
+orchestrator/workflows/steps.py,sha256=ulpheoHaCOE1qh71Bja4KW4pItQh1Z6q4QU4tn5GtNk,6067
+orchestrator/workflows/utils.py,sha256=yBwfITlseimyLEzbwI0ehOAlr-xI1N3WGVudFz4boXk,13778
 orchestrator/workflows/tasks/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
 orchestrator/workflows/tasks/cleanup_tasks_log.py,sha256=BfWYbPXhnLAHUJ0mlODDnjZnQQAvKCZJDVTwbwOWI04,1624
 orchestrator/workflows/tasks/resume_workflows.py,sha256=MzJqlSXUvKStkT7NGzxZyRlfAer_ezYm-kjUqaZi0yc,2359
-orchestrator/workflows/tasks/validate_product_type.py,sha256=UVX_6Kh8ueQs8ujLawnKVDdNc8UhWp_u69aNA8okR_w,3184
-orchestrator/workflows/tasks/validate_products.py,sha256=i6jQME9N8sZZWo4pkNOS1Zgwh3eB2w66DnJi9k93yNk,8521
+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-3.2.3.dist-info/licenses/LICENSE,sha256=b-aA5OZQuuBATmLKo_mln8CQrDPPhg3ghLzjPjLn4Tg,11409
-orchestrator_core-3.2.3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-orchestrator_core-3.2.3.dist-info/METADATA,sha256=AzahqbZrlKJSQnVOq21UaeGImMLI-62j2UI52TGS0eE,5029
-orchestrator_core-3.2.3.dist-info/RECORD,,
+orchestrator_core-4.0.0rc2.dist-info/licenses/LICENSE,sha256=b-aA5OZQuuBATmLKo_mln8CQrDPPhg3ghLzjPjLn4Tg,11409
+orchestrator_core-4.0.0rc2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+orchestrator_core-4.0.0rc2.dist-info/METADATA,sha256=eEc0N4MXX03Q--Jx61bXgZqQ3zwjzjdwLUhVl_5eGFM,5032
+orchestrator_core-4.0.0rc2.dist-info/RECORD,,