orchestrator-core 3.2.0rc1__py3-none-any.whl → 3.2.1__py3-none-any.whl

orchestrator/__init__.py

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

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/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/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/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/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.dist-info → orchestrator_core-3.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 3.2.0rc1
+Version: 3.2.1
 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.dist-info → orchestrator_core-3.2.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-orchestrator/__init__.py,sha256=DaljR2yKiWNT76zKyWAG4RD4RQ8cmT64er6J5BXvgOE,1066
+orchestrator/__init__.py,sha256=6M2nhPcbqy6evQZotd6vfnqqrc1M9YfUxkRSSjW12kw,1063
 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
@@ -8,7 +8,7 @@ orchestrator/settings.py,sha256=MTG7gnmbQYwUjAnhvX4Y3MEqmX8vIpAEC0lhDafa1zw,4039
 orchestrator/targets.py,sha256=ykjTGK7CozFaltNaxQcK90P4Cc1Qvf-W8dFztxtZhRQ,776
 orchestrator/types.py,sha256=qzs7xx5AYRmKbpYRyJJP3wuDb0W0bcAzefCN0RWLAco,15459
 orchestrator/version.py,sha256=b58e08lxs47wUNXv0jXFO_ykpksmytuzEXD4La4W-NQ,1366
-orchestrator/workflow.py,sha256=BITGaV8Pw4d9F-XCkaNGt7qoKO1fhklCq-SPmhgWdKI,43781
+orchestrator/workflow.py,sha256=T_3Z1PrlF70C16ehAthKRF1hd3jpwV-MREDVxSLfxOw,44063
 orchestrator/api/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
 orchestrator/api/error_handling.py,sha256=YrPCxSa-DSa9KwqIMlXI-KGBGnbGIW5ukOPiikUH9E4,1502
 orchestrator/api/helpers.py,sha256=s0QRHYw8AvEmlkmRhuEzz9xixaZKUF3YuPzUVHkcoXk,6933
@@ -17,7 +17,7 @@ orchestrator/api/api_v1/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n
 orchestrator/api/api_v1/api.py,sha256=m4iDktsSpzxUDaudkdgXeZ83a6B4wfc3pczQsa-Pb-8,2866
 orchestrator/api/api_v1/endpoints/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
 orchestrator/api/api_v1/endpoints/health.py,sha256=iaxs1XX1_250_gKNsspuULCV2GEMBjbtjsmfQTOvMAI,1284
-orchestrator/api/api_v1/endpoints/processes.py,sha256=UDYr7c9ypY_GS3jL_6vL1sRpTDCCSRyBa0XkgRVGZJs,13570
+orchestrator/api/api_v1/endpoints/processes.py,sha256=i5GRoszvdmpZqOxSqON83DNuc0UIV-ohOqbAa0OhESE,13564
 orchestrator/api/api_v1/endpoints/product_blocks.py,sha256=kZ6ywIOsS_S2qGq7RvZ4KzjvaS1LmwbGWR37AKRvWOw,2146
 orchestrator/api/api_v1/endpoints/products.py,sha256=BfFtwu9dZXEQbtKxYj9icc73GKGvAGMR5ytyf41nQlQ,3081
 orchestrator/api/api_v1/endpoints/resource_types.py,sha256=gGyuaDyOD0TAVoeFGaGmjDGnQ8eQQArOxKrrk4MaDzA,2145
@@ -65,7 +65,7 @@ orchestrator/cli/generator/generator/settings.py,sha256=_IhRnQ7bpGjqYtFo-OiLky25
 orchestrator/cli/generator/generator/translations.py,sha256=ip0RghW2bY7CoemEab9SxSgjizI44G35AoNHuBsgvrU,1878
 orchestrator/cli/generator/generator/unittest.py,sha256=cLbPRjBQyKFLDNABoTR3WQ21EisAodHs5Q3EGx4VQ6c,4541
 orchestrator/cli/generator/generator/validations.py,sha256=yLv_S_ZBOc_z5DNjz4JY50A4ErWeOk8rk5orty9hwbM,1815
-orchestrator/cli/generator/generator/workflow.py,sha256=IHjF4XSlfveQlwWZqoQne6Y7tua4-QdqaR_UV4HhLDc,7968
+orchestrator/cli/generator/generator/workflow.py,sha256=8mkb0a2zisb6iUFq8ICrOm2D3I_6fxxrit_LPxViSzk,8406
 orchestrator/cli/generator/products/workshop/circuit.yaml,sha256=AyRUWj61GUBoW9k9z1yfn9vZYXy52PiDMOayAr_FUdE,759
 orchestrator/cli/generator/products/workshop/node.yaml,sha256=4498iAjH6wHQAiRqsvczpgjJnyO8iCLokT6MgKwlxXQ,538
 orchestrator/cli/generator/products/workshop/user.yaml,sha256=92VrWlU1-C6KI8iONO-LGWt-U45rbZpCxhzF2Ags3iw,532
@@ -82,7 +82,7 @@ orchestrator/cli/generator/templates/enums.j2,sha256=pmx7_DeoE4X9u83_In18C97XqZP
 orchestrator/cli/generator/templates/lazy_workflow_instance.j2,sha256=BYB6LwE19OarY7_7Ovej5rqppZWtjiDkG7TDK5dYU7Y,523
 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=we2TqyHD5L8dprnOitmwBT8MU7PzVG8iMrzdxXquDfM,4751
+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/product.j2,sha256=gcN1poWRuGWbsLrQv0Z8SXO6MGuXBHBr33UvQtqsF8E,1241
 orchestrator/cli/generator/templates/product_block.j2,sha256=X5ynyBG39UiYekPHms7IkSHmxq2j-2OrhAYsFaRqktU,2454
@@ -232,6 +232,7 @@ orchestrator/migrations/versions/schema/2025-01-19_4fjdn13f83ga_add_validate_pro
 orchestrator/migrations/versions/schema/2025-02-12_bac6be6f2b4f_added_input_state_table.py,sha256=0vBDGltmOs_gcTTYlWBNOgItzqCXm8qqT02jZfTpL5c,1753
 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/schedules/__init__.py,sha256=JnnaglfK1qYUBKI6Dd9taV-tCZIPlAdAkHtnkJDMXxY,1066
 orchestrator/schedules/resume_workflows.py,sha256=kSotzTAXjX7p9fpSYiGOpuxuTQfv54eRFAe0YSG0DHc,832
 orchestrator/schedules/scheduling.py,sha256=ehtwgpbvMOk1jhn-hHgVzg_9wLJkI6l3mRY3DcO9ZVY,1526
@@ -298,7 +299,7 @@ orchestrator/workflows/tasks/resume_workflows.py,sha256=MzJqlSXUvKStkT7NGzxZyRlf
 orchestrator/workflows/tasks/validate_product_type.py,sha256=UVX_6Kh8ueQs8ujLawnKVDdNc8UhWp_u69aNA8okR_w,3184
 orchestrator/workflows/tasks/validate_products.py,sha256=i6jQME9N8sZZWo4pkNOS1Zgwh3eB2w66DnJi9k93yNk,8521
 orchestrator/workflows/translations/en-GB.json,sha256=ST53HxkphFLTMjFHonykDBOZ7-P_KxksktZU3GbxLt0,846
-orchestrator_core-3.2.0rc1.dist-info/licenses/LICENSE,sha256=b-aA5OZQuuBATmLKo_mln8CQrDPPhg3ghLzjPjLn4Tg,11409
-orchestrator_core-3.2.0rc1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-orchestrator_core-3.2.0rc1.dist-info/METADATA,sha256=FwPfK9U6vXuYqVzjbf7ObcO3HtBfCktD58FXTvM0gJw,4994
-orchestrator_core-3.2.0rc1.dist-info/RECORD,,
+orchestrator_core-3.2.1.dist-info/licenses/LICENSE,sha256=b-aA5OZQuuBATmLKo_mln8CQrDPPhg3ghLzjPjLn4Tg,11409
+orchestrator_core-3.2.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+orchestrator_core-3.2.1.dist-info/METADATA,sha256=SA6f9kL3n50wDwmn93yGZmHg6KGdkVpPKLKSh0j1mJ8,5029
+orchestrator_core-3.2.1.dist-info/RECORD,,