orchestrator-core 2.9.2rc3__tar.gz → 2.10.0rc2__tar.gz

{orchestrator_core-2.9.2rc3 → orchestrator_core-2.10.0rc2}/.bumpversion.cfg

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

{orchestrator_core-2.9.2rc3 → orchestrator_core-2.10.0rc2}/.github/workflows/build-push-container.yml

@@ -56,5 +56,3 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}

{orchestrator_core-2.9.2rc3 → orchestrator_core-2.10.0rc2}/.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.9.2rc3 → orchestrator_core-2.10.0rc2}/.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.0rc2/Dockerfile

@@ -0,0 +1,24 @@
+# Build stage
+FROM python:3.11-slim AS build
+WORKDIR /app
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends git build-essential \
+    && rm -rf /var/lib/apt/lists/*
+COPY . .
+RUN pip install --upgrade pip --no-cache-dir
+RUN pip install build --no-cache-dir
+RUN python -m build --wheel --outdir dist
+
+# Final stage
+FROM python:3.11-slim
+ENV PIP_ROOT_USER_ACTION=ignore
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends git \
+    && rm -rf /var/lib/apt/lists/*
+RUN pip install --upgrade pip --no-cache-dir
+COPY --from=build /app/dist/*.whl /tmp/
+RUN pip install /tmp/*.whl --no-cache-dir
+RUN useradd orchestrator
+USER orchestrator
+WORKDIR /home/orchestrator
+CMD ["uvicorn", "--host", "0.0.0.0", "--port", "8080", "main:app"]

{orchestrator_core-2.9.2rc3 → orchestrator_core-2.10.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: orchestrator-core
-Version: 2.9.2rc3
+Version: 2.10.0rc2
 Summary: This is the orchestrator workflow engine.
 Requires-Python: >=3.11,<3.14
 Classifier: Intended Audience :: Information Technology
@@ -27,30 +27,30 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
 Classifier: Topic :: Internet :: WWW/HTTP
-Requires-Dist: alembic==1.13.3
+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: fastapi~=0.115.2
 Requires-Dist: fastapi-etag==0.4.0
-Requires-Dist: more-itertools~=10.5.0
+Requires-Dist: more-itertools~=10.6.0
 Requires-Dist: itsdangerous
 Requires-Dist: Jinja2==3.1.5
-Requires-Dist: orjson==3.10.9
+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.5.2
+Requires-Dist: pydantic-settings~=2.7.1
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: python-rapidjson>=1.18,<1.21
 Requires-Dist: pytz==2024.1
 Requires-Dist: redis==5.0.3
 Requires-Dist: schedule==1.1.0
 Requires-Dist: sentry-sdk[fastapi]~=2.18.0
-Requires-Dist: SQLAlchemy==2.0.36
+Requires-Dist: SQLAlchemy==2.0.38
 Requires-Dist: SQLAlchemy-Utils==0.41.2
 Requires-Dist: structlog
-Requires-Dist: typer==0.12.5
+Requires-Dist: typer==0.15.1
 Requires-Dist: uvicorn[standard]~=0.32.0
 Requires-Dist: nwa-stdlib~=1.9.0
 Requires-Dist: oauth2-lib~=2.4.0

{orchestrator_core-2.9.2rc3 → orchestrator_core-2.10.0rc2}/docs/reference-docs/cli.md

@@ -26,21 +26,16 @@ Interact with the application database. By default, does nothing, specify `main.
       show_symbol_type_toc: false
       show_symbol_type_heading: false
       members:
-        - init
-        - revision
-        - upgrade
         - downgrade
         - heads
         - history
-        - merge
-        - migrate_workflows
-        - heads
-        - history
         - init
         - merge
         - migrate_workflows
+        - migrate_tasks
         - revision
         - upgrade
+
       heading_level: 3
 
 ### migrate-domain-models

{orchestrator_core-2.9.2rc3 → orchestrator_core-2.10.0rc2}/docs/reference-docs/graphql.md

@@ -677,3 +677,10 @@ customer_field.name = "customer"
 override_class(ProcessType, [customer_field])
 custom_subscription_interface = override_class(SubscriptionInterface, [customer_field])
 ```
+
+### Behavior of filterBy
+By default, string matching is configured for exact matches, i.e a search for `10` will return ONLY `10`
+and won't include `10G` or `100G`.
+Searching can also be configured for partial matching as well, where a search for `10` would include `10G` and `100G`.
+
+This can be controlled by setting the variable `FILTER_BY_MODE` can be set to a value of `exact` or `partial` as needed.

{orchestrator_core-2.9.2rc3 → orchestrator_core-2.10.0rc2}/docs/reference-docs/search.md

@@ -47,6 +47,7 @@ Some search query examples for Subscriptions:
 | `test*`                                                  | any field starting with `test` (Prefix search)                       |
 
 Note that:
+
 * For other objects the query syntax is the same
 * Searching is case-insensitive
 * Ordering of words does not matter (unless it is a Phrase)
@@ -87,6 +88,7 @@ Postgres _Full Text Search_ (TS) has extensive [documentation](https://www.postg
 The query behind `subscriptions_search` retrieves Subscriptions joined with several other tables (as shown in the previous diagram), forming a "document" of keywords that in some way relate to the subscription.
 
 Each document is turned into a _tsvector_ with Postgres function `to_tsvector()` which consists of these phases:
+
 * Parse document into _tokens_: split text into _tokens_ using special characters as delimiters
 * Convert tokens into _lexemes_: a lexeme is a normalized token, i.e. this folds upper-case to lower-case. This step can also normalize based on language, but we disable that by using the `'simple'` dictionary (shown in diagram above)
 * Create vector optimized for search: store array of _lexemes_ along with positional information

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

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

{orchestrator_core-2.9.2rc3 → orchestrator_core-2.10.0rc2}/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.9.2rc3 → orchestrator_core-2.10.0rc2}/orchestrator/api/api_v1/endpoints/processes.py

@@ -240,6 +240,7 @@ def abort_process_endpoint(process_id: UUID, request: Request, user: str = Depen
     broadcast_func = api_broadcast_process_data(request)
     try:
         abort_process(process, user, broadcast_func=broadcast_func)
+        broadcast_invalidate_status_counts()
         return
     except Exception as e:
         raise_status(HTTPStatus.INTERNAL_SERVER_ERROR, str(e))

orchestrator_core-2.10.0rc2/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.9.2rc3 → orchestrator_core-2.10.0rc2}/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-2.10.0rc2/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.0rc2/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.9.2rc3 → orchestrator_core-2.10.0rc2}/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.9.2rc3 → orchestrator_core-2.10.0rc2}/orchestrator/cli/database.py

@@ -25,6 +25,7 @@ import orchestrator.workflows
 from orchestrator.cli.domain_gen_helpers.types import ModelUpdates
 from orchestrator.cli.helpers.print_helpers import COLOR, str_fmt
 from orchestrator.cli.migrate_domain_models import create_domain_models_migration_sql
+from orchestrator.cli.migrate_tasks import create_tasks_migration_wizard
 from orchestrator.cli.migrate_workflows import create_workflows_migration_wizard
 from orchestrator.cli.migration_helpers import create_migration_file
 from orchestrator.db import init_database
@@ -397,3 +398,80 @@ def migrate_workflows(
 
     create_migration_file(alembic_cfg(), sql_upgrade_str, sql_downgrade_str, message, preamble=preamble)
     return None
+
+
+@app.command(help="Create migration file based on diff tasks in db")
+def migrate_tasks(
+    message: str = typer.Argument(..., help="Migration name"),
+    test: bool = typer.Option(False, help="Optional boolean if you don't want to generate a migration file"),
+) -> tuple[list[dict], list[dict]] | None:
+    """The `migrate-tasks` command creates a migration file based on the difference between tasks in the database and registered TaskInstances in your codebase.
+
+    !!! warning "BACKUP YOUR DATABASE BEFORE USING THE MIGRATION!"
+
+    You will be prompted with inputs for new models and resource type updates.
+    Resource type updates are only handled when it's renamed in all product blocks.
+
+    Args:
+        message: Message/description of the generated migration.
+        test: Optional boolean if you don't want to generate a migration file.
+
+    Returns None unless `--test` is used, in which case it returns:
+        - tuple:
+            - list of upgrade SQL statements in string format.
+            - list of downgrade SQL statements in string format.
+
+    CLI Arguments:
+        ```sh
+        Arguments:
+            MESSAGE  Migration name  [required]
+
+        Options:
+            --test / --no-test  Optional boolean if you don't want to generate a migration
+            file  [default: no-test]
+        ```
+    """
+    if not app_settings.TESTING:
+        init_database(app_settings)
+
+    if test:
+        print(  # noqa: T001, T201
+            f"{str_fmt('NOTE:', flags=[COLOR.BOLD, COLOR.CYAN])} Running in test mode. No migration file will be generated.\n"
+        )
+
+    tasks_to_add, tasks_to_delete = create_tasks_migration_wizard()
+
+    # String 'template' arguments
+    import_str = "from orchestrator.migrations.helpers import create_task, delete_workflow\n"
+    tpl_preamble_lines = []
+    tpl_upgrade_lines = []
+    tpl_downgrade_lines = []
+
+    if tasks_to_add:
+        tpl_preamble_lines.append(f"new_tasks = {json.dumps(tasks_to_add, indent=4)}\n")
+        tpl_upgrade_lines.extend([(" " * 4) + "for task in new_tasks:", (" " * 8) + "create_task(conn, task)"])
+        tpl_downgrade_lines.extend(
+            [(" " * 4) + "for task in new_tasks:", (" " * 8) + 'delete_workflow(conn, task["name"])']
+        )
+
+    if tasks_to_delete:
+        tpl_preamble_lines.append(f"old_tasks = {json.dumps(tasks_to_delete, indent=4)}\n")
+        tpl_upgrade_lines.extend(
+            [(" " * 4) + "for task in old_tasks:", (" " * 8) + 'delete_workflow(conn, task["name"])']
+        )
+        tpl_downgrade_lines.extend([(" " * 4) + "for task in old_tasks:", (" " * 8) + "create_task(conn, task)"])
+
+    preamble = "\n".join(
+        [
+            import_str,
+            *tpl_preamble_lines,
+        ]
+    )
+    sql_upgrade_str = "\n".join(tpl_upgrade_lines)
+    sql_downgrade_str = "\n".join(tpl_downgrade_lines)
+
+    if test:
+        return tasks_to_add, tasks_to_delete
+
+    create_migration_file(alembic_cfg(), sql_upgrade_str, sql_downgrade_str, message, preamble=preamble)
+    return None

{orchestrator_core-2.9.2rc3 → orchestrator_core-2.10.0rc2}/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,