orchestrator-core 2.10.0rc1__tar.gz → 2.10.0rc2__tar.gz

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

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.10.0rc1
+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.10.0rc1 → 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.10.0rc1 → 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.0rc1 → orchestrator_core-2.10.0rc2}/PKG-INFO

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

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

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

{orchestrator_core-2.10.0rc1 → 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.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.10.0rc1 → 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.10.0rc1 → 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.10.0rc1 → 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,

{orchestrator_core-2.10.0rc1 → orchestrator_core-2.10.0rc2}/orchestrator/schemas/product.py

@@ -41,3 +41,7 @@ class ProductSchema(ProductBaseSchema):
     product_blocks: list[ProductBlockSchema]
     fixed_inputs: list[FixedInputSchema]
     workflows: list[WorkflowSchema]
+
+
+class ProductPatchSchema(OrchestratorBaseModel):
+    description: str | None = None

{orchestrator_core-2.10.0rc1 → orchestrator_core-2.10.0rc2}/orchestrator/schemas/product_block.py

@@ -37,3 +37,7 @@ class ProductBlockSchema(ProductBlockBaseSchema):
     end_date: datetime | None = None
     resource_types: list[ResourceTypeSchema] | None = None  # type: ignore
     model_config = ConfigDict(from_attributes=True)
+
+
+class ProductBlockPatchSchema(OrchestratorBaseModel):
+    description: str | None = None

{orchestrator_core-2.10.0rc1 → orchestrator_core-2.10.0rc2}/orchestrator/schemas/resource_type.py

@@ -27,3 +27,7 @@ class ResourceTypeBaseSchema(OrchestratorBaseModel):
 class ResourceTypeSchema(ResourceTypeBaseSchema):
     resource_type_id: UUID
     model_config = ConfigDict(from_attributes=True)
+
+
+class ResourceTypePatchSchema(OrchestratorBaseModel):
+    description: str | None = None

{orchestrator_core-2.10.0rc1 → orchestrator_core-2.10.0rc2}/orchestrator/schemas/workflow.py

@@ -59,3 +59,7 @@ class SubscriptionWorkflowListsSchema(OrchestratorBaseModel):
     modify: list[WorkflowListItemSchema]
     terminate: list[WorkflowListItemSchema]
     system: list[WorkflowListItemSchema]
+
+
+class WorkflowPatchSchema(OrchestratorBaseModel):
+    description: str | None = None

orchestrator_core-2.10.0rc2/test/unit_tests/api/test_product_blocks.py

@@ -0,0 +1,58 @@
+from http import HTTPStatus
+from uuid import uuid4
+
+import pytest
+from sqlalchemy import delete
+
+from orchestrator.db import ProductBlockTable, db
+
+PRODUCT_BLOCK_ID = uuid4()
+
+
+@pytest.fixture
+def seed():
+    db.session.execute(delete(ProductBlockTable))
+    product_block = ProductBlockTable(
+        product_block_id=PRODUCT_BLOCK_ID,
+        name="Product block 123",
+        description="Original description of the product block",
+        tag="tag123",
+        status="active",
+    )
+    db.session.add(product_block)
+    db.session.commit()
+
+
+def test_product_block_by_id_404(seed, test_client):
+    response = test_client.get(f"/api/product_blocks/{str(uuid4())}")
+    assert HTTPStatus.NOT_FOUND == response.status_code
+
+
+def test_update_description(seed, test_client):
+    body = {
+        "description": "BLABLA",
+    }
+    response = test_client.patch(f"/api/product_blocks/{PRODUCT_BLOCK_ID}", json=body)
+
+    assert response.json()["description"] == "BLABLA"
+
+
+def test_update_description_with_empty_body(seed, test_client):
+    get_before = test_client.get(f"/api/product_blocks/{PRODUCT_BLOCK_ID}")
+    body = {}
+    response = test_client.patch(f"/api/product_blocks/{PRODUCT_BLOCK_ID}", json=body)
+
+    assert HTTPStatus.CREATED == response.status_code
+    get_after = test_client.get(f"/api/product_blocks/{PRODUCT_BLOCK_ID}")
+
+    assert get_before.json()["description"] == get_after.json()["description"]
+
+
+def test_update_description_nonexistent_product_block(seed, test_client):
+    random_uuid = uuid4()
+    body = {
+        "description": "BLABLA",
+    }
+    response = test_client.patch(f"/api/product_blocks/{random_uuid}", json=body)
+
+    assert HTTPStatus.NOT_FOUND == response.status_code

{orchestrator_core-2.10.0rc1 → orchestrator_core-2.10.0rc2}/test/unit_tests/api/test_products.py

@@ -170,3 +170,33 @@ def test_product_by_id(seed, test_client):
 def test_product_by_id_404(seed, test_client):
     response = test_client.get(f"/api/products/{str(uuid4())}")
     assert HTTPStatus.NOT_FOUND == response.status_code
+
+
+def test_update_description(seed, test_client):
+    body = {
+        "description": "BLABLA",
+    }
+    response = test_client.patch(f"/api/products/{PRODUCT_ID}", json=body)
+
+    assert response.json()["description"] == "BLABLA"
+
+
+def test_update_description_with_empty_body(seed, test_client):
+    get_before = test_client.get(f"/api/products/{PRODUCT_ID}")
+    body = {}
+    response = test_client.patch(f"/api/products/{PRODUCT_ID}", json=body)
+
+    assert HTTPStatus.CREATED == response.status_code
+    get_after = test_client.get(f"/api/products/{PRODUCT_ID}")
+
+    assert get_before.json()["description"] == get_after.json()["description"]
+
+
+def test_update_description_nonexistent_product(seed, test_client):
+    random_uuid = uuid4()
+    body = {
+        "description": "BLABLA",
+    }
+    response = test_client.patch(f"/api/products/{random_uuid}", json=body)
+
+    assert HTTPStatus.NOT_FOUND == response.status_code

orchestrator_core-2.10.0rc2/test/unit_tests/api/test_resource_types.py

@@ -0,0 +1,56 @@
+from http import HTTPStatus
+from uuid import uuid4
+
+import pytest
+from sqlalchemy import delete
+
+from orchestrator.db import ResourceTypeTable, db
+
+RESOURCE_TYPE_ID = uuid4()
+
+
+@pytest.fixture
+def seed():
+    db.session.execute(delete(ResourceTypeTable))
+    resource_type = ResourceTypeTable(
+        resource_type="Resource type 123",
+        description="Original description of the resource type",
+        resource_type_id=RESOURCE_TYPE_ID,
+    )
+    db.session.add(resource_type)
+    db.session.commit()
+
+
+def test_resource_type_by_id_404(seed, test_client):
+    response = test_client.get(f"/api/resource_types/{str(uuid4())}")
+    assert HTTPStatus.NOT_FOUND == response.status_code
+
+
+def test_update_description(seed, test_client):
+    body = {
+        "description": "BLABLA",
+    }
+    response = test_client.patch(f"/api/resource_types/{RESOURCE_TYPE_ID}", json=body)
+
+    assert response.json()["description"] == "BLABLA"
+
+
+def test_update_description_with_empty_body(seed, test_client):
+    get_before = test_client.get(f"/api/resource_types/{RESOURCE_TYPE_ID}")
+    body = {}
+    response = test_client.patch(f"/api/resource_types/{RESOURCE_TYPE_ID}", json=body)
+
+    assert HTTPStatus.CREATED == response.status_code
+    get_after = test_client.get(f"/api/resource_types/{RESOURCE_TYPE_ID}")
+
+    assert get_before.json()["description"] == get_after.json()["description"]
+
+
+def test_update_description_nonexistent_resource_type(seed, test_client):
+    random_uuid = uuid4()
+    body = {
+        "description": "BLABLA",
+    }
+    response = test_client.patch(f"/api/resource_types/{random_uuid}", json=body)
+
+    assert HTTPStatus.NOT_FOUND == response.status_code

orchestrator_core-2.10.0rc2/test/unit_tests/api/test_workflows.py

@@ -0,0 +1,57 @@
+from http import HTTPStatus
+from uuid import uuid4
+
+import pytest
+from sqlalchemy import delete
+
+from orchestrator.db import WorkflowTable, db
+
+WORKFLOW_ID = uuid4()
+
+
+@pytest.fixture
+def seed():
+    db.session.execute(delete(WorkflowTable))
+    workflow = WorkflowTable(
+        name="workflow123",
+        target="CREATE",
+        description="Original description of the workflow",
+        workflow_id=WORKFLOW_ID,
+    )
+    db.session.add(workflow)
+    db.session.commit()
+
+
+def test_workflow_by_id_404(seed, test_client):
+    response = test_client.get(f"/api/workflows/{str(uuid4())}")
+    assert HTTPStatus.NOT_FOUND == response.status_code
+
+
+def test_update_description(seed, test_client):
+    body = {
+        "description": "BLABLA",
+    }
+    response = test_client.patch(f"/api/workflows/{WORKFLOW_ID}", json=body)
+
+    assert response.json()["description"] == "BLABLA"
+
+
+def test_update_description_with_empty_body(seed, test_client):
+    get_before = test_client.get(f"/api/workflows/{WORKFLOW_ID}")
+    body = {}
+    response = test_client.patch(f"/api/workflows/{WORKFLOW_ID}", json=body)
+
+    assert HTTPStatus.CREATED == response.status_code
+    get_after = test_client.get(f"/api/workflows/{WORKFLOW_ID}")
+
+    assert get_before.json()["description"] == get_after.json()["description"]
+
+
+def test_update_description_nonexistent_workflow(seed, test_client):
+    random_uuid = uuid4()
+    body = {
+        "description": "BLABLA",
+    }
+    response = test_client.patch(f"/api/workflows/{random_uuid}", json=body)
+
+    assert HTTPStatus.NOT_FOUND == response.status_code

{orchestrator_core-2.10.0rc1 → orchestrator_core-2.10.0rc2}/test/unit_tests/cli/data/generate/products/product_blocks/example4sub.py

@@ -3,7 +3,7 @@ from orchestrator.types import SubscriptionLifecycle
 from pydantic import computed_field
 
 
-class Example4SubBlockInactive(ProductBlockModel, product_block_name="Example4 Sub"):
+class Example4SubBlockInactive(ProductBlockModel, product_block_name="Example4Sub"):
     str_val: str | None = None