orchestrator-core 2.10.0rc2__tar.gz → 3.0.0__tar.gz

{orchestrator_core-2.10.0rc2 → orchestrator_core-3.0.0}/.bumpversion.cfg

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

orchestrator_core-3.0.0/.github/workflows/run-codspeed-tests.yml

@@ -0,0 +1,71 @@
+name: CodSpeed
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  codspeed:
+    name: Run benchmarks
+    runs-on: ubuntu-latest
+    container:
+      image: python:3.11
+      options: --privileged
+    services:
+      postgres:
+        image: postgres:15-alpine
+        # Provide the password for postgres
+        env:
+          POSTGRES_PASSWORD: nwa
+          POSTGRES_USER: nwa
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      redis:
+        # Docker Hub image
+        image: redis
+        # Set health checks to wait until redis has started
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      # Downloads a copy of the code in your repository before running CI tests
+      - name: Check out repository code
+        uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: |
+          apt update
+          apt install curl git build-essential libpq-dev libffi-dev -y
+          python -m pip install --upgrade pip
+          pip install flit
+          flit install --deps develop --symlink
+          echo "GIT_COMMIT_HASH=\"test\"" > orchestrator/version.py
+        env:
+          FLIT_ROOT_INSTALL: 1
+
+      # Prevent error "repository path is not owned by the current user"
+      - name: Fix git owner
+        run: git config --global --add safe.directory "*"
+
+      # Speculatively add the cargo binary directory to the PATH because codspeed's installer script somehow doesn't
+      - name: Add $HOME/.cargo/bin to PATH
+        run: echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
+
+      - uses: CodSpeedHQ/action@v3
+        with:
+          run: CACHE_URI=redis://redis DATABASE_URI=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB pytest test/unit_tests --codspeed
+          token: ${{ secrets.CODSPEED_TOKEN }}
+        env:
+          POSTGRES_DB: orchestrator-core-test
+          POSTGRES_USER: nwa
+          POSTGRES_PASSWORD: nwa
+          POSTGRES_HOST: postgres
+          ENVIRONMENT: TESTING

{orchestrator_core-2.10.0rc2 → orchestrator_core-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 2.10.0rc2
+Version: 3.0.0
 Summary: This is the orchestrator workflow engine.
 Requires-Python: >=3.11,<3.14
 Classifier: Intended Audience :: Information Technology
@@ -27,11 +27,12 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
 Classifier: Topic :: Internet :: WWW/HTTP
+License-File: LICENSE
 Requires-Dist: alembic==1.14.1
 Requires-Dist: anyio>=3.7.0
 Requires-Dist: click==8.*
 Requires-Dist: deprecated
-Requires-Dist: deepmerge==1.1.1
+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
@@ -40,13 +41,13 @@ Requires-Dist: Jinja2==3.1.5
 Requires-Dist: orjson==3.10.15
 Requires-Dist: psycopg2-binary==2.9.10
 Requires-Dist: pydantic[email]~=2.8.2
-Requires-Dist: pydantic-settings~=2.7.1
+Requires-Dist: pydantic-settings~=2.8.0
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: python-rapidjson>=1.18,<1.21
-Requires-Dist: pytz==2024.1
+Requires-Dist: pytz==2025.1
 Requires-Dist: redis==5.0.3
 Requires-Dist: schedule==1.1.0
-Requires-Dist: sentry-sdk[fastapi]~=2.18.0
+Requires-Dist: sentry-sdk[fastapi]~=2.22.0
 Requires-Dist: SQLAlchemy==2.0.38
 Requires-Dist: SQLAlchemy-Utils==0.41.2
 Requires-Dist: structlog
@@ -56,7 +57,7 @@ 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.2.1
+Requires-Dist: pydantic-forms~=1.3.0
 Requires-Dist: celery~=5.4.0 ; extra == "celery"
 Requires-Dist: toml ; extra == "dev"
 Requires-Dist: bumpversion ; extra == "dev"
@@ -81,8 +82,9 @@ Requires-Dist: dirty-equals ; extra == "test"
 Requires-Dist: jsonref ; extra == "test"
 Requires-Dist: mypy==1.9 ; extra == "test"
 Requires-Dist: pyinstrument ; extra == "test"
-Requires-Dist: pytest==8.3.2 ; extra == "test"
+Requires-Dist: pytest==8.3.4 ; extra == "test"
 Requires-Dist: pytest-asyncio==0.21.2 ; extra == "test"
+Requires-Dist: pytest-codspeed ; extra == "test"
 Requires-Dist: pytest-cov ; extra == "test"
 Requires-Dist: pytest-httpx ; extra == "test"
 Requires-Dist: pytest-xdist ; extra == "test"

{orchestrator_core-2.10.0rc2 → orchestrator_core-3.0.0}/README.md

@@ -191,3 +191,10 @@ You can do the necessary change with a clean, e.g. every change committed, branc
 ```shell
 bumpversion patch --new-version 0.4.1-rc3
 ```
+
+### Changing the Core database schema
+When you would like to change the core database schema, execute the following steps.
+
+- Create the new model `orchestrator/database/models.py`
+- `cd orchestrator/migrations`
+- `alembic revision --autogenerate -m "Name of the migratioin"`

{orchestrator_core-2.10.0rc2 → orchestrator_core-3.0.0}/docs/contributing/guidelines.md

@@ -6,6 +6,20 @@ free to raise an issue in the project. We will strive to reply to your enquiry A
 ## Documentation
 We use [**MKDOCS**](https://www.mkdocs.org) as a documentation tool. Please create a PR if you have any additions or contributions to make. All docs can be written in MD or html. Full guidelines on how to set this up can be found [here](development.md).
 
+## Pre-commit hooks
+We use pre-commit hooks to ensure that the code is formatted correctly and that the tests pass. To install the
+pre-commit hooks, run the following command:
+
+```shell
+pre-commit install
+```
+
+To run the pre-commit hooks manually, run the following command:
+
+```shell
+pre-commit run --all-files
+```
+
 ## Orchestrator release
 The `orchestrator-core` has no release schedule but is actively used and maintained by the workflow orchestrator group.
 Creating a new release is done by the developers of the project and the procedure is as follows.

orchestrator_core-3.0.0/docs/migration-guide/3.0.md

@@ -0,0 +1,18 @@
+---
+hide:
+  - navigation
+---
+# 3.0 Migration Guide
+
+In this document we describe the steps that should be taken to migrate from `orchestrator-core` v2 to v3.
+
+## About 3.0
+
+In this release, deprecated import statements from the `orchestrator.types` module are removed, that now come from
+`pydantic-forms.types` instead. These will have to be updated in your implementation of the orchestrator as well.
+
+## Steps
+
+To update the import statements you may have in your implementation of Workflow Orchestrator, we offer a migration
+script that can be run as follows: `python -m orchestrator.devtools.scripts.migrate_30 <dir>` where `<dir>` points to
+your orchestrator implementation.

{orchestrator_core-2.10.0rc2 → orchestrator_core-3.0.0}/mkdocs.yml

@@ -189,7 +189,9 @@ nav:
                 # - Workflow Lifecycles: reference-docs/workflows/workflow-lifecycles.md
                 - Callbacks: reference-docs/workflows/callbacks.md
           - Websockets: reference-docs/websockets.md
-          - Migration guide: migration-guide/2.0.md
+          - Migration guides:
+                - 2.x: migration-guide/2.0.md
+                - 3.x: migration-guide/3.0.md
 
     - Workshops:
           #    - Beginner:

{orchestrator_core-2.10.0rc2 → orchestrator_core-3.0.0}/orchestrator/__init__.py

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

{orchestrator_core-2.10.0rc2 → orchestrator_core-3.0.0}/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_core-2.10.0rc2 → orchestrator_core-3.0.0}/orchestrator/api/api_v1/endpoints/settings.py

@@ -28,6 +28,7 @@ from orchestrator.services import processes, settings
 from orchestrator.settings import ExecutorType, app_settings
 from orchestrator.utils.json import json_dumps
 from orchestrator.utils.redis import delete_keys_matching_pattern
+from orchestrator.utils.redis_client import create_redis_asyncio_client
 from orchestrator.websocket import WS_CHANNELS, broadcast_invalidate_cache, websocket_manager
 
 router = APIRouter()
@@ -41,7 +42,7 @@ CACHE_FLUSH_OPTIONS: dict[str, str] = {
 
 @router.delete("/cache/{name}")
 async def clear_cache(name: str) -> int | None:
-    cache: AIORedis = AIORedis.from_url(str(app_settings.CACHE_URI))
+    cache: AIORedis = create_redis_asyncio_client(app_settings.CACHE_URI)
     if name not in CACHE_FLUSH_OPTIONS:
         raise_status(HTTPStatus.BAD_REQUEST, "Invalid cache name")
 

{orchestrator_core-2.10.0rc2 → orchestrator_core-3.0.0}/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_core-2.10.0rc2 → orchestrator_core-3.0.0}/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_core-2.10.0rc2 → orchestrator_core-3.0.0}/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_core-2.10.0rc2 → orchestrator_core-3.0.0}/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_core-2.10.0rc2 → orchestrator_core-3.0.0}/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_core-2.10.0rc2 → orchestrator_core-3.0.0}/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_core-2.10.0rc2 → orchestrator_core-3.0.0}/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_core-2.10.0rc2 → orchestrator_core-3.0.0}/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_core-2.10.0rc2 → orchestrator_core-3.0.0}/orchestrator/config/assignee.py

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

{orchestrator_core-2.10.0rc2 → orchestrator_core-3.0.0}/orchestrator/db/models.py

@@ -13,6 +13,7 @@
 
 from __future__ import annotations
 
+import enum
 from datetime import datetime, timezone
 
 import sqlalchemy
@@ -23,6 +24,7 @@ from sqlalchemy import (
     Boolean,
     CheckConstraint,
     Column,
+    Enum,
     ForeignKey,
     Index,
     Integer,
@@ -81,6 +83,20 @@ class UtcTimestamp(TypeDecorator):
         return value.astimezone(timezone.utc) if value else value
 
 
+class InputStateTable(BaseModel):
+    __tablename__ = "input_states"
+
+    class InputType(enum.Enum):
+        user_input = "user_input"
+        initial_state = "initial_state"
+
+    input_state_id = mapped_column(UUIDType, primary_key=True, server_default=text("uuid_generate_v4()"), index=True)
+    process_id = mapped_column("pid", UUIDType, ForeignKey("processes.pid"), nullable=False)
+    input_state = mapped_column(pg.JSONB(), nullable=False)  # type: ignore
+    input_time = mapped_column(UtcTimestamp, server_default=text("current_timestamp()"), nullable=False)
+    input_type = mapped_column(Enum(InputType), nullable=False)
+
+
 class ProcessTable(BaseModel):
     __tablename__ = "processes"
 
@@ -101,6 +117,7 @@ class ProcessTable(BaseModel):
     steps = relationship(
         "ProcessStepTable", cascade="delete", passive_deletes=True, order_by="asc(ProcessStepTable.executed_at)"
     )
+    input_states = relationship("InputStateTable", cascade="delete", order_by="desc(InputStateTable.input_time)")
     process_subscriptions = relationship("ProcessSubscriptionTable", back_populates="process", passive_deletes=True)
     workflow = relationship("WorkflowTable", back_populates="processes")
 

{orchestrator_core-2.10.0rc2 → orchestrator_core-3.0.0}/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_core-2.10.0rc2 → orchestrator_core-3.0.0}/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_core-3.0.0/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)