orchestrator-core 3.1.2rc3__tar.gz → 3.2.0rc1__tar.gz

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/.bumpversion.cfg

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

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/.github/workflows/run-codspeed-tests.yml

@@ -61,7 +61,7 @@ jobs:
 
       - uses: CodSpeedHQ/action@v3
         with:
-          run: CACHE_URI=redis://redis DATABASE_URI=postgresql+psycopg://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB pytest test/unit_tests --codspeed
+          run: CACHE_URI=redis://redis DATABASE_URI=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB pytest test/unit_tests --codspeed
           token: ${{ secrets.CODSPEED_TOKEN }}
         env:
           POSTGRES_DB: orchestrator-core-test

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/.github/workflows/run-unit-tests.yml

@@ -53,7 +53,7 @@ jobs:
         env:
           FLIT_ROOT_INSTALL: 1
       - name: Run Unit tests
-        run: CACHE_URI=redis://redis DATABASE_URI=postgresql+psycopg://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB  pytest --cov-branch --cov=orchestrator --cov-report=xml --ignore=test --ignore=orchestrator/devtools --ignore=examples --ignore=docs --ignore=orchestrator/vendor
+        run: CACHE_URI=redis://redis DATABASE_URI=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB  pytest --cov-branch --cov=orchestrator --cov-report=xml --ignore=test --ignore=orchestrator/devtools --ignore=examples --ignore=docs --ignore=orchestrator/vendor
         env:
           POSTGRES_DB: orchestrator-core-test
           POSTGRES_USER: nwa

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/.pre-commit-config.yaml

@@ -17,13 +17,12 @@ repos:
     rev: v0.9.6
     hooks:
       - id: ruff
-        args: [ --fix, --exit-non-zero-on-fix, --show-fixes ]
+        args: [--fix, --exit-non-zero-on-fix, --show-fixes]
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
       - id: trailing-whitespace
-        exclude:
-          .bumpversion.cfg
+        exclude: .bumpversion.cfg
         args: [--markdown-linebreak-ext=md]
       - id: end-of-file-fixer
       - id: check-docstring-first
@@ -62,7 +61,7 @@ repos:
         name: mypy
         language: system
         entry: "mypy"
-        types: [ python ]
+        types: [python]
         require_serial: true
         verbose: true
         args:

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 3.1.2rc3
+Version: 3.2.0rc1
 Summary: This is the orchestrator workflow engine.
 Requires-Python: >=3.11,<3.14
 Classifier: Intended Audience :: Information Technology
@@ -28,7 +28,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
 Classifier: Topic :: Internet :: WWW/HTTP
 License-File: LICENSE
-Requires-Dist: alembic==1.15.1
+Requires-Dist: alembic==1.15.2
 Requires-Dist: anyio>=3.7.0
 Requires-Dist: click==8.*
 Requires-Dist: deprecated
@@ -38,17 +38,17 @@ Requires-Dist: fastapi-etag==0.4.0
 Requires-Dist: more-itertools~=10.6.0
 Requires-Dist: itsdangerous
 Requires-Dist: Jinja2==3.1.6
-Requires-Dist: orjson==3.10.15
-Requires-Dist: psycopg[binary]==3.2.6
+Requires-Dist: orjson==3.10.16
+Requires-Dist: psycopg2-binary==2.9.10
 Requires-Dist: pydantic[email]~=2.8.2
 Requires-Dist: pydantic-settings~=2.8.0
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: python-rapidjson>=1.18,<1.21
-Requires-Dist: pytz==2025.1
+Requires-Dist: pytz==2025.2
 Requires-Dist: redis==5.1.1
 Requires-Dist: schedule==1.1.0
-Requires-Dist: sentry-sdk[fastapi]~=2.22.0
-Requires-Dist: SQLAlchemy==2.0.39
+Requires-Dist: sentry-sdk[fastapi]~=2.25.1
+Requires-Dist: SQLAlchemy==2.0.40
 Requires-Dist: SQLAlchemy-Utils==0.41.2
 Requires-Dist: structlog
 Requires-Dist: typer==0.15.2

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/docs/getting-started/versions.md

@@ -5,7 +5,7 @@ The orchestrator backend has the following requirements
 For the backend you need the following packages:
 
 * Python >= 3.11
-* Postgres >= 14
+* Postgres >= 15
 
 ### Optional dependencies
 * Redis

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/docs/workshops/beginner/macos.md

@@ -10,14 +10,14 @@ This installation instruction assumes the use of [Homebrew](https://brew.sh/).
 The following software dependencies need to be installed:
 
 * Python 3.11
-* PostgreSQL (version >=11)
+* Postgres >= 15
 * virtualenvwrapper (or use any other tool to create virtual Python
   environments)
 * Node.js (version 14)
 * yarn
 
 ``` shell
-brew install python@3.11 postgresql@13 virtualenvwrapper node@14 yarn
+brew install python@3.11 postgresql@15 virtualenvwrapper node@14 yarn
 ```
 
 ### Step 2 - Database setup
@@ -26,7 +26,7 @@ Start the database server and create the database with the following commands,
 use `nwa` as password:
 
 ``` shell
-brew services start postgresql@13
+brew services start postgresql@15
 createuser -sP nwa
 createdb orchestrator-core -O nwa
 ```

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2025 SURF, GÉANT.
 # 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
@@ -13,7 +13,7 @@
 
 """This is the orchestrator workflow engine."""
 
-__version__ = "3.1.2rc3"
+__version__ = "3.2.0rc1"
 
 from orchestrator.app import OrchestratorCore
 from orchestrator.settings import app_settings

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/api/api_v1/api.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # 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

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/api/api_v1/endpoints/processes.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2025 SURF, GÉANT, ESnet.
 # 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
@@ -40,13 +40,7 @@ from orchestrator.db.filters import Filter
 from orchestrator.db.filters.process import filter_processes
 from orchestrator.db.sorting import Sort, SortOrder
 from orchestrator.db.sorting.process import sort_processes
-from orchestrator.schemas import (
-    ProcessIdSchema,
-    ProcessResumeAllSchema,
-    ProcessSchema,
-    ProcessStatusCounts,
-    Reporter,
-)
+from orchestrator.schemas import ProcessIdSchema, ProcessResumeAllSchema, ProcessSchema, ProcessStatusCounts, Reporter
 from orchestrator.security import authenticate
 from orchestrator.services.process_broadcast_thread import api_broadcast_process_data
 from orchestrator.services.processes import (
@@ -139,9 +133,12 @@ async def new_process(
     request: Request,
     json_data: list[dict[str, Any]] | None = Body(...),
     user: str = Depends(user_name),
+    user_model: OIDCUserModel | None = Depends(authenticate),
 ) -> dict[str, UUID]:
     broadcast_func = api_broadcast_process_data(request)
-    process_id = start_process(workflow_key, user_inputs=json_data, user=user, broadcast_func=broadcast_func)
+    process_id = start_process(
+        workflow_key, user_inputs=json_data, user_model=user_model, user=user, broadcast_func=broadcast_func
+    )
 
     return {"id": process_id}
 

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/api/api_v1/endpoints/settings.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # 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

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/api/api_v1/endpoints/subscriptions.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # 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

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/app.py

@@ -5,7 +5,7 @@ This module contains the main `OrchestratorCore` class for the `FastAPI` backend
 provides the ability to run the CLI.
 """
 
-# Copyright 2019-2020 SURF, ESnet
+# Copyright 2019-2020 SURF, ESnet, GÉANT.
 # 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

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/cli/database.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF, ESnet
+# Copyright 2019-2025 SURF, ESnet, GÉANT.
 # 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

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/cli/generator/generator/migration.py

@@ -31,16 +31,13 @@ from orchestrator.cli.generator.generator.helpers import (
     sort_product_blocks_by_dependencies,
 )
 from orchestrator.cli.generator.generator.settings import product_generator_settings as settings
-from orchestrator.settings import convert_database_uri
 
 logger = structlog.getLogger(__name__)
 
 
 def create_migration_file(message: str, head: str) -> Path | None:
-    if environ.get("DATABASE_URI"):
-        environ.update({"DATABASE_URI": convert_database_uri(environ["DATABASE_URI"])})
-    else:
-        environ.update({"DATABASE_URI": "postgresql+psycopg://nwa:nwa@localhost/orchestrator-core"})
+    if not environ.get("DATABASE_URI"):
+        environ.update({"DATABASE_URI": "postgresql://nwa:nwa@localhost/orchestrator-core"})
     if not environ.get("PYTHONPATH"):
         environ.update({"PYTHONPATH": "."})
     logger.info(

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/cli/migrate_tasks.py

@@ -1,3 +1,16 @@
+# Copyright 2019-2025 SURF, GÉANT.
+# 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.
+
 import itertools
 import operator
 from collections.abc import Iterable

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/config/assignee.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2025 SURF, GÉANT.
 # 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

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/db/__init__.py

@@ -19,6 +19,7 @@ from orchestrator.db.database import Database, transactional
 from orchestrator.db.models import (  # noqa: F401
     EngineSettingsTable,
     FixedInputTable,
+    InputStateTable,
     ProcessStepTable,
     ProcessSubscriptionTable,
     ProcessTable,
@@ -85,6 +86,7 @@ __all__ = [
     "SubscriptionMetadataTable",
     "ResourceTypeTable",
     "FixedInputTable",
+    "InputStateTable",
     "EngineSettingsTable",
     "WorkflowTable",
     "SubscriptionCustomerDescriptionTable",

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/db/loaders.py

@@ -1,5 +1,5 @@
 from functools import reduce
-from typing import Any, Callable, Iterator, NamedTuple, cast
+from typing import Any, Callable, Iterable, Iterator, NamedTuple, cast
 
 import structlog
 from sqlalchemy import inspect
@@ -131,12 +131,15 @@ def init_model_loaders() -> None:
         _MODEL_LOADERS[model] = dict(_inspect_model(model))
 
 
-def lookup_attr_loaders(model: type[DbBaseModel], attr: str) -> list[AttrLoader]:
+def _lookup_attr_loaders(model: type[DbBaseModel], attr: str) -> list[AttrLoader]:
     """Return loader(s) for an attribute on the given model."""
+    if not _MODEL_LOADERS:
+        # Ensure loaders are always initialized
+        init_model_loaders()
     return _MODEL_LOADERS.get(model, {}).get(attr, [])
 
 
-def join_attr_loaders(loaders: list[AttrLoader]) -> Load | None:
+def _join_attr_loaders(loaders: list[AttrLoader]) -> Load | None:
     """Given 1 or more attribute loaders, instantiate and chain them together."""
     if not loaders:
         return None
@@ -151,3 +154,48 @@ def join_attr_loaders(loaders: list[AttrLoader]) -> Load | None:
         return getattr(final_loader, next.loader_fn.__name__)(next.attr)
 
     return reduce(chain_loader_func, other_loaders, loader_fn)
+
+
+def _split_path(query_path: str) -> Iterable[str]:
+    yield from (field for field in query_path.split("."))
+
+
+def get_query_loaders_for_model_paths(root_model: type[DbBaseModel], model_paths: list[str]) -> list[Load]:
+    """Get sqlalchemy query loaders to use for the model based on the paths."""
+    # Sort by length to find the longest match first
+    model_paths.sort(key=lambda x: x.count("."), reverse=True)
+
+    def get_loader_for_path(model_path: str) -> tuple[str, Load | None]:
+        next_model = root_model
+
+        matched_fields: list[str] = []
+        path_loaders: list[AttrLoader] = []
+
+        for field in _split_path(model_path):
+            if not (attr_loaders := _lookup_attr_loaders(next_model, field)):
+                break
+
+            matched_fields.append(field)
+            path_loaders.extend(attr_loaders)
+            next_model = attr_loaders[-1].next_model
+
+        return ".".join(matched_fields), _join_attr_loaders(path_loaders)
+
+    query_loaders: dict[str, Load] = {}
+
+    for path in model_paths:
+        matched_path, loader = get_loader_for_path(path)
+        if not matched_path or not loader or matched_path in query_loaders:
+            continue
+        if any(known_path.startswith(f"{matched_path}.") for known_path in query_loaders):
+            continue
+        query_loaders[matched_path] = loader
+
+    loaders = list(query_loaders.values())
+    logger.debug(
+        "Generated query loaders for paths",
+        root_model=root_model,
+        model_paths=model_paths,
+        query_loaders=[str(i.path) for i in loaders],
+    )
+    return loaders

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/db/models.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # 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
@@ -15,6 +15,7 @@ from __future__ import annotations
 
 import enum
 from datetime import datetime, timezone
+from uuid import UUID
 
 import sqlalchemy
 import structlog
@@ -43,6 +44,7 @@ from sqlalchemy.exc import DontWrapMixin
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.orderinglist import ordering_list
 from sqlalchemy.orm import Mapped, deferred, mapped_column, object_session, relationship, undefer
+from sqlalchemy.sql.functions import GenericFunction
 from sqlalchemy_utils import TSVectorType, UUIDType
 
 from orchestrator.config.assignee import Assignee
@@ -667,3 +669,14 @@ class EngineSettingsTable(BaseModel):
     global_lock = mapped_column(Boolean(), default=False, nullable=False, primary_key=True)
     running_processes = mapped_column(Integer(), default=0, nullable=False)
     __table_args__: tuple = (CheckConstraint(running_processes >= 0, name="check_running_processes_positive"), {})
+
+
+class SubscriptionInstanceAsJsonFunction(GenericFunction):
+    # Added in migration 42b3d076a85b
+    name = "subscription_instance_as_json"
+
+    type = pg.JSONB()
+    inherit_cache = True
+
+    def __init__(self, sub_inst_id: UUID):
+        super().__init__(sub_inst_id)

orchestrator_core-3.2.0rc1/orchestrator/db/queries/subscription.py

@@ -0,0 +1,85 @@
+# Copyright 2019-2025 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 uuid import UUID
+
+from sqlalchemy import UUID as SA_UUID
+from sqlalchemy import cast as sa_cast
+from sqlalchemy import select
+from sqlalchemy.orm import raiseload
+
+from orchestrator.db import SubscriptionInstanceRelationTable, SubscriptionInstanceTable, db
+
+
+def _eagerload_subscription_instances(
+    subscription_id: UUID | str, instance_attributes: list[str]
+) -> list[SubscriptionInstanceTable]:
+    """Given a subscription id, recursively query all depends_on subscription instances with the instance_attributes eagerloaded.
+
+    Note: accessing instance attributes on the result that were not explicitly loaded will
+    trigger a sqlalchemy error.
+    """
+    from orchestrator.db.loaders import get_query_loaders_for_model_paths
+
+    # CTE to recursively get all subscription instance ids the subscription depends on
+    instance_ids_cte = (
+        select(
+            sa_cast(None, SA_UUID(as_uuid=True)).label("in_use_by_id"),
+            SubscriptionInstanceTable.subscription_instance_id.label("depends_on_id"),
+        )
+        .where(SubscriptionInstanceTable.subscription_id == subscription_id)
+        .cte(name="recursive_instance_ids", recursive=True)
+    )
+
+    cte_alias = instance_ids_cte.alias()
+    rel_alias = select(SubscriptionInstanceRelationTable).alias()
+
+    instance_ids = instance_ids_cte.union(
+        select(rel_alias.c.in_use_by_id, rel_alias.c.depends_on_id).where(
+            rel_alias.c.in_use_by_id == cte_alias.c.depends_on_id
+        )
+    )
+
+    select_all_instance_ids = select(instance_ids.c.depends_on_id).subquery()
+
+    # Eagerload specified instance attributes
+    query_loaders = get_query_loaders_for_model_paths(SubscriptionInstanceTable, instance_attributes)
+    # Prevent unwanted lazyloading of all other attributes
+    query_loaders += [raiseload("*")]  # type: ignore[list-item]  # todo fix this type
+    stmt = (
+        select(SubscriptionInstanceTable)
+        .where(SubscriptionInstanceTable.subscription_instance_id.in_(select(select_all_instance_ids)))
+        .options(*query_loaders)
+    )
+
+    return db.session.scalars(stmt).all()  # type: ignore[return-value]  # todo fix this type
+
+
+def eagerload_all_subscription_instances(subscription_id: UUID | str) -> list[SubscriptionInstanceTable]:
+    """Recursively find the subscription's depends_on instances and resolve relations for SubscriptionModel.from_subscription_id()."""
+    instance_attributes = [
+        "subscription.product",
+        "product_block",
+        "values.resource_type",
+        "depends_on",
+        "in_use_by",
+    ]
+    return _eagerload_subscription_instances(subscription_id, instance_attributes)
+
+
+def eagerload_all_subscription_instances_only_inuseby(subscription_id: UUID | str) -> list[SubscriptionInstanceTable]:
+    """Recursively find the subscription's depends_on instances and resolve their in_use_by relations."""
+    instance_attributes = [
+        "in_use_by",
+    ]
+    return _eagerload_subscription_instances(subscription_id, instance_attributes)

orchestrator_core-3.2.0rc1/orchestrator/db/queries/subscription_instance.py

@@ -0,0 +1,28 @@
+# Copyright 2019-2025 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 uuid import UUID
+
+from sqlalchemy import select
+
+from orchestrator.db import db
+from orchestrator.db.models import SubscriptionInstanceAsJsonFunction
+
+
+def get_subscription_instance_dict(subscription_instance_id: UUID) -> dict:
+    """Query the subscription instance as aggregated JSONB and returns it as a dict.
+
+    Note: all values are returned as lists and have to be transformed by the caller.
+    It was attempted to do this in the DB query but this gave worse performance.
+    """
+    return db.session.execute(select(SubscriptionInstanceAsJsonFunction(subscription_instance_id))).scalar_one()

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/devtools/populator.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # 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

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.2.0rc1}/orchestrator/domain/__init__.py

@@ -11,11 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-from orchestrator.domain.base import SubscriptionModel
+from orchestrator.domain.base import SubscriptionModel, SubscriptionModelRegistry
 from orchestrator.utils.docs import make_product_type_index_doc
 
-SUBSCRIPTION_MODEL_REGISTRY: dict[str, type[SubscriptionModel]] = {}
+SUBSCRIPTION_MODEL_REGISTRY: SubscriptionModelRegistry = SubscriptionModelRegistry()
 
 __doc__ = make_product_type_index_doc(SUBSCRIPTION_MODEL_REGISTRY)