orchestrator-core 2.10.0rc2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

orchestrator/__init__.py

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

orchestrator/api/api_v1/endpoints/processes.py

@@ -61,7 +61,6 @@ from orchestrator.services.processes import (
 )
 from orchestrator.services.settings import get_engine_settings
 from orchestrator.settings import app_settings
-from orchestrator.types import JSON, State
 from orchestrator.utils.enrich_process import enrich_process
 from orchestrator.websocket import (
     WS_CHANNELS,
@@ -70,6 +69,7 @@ from orchestrator.websocket import (
     websocket_manager,
 )
 from orchestrator.workflow import ProcessStatus
+from pydantic_forms.types import JSON, State
 
 router = APIRouter()
 

orchestrator/cli/generator/templates/create_product.j2

@@ -7,11 +7,12 @@ from typing import Annotated
 
 import structlog
 from pydantic import AfterValidator, ConfigDict, model_validator
+from pydantic_forms.types import FormGenerator, State, UUIDstr
 
 from orchestrator.forms import FormPage
 from orchestrator.forms.validators import Divider, Label, CustomerId, MigrationSummary
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State, SubscriptionLifecycle, UUIDstr
+from orchestrator.types import SubscriptionLifecycle
 from orchestrator.workflow import StepList, begin, step
 from orchestrator.workflows.steps import store_process_subscription
 from orchestrator.workflows.utils import create_workflow

orchestrator/cli/generator/templates/modify_product.j2

@@ -6,11 +6,12 @@ from typing import Annotated
 
 import structlog
 from pydantic import AfterValidator, ConfigDict, model_validator
+from pydantic_forms.types import FormGenerator, State, UUIDstr
 from pydantic_forms.validators import ReadOnlyField
 
 from orchestrator.forms import FormPage
 from orchestrator.forms.validators import CustomerId, Divider
-from orchestrator.types import FormGenerator, State, SubscriptionLifecycle, UUIDstr
+from orchestrator.types import SubscriptionLifecycle
 from orchestrator.workflow import StepList, begin, step
 from orchestrator.workflows.steps import set_status
 from orchestrator.workflows.utils import modify_workflow

orchestrator/cli/generator/templates/shared_workflows.j2

@@ -1,4 +1,5 @@
-from typing import Generator, List, TypeAlias, cast
+from collections.abc import Generator
+from typing import List, TypeAlias, cast
 
 from pydantic import ConfigDict
 

orchestrator/cli/generator/templates/terminate_product.j2

@@ -2,10 +2,10 @@
 
 import structlog
 from pydantic import AfterValidator, ConfigDict, model_validator
+from pydantic_forms.types import InputForm, State, UUIDstr
 
 from orchestrator.forms import FormPage
 from orchestrator.forms.validators import DisplaySubscription
-from orchestrator.types import InputForm, State, UUIDstr
 from orchestrator.workflow import StepList, begin, step
 from orchestrator.workflows.utils import terminate_workflow
 

orchestrator/cli/generator/templates/test_create_workflow.j2

@@ -4,7 +4,6 @@ from orchestrator.db import ProductTable
 from orchestrator.forms import FormValidationError
 
 from test.unit_tests.workflows import assert_complete, extract_state, run_workflow
-
 from {{ product_types_module }}.{{ product.variable }} import {{ product.type }}
 
 

orchestrator/cli/generator/templates/test_modify_workflow.j2

@@ -1,9 +1,8 @@
 import pytest
 from orchestrator.forms import FormValidationError
-
 from orchestrator.types import SubscriptionLifecycle
-from test.unit_tests.workflows import assert_complete, extract_state, run_workflow
 
+from test.unit_tests.workflows import assert_complete, extract_state, run_workflow
 from {{ product_types_module }}.{{ product.variable }} import {{ product.type }}
 
 

orchestrator/cli/generator/templates/test_terminate_workflow.j2

@@ -4,8 +4,8 @@ import pytest
 from orchestrator.forms import FormValidationError
 {% endif %}
 from orchestrator.types import SubscriptionLifecycle
-from test.unit_tests.workflows import assert_complete, extract_state, run_workflow
 
+from test.unit_tests.workflows import assert_complete, extract_state, run_workflow
 from {{ product_types_module }}.{{ product.variable }} import {{ product.type }}
 
 

orchestrator/cli/generator/templates/validate_product.j2

@@ -3,9 +3,11 @@
 import structlog
 {% if product.nso_service_id_path %}
 from deepdiff import DeepDiff
+{% endif %}
+from pydantic_forms.types import State
+{% if product.nso_service_id_path %}
 from surf.products.services.nso.nso import build_payload
 {% endif %}
-from orchestrator.types import State
 from orchestrator.workflow import StepList, begin, step
 from orchestrator.workflows.utils import validate_workflow
 

orchestrator/cli/helpers/print_helpers.py

@@ -1,7 +1,7 @@
 from collections.abc import Callable, Iterable
 from typing import Any
 
-from orchestrator.types import strEnum
+from pydantic_forms.types import strEnum
 
 
 def _esc_str(i: int) -> str:

orchestrator/config/assignee.py

@@ -13,7 +13,7 @@
 
 import strawberry
 
-from orchestrator.types import strEnum
+from pydantic_forms.types import strEnum
 
 
 @strawberry.enum

orchestrator/devtools/populator.py

@@ -26,8 +26,8 @@ import structlog
 from more_itertools import first, first_true
 
 from nwastdlib.url import URL
-from orchestrator.types import State
 from pydantic_forms.types import InputForm as LegacyInputForm
+from pydantic_forms.types import State
 
 
 class JSONSubSchema(TypedDict, total=False):

orchestrator/devtools/scripts/migrate_20.py

@@ -6,61 +6,17 @@ Refer to the 2.0 migration guide documentation for background.
 import re
 import sys
 from pathlib import Path
-from subprocess import run
 from typing import Iterable
 
-
-def remove_imports(text: str, module: str, symbol: str) -> tuple[str, bool]:
-    """Find imports and remove them.
-
-    Assumes code is formatted through Black to keep the regex somewhat readable.
-    """
-    text_orig = text
-
-    # single import from module (may have a #comment) -> remove line
-    rgx = r"(from %s import \b%s\b(\s*#[^\n]*)*\n)" % (re.escape(module), symbol)
-    text = re.sub(rgx, "", text)
-
-    # middle or last of multiple imports from module -> strip symbol
-    rgx = r"(from %s import .+)(, \b%s\b)" % (re.escape(module), symbol)
-    text = re.sub(rgx, r"\1", text)
-
-    # first of multiple imports from same module -> strip symbol
-    rgx = r"(from %s import )\b%s\b, " % (re.escape(module), symbol)
-    text = re.sub(rgx, r"\1", text)
-
-    # multiline import -> remove line with symbol
-    rgx_verbose = r"""(?P<before>^from\s%s\simport\s*\([^\n]*\n(?:^[^\n]+,\n)*)
-                      (^\s*\b%s\b,[^\n]*\n)
-                      (?P<after>(?:^[^\n]+,\n)*\)[^\n]*$)"""
-    text = re.sub(rgx_verbose % (re.escape(module), symbol), r"\g<before>\g<after>", text, flags=re.M | re.X)
-    return text, text_orig != text
-
-
-def insert_import(text: str, import_stmt: str) -> str:
-    # Find the first import line and add our line above that
-    # Rely on ruff & black for formatting
-    return re.sub(r"(^(?:from .+|import .+)$)", f"{import_stmt}\n" + r"\1", text, count=1, flags=re.M)
-
-
-def find_and_remove_aliases(text: str, symbol: str) -> tuple[str, list[str]]:
-    """In the given text find aliases of the given symbol and remove them.
-
-    Return updated text and aliases removed.
-    """
-    rgx = r"(\b%s as (\w+))" % (symbol,)
-    aliases = [aliasgroup for fullgroup, aliasgroup in re.findall(rgx, text)]
-    newtext = re.sub(rgx, symbol, text)
-    return newtext, aliases
-
-
-def replace_words(text: str, words: list[str], replace: str) -> str:
-    rgx = r"\b(%s)\b" % ("|".join(words),)
-    return re.sub(rgx, replace, text)
-
-
-def has_word(text: str, word: str) -> bool:
-    return bool(re.search(r"\b%s\b" % (word,), text))
+from orchestrator.devtools.scripts.shared import (
+    find_and_remove_aliases,
+    has_word,
+    insert_import,
+    migrate,
+    move_import,
+    remove_imports,
+    replace_words,
+)
 
 
 def rewrite_subscription_instance_lists(f: Path) -> list[str]:
@@ -124,17 +80,6 @@ def rewrite_subscription_instance_lists(f: Path) -> list[str]:
     return names
 
 
-def move_import(f: Path, symbol: str, old_module: str, new_module: str) -> bool:
-    text = f.read_text()
-    text, changed = remove_imports(text, old_module, symbol)
-    if not changed:
-        return False
-    text = insert_import(text, f"from {new_module} import {symbol}")
-    with f.open(mode="w"):
-        f.write_text(text)
-    return True
-
-
 re_serializable_property = re.compile(r"^(\s+)(@serializable_property)([^\n]*)\n", flags=re.MULTILINE)
 
 
@@ -167,7 +112,7 @@ def replace_serializable_props(f: Path) -> bool:
     return True
 
 
-def migrate_file(f: Path) -> int:
+def migrate_file(f: Path) -> bool:
     imports = {
         "SI": move_import(f, "SI", "orchestrator.domain.base", "orchestrator.types"),
         "VlanRanges": move_import(f, "VlanRanges", "orchestrator.utils.vlans", "nwastdlib.vlans"),
@@ -189,46 +134,6 @@ def migrate_file(f: Path) -> int:
     return bool(lines)
 
 
-def run_tool(*args: str) -> bool:
-    cmd = " ".join(args)
-    try:
-        r = run(args, capture_output=True)  # noqa: S603
-        if r.returncode == 0:
-            return True
-        print(f"{cmd} failed:", r.stdout, r.stderr)
-    except FileNotFoundError:
-        print(f"{cmd }failed: could not find executable in the current venv")
-    return False
-
-
-def migrate(target_dir: Path) -> bool:
-    abs_path = str(target_dir.resolve())
-
-    def run_tools() -> bool:
-        return run_tool("ruff", "--fix", abs_path) and run_tool("black", "--quiet", abs_path)
-
-    print(f"\n### Verifing files in {abs_path}... ", end="")
-    if not run_tools():
-        print("Failed to verify files, aborting migration. Please resolve the errors.")
-        return False
-    print("Ok")
-
-    files_migrated = files_checked = 0
-    print(f"\n### Migrating files in {abs_path}")
-    try:
-        for f in target_dir.glob("**/*.py"):
-            if migrate_file(f):
-                files_migrated += 1
-            files_checked += 1
-    except KeyboardInterrupt:
-        print("Interrupted...")
-
-    print(f"\n### Migrated {files_migrated}/{files_checked} files in {abs_path}")
-
-    print(f"\n### Formatting files in {abs_path}")
-    return run_tools()
-
-
 if __name__ == "__main__":
     try:
         _target_dir = Path(sys.argv[1])
@@ -237,4 +142,4 @@ if __name__ == "__main__":
         print("Need a directory as parameter")
         sys.exit(1)
 
-    sys.exit(0 if migrate(_target_dir) else 1)
+    sys.exit(0 if migrate(_target_dir, migrate_file) else 1)

orchestrator/devtools/scripts/migrate_30.py

@@ -0,0 +1,61 @@
+"""Helper script to rewrite import statements in your orchestrator.
+
+Since types have been externalised in `pydantic_forms`, they were re-imported in `orchestrator.types` for backwards
+compatibility. These import statements have been removed, and therefore need to be updated in orchestrator
+implementations.
+"""
+
+import sys
+from pathlib import Path
+
+from orchestrator.devtools.scripts.shared import migrate, move_import
+
+
+def migrate_file(f: Path) -> bool:
+    imports = {
+        "JSON": move_import(f, "JSON", "orchestrator.types", "pydantic_forms.types"),
+        "AcceptData": move_import(f, "AcceptData", "orchestrator.types", "pydantic_forms.types"),
+        "AcceptItemType": move_import(f, "AcceptItemType", "orchestrator.types", "pydantic_forms.types"),
+        "FormGenerator": move_import(f, "FormGenerator", "orchestrator.types", "pydantic_forms.types"),
+        "FormGeneratorAsync": move_import(f, "FormGeneratorAsync", "orchestrator.types", "pydantic_forms.types"),
+        "InputForm": move_import(f, "InputForm", "orchestrator.types", "pydantic_forms.types"),
+        "InputFormGenerator": move_import(f, "InputFormGenerator", "orchestrator.types", "pydantic_forms.types"),
+        "InputStepFunc": move_import(f, "InputStepFunc", "orchestrator.types", "pydantic_forms.types"),
+        "SimpleInputFormGenerator": move_import(
+            f, "SimpleInputFormGenerator", "orchestrator.types", "pydantic_forms.types"
+        ),
+        "State": move_import(f, "State", "orchestrator.types", "pydantic_forms.types"),
+        "StateInputFormGenerator": move_import(
+            f, "StateInputFormGenerator", "orchestrator.types", "pydantic_forms.types"
+        ),
+        "StateInputFormGeneratorAsync": move_import(
+            f, "StateInputFormGeneratorAsync", "orchestrator.types", "pydantic_forms.types"
+        ),
+        "StateInputStepFunc": move_import(f, "StateInputStepFunc", "orchestrator.types", "pydantic_forms.types"),
+        "StateSimpleInputFormGenerator": move_import(
+            f, "StateSimpleInputFormGenerator", "orchestrator.types", "pydantic_forms.types"
+        ),
+        "SubscriptionMapping": move_import(f, "SubscriptionMapping", "orchestrator.types", "pydantic_forms.types"),
+        "SummaryData": move_import(f, "SummaryData", "orchestrator.types", "pydantic_forms.types"),
+        "UUIDstr": move_import(f, "UUIDstr", "orchestrator.types", "pydantic_forms.types"),
+        "strEnum": move_import(f, "strEnum", "orchestrator.types", "pydantic_forms.types"),
+    }
+    lines = []
+    lines.extend([f"Moved {k} import" for k, v in imports.items() if v])
+
+    if lines:
+        formatted_lines = "\n".join(f" - {line}" for line in lines)
+        print(f"Updated {f.name:50s}\n{formatted_lines}")
+
+    return bool(lines)
+
+
+if __name__ == "__main__":
+    try:
+        _target_dir = Path(sys.argv[1])
+        assert _target_dir.is_dir()
+    except Exception:
+        print("Need a directory as parameter")
+        sys.exit(1)
+
+    sys.exit(0 if migrate(_target_dir, migrate_file) else 1)

orchestrator/devtools/scripts/shared.py

@@ -0,0 +1,108 @@
+import re
+from pathlib import Path
+from subprocess import run
+from typing import Callable
+
+
+def remove_imports(text: str, module: str, symbol: str) -> tuple[str, bool]:
+    """Find imports and remove them.
+
+    Assumes code is formatted through Black to keep the regex somewhat readable.
+    """
+    text_orig = text
+
+    # single import from module (may have a #comment) -> remove line
+    rgx = r"(from %s import \b%s\b(\s*#[^\n]*)*\n)" % (re.escape(module), symbol)
+    text = re.sub(rgx, "", text)
+
+    # middle or last of multiple imports from module -> strip symbol
+    rgx = r"(from %s import .+)(, \b%s\b)" % (re.escape(module), symbol)
+    text = re.sub(rgx, r"\1", text)
+
+    # first of multiple imports from same module -> strip symbol
+    rgx = r"(from %s import )\b%s\b, " % (re.escape(module), symbol)
+    text = re.sub(rgx, r"\1", text)
+
+    # multiline import -> remove line with symbol
+    rgx_verbose = r"""(?P<before>^from\s%s\simport\s*\([^\n]*\n(?:^[^\n]+,\n)*)
+                      (^\s*\b%s\b,[^\n]*\n)
+                      (?P<after>(?:^[^\n]+,\n)*\)[^\n]*$)"""
+    text = re.sub(rgx_verbose % (re.escape(module), symbol), r"\g<before>\g<after>", text, flags=re.M | re.X)
+    return text, text_orig != text
+
+
+def insert_import(text: str, import_stmt: str) -> str:
+    # Find the first import line and add our line above that
+    # Rely on ruff & black for formatting
+    return re.sub(r"(^(?:from .+|import .+)$)", f"{import_stmt}\n" + r"\1", text, count=1, flags=re.M)
+
+
+def move_import(f: Path, symbol: str, old_module: str, new_module: str) -> bool:
+    text = f.read_text()
+    text, changed = remove_imports(text, old_module, symbol)
+    if not changed:
+        return False
+    text = insert_import(text, f"from {new_module} import {symbol}")
+    with f.open(mode="w"):
+        f.write_text(text)
+    return True
+
+
+def find_and_remove_aliases(text: str, symbol: str) -> tuple[str, list[str]]:
+    """In the given text find aliases of the given symbol and remove them.
+
+    Return updated text and aliases removed.
+    """
+    rgx = r"(\b%s as (\w+))" % (symbol,)
+    aliases = [aliasgroup for fullgroup, aliasgroup in re.findall(rgx, text)]
+    newtext = re.sub(rgx, symbol, text)
+    return newtext, aliases
+
+
+def replace_words(text: str, words: list[str], replace: str) -> str:
+    rgx = r"\b(%s)\b" % ("|".join(words),)
+    return re.sub(rgx, replace, text)
+
+
+def has_word(text: str, word: str) -> bool:
+    return bool(re.search(r"\b%s\b" % (word,), text))
+
+
+def run_tool(*args: str) -> bool:
+    cmd = " ".join(args)
+    try:
+        r = run(args, capture_output=True)  # noqa: S603
+        if r.returncode == 0:
+            return True
+        print(f"{cmd} failed:", r.stdout, r.stderr)
+    except FileNotFoundError:
+        print(f"{cmd} failed: could not find executable in the current venv")
+    return False
+
+
+def migrate(target_dir: Path, migrate_file: Callable[[Path], bool]) -> bool:
+    abs_path = str(target_dir.resolve())
+
+    def run_tools() -> bool:
+        return run_tool("ruff", "check", "--fix", abs_path) and run_tool("black", "--quiet", abs_path)
+
+    print(f"\n### Verifying files in {abs_path}... ", end="")
+    if not run_tools():
+        print("Failed to verify files, aborting migration. Please resolve errors.")
+        return False
+    print("Ok")
+
+    files_migrated = files_checked = 0
+    print(f"\n### Migrating files in {abs_path}")
+    try:
+        for f in target_dir.glob("**/*.py"):
+            if migrate_file(f):
+                files_migrated += 1
+            files_checked += 1
+    except KeyboardInterrupt:
+        print("Interrupted...")
+
+    print(f"\n### Migrated {files_migrated}/{files_checked} files in {abs_path}")
+
+    print(f"\n### Formatting files in {abs_path}")
+    return run_tools()

orchestrator/domain/base.py

@@ -55,9 +55,7 @@ from orchestrator.domain.lifecycle import (
 from orchestrator.services.products import get_product_by_id
 from orchestrator.types import (
     SAFE_USED_BY_TRANSITIONS_FOR_STATUS,
-    State,
     SubscriptionLifecycle,
-    UUIDstr,
     filter_nonetype,
     get_origin_and_args,
     get_possible_product_block_types,
@@ -69,6 +67,7 @@ from orchestrator.types import (
 )
 from orchestrator.utils.datetime import nowtz
 from orchestrator.utils.docs import make_product_block_docstring, make_subscription_model_docstring
+from pydantic_forms.types import State, UUIDstr
 
 logger = structlog.get_logger(__name__)
 

orchestrator/domain/lifecycle.py

@@ -16,7 +16,8 @@ from typing import TYPE_CHECKING, TypeVar
 import strawberry
 import structlog
 
-from orchestrator.types import SubscriptionLifecycle, strEnum
+from orchestrator.types import SubscriptionLifecycle
+from pydantic_forms.types import strEnum
 
 if TYPE_CHECKING:
     from orchestrator.domain.base import DomainModel

orchestrator/migrations/helpers.py

@@ -19,7 +19,7 @@ import sqlalchemy as sa
 import structlog
 
 from orchestrator.settings import app_settings
-from orchestrator.types import UUIDstr
+from pydantic_forms.types import UUIDstr
 
 logger = structlog.get_logger(__name__)
 

orchestrator/schemas/engine_settings.py

@@ -16,7 +16,7 @@ import strawberry
 from pydantic import ConfigDict
 
 from orchestrator.schemas.base import OrchestratorBaseModel
-from orchestrator.types import strEnum
+from pydantic_forms.types import strEnum
 
 
 @strawberry.enum

orchestrator/schemas/subscription.py

@@ -22,7 +22,8 @@ from orchestrator.schemas.product import ProductBaseSchema
 from orchestrator.schemas.product_block import ProductBlockSchema
 from orchestrator.schemas.resource_type import ResourceTypeSchema
 from orchestrator.schemas.subscription_descriptions import SubscriptionDescriptionSchema
-from orchestrator.types import SubscriptionLifecycle, strEnum
+from orchestrator.types import SubscriptionLifecycle
+from pydantic_forms.types import strEnum
 
 
 class PortMode(strEnum):

orchestrator/services/celery.py

@@ -24,8 +24,8 @@ from orchestrator.api.error_handling import raise_status
 from orchestrator.db import ProcessTable, db
 from orchestrator.services.processes import create_process, delete_process
 from orchestrator.targets import Target
-from orchestrator.types import State
 from orchestrator.workflows import get_workflow
+from pydantic_forms.types import State
 
 SYSTEM_USER = "SYSTEM"
 

orchestrator/services/processes.py

@@ -39,7 +39,7 @@ 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, State
+from orchestrator.types import BroadcastFunc
 from orchestrator.utils.datetime import nowtz
 from orchestrator.utils.errors import error_state_to_dict
 from orchestrator.websocket import broadcast_invalidate_status_counts
@@ -60,6 +60,7 @@ from orchestrator.workflows import get_workflow
 from orchestrator.workflows.removed_workflow import removed_workflow
 from pydantic_forms.core import post_form
 from pydantic_forms.exceptions import FormValidationError
+from pydantic_forms.types import State
 
 logger = structlog.get_logger(__name__)
 

orchestrator/services/products.py

@@ -18,7 +18,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import joinedload
 
 from orchestrator.db import ProductTable, db
-from orchestrator.types import UUIDstr
+from pydantic_forms.types import UUIDstr
 
 
 def get_products(*, filters: list | None = None) -> list[ProductTable]:

orchestrator/services/subscriptions.py

@@ -43,9 +43,10 @@ from orchestrator.db.models import (
 )
 from orchestrator.domain.base import SubscriptionModel
 from orchestrator.targets import Target
-from orchestrator.types import SubscriptionLifecycle, UUIDstr
+from orchestrator.types import SubscriptionLifecycle
 from orchestrator.utils.datetime import nowtz
 from orchestrator.utils.helpers import is_ipaddress_type
+from pydantic_forms.types import UUIDstr
 
 logger = structlog.get_logger(__name__)
 

orchestrator/services/tasks.py

@@ -30,10 +30,11 @@ from orchestrator.services.processes import (
     safe_logstep,
     thread_resume_process,
 )
-from orchestrator.types import BroadcastFunc, State
+from orchestrator.types import BroadcastFunc
 from orchestrator.utils.json import json_dumps, json_loads
 from orchestrator.workflow import ProcessStat, ProcessStatus, Success, runwf
 from orchestrator.workflows import get_workflow
+from pydantic_forms.types import State
 
 logger = get_task_logger(__name__)
 

orchestrator/settings.py

@@ -20,7 +20,7 @@ from pydantic import PostgresDsn, RedisDsn
 from pydantic_settings import BaseSettings
 
 from oauth2_lib.settings import oauth2lib_settings
-from orchestrator.types import strEnum
+from pydantic_forms.types import strEnum
 
 
 class ExecutorType(strEnum):

orchestrator/targets.py

@@ -13,7 +13,7 @@
 
 import strawberry
 
-from orchestrator.types import strEnum
+from pydantic_forms.types import strEnum
 
 
 @strawberry.enum

orchestrator/types.py

@@ -34,59 +34,24 @@ from annotated_types import Len, MaxLen, MinLen
 from more_itertools import first, last
 from pydantic.fields import FieldInfo
 
-# TODO #428: eventually enforce code migration for downstream users to import
-# these types from pydantic_forms themselves
-from pydantic_forms.types import (
-    JSON,
-    AcceptData,
-    AcceptItemType,
-    FormGenerator,
-    FormGeneratorAsync,
-    InputForm,
-    InputFormGenerator,
-    InputStepFunc,
-    SimpleInputFormGenerator,
-    State,
-    StateInputFormGenerator,
-    StateInputFormGeneratorAsync,
-    StateInputStepFunc,
-    StateSimpleInputFormGenerator,
-    SubscriptionMapping,
-    SummaryData,
-    UUIDstr,
-    strEnum,
-)
+from pydantic_forms.types import InputForm, State, strEnum
 
 __all__ = [
-    "JSON",
+    "SAFE_USED_BY_TRANSITIONS_FOR_STATUS",
     "BroadcastFunc",
-    "AcceptData",
-    "AcceptItemType",
     "ErrorDict",
     "ErrorState",
-    "FormGenerator",
-    "FormGeneratorAsync",
-    "InputForm",
-    "InputFormGenerator",
-    "InputStepFunc",
-    "SimpleInputFormGenerator",
-    "State",
-    "StateInputFormGenerator",
-    "StateInputFormGeneratorAsync",
-    "StateInputStepFunc",
-    "StateSimpleInputFormGenerator",
     "StateStepFunc",
     "StepFunc",
     "SubscriptionLifecycle",
-    "SubscriptionMapping",
-    "SummaryData",
-    "UUIDstr",
+    "filter_nonetype",
+    "get_origin_and_args",
+    "get_possible_product_block_types",
     "is_list_type",
     "is_of_type",
     "is_optional_type",
     "is_union_type",
-    "get_possible_product_block_types",
-    "strEnum",
+    "list_factory",
 ]
 
 if TYPE_CHECKING:
@@ -97,8 +62,8 @@ def is_union(tp: type[Any] | None) -> bool:
     return tp is Union or tp is types.UnionType  # type: ignore[comparison-overlap]
 
 
-# ErrorState is either a string containing an error message, a catched Exception or a tuple containing a message and
-# a HTTP status code
+# ErrorState is either a string containing an error message, a caught Exception, or a tuple containing a message and
+# an HTTP status code
 ErrorState = Union[str, Exception, tuple[str, Union[int, HTTPStatus]]]
 # An ErrorDict should have the following keys:
 # error: str  # A message describing the error

orchestrator/utils/errors.py

@@ -18,7 +18,8 @@ from typing import Any, cast
 import structlog
 
 from nwastdlib.ex import show_ex
-from orchestrator.types import JSON, ErrorDict
+from orchestrator.types import ErrorDict
+from pydantic_forms.types import JSON
 
 logger = structlog.get_logger(__name__)
 

orchestrator/utils/state.py

@@ -19,7 +19,7 @@ from typing import Any, cast, get_args
 from uuid import UUID
 
 from orchestrator.domain.base import SubscriptionModel
-from orchestrator.types import State, StepFunc, is_list_type, is_optional_type
+from orchestrator.types import StepFunc, is_list_type, is_optional_type
 from orchestrator.utils.functional import logger
 from pydantic_forms.types import (
     FormGenerator,
@@ -27,6 +27,7 @@ from pydantic_forms.types import (
     InputFormGenerator,
     InputStepFunc,
     SimpleInputFormGenerator,
+    State,
     StateInputStepFunc,
 )
 

orchestrator/workflow.py

@@ -43,7 +43,7 @@ from orchestrator.config.assignee import Assignee
 from orchestrator.db import db, transactional
 from orchestrator.services.settings import get_engine_settings
 from orchestrator.targets import Target
-from orchestrator.types import ErrorDict, State, StepFunc, strEnum
+from orchestrator.types import ErrorDict, StepFunc
 from orchestrator.utils.docs import make_workflow_doc
 from orchestrator.utils.errors import error_state_to_dict
 from orchestrator.utils.state import form_inject_args, inject_args
@@ -52,9 +52,11 @@ from pydantic_forms.types import (
     FormGenerator,
     InputFormGenerator,
     InputStepFunc,
+    State,
     StateInputFormGenerator,
     StateInputStepFunc,
     StateSimpleInputFormGenerator,
+    strEnum,
 )
 
 logger = structlog.get_logger(__name__)

orchestrator/workflows/modify_note.py

@@ -15,12 +15,11 @@ from orchestrator.forms import SubmitFormPage
 from orchestrator.services import subscriptions
 from orchestrator.settings import app_settings
 from orchestrator.targets import Target
-from orchestrator.types import UUIDstr
 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.workflows.utils import wrap_modify_initial_input_form
-from pydantic_forms.types import FormGenerator, State
+from pydantic_forms.types import FormGenerator, State, UUIDstr
 from pydantic_forms.validators import LongText
 
 

orchestrator/workflows/steps.py

@@ -23,11 +23,12 @@ from orchestrator.domain.base import ProductBlockModel, SubscriptionModel
 from orchestrator.services.settings import reset_search_index
 from orchestrator.services.subscriptions import build_extended_domain_model, get_subscription
 from orchestrator.targets import Target
-from orchestrator.types import State, SubscriptionLifecycle, UUIDstr
+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
 
 logger = structlog.get_logger(__name__)
 

orchestrator/workflows/tasks/cleanup_tasks_log.py

@@ -19,9 +19,9 @@ from sqlalchemy import select
 from orchestrator.db import ProcessTable, db
 from orchestrator.settings import app_settings
 from orchestrator.targets import Target
-from orchestrator.types import State
 from orchestrator.utils.datetime import nowtz
 from orchestrator.workflow import ProcessStatus, StepList, done, init, step, workflow
+from pydantic_forms.types import State
 
 
 @step("Clean up completed tasks older than TASK_LOG_RETENTION_DAYS")

orchestrator/workflows/tasks/resume_workflows.py

@@ -18,8 +18,8 @@ from sqlalchemy import select
 from orchestrator.db import ProcessTable, db
 from orchestrator.services import processes
 from orchestrator.targets import Target
-from orchestrator.types import State, UUIDstr
 from orchestrator.workflow import ProcessStatus, StepList, done, init, step, workflow
+from pydantic_forms.types import State, UUIDstr
 
 logger = structlog.get_logger(__name__)
 

orchestrator/workflows/tasks/validate_product_type.py

@@ -26,8 +26,8 @@ from orchestrator.services.workflows import (
     start_validation_workflow_for_workflows,
 )
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State
 from orchestrator.workflow import StepList, done, init, step, workflow
+from pydantic_forms.types import FormGenerator, State
 
 logger = structlog.get_logger(__name__)
 

orchestrator/workflows/tasks/validate_products.py

@@ -27,10 +27,10 @@ from orchestrator.services.products import get_products
 from orchestrator.services.translations import generate_translations
 from orchestrator.services.workflows import get_workflow_by_name, get_workflows
 from orchestrator.targets import Target
-from orchestrator.types import State
 from orchestrator.utils.errors import ProcessFailureError
 from orchestrator.utils.fixed_inputs import fixed_input_configuration as fi_configuration
 from orchestrator.workflow import StepList, done, init, step, workflow
+from pydantic_forms.types import State
 
 # Since these errors are probably programming failures we should not throw AssertionErrors
 

orchestrator/workflows/utils.py

@@ -25,7 +25,7 @@ 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 State, SubscriptionLifecycle
+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
@@ -41,7 +41,7 @@ from orchestrator.workflows.steps import (
     unsync_unchecked,
 )
 from pydantic_forms.core import FormPage
-from pydantic_forms.types import FormGenerator, InputForm, InputStepFunc, StateInputStepFunc
+from pydantic_forms.types import FormGenerator, InputForm, InputStepFunc, State, StateInputStepFunc
 
 
 def _generate_new_subscription_form(_workflow_target: str, workflow_name: str) -> InputForm:

{orchestrator_core-2.10.0rc2.dist-info → orchestrator_core-3.0.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: orchestrator-core
-Version: 2.10.0rc2
+Version: 3.0.0rc1
 Summary: This is the orchestrator workflow engine.
 Requires-Python: >=3.11,<3.14
 Classifier: Intended Audience :: Information Technology

{orchestrator_core-2.10.0rc2.dist-info → orchestrator_core-3.0.0rc1.dist-info}/RECORD

@@ -1,14 +1,14 @@
-orchestrator/__init__.py,sha256=p507KZH6dyfb9vX3cZ80I0_bDmngfQ255K-SjZGbjiw,1059
+orchestrator/__init__.py,sha256=PnH1xL8hwv-BN9lOpIIDdCKTzsJ5VLGvZxYxQU39j_U,1058
 orchestrator/app.py,sha256=8GMzoHjdR0bkgRBCejiG8nIUjeo43f12I3WNNZ89pKE,11659
 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=_W_wFkjmlwVwwHRsql69iMoqRvDCiaA63i5rvRHSrZ0,2414
-orchestrator/settings.py,sha256=SFF-jjkVkq_UILzuZbvhBUN3408PeG0y9AFZiCipBVs,3617
-orchestrator/targets.py,sha256=QphHzEUTRhue3pKTPYklxDdvCQF1ANxt0r_HjbaxVCc,766
-orchestrator/types.py,sha256=cXUWV9EtoO4Dx3h3YJHaGVxmw-5XLt6Mow-dALdhTWk,16230
+orchestrator/settings.py,sha256=9T0faNp2TQTLlI22RCj22EZzj8IFoqWvsapvOnUgbRA,3619
+orchestrator/targets.py,sha256=q_IMCdVUUYWcyKHqyls38fJPveJDBNfSzMKj_U2hLsk,768
+orchestrator/types.py,sha256=4vDeL5teRnugXoet3O2dMv8WwTsEyimrIfzagx9jQRo,15451
 orchestrator/version.py,sha256=b58e08lxs47wUNXv0jXFO_ykpksmytuzEXD4La4W-NQ,1366
-orchestrator/workflow.py,sha256=Qga7ttanKpiILq2az5BmXXZYIUAYMavAv231JLj4I10,43043
+orchestrator/workflow.py,sha256=sdHAuxOsMNzHf3xum-9Lm9FE0OfCm2VcauroOTYn1fw,43051
 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=Q_Yh9w_SBoyx06jV_kf6leGFrAMXoGjF8UikIAie_us,2858
 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=21BG32TslSgG2ePs68jUYAy8rDuohTXgzWETOpuNzyI,12761
+orchestrator/api/api_v1/endpoints/processes.py,sha256=VPNqzogjgK9Y-70b9r-tqPSJD-6PyMj9kOrmhPC__lc,12763
 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
@@ -77,30 +77,30 @@ orchestrator/cli/generator/templates/additional_modify_steps.j2,sha256=jwle7hIvd
 orchestrator/cli/generator/templates/additional_terminate_steps.j2,sha256=jwle7hIvd-EYbnecVFmG0n-6Jpr4DearM0era8AvGYM,25
 orchestrator/cli/generator/templates/constrained_int_definitions.j2,sha256=59FKIWOeXrO0nblLmbhaFXKb4UQesQ8zFUZ1jDCp9Vk,282
 orchestrator/cli/generator/templates/create_data_head.j2,sha256=ArP9TUsbobXF4CIpckcaIYos-dgGmPeL-n7SQATvSiE,361
-orchestrator/cli/generator/templates/create_product.j2,sha256=di6vqZXPjPp_KtJsIoseoCw5Oj8ayhcmuZpX_C7_LsA,4806
+orchestrator/cli/generator/templates/create_product.j2,sha256=ZPzY1clJ7in_UlBJf0TS94-KYuwN71kGjJn_6eM1Bo4,4838
 orchestrator/cli/generator/templates/enums.j2,sha256=pmx7_DeoE4X9u83_In18C97XqZP_YwETiw54_E33p1A,298
 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=9CeuNKzZkKyB4ntKudLs915BsGfxhUa1dfK3SABAhww,4719
+orchestrator/cli/generator/templates/modify_product.j2,sha256=we2TqyHD5L8dprnOitmwBT8MU7PzVG8iMrzdxXquDfM,4751
 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
 orchestrator/cli/generator/templates/shared_forms.j2,sha256=tXbauuMMExwHLYLJVkmAJ74SSFriXlwpOyd04jwWE0k,545
-orchestrator/cli/generator/templates/shared_workflows.j2,sha256=esrqnsGH1HcVTUN7yHtR-Bfj01ODbK_bQ9fRf6y2iGk,1274
+orchestrator/cli/generator/templates/shared_workflows.j2,sha256=Y2bu1wP4fmoBXwzBecXqz2O-_9ckTGrGTKRfXux-2H0,1301
 orchestrator/cli/generator/templates/subscription_model_registry.j2,sha256=7IJF9jX6tJMAuCOYQnfTjsgK0eaF0bFzUuLJImsdl4s,291
-orchestrator/cli/generator/templates/terminate_product.j2,sha256=XJO49KkKnexAGkXAvow2O65F5Atd5LNVPQIs1Qk8slM,1883
-orchestrator/cli/generator/templates/test_create_workflow.j2,sha256=SO9ja_23wgnMYcI4VFE-eHLR4ZeqEROhGmENxgwWc1M,1802
-orchestrator/cli/generator/templates/test_modify_workflow.j2,sha256=sh2JBEhWcEPwxnyD1AieyEAGrfwygP5mA1qjuozv3M4,1677
+orchestrator/cli/generator/templates/terminate_product.j2,sha256=sPqZlMA-Cj-P6RumCMAKwGtvLljlaZfQ1z-Vx3z6eU8,1885
+orchestrator/cli/generator/templates/test_create_workflow.j2,sha256=CnVRdfua1EqXvZx-UY0tq1b3Vmgtq3muQ3nuzHevnT0,1801
+orchestrator/cli/generator/templates/test_modify_workflow.j2,sha256=N91sRRIWQhVB2jcyBAXungoWNb9b1wbSNfsTGq1NwXo,1676
 orchestrator/cli/generator/templates/test_product_type.j2,sha256=1fRF3HbhQk3BIo58KVsbnchwdQFKM8As7atm9ULjf8s,1860
-orchestrator/cli/generator/templates/test_terminate_workflow.j2,sha256=ltjcGw-RWUI9h_3tLD_TWqG8sQkhVry7poNZFFrxCaU,1518
+orchestrator/cli/generator/templates/test_terminate_workflow.j2,sha256=Dwgjf_81drED3z3hNdS3F4Gtsg9VJGStj3VSvD2YuwA,1518
 orchestrator/cli/generator/templates/test_validate_workflow.j2,sha256=T27fNTOqgbKosI_ZqE1Gdhd8gJCACEVjy2oNrSK6908,985
-orchestrator/cli/generator/templates/validate_product.j2,sha256=dPQ1a-WGaYUYI-ZjH3B6zrOj4Ufs804O25Pj5PNiNjc,2315
+orchestrator/cli/generator/templates/validate_product.j2,sha256=_gPNYS8dGOSpRm2E_nf6oxQS0AmXN7MkKm2Klz9HLek,2366
 orchestrator/cli/helpers/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
 orchestrator/cli/helpers/input_helpers.py,sha256=pv5GTMuIWLzBE_bKNhn1XD_gxoqB0s1ZN4cnKkIIu5I,1139
-orchestrator/cli/helpers/print_helpers.py,sha256=vxgBD48xnPRjSKrLfrez6s0BRETnCX8X31d9bSFu_DU,857
+orchestrator/cli/helpers/print_helpers.py,sha256=b3ePg6HfBLKPYBBVr5XOA__JnFEMI5HBjbjov3CP8Po,859
 orchestrator/config/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
-orchestrator/config/assignee.py,sha256=WgXmj_tmsxz5PrOkAYVwgJnxt_QuatwmCfknjEtGoAo,770
+orchestrator/config/assignee.py,sha256=jxMIY6iCLjlbfxwhp-UhImunpE32C9sAR7FSpMD-LvU,772
 orchestrator/db/__init__.py,sha256=6yC3HSSIgHgfLvGpYE-j8ENr8A2urJxjxUEiZ0C7JJY,3454
 orchestrator/db/database.py,sha256=MU_w_e95ho2dVb2JDnt_KFYholx___XDkiQXbc8wCkI,10269
 orchestrator/db/helpers.py,sha256=L8kEdnSSNGnUpZhdeGx2arCodakWN8vSpKdfjoLuHdY,831
@@ -128,19 +128,21 @@ orchestrator/db/sorting/sorting.py,sha256=WpwImCDRKiOp4Tr54vovWpHkoJIov8SNQNPods
 orchestrator/db/sorting/subscription.py,sha256=uepBMyfRFLZz5yoYK4VK3mdRBvO1Gc-6jSQXQ41fR-8,1441
 orchestrator/db/sorting/workflow.py,sha256=6-JceMyB99M994Re58E0MX5uhlpnTW5OJCxmXopEfRU,576
 orchestrator/devtools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-orchestrator/devtools/populator.py,sha256=gCw-U4gDAdCQ1P-YOG_NgDducql8he1Vdjw_P8L6okA,19678
+orchestrator/devtools/populator.py,sha256=MeO7qv7YskY5i5p1Ko9yluplY520GFq0HjFlz-WXMio,19680
 orchestrator/devtools/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-orchestrator/devtools/scripts/migrate_20.py,sha256=WiDyOjeYh7sPufrbrc33BBmJRYWwxPqJOqhHApjuBoI,8359
+orchestrator/devtools/scripts/migrate_20.py,sha256=8-qLiWfjYctu2kNl5MHtZvfeCdUs0YzRjepy4VYOUkc,4891
+orchestrator/devtools/scripts/migrate_30.py,sha256=pRnJQFvmliwTLgbbDSUGyS9sCWqQcTms-g_3yfUO5vQ,3030
+orchestrator/devtools/scripts/shared.py,sha256=ZnGb2nA62gjG0DSEpXcnVq1xIjdkadUXJIZsF5O3tEc,3775
 orchestrator/distlock/__init__.py,sha256=0uCW-4efWGbU4RXSb7t3U1yA2T8z77OGgb9SDNebdmA,2491
 orchestrator/distlock/distlock_manager.py,sha256=VVfBpOnk574JncfHwS6sPavKwPxCgAneDqZNT8fVWNw,2508
 orchestrator/distlock/managers/__init__.py,sha256=ImIkNsrXcyE7-NgRWqEhUXUuUzda9KwcDkhebipfSdI,571
 orchestrator/distlock/managers/memory_distlock_manager.py,sha256=HWQafcVKBF-Cka_wukZZ1GM69AWPVOpJPje3quIebQ8,3114
 orchestrator/distlock/managers/redis_distlock_manager.py,sha256=Lk0Krw7dQD58uleAz3Eancc4La-xSCFHxB8ymg3qWf0,3271
 orchestrator/domain/__init__.py,sha256=Rnt9XXHasAgieQiLT0JhUFRrysa9EIubvzcd5kk3Gvc,894
-orchestrator/domain/base.py,sha256=2yehcuXSkq3H2wl8y19qeY98BQX_aL2i5QxxAU896JI,61929
+orchestrator/domain/base.py,sha256=cMBJps91vtJJPXQUk0Ejps-K6DaEdkK6GTGdvtPpDnA,61953
 orchestrator/domain/customer_description.py,sha256=v7o6TTN4oc6bWHZU-jCT-fUYvkeYahbpXOwlKXofuI8,3360
 orchestrator/domain/helpers.py,sha256=2j2j_7J8qvniHxxpdoEQsoVpC-llkn0tbww2eCA0K1A,989
-orchestrator/domain/lifecycle.py,sha256=ROYJ5t6JFy5PwE9nmApS54NIEw0dwk-2iZC-OzW18-U,2882
+orchestrator/domain/lifecycle.py,sha256=VeQwik9nNX-6bQl12G9VP4JPq6ephDV73XDXu1pfh5g,2914
 orchestrator/forms/__init__.py,sha256=bw_1238HKy_T0gvfA5oEjJFwkALzvWU4O_VJ0xE8UyU,1168
 orchestrator/forms/validators/__init__.py,sha256=2T7w429dQhChsAbnQDeyp2BrM_iKj6-nkNrz27RZatY,1906
 orchestrator/forms/validators/customer_contact_list.py,sha256=61A7FpXBjWhurIAGzJcLVlZSWajm41QWgFZP-rUT_5o,1508
@@ -197,7 +199,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=AwlgBPYbV2hr5rHNwlOPJ5rs-vRyfmzcWyxae0btpZ4,3382
-orchestrator/migrations/helpers.py,sha256=5BVDKOFETKyW4kE0-DiTU068VFrRo52n3MKrvt5LfjU,43769
+orchestrator/migrations/helpers.py,sha256=iGDHvFR2cHIHyG0kTnXP0XrJCAKAeG57S79GEHbtd64,43771
 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
@@ -230,27 +232,27 @@ orchestrator/schedules/validate_products.py,sha256=YMr7ASSqdXM6pd6oZu0kr8mfmH8If
 orchestrator/schedules/validate_subscriptions.py,sha256=YYcU2iGf8Ga_s577kgpKdhQV4p7wCEHGYvUf8FCvBvQ,2022
 orchestrator/schemas/__init__.py,sha256=YDyZ0YBvzB4ML9oDBCBPGnBvf680zFFgUzg7X0tYBRY,2326
 orchestrator/schemas/base.py,sha256=Vc444LetsINLRhG2SxW9Bq01hOzChPOhQWCImQTr-As,930
-orchestrator/schemas/engine_settings.py,sha256=BOyFNOn7AqHVdUxXyqmPk5aVdFY5A0cCOZ4bAwxQsgo,1286
+orchestrator/schemas/engine_settings.py,sha256=8cgJHPigu2TjYG-t3uRrBLFjcVJGKVPpAnIKFs29mL4,1288
 orchestrator/schemas/fixed_input.py,sha256=Rth3hT5K7zYuQr1bUY_NJRzb03xEZuT1p6EvYXVNE54,1214
 orchestrator/schemas/problem_detail.py,sha256=DxiUhWv6EVXLZgdKFv0EYVnCgtkDj7xteDCR0q2f5yw,802
 orchestrator/schemas/process.py,sha256=NgS1eBRtO2GUCRNsvbvYyjNkR2aBdH-kwcsR_y8DfNU,2354
 orchestrator/schemas/product.py,sha256=MhMCh058ZuS2RJq-wSmxIPUNlhQexxXIx3DSz2OmOh4,1570
 orchestrator/schemas/product_block.py,sha256=kCqvm6qadHpegMr9aWI_fYX-T7mS-5S-ldPxnGQZg7M,1519
 orchestrator/schemas/resource_type.py,sha256=VDju4XywcDDLxdpbWU62RTvR9QF8x_GRrpTlN_NE8uI,1064
-orchestrator/schemas/subscription.py,sha256=zNy7bb-ww-MEN4QW9xIwxzcNSyFPEgjt5tt1T4Ah0hQ,3383
+orchestrator/schemas/subscription.py,sha256=1SKrhw25-HtTp39lM05R9gynr9GprMxQol4GjnXPEwM,3415
 orchestrator/schemas/subscription_descriptions.py,sha256=Ft_jw1U0bf9Z0U8O4OWfLlcl0mXCVT_qYVagBP3GbIQ,1262
 orchestrator/schemas/workflow.py,sha256=w-CaRPp9AAddhnd8o_0jPaey1Vnnh-s-A5s5kWlR2pI,1977
 orchestrator/services/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
-orchestrator/services/celery.py,sha256=uvXSKuq_XHcF4BgEpt2QgGUfUnpopApF74FsgAQdnFY,4634
+orchestrator/services/celery.py,sha256=aiWw7ps5a1f6dPTLzJG67JmwqpKSBhsD7ZiBKhbWDPk,4636
 orchestrator/services/fixed_inputs.py,sha256=kyz7s2HLzyDulvcq-ZqefTw1om86COvyvTjz0_5CmgI,876
 orchestrator/services/process_broadcast_thread.py,sha256=D44YbjF8mRqGuznkRUV4SoRn1J0lfy_x1H508GnSVlU,4649
-orchestrator/services/processes.py,sha256=zZ4CX-AaV1XG2LUvYhReTEw05NZe9cXdiqvRdM7YtjI,27459
-orchestrator/services/products.py,sha256=5lKxnfDw80YkF3jOvV1v8c8FtR6allVk3MwpRSDTfPY,1933
+orchestrator/services/processes.py,sha256=466d7WgRwh6qNxNjDZRMvL0QFiQYEU_WG3D2sI4REPQ,27491
+orchestrator/services/products.py,sha256=w6b6sSA3MstmbM_YN8xWEvkb_YnuCQFph48wYU3_Lx4,1935
 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=AEuh0p2pmVLDXWE-ylJMD32NQUuqw1_jbaPAYvx_wvA,26177
-orchestrator/services/tasks.py,sha256=f3045Hn9uWIXcRvIPN6qdznH_0u-rsIGM9hHalc_BvE,6286
+orchestrator/services/subscriptions.py,sha256=yEeZbgXqrfAgo-l0Tz_NtNJHG5-CkXa8-l76gZ_aw6A,26209
+orchestrator/services/tasks.py,sha256=n-J8At0R4ZuGs7MqGFGVxLs06EbPIlsM2DCyAbsZVKw,6318
 orchestrator/services/translations.py,sha256=GyP8soUFGej8AS8uulBsk10CCK6Kwfjv9AHMFm3ElQY,1713
 orchestrator/services/workflows.py,sha256=DStBiQQdPV3zEg1EgPDlk85T6kkBc9AKbiEpxrQG6dI,3170
 orchestrator/utils/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
@@ -259,7 +261,7 @@ orchestrator/utils/datetime.py,sha256=a1WQ_yvu7MA0TiaRpC5avwbOSFdrj4eMrV4a7I2sD5
 orchestrator/utils/deprecation_logger.py,sha256=oqju7ecJcB_r7cMnldaOAA79QUZYS_h69IkDrFV9nAg,875
 orchestrator/utils/docs.py,sha256=GbyD61oKn1yVYaphUKHCBvrWEWJDTQfRc_VEbVb-zgU,6172
 orchestrator/utils/enrich_process.py,sha256=o_QSy5Q4wn1SMHhzVOw6bp7uhDXr7GhAIWRDDMWUVO4,4699
-orchestrator/utils/errors.py,sha256=LCYn2OEBCxQBWCYIbJeO8vv6IjK1Dp4195TulD5nJzU,4613
+orchestrator/utils/errors.py,sha256=4dJ3BvAEunG5w-VUtc8346zzOTUv_102qeH2YFdJhPs,4645
 orchestrator/utils/fixed_inputs.py,sha256=pnL6I_19VMp_Bny8SYjSzVFNvTFDyeCxFFOWGhTnDiQ,2665
 orchestrator/utils/functional.py,sha256=w_iqB8zppLMnUaioyRjsZAAYC4y5kLw3zih5NKkEFoM,8063
 orchestrator/utils/get_subscription_dict.py,sha256=fkgDM54hn5YGUP9_2MOcJApJK1Z6c_Rl6sJERsrOy6M,686
@@ -268,7 +270,7 @@ orchestrator/utils/helpers.py,sha256=NjUF3IvWdnLulliP8-JQvGGGpHrh0vs0Vm092ynw-ss
 orchestrator/utils/json.py,sha256=7386sdqkrKYyy4sbn5NscwctH_v1hLyw5172P__rU3g,8341
 orchestrator/utils/redis.py,sha256=fvALD_Yt4lZuIfgCLGJwwQSElgKOLHrxH_RdhSXkeZw,7222
 orchestrator/utils/search_query.py,sha256=ji5LHtrzohGz6b1IG41cnPdpWXzLEzz4SGWgHly_yfU,16205
-orchestrator/utils/state.py,sha256=aNR7XftX9dX-2TKHFu2I2rIRIqFENB7AnlpH6Zs80QA,13181
+orchestrator/utils/state.py,sha256=DLHBnpEjhHQNeBGYV6H6geqZclToeMuWwqU26TVy220,13185
 orchestrator/utils/strings.py,sha256=N0gWjmQaMjE9_99VtRvRaU8IBLTKMgBKSXcTZ9TpWAg,1077
 orchestrator/utils/validate_data_version.py,sha256=3Eioy2wE2EWKSgkyMKcEKrkCAfUIAq-eb73iRcpgppw,184
 orchestrator/websocket/__init__.py,sha256=V79jskk1z3uPIYgu0Gt6JLzuqr7NGfNeAZ-hbBqoUv4,5745
@@ -276,17 +278,17 @@ orchestrator/websocket/websocket_manager.py,sha256=Vw5GW67rP_RYoPUhfPp9Fi8_M9E9S
 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=OkouKVZDinjWSN3J3_0gbvOMScvcKlWvPCkban45HxE,2438
+orchestrator/workflows/modify_note.py,sha256=FcyxUajzGeBX0O1XjXDgqNLpBHqU6Uk3iA1Vzq6gMHc,2408
 orchestrator/workflows/removed_workflow.py,sha256=V0Da5TEdfLdZZKD38ig-MTp3_IuE7VGqzHHzvPYQmLI,909
-orchestrator/workflows/steps.py,sha256=8dnB4HlqBWZ4JlP1eQVnHdinzoM0ZlgFL0KYn_3k8x4,9762
-orchestrator/workflows/utils.py,sha256=inWbR-44B0jj8YZMFBxndpcsfk5IC0MnlCnGB2dy5BU,13525
+orchestrator/workflows/steps.py,sha256=8va4iHbU35bUB-RVatI8dMs8LzB0Y29s9ZdmDFTv7VE,9794
+orchestrator/workflows/utils.py,sha256=9KfhnDL88csT4fvFfUVDv8o9mHBtNUQuG3LBDms8ApQ,13525
 orchestrator/workflows/tasks/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
-orchestrator/workflows/tasks/cleanup_tasks_log.py,sha256=JNx2lCIxdhTPD33EgwQUsQjoLeyKH2RKZR_e5eh80Ls,1614
-orchestrator/workflows/tasks/resume_workflows.py,sha256=wZGNHHQYL7wociSTmoNdDdh5CJkVOkvu3kCUg9uY_88,2349
-orchestrator/workflows/tasks/validate_product_type.py,sha256=kVuN94hGWcmBNphgpAlGTSiyO2dEhFwgIq87SYjArns,3174
-orchestrator/workflows/tasks/validate_products.py,sha256=j_aOyxcH8DymlGupSS6XRwQdWx2Ab-c8f8iUvAXBTes,8511
+orchestrator/workflows/tasks/cleanup_tasks_log.py,sha256=A3R_EQHJ75EYvzRK8ZdDcFNC9KjsSOQXLugmaNVOcWA,1616
+orchestrator/workflows/tasks/resume_workflows.py,sha256=R0I3jxGToiqDr5mF3YjDd6dNQjQrSYb7-X7GCn7E9uc,2351
+orchestrator/workflows/tasks/validate_product_type.py,sha256=5FwhRQyMNgtys5DM846EIIY0uXKvnSYy3Orf7lOg0DA,3176
+orchestrator/workflows/tasks/validate_products.py,sha256=5uXX7MXMDDP13cXRvfLDNvvCp4nG7zLQBm_IYdf8BSs,8513
 orchestrator/workflows/translations/en-GB.json,sha256=ST53HxkphFLTMjFHonykDBOZ7-P_KxksktZU3GbxLt0,846
-orchestrator_core-2.10.0rc2.dist-info/LICENSE,sha256=b-aA5OZQuuBATmLKo_mln8CQrDPPhg3ghLzjPjLn4Tg,11409
-orchestrator_core-2.10.0rc2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-orchestrator_core-2.10.0rc2.dist-info/METADATA,sha256=O8kU95N5X4y2BZNhjkkhn-Jkl4Gc3KWzh2owKvgJxek,4926
-orchestrator_core-2.10.0rc2.dist-info/RECORD,,
+orchestrator_core-3.0.0rc1.dist-info/LICENSE,sha256=b-aA5OZQuuBATmLKo_mln8CQrDPPhg3ghLzjPjLn4Tg,11409
+orchestrator_core-3.0.0rc1.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+orchestrator_core-3.0.0rc1.dist-info/METADATA,sha256=mtEpdm66aYgUKffNCNR3Qn5sWf4ztiYjJoK9julFcTs,4925
+orchestrator_core-3.0.0rc1.dist-info/RECORD,,