orchestrator-core 2.9.2rc3__py3-none-any.whl → 2.10.0rc2__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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/cli/migrate_tasks.py

@@ -0,0 +1,188 @@
+import itertools
+import operator
+from collections.abc import Iterable
+from typing import TypeVar, cast
+
+import structlog
+from sqlalchemy import select
+from tabulate import tabulate
+
+import orchestrator.workflows
+from orchestrator.cli.helpers.input_helpers import _enumerate_menu_keys, _prompt_user_menu, get_user_input
+from orchestrator.cli.helpers.print_helpers import COLOR, noqa_print, print_fmt
+from orchestrator.db import WorkflowTable, db
+from orchestrator.targets import Target
+from orchestrator.workflow import Workflow
+from orchestrator.workflows import get_workflow
+
+logger = structlog.get_logger(__name__)
+
+T = TypeVar("T")
+
+
+def _print_tasks_table(tasks: list[WorkflowTable]) -> None:
+    items = [(task.name, task.description) for task in tasks]
+    print_fmt(
+        tabulate(
+            items,
+            headers=["#", "name", "description"],
+            showindex=itertools.count(1),
+        ),
+        end="\n\n",
+    )
+
+
+def _add_task(tasks: dict[str, Workflow], state: dict) -> dict:
+    print_fmt("\nAdd new task\n", flags=[COLOR.UNDERLINE])
+
+    if not tasks:
+        noqa_print("No registered tasks found to add to the database")
+        return state
+
+    noqa_print("\nWhich task should be added?")
+
+    already_used_tasks = {task["name"] for task in state["tasks_to_add"] + state["tasks_to_delete"]}
+    task_options = [(task, task) for task in tasks.keys() if task not in already_used_tasks]
+    task_name = _prompt_user_menu([*task_options, ("cancel", None)], keys=[*_enumerate_menu_keys(task_options), "q"])
+    if not task_name:
+        # Menu cancelled
+        return state
+
+    task_to_add = {"name": task_name, "description": tasks[task_name].description}
+    return {**state, "tasks_to_add": [*state["tasks_to_add"], task_to_add]}
+
+
+def _delete_task(tasks: Iterable[WorkflowTable], state: dict) -> dict:
+    print_fmt("\nDelete existing task\n", flags=[COLOR.UNDERLINE])
+    already_used_tasks = {task["name"] for task in state["tasks_to_add"] + state["tasks_to_delete"]}
+    items = [(task.name, task.description) for task in tasks if task not in already_used_tasks]
+    items = sorted(items, key=operator.itemgetter(1, 1))
+    keys = ["#", "name", "description"]
+    if not items:
+        noqa_print("No deletable tasks in database")
+        return state
+
+    print_fmt(
+        tabulate(
+            items,
+            headers=keys,
+            showindex=itertools.count(1),
+        ),
+        end="\n\n",
+    )
+    task_num = get_user_input("Which task do you want to delete? (q to cancel) ", "q")
+    if not task_num.isdigit():
+        return state
+    task_index = int(task_num) - 1
+    if 0 <= task_index < len(items):
+        item = dict(zip(keys[1:], items[task_index]))
+        return {**state, "tasks_to_delete": [*state["tasks_to_delete"], item]}
+    return state
+
+
+def _show_state(state: dict) -> dict:
+    print_fmt("\nTasks to add:", flags=[COLOR.GREEN])
+    print_fmt(
+        tabulate(
+            state["tasks_to_add"],
+            headers="keys",
+            showindex=itertools.count(1),
+        ),
+        end="\n\n",
+    )
+
+    print_fmt("Tasks to delete:", flags=[COLOR.RED])
+    print_fmt(
+        tabulate(
+            state["tasks_to_delete"],
+            headers="keys",
+            showindex=itertools.count(1),
+        ),
+        end="\n\n",
+    )
+    return state
+
+
+def delete_dangling_tasks(tasks: list[WorkflowTable], state: dict) -> dict:
+    if not tasks:
+        noqa_print("No dangling tasks found.")
+        return state
+
+    print_fmt(
+        "\nThe following tasks were found in the database that do not have a corresponding LazyWorkflowInstance:\n"
+    )
+    _print_tasks_table(tasks)
+    should_delete_dangling_tasks = (
+        get_user_input("Do you wish to delete all dangling tasks from the database? [y/n]: ", "n").lower() == "y"
+    )
+
+    if not should_delete_dangling_tasks:
+        noqa_print("Cancelling")
+        return state
+
+    already_used_tasks = {task["name"] for task in state["tasks_to_add"] + state["tasks_to_delete"]}
+    keys = ["name", "description"]
+    items = [
+        {"name": task.name, "description": task.description}
+        for k, task in zip(keys, tasks)
+        if task.name not in already_used_tasks
+    ]
+    return {**state, "tasks_to_delete": [*state["tasks_to_delete"], *items]}
+
+
+def create_tasks_migration_wizard() -> tuple[list[dict], list[dict]]:
+    """Create tuple with lists for tasks to add and delete.
+
+    Returns tuple:
+        - list of task items to add in the migration
+        - list of task items to delete in the migration
+    """
+    database_tasks = {
+        task.name: task for task in list(db.session.scalars(select(WorkflowTable))) if task.target == Target.SYSTEM
+    }
+    registered_wf_instances = {
+        task: cast(Workflow, get_workflow(task)) for task in orchestrator.workflows.ALL_WORKFLOWS.keys()
+    }
+
+    registered_tasks = dict(
+        filter(
+            lambda task: task[1].target == Target.SYSTEM and task[0] in database_tasks.keys(),
+            registered_wf_instances.items(),
+        )
+    )
+    available_tasks = dict(
+        filter(
+            lambda task: task[1].target == Target.SYSTEM and task[0] not in database_tasks.keys(),
+            registered_wf_instances.items(),
+        )
+    )
+    unregistered_tasks = [task for task in database_tasks.values() if task.name not in registered_tasks.keys()]
+
+    # Main menu loop
+    state = {"tasks_to_add": [], "tasks_to_delete": [], "done": False}
+    while not state["done"]:
+        print_fmt("\nWhat do you want to do?\n", flags=[COLOR.UNDERLINE, COLOR.BOLD])
+        choice_fn = _prompt_user_menu(
+            [
+                ("Add task to database", lambda s: _add_task(available_tasks, s)),
+                ("Delete task from database", lambda s: _delete_task(database_tasks.values(), s)),
+                (
+                    "Delete unregistered tasks from database",
+                    lambda s: delete_dangling_tasks(unregistered_tasks, s),
+                ),
+                ("Finish and create migration file", lambda s: {**s, "done": True, "abort": False}),
+                ("Show current diff", _show_state),
+                ("Quit menu without creating a migration file", lambda s: {**s, "done": True, "abort": True}),
+            ],
+            keys=["a", "x", "c", "y", "d", "q"],
+        )
+        if choice_fn:
+            state = choice_fn(state)  # type: ignore
+
+    if state.get("abort"):
+        return [], []
+
+    logger.info("Create tasks", create_tasks=state["tasks_to_add"])
+    logger.info("Delete tasks", delete_tasks=state["tasks_to_delete"])
+
+    return state["tasks_to_add"], state["tasks_to_delete"]  # type: ignore

orchestrator/db/filters/search_filters/inferred_filter.py

@@ -21,6 +21,7 @@ from sqlalchemy import BinaryExpression, Cast, ColumnClause, ColumnElement, Stri
 from sqlalchemy.sql.functions import coalesce
 from sqlalchemy.sql.operators import eq
 
+from orchestrator.settings import app_settings
 from orchestrator.utils.search_query import Node, WhereCondGenerator
 
 
@@ -67,7 +68,7 @@ def _filter_string(field: ColumnElement) -> WhereCondGenerator:
         if node[0] == "ValueGroup":
             vals = [w[1] for w in node[1] if w[0] in ["Word", "PrefixWord"]]  # Only works for (Prefix)Words atm
             return field.in_(vals)
-        return field.ilike(f"%{node[1]}%")
+        return field.ilike(f"{node[1]}") if app_settings.FILTER_BY_MODE == "exact" else field.ilike(f"%{node[1]}%")
 
     return _clause_gen
 

orchestrator/graphql/resolvers/__init__.py

@@ -5,6 +5,7 @@ from orchestrator.graphql.resolvers.product_block import resolve_product_blocks
 from orchestrator.graphql.resolvers.resource_type import resolve_resource_types
 from orchestrator.graphql.resolvers.settings import SettingsMutation, resolve_settings
 from orchestrator.graphql.resolvers.subscription import resolve_subscription, resolve_subscriptions
+from orchestrator.graphql.resolvers.version import resolve_version
 from orchestrator.graphql.resolvers.workflow import resolve_workflows
 
 __all__ = [
@@ -19,4 +20,5 @@ __all__ = [
     "resolve_customer",
     "resolve_resource_types",
     "resolve_workflows",
+    "resolve_version",
 ]

orchestrator/graphql/resolvers/version.py

@@ -0,0 +1,25 @@
+from structlog import get_logger
+
+from orchestrator import __version__
+from orchestrator.graphql.schemas.version import VersionType
+from orchestrator.graphql.types import OrchestratorInfo
+from orchestrator.graphql.utils import create_resolver_error_handler
+
+logger = get_logger(__name__)
+
+
+VERSIONS = [f"orchestrator-core: {__version__}"]
+
+
+def resolve_version(info: OrchestratorInfo) -> VersionType | None:
+    logger.debug("resolve_version() called")
+    _error_handler = create_resolver_error_handler(info)
+
+    ver = None
+    try:
+        ver = VersionType(application_versions=VERSIONS)
+    except Exception as e:
+        logger.error(f"Error getting version: {str(e)}")
+        _error_handler("Failed to retrieve orchestrator_core version", extensions={"code": "PACKAGE_VERSION_ERROR"})
+
+    return ver

orchestrator/graphql/schema.py

@@ -47,6 +47,7 @@ from orchestrator.graphql.resolvers import (
     resolve_settings,
     resolve_subscription,
     resolve_subscriptions,
+    resolve_version,
     resolve_workflows,
 )
 from orchestrator.graphql.schemas import DEFAULT_GRAPHQL_MODELS
@@ -57,6 +58,7 @@ from orchestrator.graphql.schemas.product_block import ProductBlock
 from orchestrator.graphql.schemas.resource_type import ResourceType
 from orchestrator.graphql.schemas.settings import StatusType
 from orchestrator.graphql.schemas.subscription import SubscriptionInterface
+from orchestrator.graphql.schemas.version import VersionType
 from orchestrator.graphql.schemas.workflow import Workflow
 from orchestrator.graphql.types import SCALAR_OVERRIDES, OrchestratorContext, ScalarOverrideType, StrawberryModelType
 from orchestrator.services.process_broadcast_thread import ProcessDataBroadcastThread
@@ -95,6 +97,7 @@ class OrchestratorQuery:
         resolver=resolve_settings,
         description="Returns information about cache, workers, and global engine settings",
     )
+    version: VersionType = authenticated_field(resolver=resolve_version, description="Returns version information")
 
 
 @strawberry.federation.type(description="Orchestrator customer Query")

orchestrator/graphql/schemas/version.py

@@ -0,0 +1,6 @@
+import strawberry
+
+
+@strawberry.type
+class VersionType:
+    application_versions: list[str]

orchestrator/migrations/helpers.py

@@ -164,6 +164,36 @@ def create_workflow(conn: sa.engine.Connection, workflow: dict) -> None:
     )
 
 
+def create_task(conn: sa.engine.Connection, task: dict) -> None:
+    """Create a new task.
+
+    Args:
+        conn: DB connection as available in migration main file.
+        task: Dict with data for a new workflow.
+            name: Name of the task.
+            description: Description of the workflow.
+
+    Usage:
+        >>> task = {
+            "name": "task_name",
+            "description": "task description",
+        }
+        >>> create_workflow(conn, task)
+    """
+
+    conn.execute(
+        sa.text(
+            """
+                INSERT INTO workflows(name, target, description)
+                    VALUES (:name, 'SYSTEM', :description)
+                    ON CONFLICT DO NOTHING
+                    RETURNING workflow_id
+            """
+        ),
+        task,
+    )
+
+
 def create_workflows(conn: sa.engine.Connection, new: dict) -> None:
     """Create new workflows.
 
@@ -894,7 +924,7 @@ def delete_product_block(conn: sa.engine.Connection, name: str) -> None:
 
 
 def delete_workflow(conn: sa.engine.Connection, name: str) -> None:
-    """Delete a workflow and it's occurrences in products.
+    """Delete a workflow and its occurrences in products.
 
     Note: the cascading delete rules in postgres will also ensure removal from `products_workflows`.
 

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/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/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/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/settings.py

@@ -14,6 +14,7 @@
 import secrets
 import string
 from pathlib import Path
+from typing import Literal
 
 from pydantic import PostgresDsn, RedisDsn
 from pydantic_settings import BaseSettings
@@ -82,6 +83,7 @@ class AppSettings(BaseSettings):
     ENABLE_GRAPHQL_PROFILING_EXTENSION: bool = False
     ENABLE_GRAPHQL_STATS_EXTENSION: bool = False
     VALIDATE_OUT_OF_SYNC_SUBSCRIPTIONS: bool = False
+    FILTER_BY_MODE: Literal["partial", "exact"] = "exact"
 
 
 app_settings = AppSettings()

orchestrator/utils/search_query.py

@@ -5,12 +5,10 @@ from itertools import chain
 from typing import Any, Union, cast
 
 import structlog
-from sqlalchemy import BinaryExpression, ColumnElement, CompoundSelect, Select, column, false, func, not_, or_, select
+from sqlalchemy import BinaryExpression, ColumnElement, CompoundSelect, Select, false, not_, or_
 from sqlalchemy.orm import InstrumentedAttribute, MappedColumn
 
-from orchestrator.db import db
 from orchestrator.db.database import BaseModel
-from orchestrator.db.helpers import get_postgres_version
 from orchestrator.utils.helpers import camel_to_snake
 
 logger = structlog.getLogger(__name__)
@@ -257,28 +255,10 @@ class Parser:
 
 
 class TSQueryVisitor:
-
     _glue_chars = re.compile(r"[-_@#$%^&]")
 
     @staticmethod
     def _split_term(term: str) -> list[str]:
-        """Workaround for the way Postgres <14 parses text with to_tsquery.
-
-        For Postgres <14, we issue a database query to parse the text for us in a way that is compatible with to_tsvector. This is the same behavior as Postgres >=14.
-        """
-
-        # TODO: Remove this workaround when support for Postgres <14 is dropped
-        # https://github.com/workfloworchestrator/orchestrator-core/issues/621
-
-        if get_postgres_version() < 14:
-            # tokid 12 is the space separator token
-            stmt = (
-                select(func.array_agg(column("token")))
-                .select_from(func.ts_parse("default", func.replace(term, "-", "_")))
-                .where(column("tokid") != 12)
-            )
-            return db.session.scalar(stmt) or []
-
         return [part.strip() for part in TSQueryVisitor._glue_chars.split(term) if part and not part.isspace()]
 
     @staticmethod

orchestrator/utils/state.py

@@ -183,11 +183,12 @@ def _build_arguments(func: StepFunc | InputStepFunc, state: State) -> list:  # n
                     raise KeyError(f"Could not find key '{name}' in state.")
             elif is_list_type(param.annotation, SubscriptionModel):
                 subscription_ids = map(_get_sub_id, state.get(name, []))
-                subscriptions = [
-                    # Actual type is first argument from list type
-                    get_args(param.annotation)[0].from_subscription(subscription_id)
-                    for subscription_id in subscription_ids
-                ]
+                # Actual type is first argument from list type
+                if (actual_type := get_args(param.annotation)[0]) == Any:
+                    raise ValueError(
+                        f"Step function argument '{param.name}' cannot be serialized from database with type 'Any'"
+                    )
+                subscriptions = [actual_type.from_subscription(subscription_id) for subscription_id in subscription_ids]
                 arguments.append(subscriptions)
             elif is_optional_type(param.annotation, SubscriptionModel):
                 subscription_id = _get_sub_id(state.get(name))

{orchestrator_core-2.9.2rc3.dist-info → orchestrator_core-2.10.0rc2.dist-info}/METADATA

@@ -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.dist-info → orchestrator_core-2.10.0rc2.dist-info}/RECORD

@@ -1,10 +1,10 @@
-orchestrator/__init__.py,sha256=ZEfVsV-TQSD6cNrXVHcgemFAbqGTVKsyAnxfA9sraH8,1058
-orchestrator/app.py,sha256=_2e3JMYgH_egOScokFVpFuTlJWGGwH0KYgZajDdm--0,11563
+orchestrator/__init__.py,sha256=p507KZH6dyfb9vX3cZ80I0_bDmngfQ255K-SjZGbjiw,1059
+orchestrator/app.py,sha256=8GMzoHjdR0bkgRBCejiG8nIUjeo43f12I3WNNZ89pKE,11659
 orchestrator/exception_handlers.py,sha256=UsW3dw8q0QQlNLcV359bIotah8DYjMsj2Ts1LfX4ClY,1268
 orchestrator/log_config.py,sha256=1tPRX5q65e57a6a_zEii_PFK8SzWT0mnA5w2sKg4hh8,1853
 orchestrator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 orchestrator/security.py,sha256=_W_wFkjmlwVwwHRsql69iMoqRvDCiaA63i5rvRHSrZ0,2414
-orchestrator/settings.py,sha256=55AIpcxDcJJP61Jh-y6-wyqOMrzuukx5SjBTam3sNHk,3532
+orchestrator/settings.py,sha256=SFF-jjkVkq_UILzuZbvhBUN3408PeG0y9AFZiCipBVs,3617
 orchestrator/targets.py,sha256=QphHzEUTRhue3pKTPYklxDdvCQF1ANxt0r_HjbaxVCc,766
 orchestrator/types.py,sha256=cXUWV9EtoO4Dx3h3YJHaGVxmw-5XLt6Mow-dALdhTWk,16230
 orchestrator/version.py,sha256=b58e08lxs47wUNXv0jXFO_ykpksmytuzEXD4La4W-NQ,1366
@@ -14,22 +14,26 @@ orchestrator/api/error_handling.py,sha256=YrPCxSa-DSa9KwqIMlXI-KGBGnbGIW5ukOPiik
 orchestrator/api/helpers.py,sha256=s0QRHYw8AvEmlkmRhuEzz9xixaZKUF3YuPzUVHkcoXk,6933
 orchestrator/api/models.py,sha256=z9BDBx7uI4KBHWbD_LVrLsqNQ0_w-Mg9Qiy7PR_rZhk,5996
 orchestrator/api/api_v1/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
-orchestrator/api/api_v1/api.py,sha256=zGPSCX-nCebZXN2OT9QA_ChAtpsK53hpxZ7F2x_0gjI,2332
+orchestrator/api/api_v1/api.py,sha256=Q_Yh9w_SBoyx06jV_kf6leGFrAMXoGjF8UikIAie_us,2858
 orchestrator/api/api_v1/endpoints/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
 orchestrator/api/api_v1/endpoints/health.py,sha256=iaxs1XX1_250_gKNsspuULCV2GEMBjbtjsmfQTOvMAI,1284
-orchestrator/api/api_v1/endpoints/processes.py,sha256=bsS8CqpfE3q5uIYZeZYiKjlbwHYSliFJQu130ov8cL8,12716
-orchestrator/api/api_v1/endpoints/products.py,sha256=Qyj9OzlfWfgsWe9Homd60LFco91VaJ1gkgXxn0AmP6Q,2143
+orchestrator/api/api_v1/endpoints/processes.py,sha256=21BG32TslSgG2ePs68jUYAy8rDuohTXgzWETOpuNzyI,12761
+orchestrator/api/api_v1/endpoints/product_blocks.py,sha256=kZ6ywIOsS_S2qGq7RvZ4KzjvaS1LmwbGWR37AKRvWOw,2146
+orchestrator/api/api_v1/endpoints/products.py,sha256=BfFtwu9dZXEQbtKxYj9icc73GKGvAGMR5ytyf41nQlQ,3081
+orchestrator/api/api_v1/endpoints/resource_types.py,sha256=gGyuaDyOD0TAVoeFGaGmjDGnQ8eQQArOxKrrk4MaDzA,2145
 orchestrator/api/api_v1/endpoints/settings.py,sha256=QiSih8zOUombxXk5Hd7MACq5BC5Y9w-BrmgBdTPRIDg,6141
 orchestrator/api/api_v1/endpoints/subscription_customer_descriptions.py,sha256=Elu4DVJoNtUFq_b3pG1Ws8StrUIo_jTViff2TJqe6ZU,3398
 orchestrator/api/api_v1/endpoints/subscriptions.py,sha256=s0nzWY1n8J1Ep-f6LuhRj_LX3shfCq7PsMmHf0_Rzsw,8716
 orchestrator/api/api_v1/endpoints/translations.py,sha256=dIWh_fCnZZUxJoGiNeJ49DK_xpf75IpR_0EIMSvzIvY,963
 orchestrator/api/api_v1/endpoints/user.py,sha256=RyI32EXVu6I-IxWjz0XB5zQWzzLL60zKXLgLqLH02xU,1827
+orchestrator/api/api_v1/endpoints/workflows.py,sha256=_0vhGiQeu3-z16Zi0WmuDWBs8gmed6BzRNwYH_sF6AY,1977
 orchestrator/api/api_v1/endpoints/ws.py,sha256=1l7E0ag_sZ6UMfQPHlmew7ENwxjm6fflBwcMZAb7V-k,2786
 orchestrator/cli/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
-orchestrator/cli/database.py,sha256=qMpE9qXfJ55SioBBVymXu4hn7pkLR2G7SYPXb_snhFY,16184
+orchestrator/cli/database.py,sha256=6Q9TZHAHaBEgP4mQArVsXKcQ1V7D2KM3ClMZ4PgSzA0,19274
 orchestrator/cli/generate.py,sha256=SBaYfRijXPF9r3VxarPKTiDzDcB6GBMMQvecQIb_ZLQ,7377
 orchestrator/cli/main.py,sha256=GC_kxa9OZ-Y0ig_klfWc6ysOQuPVTUmTmDRj3m8cJHA,983
 orchestrator/cli/migrate_domain_models.py,sha256=OhjNuIheytgShpMYCZ18leNUzk17ExhtkCqx7Ww03R8,20371
+orchestrator/cli/migrate_tasks.py,sha256=PoNMRQadY3_VtDfR3OKjbjf01Tu-Q2VJd8YAVB_zrUc,6669
 orchestrator/cli/migrate_workflows.py,sha256=-_nsKUcVa14-Ug3aSppU9yk-oWlK411SX33WqzD1p4M,8979
 orchestrator/cli/migration_helpers.py,sha256=C5tpkP5WEBr7G9S-1k1hgSI8ili6xd9Z5ygc9notaK0,4110
 orchestrator/cli/scheduler.py,sha256=iCKBWYUwQIYTDqKQ9rMVvs2sNiAzE-J2SkV170TPP2g,1896
@@ -56,7 +60,7 @@ orchestrator/cli/generator/generator/enums.py,sha256=ztGxHzpq7l4HDSZswH8UDJlf237
 orchestrator/cli/generator/generator/helpers.py,sha256=IoHXacEebef7MhUseTVkj05fRryyGMDH94Ai0nGq-nw,9838
 orchestrator/cli/generator/generator/migration.py,sha256=lDqosegGRKJRs1dN4QZV7lFwdWBKTEwe9DeNqP8OVkY,7045
 orchestrator/cli/generator/generator/product.py,sha256=W930c-9C8k0kW7I8_SC4mWf045neYcfFpkck5SwHeNQ,2079
-orchestrator/cli/generator/generator/product_block.py,sha256=5EthccKVeIzOvJU5sdSKPfEDj-1eEpkZt679vMkrNPE,5036
+orchestrator/cli/generator/generator/product_block.py,sha256=h552YZTuehtaux6PKw5GKWAmBQ6cStOSY4TbaJ1Kcq8,4802
 orchestrator/cli/generator/generator/settings.py,sha256=_IhRnQ7bpGjqYtFo-OiLky25IKCibdghC6pkHmPIPoI,1379
 orchestrator/cli/generator/generator/translations.py,sha256=ip0RghW2bY7CoemEab9SxSgjizI44G35AoNHuBsgvrU,1878
 orchestrator/cli/generator/generator/unittest.py,sha256=cLbPRjBQyKFLDNABoTR3WQ21EisAodHs5Q3EGx4VQ6c,4541
@@ -112,7 +116,7 @@ orchestrator/db/filters/resource_type.py,sha256=7aH4_n8vPpsySFnnN8SefN8h964glmEi
 orchestrator/db/filters/subscription.py,sha256=IV7ur7yyKFNUQRx0gZPelcMLHjuUPU0Rx4oZ6Shbn6A,1519
 orchestrator/db/filters/workflow.py,sha256=osyyEmOFuev6q5lizHeUvgxf1Nji3fZtlbf2_lzSNao,1276
 orchestrator/db/filters/search_filters/__init__.py,sha256=a7yfEAA-qpD_PHZH5LeqSjrLeGAvQrDsJp7mzVwDMwo,562
-orchestrator/db/filters/search_filters/inferred_filter.py,sha256=B3WuA6yi3AFhkgbr8yK0UnqiZNUZ1h1aNFQCtNqaP7I,5591
+orchestrator/db/filters/search_filters/inferred_filter.py,sha256=LTRrcLY7hTu8Dr18-xLVMdge9_MNCvtfcCH0CbaJc2Y,5711
 orchestrator/db/range/__init__.py,sha256=mAOCJrQLMMeks0zTK5resf5t-01GrlFN8nIT1gNbqEQ,162
 orchestrator/db/range/range.py,sha256=sOSzkRqvLXvoTYxOd_Q0OWQ9lSqrXTnwXh4DVLGGSK0,2175
 orchestrator/db/sorting/__init__.py,sha256=d33YUS6uAI75l35Mpb-GB9t9sd03jCxq0V-kLmijVOc,353
@@ -147,7 +151,7 @@ orchestrator/forms/validators/product_id.py,sha256=u5mURLT0pOhbFLdwvYcy2_2fXMt35
 orchestrator/graphql/__init__.py,sha256=avq8Yg3Jr_9pJqh7ClyIAOX7YSg1eM_AWmt5C3FRYUY,1440
 orchestrator/graphql/autoregistration.py,sha256=pF2jbMKG26MvYoMSa6ZpqpHjVks7_NvSRFymHTgmfjs,6342
 orchestrator/graphql/pagination.py,sha256=iqVDn3GPZpiQhEydfwkBJLURY-X8wwUphS8Lkeg0BOc,2413
-orchestrator/graphql/schema.py,sha256=K1qTYOKyhAj0OK-vkctwkTKxZ_3P_dZ7mAgFRnrazWY,8892
+orchestrator/graphql/schema.py,sha256=JNAd_MNyFkKzFIutaA6bwtgUsahGDt9RhWZIpFAtVAg,9090
 orchestrator/graphql/types.py,sha256=0aaRM1cUaWUC2SaWRtgLmSe2_2C0KuwA4LMCav4SdPg,5037
 orchestrator/graphql/extensions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 orchestrator/graphql/extensions/stats.py,sha256=pGhEBQg45XvqZhRobcrCSGwt5AGmR3gflsm1dYiIg5g,2018
@@ -155,7 +159,7 @@ orchestrator/graphql/loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 orchestrator/graphql/loaders/subscriptions.py,sha256=31zE2WC7z-tPIUmVpU1QWOJvNbLvF7sYgY7JAQ6OPJg,1856
 orchestrator/graphql/mutations/customer_description.py,sha256=37yX92fE1Sc51O9i-gP8JfD3HdsvpR3TtbgYqKtGC-w,3343
 orchestrator/graphql/mutations/start_process.py,sha256=8vLVvmBwL1ujbZJoI_8YE3VAgI-J2RTzgrTZJC8THZ4,1576
-orchestrator/graphql/resolvers/__init__.py,sha256=v6G9OboMuqEdZAB4RfCNjQZhJyXcvuZ_gC7RN9gTSrU,941
+orchestrator/graphql/resolvers/__init__.py,sha256=EEw9NO4LAryfrpkLlgsNQ9rytKd0usBDx95OURRV6sg,1031
 orchestrator/graphql/resolvers/customer.py,sha256=tq06MtMoaqFwqn3YQvSv0VmROW7QJZRJp1ykO4tUhck,934
 orchestrator/graphql/resolvers/helpers.py,sha256=8NeuiJD9CPus4BhRK9nDsSMhb2LhW1W7nrEpyj_J3M4,771
 orchestrator/graphql/resolvers/process.py,sha256=8UQaw3Mqjwubq_V7iW4O2KsFpqlPKLyXkPRVNS9eKec,4965
@@ -164,6 +168,7 @@ orchestrator/graphql/resolvers/product_block.py,sha256=BAYW66KT_1mozNidfBxBI7l3_
 orchestrator/graphql/resolvers/resource_type.py,sha256=NRDKPFqwktOvVLLm2QCLxVPwzXIYEMJKUN3DS_kS49o,2926
 orchestrator/graphql/resolvers/settings.py,sha256=M-WJGFN0NmINc7SP9plJn689Sn7DVZ5pMIIpoceMrsw,3700
 orchestrator/graphql/resolvers/subscription.py,sha256=57niFv-JCro_wm0peJ5Ne04F2WIPuJ-Lx2h8yd9qubA,6541
+orchestrator/graphql/resolvers/version.py,sha256=qgwe1msPOexeg3RHCscJ8s45vNfMhYh9ZKyCZ3MNw30,809
 orchestrator/graphql/resolvers/workflow.py,sha256=YUwPklwYesgmRS4d0eIQdgVmkyhgGbkQZ9uC1Oe8EyA,2776
 orchestrator/graphql/schemas/__init__.py,sha256=dWG4DNzWq5akQ3v5tSAvT03HLxPWXa09Gx8rTz_MHmk,940
 orchestrator/graphql/schemas/customer.py,sha256=ZptVFG0qauZaoy29KDrh6k5xAnacNCTavmQrZMH8czc,147
@@ -178,6 +183,7 @@ orchestrator/graphql/schemas/resource_type.py,sha256=s5d_FwQXL2-Sc-IDUxTJun5qFQ4
 orchestrator/graphql/schemas/settings.py,sha256=drhm5VcLmUbiYAk6WUSJcyJqjNM96E6GvpxVdPAobnA,999
 orchestrator/graphql/schemas/strawberry_pydantic_patch.py,sha256=CjNUhTKdYmLiaem-WY_mzw4HASIeaZitxGF8pPocqVw,1602
 orchestrator/graphql/schemas/subscription.py,sha256=_ra7MG9P2w7_WMiMx-zTOaAMinGlTKN4gwE9vej-5V8,9573
+orchestrator/graphql/schemas/version.py,sha256=HSzVg_y4Sjd5_H5rRUtu3FJKOG_8ifhvBNt_qjOtC-E,92
 orchestrator/graphql/schemas/workflow.py,sha256=0UWU0HGTiAC_5Wzh16clBd74JoYHrr38YIGV86q-si0,1276
 orchestrator/graphql/utils/__init__.py,sha256=1JvenzEVW1CBa1sGVI9I8IWnnoXIkb1hneDqph9EEZY,524
 orchestrator/graphql/utils/create_resolver_error_handler.py,sha256=PpQMVwGrE9t0nZ12TwoxPxksXxEwQM7lSNPeh7qW3vk,1233
@@ -191,7 +197,7 @@ orchestrator/graphql/utils/to_graphql_result_page.py,sha256=8ObkJP8reVf-TQOQVPKv
 orchestrator/migrations/README,sha256=heMzebYwlGhnE8_4CWJ4LS74WoEZjBy-S-mIJRxAEKI,39
 orchestrator/migrations/alembic.ini,sha256=kMoADqhGeubU8xanILNaqm4oixLy9m4ngYtdGpZcc7I,873
 orchestrator/migrations/env.py,sha256=AwlgBPYbV2hr5rHNwlOPJ5rs-vRyfmzcWyxae0btpZ4,3382
-orchestrator/migrations/helpers.py,sha256=8Ny9k0D-siSKPDf0DNcvhSVtlMU1ieRgLy0l8EtPtRc,42983
+orchestrator/migrations/helpers.py,sha256=5BVDKOFETKyW4kE0-DiTU068VFrRo52n3MKrvt5LfjU,43769
 orchestrator/migrations/script.py.mako,sha256=607Zrgp-Z-m9WGLt4wewN1QDOmHeifxcePUdADkSZyM,510
 orchestrator/migrations/templates/alembic.ini.j2,sha256=jA-QykVparwWSNt5XDP0Zk7epLOhK7D87Af-i2shJV4,905
 orchestrator/migrations/templates/env.py.j2,sha256=RfLAQItZ56Jlzwi6LJfBo92m1-th_bdfkFKD1mwTZIE,2821
@@ -228,12 +234,12 @@ orchestrator/schemas/engine_settings.py,sha256=BOyFNOn7AqHVdUxXyqmPk5aVdFY5A0cCO
 orchestrator/schemas/fixed_input.py,sha256=Rth3hT5K7zYuQr1bUY_NJRzb03xEZuT1p6EvYXVNE54,1214
 orchestrator/schemas/problem_detail.py,sha256=DxiUhWv6EVXLZgdKFv0EYVnCgtkDj7xteDCR0q2f5yw,802
 orchestrator/schemas/process.py,sha256=NgS1eBRtO2GUCRNsvbvYyjNkR2aBdH-kwcsR_y8DfNU,2354
-orchestrator/schemas/product.py,sha256=bIgeLGIsrRiQZ7J36S2Bym8CkV-xhPjn8QoHhZkEBa0,1484
-orchestrator/schemas/product_block.py,sha256=mKX9FwQ5TGo9SrrAtDJOhB_nji1LHJ3-mKBrEEoQ-No,1428
-orchestrator/schemas/resource_type.py,sha256=z1UQTaW79UlLDzVQtstNo0trXQVT8-GDisxieJPUeYo,973
+orchestrator/schemas/product.py,sha256=MhMCh058ZuS2RJq-wSmxIPUNlhQexxXIx3DSz2OmOh4,1570
+orchestrator/schemas/product_block.py,sha256=kCqvm6qadHpegMr9aWI_fYX-T7mS-5S-ldPxnGQZg7M,1519
+orchestrator/schemas/resource_type.py,sha256=VDju4XywcDDLxdpbWU62RTvR9QF8x_GRrpTlN_NE8uI,1064
 orchestrator/schemas/subscription.py,sha256=zNy7bb-ww-MEN4QW9xIwxzcNSyFPEgjt5tt1T4Ah0hQ,3383
 orchestrator/schemas/subscription_descriptions.py,sha256=Ft_jw1U0bf9Z0U8O4OWfLlcl0mXCVT_qYVagBP3GbIQ,1262
-orchestrator/schemas/workflow.py,sha256=YvjidAaYz1MsqVsA7DynOlW4kChBO-47M-JCkpSOro4,1890
+orchestrator/schemas/workflow.py,sha256=w-CaRPp9AAddhnd8o_0jPaey1Vnnh-s-A5s5kWlR2pI,1977
 orchestrator/services/__init__.py,sha256=GyHNfEFCGKQwRiN6rQmvSRH2iYX7npjMZn97n8XzmLU,571
 orchestrator/services/celery.py,sha256=uvXSKuq_XHcF4BgEpt2QgGUfUnpopApF74FsgAQdnFY,4634
 orchestrator/services/fixed_inputs.py,sha256=kyz7s2HLzyDulvcq-ZqefTw1om86COvyvTjz0_5CmgI,876
@@ -261,8 +267,8 @@ orchestrator/utils/get_updated_properties.py,sha256=egVZ0R5LNJ4e51Z8SXlU8cmb4tXx
 orchestrator/utils/helpers.py,sha256=NjUF3IvWdnLulliP8-JQvGGGpHrh0vs0Vm092ynw-ss,3212
 orchestrator/utils/json.py,sha256=7386sdqkrKYyy4sbn5NscwctH_v1hLyw5172P__rU3g,8341
 orchestrator/utils/redis.py,sha256=fvALD_Yt4lZuIfgCLGJwwQSElgKOLHrxH_RdhSXkeZw,7222
-orchestrator/utils/search_query.py,sha256=ncJlynwtW-qwL0RcNq4DuAUx9KUMI6llwGAEwLO2QCA,17097
-orchestrator/utils/state.py,sha256=gPYHOWDxPvoYZ83WwKPCpeBAsNWOTlkwZz5kAZcM9rw,13011
+orchestrator/utils/search_query.py,sha256=ji5LHtrzohGz6b1IG41cnPdpWXzLEzz4SGWgHly_yfU,16205
+orchestrator/utils/state.py,sha256=aNR7XftX9dX-2TKHFu2I2rIRIqFENB7AnlpH6Zs80QA,13181
 orchestrator/utils/strings.py,sha256=N0gWjmQaMjE9_99VtRvRaU8IBLTKMgBKSXcTZ9TpWAg,1077
 orchestrator/utils/validate_data_version.py,sha256=3Eioy2wE2EWKSgkyMKcEKrkCAfUIAq-eb73iRcpgppw,184
 orchestrator/websocket/__init__.py,sha256=V79jskk1z3uPIYgu0Gt6JLzuqr7NGfNeAZ-hbBqoUv4,5745
@@ -280,7 +286,7 @@ orchestrator/workflows/tasks/resume_workflows.py,sha256=wZGNHHQYL7wociSTmoNdDdh5
 orchestrator/workflows/tasks/validate_product_type.py,sha256=kVuN94hGWcmBNphgpAlGTSiyO2dEhFwgIq87SYjArns,3174
 orchestrator/workflows/tasks/validate_products.py,sha256=j_aOyxcH8DymlGupSS6XRwQdWx2Ab-c8f8iUvAXBTes,8511
 orchestrator/workflows/translations/en-GB.json,sha256=ST53HxkphFLTMjFHonykDBOZ7-P_KxksktZU3GbxLt0,846
-orchestrator_core-2.9.2rc3.dist-info/LICENSE,sha256=b-aA5OZQuuBATmLKo_mln8CQrDPPhg3ghLzjPjLn4Tg,11409
-orchestrator_core-2.9.2rc3.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-orchestrator_core-2.9.2rc3.dist-info/METADATA,sha256=3rVMT6j1-fRT6J3eL_MCkSerRs1RURkFTwCs1ejjA74,4924
-orchestrator_core-2.9.2rc3.dist-info/RECORD,,
+orchestrator_core-2.10.0rc2.dist-info/LICENSE,sha256=b-aA5OZQuuBATmLKo_mln8CQrDPPhg3ghLzjPjLn4Tg,11409
+orchestrator_core-2.10.0rc2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+orchestrator_core-2.10.0rc2.dist-info/METADATA,sha256=O8kU95N5X4y2BZNhjkkhn-Jkl4Gc3KWzh2owKvgJxek,4926
+orchestrator_core-2.10.0rc2.dist-info/RECORD,,