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

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 3.2.0rc1
+Version: 3.2.2
 Summary: This is the orchestrator workflow engine.
 Requires-Python: >=3.11,<3.14
 Classifier: Intended Audience :: Information Technology
@@ -47,6 +47,7 @@ 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: SQLAlchemy==2.0.40
 Requires-Dist: SQLAlchemy-Utils==0.41.2
@@ -57,8 +58,8 @@ 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
-Requires-Dist: celery~=5.4.0 ; extra == "celery"
+Requires-Dist: pydantic-forms>=1.4.0, <=2.0.0
+Requires-Dist: celery~=5.5.1 ; extra == "celery"
 Requires-Dist: toml ; extra == "dev"
 Requires-Dist: bumpversion ; extra == "dev"
 Requires-Dist: mypy_extensions ; extra == "dev"

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

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

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/orchestrator/api/api_v1/endpoints/processes.py

@@ -128,7 +128,7 @@ def delete(process_id: UUID) -> None:
     status_code=HTTPStatus.CREATED,
     dependencies=[Depends(check_global_lock, use_cache=False)],
 )
-async def new_process(
+def new_process(
     workflow_key: str,
     request: Request,
     json_data: list[dict[str, Any]] | None = Body(...),

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/orchestrator/cli/generator/generator/workflow.py

@@ -10,12 +10,13 @@
 # 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.
-
 from collections.abc import Callable
 from functools import partial, wraps
+from importlib import metadata
 from pathlib import Path
 from typing import Any
 
+import semver
 import structlog
 from jinja2 import Environment
 
@@ -123,7 +124,17 @@ def get_product_workflow_path(config: dict, workflow_type: str) -> Path:
     return product_workflow_folder(config) / Path(f"{workflow_type}_{file_name}").with_suffix(".py")
 
 
+def eval_pydantic_forms_version() -> bool:
+    updated_version = semver.Version.parse("2.0.0")
+
+    installed_version = metadata.version("pydantic-forms")
+    installed_semver = semver.Version.parse(installed_version)
+
+    return installed_semver >= updated_version
+
+
 def render_template(environment: Environment, config: dict, template: str, workflow: str = "") -> str:
+    use_updated_readonly_field = eval_pydantic_forms_version()
     product_block = root_product_block(config)
     types_to_import = get_name_spaced_types_to_import(product_block["fields"])
     fields = get_input_fields(product_block)
@@ -152,6 +163,7 @@ def render_template(environment: Environment, config: dict, template: str, workf
         product_types_module=get_product_types_module(),
         workflows_module=get_workflows_module(),
         workflow_validations=workflow_validations if workflow else [],
+        use_updated_readonly_field=use_updated_readonly_field,
     )
 
 

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/orchestrator/cli/generator/templates/modify_product.j2

@@ -7,7 +7,12 @@ from typing import Annotated
 import structlog
 from pydantic import AfterValidator, ConfigDict, model_validator
 from pydantic_forms.types import FormGenerator, State, UUIDstr
+
+{%- if use_updated_readonly_field is true  %}
+from pydantic_forms.validators import read_only_field
+{%- else %}
 from pydantic_forms.validators import ReadOnlyField
+{%- endif %}
 
 from orchestrator.forms import FormPage
 from orchestrator.forms.validators import CustomerId, Divider
@@ -52,7 +57,11 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
         divider_1: Divider
 
         {% for field in fields if not field.modifiable is defined -%}
+        {% if use_updated_readonly_field is true  -%}
+        {{ field.name }}: read_only_field({{ product_block.name }}.{{ field.name }})
+        {% else -%}
         {{ field.name }}: ReadOnlyField({{ product_block.name }}.{{ field.name }})
+        {% endif -%}
         {% endfor -%}
 
         {% for field in fields if field.modifiable is defined -%}

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/orchestrator/domain/context_cache.py

@@ -38,6 +38,13 @@ def cache_subscription_models() -> Iterator:
         with cache_subscription_models():
            subscription_dict = subscription.model_dump()
     """
+    if __subscription_model_cache.get() is not None:
+        # If it's already active in the current context, we do nothing.
+        # This makes the contextmanager reentrant.
+        # The outermost contextmanager will eventually reset the context.
+        yield
+        return
+
     before = __subscription_model_cache.set({})
     try:
         yield

orchestrator_core-3.2.2/orchestrator/graphql/extensions/model_cache.py

@@ -0,0 +1,29 @@
+# Copyright 2022-2025 SURF.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+from collections.abc import Iterator
+
+from strawberry.extensions import SchemaExtension
+
+from orchestrator.domain.context_cache import cache_subscription_models
+
+
+class ModelCacheExtension(SchemaExtension):
+    """Wraps the GraphQL operation in a cache_subscription_models context.
+
+    For more background, please refer to the documentation of the contextmanager.
+    """
+
+    def on_operation(self, *args, **kwargs) -> Iterator[None]:  # type: ignore
+
+        with cache_subscription_models():
+            yield

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/orchestrator/graphql/schema.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2023 SURF, GÉANT.
+# Copyright 2022-2025 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -32,6 +32,7 @@ from oauth2_lib.fastapi import AuthManager
 from oauth2_lib.strawberry import authenticated_field
 from orchestrator.domain.base import SubscriptionModel
 from orchestrator.graphql.autoregistration import create_subscription_strawberry_type, register_domain_models
+from orchestrator.graphql.extensions.model_cache import ModelCacheExtension
 from orchestrator.graphql.extensions.stats import StatsExtension
 from orchestrator.graphql.mutations.customer_description import CustomerSubscriptionDescriptionMutation
 from orchestrator.graphql.mutations.start_process import ProcessMutation
@@ -160,6 +161,7 @@ def default_context_getter(
 
 
 def get_extensions(mutation: Any, query: Any) -> Iterable[type[SchemaExtension]]:
+    yield ModelCacheExtension
     yield ErrorHandlerExtension
     if app_settings.ENABLE_GRAPHQL_DEPRECATION_CHECKER:
         yield make_deprecation_checker_extension(query=query, mutation=mutation)

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/orchestrator/graphql/schemas/subscription.py

@@ -101,9 +101,9 @@ class SubscriptionInterface:
 
     @strawberry.field(description="Return all products block instances of a subscription")  # type: ignore
     async def product_block_instances(
-        self, tags: list[str] | None = None, resource_types: list[str] | None = None
+        self, info: OrchestratorInfo, tags: list[str] | None = None, resource_types: list[str] | None = None
     ) -> list[ProductBlockInstance]:
-        return await get_subscription_product_blocks(self.subscription_id, tags, resource_types)
+        return await get_subscription_product_blocks(info, self.subscription_id, tags, resource_types)
 
     @strawberry.field(description="Return fixed inputs")  # type: ignore
     async def fixed_inputs(self) -> strawberry.scalars.JSON:

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/orchestrator/graphql/utils/get_subscription_product_blocks.py

@@ -21,6 +21,8 @@ from pydantic.alias_generators import to_camel as to_lower_camel
 from strawberry.scalars import JSON
 
 from orchestrator.graphql.schemas.product_block import owner_subscription_resolver
+from orchestrator.graphql.types import OrchestratorInfo
+from orchestrator.graphql.utils.get_selected_paths import get_selected_paths
 from orchestrator.utils.get_subscription_dict import get_subscription_dict
 
 if TYPE_CHECKING:
@@ -81,9 +83,13 @@ pb_instance_property_keys = (
 
 
 async def get_subscription_product_blocks(
-    subscription_id: UUID, tags: list[str] | None = None, product_block_instance_values: list[str] | None = None
+    info: OrchestratorInfo,
+    subscription_id: UUID,
+    tags: list[str] | None = None,
+    product_block_instance_values: list[str] | None = None,
 ) -> list[ProductBlockInstance]:
-    subscription, _ = await get_subscription_dict(subscription_id)
+    inject_inuseby = "in_use_by_relations" in get_selected_paths(info)
+    subscription, _ = await get_subscription_dict(subscription_id, inject_inuseby=inject_inuseby)
 
     def to_product_block(product_block: dict[str, Any]) -> ProductBlockInstance:
         def is_resource_type(candidate: Any) -> bool:

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/orchestrator/migrations/versions/schema/2025-02-12_bac6be6f2b4f_added_input_state_table.py

@@ -52,5 +52,5 @@ def upgrade() -> None:
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_index(op.f("ix_input_state_input_state_id"), table_name="input_states")
-    op.drop_table("input_statse")
+    op.drop_table("input_states")
     # ### end Alembic commands ###

orchestrator_core-3.2.2/orchestrator/migrations/versions/schema/2025-04-09_fc5c993a4b4a_add_cascade_constraint_on_processes_.py

@@ -0,0 +1,44 @@
+"""add cascade constraint on processes input state.
+
+Revision ID: fc5c993a4b4a
+Revises: 42b3d076a85b
+Create Date: 2025-04-09 18:27:31.922214
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "fc5c993a4b4a"
+down_revision = "42b3d076a85b"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # Drop the existing foreign key constraint
+    op.drop_constraint("input_states_pid_fkey", "input_states", type_="foreignkey")
+
+    # Add a new foreign key constraint with cascade delete
+    op.create_foreign_key(
+        "input_states_pid_fkey",
+        "input_states",
+        "processes",
+        ["pid"],
+        ["pid"],
+        ondelete="CASCADE",
+    )
+
+
+def downgrade() -> None:
+    # Drop the cascade foreign key constraint
+    op.drop_constraint("input_states_pid_fkey", "input_states", type_="foreignkey")
+
+    # Recreate the original foreign key constraint without cascade
+    op.create_foreign_key(
+        "input_states_pid_fkey",
+        "input_states",
+        "processes",
+        ["pid"],
+        ["pid"],
+    )

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

@@ -597,6 +597,12 @@ def convert_to_in_use_by_relation(obj: Any) -> dict[str, str]:
     return {"subscription_instance_id": str(obj.subscription_instance_id), "subscription_id": str(obj.subscription_id)}
 
 
+def build_domain_model(subscription_model: SubscriptionModel) -> dict:
+    """Create a subscription dict from the SubscriptionModel."""
+    with cache_subscription_models():
+        return subscription_model.model_dump()
+
+
 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

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/orchestrator/utils/get_subscription_dict.py

@@ -1,17 +1,21 @@
 from uuid import UUID
 
 from orchestrator.domain.base import SubscriptionModel
-from orchestrator.services.subscriptions import _generate_etag, build_extended_domain_model
+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) -> tuple[dict, str]:
+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)
-    subscription = build_extended_domain_model(subscription_model)
+
+    if not inject_inuseby:
+        subscription = build_domain_model(subscription_model)
+    else:
+        subscription = build_extended_domain_model(subscription_model)
     etag = _generate_etag(subscription)
     return subscription, etag

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/orchestrator/utils/redis.py

@@ -58,7 +58,7 @@ def from_redis(subscription_id: UUID) -> tuple[PY_JSON_TYPES, str] | None:
 
     if app_settings.ENABLE_SUBSCRIPTION_MODEL_OPTIMIZATIONS:
         # TODO #900 remove toggle and remove usage of this function in get_subscription_dict
-        log.warning("Using SubscriptionModel optimization, not loading subscription from cache")
+        log.info("Using SubscriptionModel optimization, not loading subscription from redis cache")
         return None
 
     if caching_models_enabled():

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/orchestrator/workflow.py

@@ -223,7 +223,11 @@ def step(name: str) -> Callable[[StepFunc], Step]:
     def decorator(func: StepFunc) -> Step:
         @functools.wraps(func)
         def wrapper(state: State) -> Process:
-            with bound_contextvars(func=func.__qualname__):
+            with bound_contextvars(
+                func=func.__qualname__,
+                workflow_name=state.get("workflow_name"),
+                process_id=state.get("process_id"),
+            ):
                 step_in_inject_args = inject_args(func)
                 try:
                     with transactional(db, logger):
@@ -248,7 +252,11 @@ def retrystep(name: str) -> Callable[[StepFunc], Step]:
     def decorator(func: StepFunc) -> Step:
         @functools.wraps(func)
         def wrapper(state: State) -> Process:
-            with bound_contextvars(func=func.__qualname__):
+            with bound_contextvars(
+                func=func.__qualname__,
+                workflow_name=state.get("workflow_name"),
+                process_id=state.get("process_id"),
+            ):
                 step_in_inject_args = inject_args(func)
                 try:
                     with transactional(db, logger):

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/pyproject.toml

@@ -55,6 +55,7 @@ dependencies = [
     "pytz==2025.2",
     "redis==5.1.1",
     "schedule==1.1.0",
+    "semver==3.0.4",
     "sentry-sdk[fastapi]~=2.25.1",
     "SQLAlchemy==2.0.40",
     "SQLAlchemy-Utils==0.41.2",
@@ -65,7 +66,7 @@ dependencies = [
     "oauth2-lib~=2.4.0",
     "tabulate==0.9.0",
     "strawberry-graphql>=0.246.2",
-    "pydantic-forms~=1.4.0",
+    "pydantic-forms>=1.4.0, <=2.0.0",
 ]
 
 description-file = "README.md"
@@ -77,7 +78,7 @@ Source = "https://github.com/workfloworchestrator/orchestrator-core"
 
 [project.optional-dependencies]
 celery = [
-    "celery~=5.4.0"
+    "celery~=5.5.1"
 ]
 
 test = [

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/test/unit_tests/cli/data/generate/workflows/example1/modify_example1.py

@@ -10,7 +10,7 @@ from orchestrator.workflows.steps import set_status
 from orchestrator.workflows.utils import modify_workflow
 from pydantic import AfterValidator
 from pydantic_forms.types import FormGenerator, State, UUIDstr
-from pydantic_forms.validators import ReadOnlyField
+from pydantic_forms.validators import read_only_field
 
 from products.product_blocks.example1 import ExampleStrEnum1
 from products.product_types.example1 import Example1, Example1Provisioning
@@ -41,8 +41,8 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
 
         divider_1: Divider
 
-        unmodifiable_str: ReadOnlyField(example1.unmodifiable_str)
-        annotated_int: ReadOnlyField(example1.annotated_int)
+        unmodifiable_str: read_only_field(example1.unmodifiable_str)
+        annotated_int: read_only_field(example1.annotated_int)
         example_str_enum_1: validated_example_str_enum_1 = example1.example_str_enum_1
         modifiable_boolean: bool = example1.modifiable_boolean
         always_optional_str: str | None = example1.always_optional_str

{orchestrator_core-3.2.0rc1 → orchestrator_core-3.2.2}/test/unit_tests/cli/data/generate/workflows/example4/modify_example4.py

@@ -7,7 +7,7 @@ from orchestrator.workflow import StepList, begin, step
 from orchestrator.workflows.steps import set_status
 from orchestrator.workflows.utils import modify_workflow
 from pydantic_forms.types import FormGenerator, State, UUIDstr
-from pydantic_forms.validators import ReadOnlyField
+from pydantic_forms.validators import read_only_field
 
 from products.product_types.example4 import Example4, Example4Provisioning
 
@@ -33,7 +33,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
 
         divider_1: Divider
 
-        num_val: ReadOnlyField(example4.num_val)
+        num_val: read_only_field(example4.num_val)
 
     user_input = yield ModifyExample4Form
     user_input_dict = user_input.dict()

orchestrator_core-3.2.2/test/unit_tests/migrations/test_cascade_constraint.py

@@ -0,0 +1,55 @@
+# Copyright 2019-2025 GÉANT, SURF, ESnet
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 pytest
+
+from orchestrator.db import db
+from orchestrator.db.models import InputStateTable, ProcessTable
+
+
+@pytest.fixture
+def create_input_state():
+    """Fixture to create an input state."""
+
+    def _create_input_state(process_id, input_state, input_type, **kwargs):
+        input_state_entry = InputStateTable(
+            process_id=process_id, input_state=input_state, input_type=input_type, **kwargs
+        )
+        db.session.add(input_state_entry)
+        db.session.commit()
+        return input_state_entry
+
+    return _create_input_state
+
+
+def test_cascade_delete(mocked_processes, test_client, create_input_state):
+    # Create a process and related input state
+    processes = test_client.get("/api/processes").json()
+    # Create an input state for the first process
+    create_input_state(
+        process_id=processes[0]["process_id"],
+        input_state={"key": "value"},
+        input_type="initial_state",
+    )
+
+    # Verify both records exist
+    assert db.session.query(ProcessTable).count() == 9
+    assert db.session.query(InputStateTable).count() == 1
+
+    # Delete one of the process so that the input state is deleted as well
+    process = db.session.query(ProcessTable).filter_by(process_id=processes[0]["process_id"]).one()
+    db.session.delete(process)
+    db.session.commit()
+
+    # Verify cascade delete
+    assert db.session.query(ProcessTable).count() == 8
+    assert db.session.query(InputStateTable).count() == 0