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

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

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.10.0rc1
+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.0rc1 → orchestrator_core-3.0.0}/.github/workflows/run-linting-tests.yml

@@ -29,13 +29,6 @@ jobs:
           python -m pip install --upgrade pip
           pip install flit
           flit install --deps develop --symlink
-      - name: Check formatting
-        run: |
-          black --check .
-      - name: Lint with ruff
-        run: |
-          # stop the build if there are Python syntax errors or undefined names
-          ruff check .
       - name: Check with mypy
         run: |
           mypy .

{orchestrator_core-2.10.0rc1 → orchestrator_core-3.0.0}/.pre-commit-config.yaml

@@ -3,7 +3,7 @@ default_language_version:
 exclude: ^test/unit_tests/cli/data/generate/.*\.py|orchestrator/vendor.*
 repos:
   - repo: https://github.com/psf/black
-    rev: 24.8.0
+    rev: 25.1.0
     hooks:
       - id: black
   # - repo: https://github.com/asottile/blacken-docs
@@ -14,12 +14,12 @@ repos:
   # Disabling since this cannot parse bit shift operators how we've overloaded them and you can't ignore lines.
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.6.1
+    rev: v0.9.6
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix, --show-fixes ]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         exclude:

{orchestrator_core-2.10.0rc1 → 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.0rc1
+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.0rc1 → 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.0rc1 → 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.0rc1 → 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.0rc1 → orchestrator_core-3.0.0}/orchestrator/__init__.py

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

{orchestrator_core-2.10.0rc1 → orchestrator_core-3.0.0}/orchestrator/api/api_v1/api.py

@@ -19,12 +19,15 @@ from fastapi.routing import APIRouter
 from orchestrator.api.api_v1.endpoints import (
     health,
     processes,
+    product_blocks,
     products,
+    resource_types,
     settings,
     subscription_customer_descriptions,
     subscriptions,
     translations,
     user,
+    workflows,
     ws,
 )
 from orchestrator.security import authorize
@@ -34,14 +37,32 @@ api_router = APIRouter()
 api_router.include_router(
     processes.router, prefix="/processes", tags=["Core", "Processes"], dependencies=[Depends(authorize)]
 )
+api_router.include_router(
+    subscriptions.router,
+    prefix="/subscriptions",
+    tags=["Core", "Subscriptions"],
+    dependencies=[Depends(authorize)],
+)
 api_router.include_router(processes.ws_router, prefix="/processes", tags=["Core", "Processes"])
 api_router.include_router(
     products.router, prefix="/products", tags=["Core", "Product"], dependencies=[Depends(authorize)]
 )
 api_router.include_router(
-    subscriptions.router,
-    prefix="/subscriptions",
-    tags=["Core", "Subscriptions"],
+    product_blocks.router,
+    prefix="/product_blocks",
+    tags=["Core", "Product Blocks"],
+    dependencies=[Depends(authorize)],
+)
+api_router.include_router(
+    resource_types.router,
+    prefix="/resource_types",
+    tags=["Core", "Resource Types"],
+    dependencies=[Depends(authorize)],
+)
+api_router.include_router(
+    workflows.router,
+    prefix="/workflows",
+    tags=["Core", "Workflows"],
     dependencies=[Depends(authorize)],
 )
 api_router.include_router(

{orchestrator_core-2.10.0rc1 → 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-3.0.0/orchestrator/api/api_v1/endpoints/product_blocks.py

@@ -0,0 +1,56 @@
+# Copyright 2019-2020 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 http import HTTPStatus
+from uuid import UUID
+
+from fastapi.param_functions import Body
+from fastapi.routing import APIRouter
+
+from orchestrator.api.error_handling import raise_status
+from orchestrator.db import db
+from orchestrator.db.models import ProductBlockTable
+from orchestrator.schemas.product_block import ProductBlockPatchSchema, ProductBlockSchema
+
+router = APIRouter()
+
+
+@router.get("/{product_block_id}", response_model=ProductBlockSchema)
+def get_product_block_description(product_block_id: UUID) -> str:
+    product_block = db.session.get(ProductBlockTable, product_block_id)
+    if product_block is None:
+        raise_status(HTTPStatus.NOT_FOUND)
+    return product_block
+
+
+@router.patch("/{product_block_id}", status_code=HTTPStatus.CREATED, response_model=ProductBlockSchema)
+async def patch_product_block_by_id(
+    product_block_id: UUID, data: ProductBlockPatchSchema = Body(...)
+) -> ProductBlockTable:
+    product_block = db.session.get(ProductBlockTable, product_block_id)
+    if not product_block:
+        raise_status(HTTPStatus.NOT_FOUND, f"Product_block id {product_block_id} not found")
+
+    return await _patch_product_block_description(data, product_block)
+
+
+async def _patch_product_block_description(
+    data: ProductBlockPatchSchema,
+    product_block: ProductBlockTable,
+) -> ProductBlockTable:
+
+    updated_properties = data.model_dump(exclude_unset=True)
+    description = updated_properties.get("description", product_block.description)
+    product_block.description = description
+    db.session.commit()
+    return product_block

{orchestrator_core-2.10.0rc1 → orchestrator_core-3.0.0}/orchestrator/api/api_v1/endpoints/products.py

@@ -14,6 +14,7 @@
 from http import HTTPStatus
 from uuid import UUID
 
+from fastapi.param_functions import Body
 from fastapi.routing import APIRouter
 from sqlalchemy import select
 from sqlalchemy.orm import joinedload, selectinload
@@ -21,6 +22,7 @@ from sqlalchemy.orm import joinedload, selectinload
 from orchestrator.api.error_handling import raise_status
 from orchestrator.db import ProductBlockTable, ProductTable, db
 from orchestrator.schemas import ProductSchema
+from orchestrator.schemas.product import ProductPatchSchema
 
 router = APIRouter()
 
@@ -48,6 +50,13 @@ def fetch(tag: str | None = None, product_type: str | None = None) -> list[Produ
     response_model=ProductSchema,
 )
 def product_by_id(product_id: UUID) -> ProductTable:
+    product = _product_by_id(product_id)
+    if not product:
+        raise_status(HTTPStatus.NOT_FOUND, f"Product id {product_id} not found")
+    return product
+
+
+def _product_by_id(product_id: UUID) -> ProductTable | None:
     stmt = (
         select(ProductTable)
         .options(
@@ -57,7 +66,25 @@ def product_by_id(product_id: UUID) -> ProductTable:
         )
         .filter(ProductTable.product_id == product_id)
     )
-    product = db.session.scalars(stmt).unique().one_or_none()
+    return db.session.scalars(stmt).unique().one_or_none()
+
+
+@router.patch("/{product_id}", status_code=HTTPStatus.CREATED, response_model=ProductSchema)
+async def patch_product_by_id(product_id: UUID, data: ProductPatchSchema = Body(...)) -> ProductTable:
+    product = _product_by_id(product_id)
     if not product:
         raise_status(HTTPStatus.NOT_FOUND, f"Product id {product_id} not found")
+
+    return await _patch_product_description(data, product)
+
+
+async def _patch_product_description(
+    data: ProductPatchSchema,
+    product: ProductTable,
+) -> ProductTable:
+
+    updated_properties = data.model_dump(exclude_unset=True)
+    description = updated_properties.get("description", product.description)
+    product.description = description
+    db.session.commit()
     return product

orchestrator_core-3.0.0/orchestrator/api/api_v1/endpoints/resource_types.py

@@ -0,0 +1,56 @@
+# Copyright 2019-2020 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 http import HTTPStatus
+from uuid import UUID
+
+from fastapi.param_functions import Body
+from fastapi.routing import APIRouter
+
+from orchestrator.api.error_handling import raise_status
+from orchestrator.db import db
+from orchestrator.db.models import ResourceTypeTable
+from orchestrator.schemas.resource_type import ResourceTypePatchSchema, ResourceTypeSchema
+
+router = APIRouter()
+
+
+@router.get("/{resource_type_id}", response_model=ResourceTypeSchema)
+def get_resource_type_description(resource_type_id: UUID) -> str:
+    resource_type = db.session.get(ResourceTypeTable, resource_type_id)
+    if resource_type is None:
+        raise_status(HTTPStatus.NOT_FOUND)
+    return resource_type
+
+
+@router.patch("/{resource_type_id}", status_code=HTTPStatus.CREATED, response_model=ResourceTypeSchema)
+async def patch_resource_type_by_id(
+    resource_type_id: UUID, data: ResourceTypePatchSchema = Body(...)
+) -> ResourceTypeTable:
+    resource_type = db.session.get(ResourceTypeTable, resource_type_id)
+    if not resource_type:
+        raise_status(HTTPStatus.NOT_FOUND, f"ResourceType id {resource_type_id} not found")
+
+    return await _patch_resource_type_description(data, resource_type)
+
+
+async def _patch_resource_type_description(
+    data: ResourceTypePatchSchema,
+    resource_type: ResourceTypeTable,
+) -> ResourceTypeTable:
+
+    updated_properties = data.model_dump(exclude_unset=True)
+    description = updated_properties.get("description", resource_type.description)
+    resource_type.description = description
+    db.session.commit()
+    return resource_type

{orchestrator_core-2.10.0rc1 → 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-3.0.0/orchestrator/api/api_v1/endpoints/workflows.py

@@ -0,0 +1,54 @@
+# Copyright 2019-2020 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 http import HTTPStatus
+from uuid import UUID
+
+from fastapi.param_functions import Body
+from fastapi.routing import APIRouter
+
+from orchestrator.api.error_handling import raise_status
+from orchestrator.db import db
+from orchestrator.db.models import WorkflowTable
+from orchestrator.schemas.workflow import WorkflowPatchSchema, WorkflowSchema
+
+router = APIRouter()
+
+
+@router.get("/{workflow_id}", response_model=WorkflowSchema)
+def get_workflow_description(workflow_id: UUID) -> str:
+    workflow = db.session.get(WorkflowTable, workflow_id)
+    if workflow is None:
+        raise_status(HTTPStatus.NOT_FOUND)
+    return workflow
+
+
+@router.patch("/{workflow_id}", status_code=HTTPStatus.CREATED, response_model=WorkflowSchema)
+async def patch_workflow_by_id(workflow_id: UUID, data: WorkflowPatchSchema = Body(...)) -> WorkflowTable:
+    workflow = db.session.get(WorkflowTable, workflow_id)
+    if not workflow:
+        raise_status(HTTPStatus.NOT_FOUND, f"Workflow id {workflow_id} not found")
+
+    return await _patch_workflow_description(data, workflow)
+
+
+async def _patch_workflow_description(
+    data: WorkflowPatchSchema,
+    workflow: WorkflowTable,
+) -> WorkflowTable:
+
+    updated_properties = data.model_dump(exclude_unset=True)
+    description = updated_properties.get("description", workflow.description)
+    workflow.description = description
+    db.session.commit()
+    return workflow

{orchestrator_core-2.10.0rc1 → orchestrator_core-3.0.0}/orchestrator/app.py

@@ -199,8 +199,9 @@ class OrchestratorCore(FastAPI):
 
     def register_graphql(
         self: "OrchestratorCore",
-        query: Any = Query,
-        mutation: Any = Mutation,
+        # mypy 1.9 cannot properly inspect these, fixed in 1.15
+        query: Any = Query,  # type: ignore
+        mutation: Any = Mutation,  # type: ignore
         register_models: bool = True,
         subscription_interface: Any = SubscriptionInterface,
         graphql_models: StrawberryModelType | None = None,

{orchestrator_core-2.10.0rc1 → orchestrator_core-3.0.0}/orchestrator/cli/generator/generator/product_block.py

@@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import re
 from collections import ChainMap
 from collections.abc import Mapping
 from pathlib import Path
@@ -56,15 +55,8 @@ def get_product_block_path(product_block: dict) -> Path:
 
 
 def enrich_product_block(product_block: dict) -> dict:
-    def to_block_name() -> str:
-        """Separate block name into words."""
-        type = product_block["type"]
-        name = re.sub("(.)([A-Z][a-z]+)", r"\1 \2", type)
-        return re.sub("([a-z0-9])([A-Z])", r"\1 \2", name)
-
     fields = get_all_fields(product_block)
-    block_name = product_block.get("block_name", to_block_name())
-
+    block_name = product_block.get("block_name", product_block.get("type"))
     return product_block | {
         "fields": fields,
         "block_name": block_name,

{orchestrator_core-2.10.0rc1 → 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.0rc1 → 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.0rc1 → 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.0rc1 → 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.0rc1 → 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 }}