orchestrator-core 3.2.2__tar.gz → 4.0.0rc1__tar.gz

{orchestrator_core-3.2.2 → orchestrator_core-4.0.0rc1}/.bumpversion.cfg

@@ -1,9 +1,9 @@
 [bumpversion]
-current_version = 3.2.2
+current_version = 4.0.0rc1
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(rc(?P<build>\d+))?
-serialize = 
+serialize =
 	{major}.{minor}.{patch}rc{build}
 	{major}.{minor}.{patch}
 

{orchestrator_core-3.2.2 → orchestrator_core-4.0.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 3.2.2
+Version: 4.0.0rc1
 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-4.0.0rc1/docs/migration-guide/4.0.md

@@ -0,0 +1,16 @@
+---
+hide:
+  - navigation
+---
+# 4.0 Migration Guide
+
+In this document we describe the steps that should be taken to migrate from `orchestrator-core` v3 to v4.
+
+## About 4.0
+
+In this release we have removed the caching of domain models. Domain models will always be loaded from the database.
+
+## Steps
+
+To use 4.0 all workflows must have run to completion. The `cache_domain_models` step no longer is part of the codebase
+therfore `in flight` workflows will fail.

{orchestrator_core-3.2.2 → orchestrator_core-4.0.0rc1}/mkdocs.yml

@@ -192,6 +192,7 @@ nav:
           - Migration guides:
                 - 2.x: migration-guide/2.0.md
                 - 3.x: migration-guide/3.0.md
+                - 4.x: migration-guide/4.0.md
 
     - Workshops:
           #    - Beginner:

{orchestrator_core-3.2.2 → orchestrator_core-4.0.0rc1}/orchestrator/__init__.py

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

{orchestrator_core-3.2.2 → orchestrator_core-4.0.0rc1}/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_core-3.2.2 → orchestrator_core-4.0.0rc1}/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)
 

{orchestrator_core-3.2.2 → orchestrator_core-4.0.0rc1}/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_core-3.2.2 → orchestrator_core-4.0.0rc1}/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_core-3.2.2 → orchestrator_core-4.0.0rc1}/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_core-4.0.0rc1/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 = "bac6be6f2b4f"
+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_core-3.2.2 → orchestrator_core-4.0.0rc1}/orchestrator/services/processes.py

@@ -441,6 +441,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)
@@ -682,7 +683,7 @@ def update_awaiting_process_progress(
     ensure_correct_callback_token(pstat, token=token)
 
     state = pstat.state.unwrap()
-    progress_key = state.get(DEFAULT_CALLBACK_PROGRESS_KEY, "callback_progress")
+    progress_key = DEFAULT_CALLBACK_PROGRESS_KEY
     state = {**state, progress_key: data} | {"__remove_keys": [progress_key]}
 
     replace_current_step_state(process, new_state=state)

{orchestrator_core-3.2.2 → orchestrator_core-4.0.0rc1}/orchestrator/services/subscriptions.py

@@ -605,7 +605,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 +614,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_core-3.2.2 → orchestrator_core-4.0.0rc1}/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_core-3.2.2 → orchestrator_core-4.0.0rc1}/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_core-3.2.2 → orchestrator_core-4.0.0rc1}/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_core-3.2.2 → orchestrator_core-4.0.0rc1}/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_core-3.2.2 → orchestrator_core-4.0.0rc1}/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_core-3.2.2 → orchestrator_core-4.0.0rc1}/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,17 +342,7 @@ 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)