Core 5.0 namespaced

README.md

@@ -353,8 +353,8 @@ The `wsgi.py` can be as simple as shown below, and can be deployed by a
 ASGI server like Uvicorn[^5].
 
 ```python
-from orchestrator import OrchestratorCore
-from orchestrator.settings import AppSettings
+from orchestrator.core import OrchestratorCore
+from orchestrator.core.settings import AppSettings
 
 import products
 import workflows
@@ -373,7 +373,7 @@ uvicorn --host localhost --port 8080 wsgi:app
 To use the orchestrator command line interface create a `main.py` like below:
 
 ```python
-from orchestrator.cli.main import app as core_cli
+from orchestrator.core.cli.main import app as core_cli
 
 if __name__ == "__main__":
     core_cli()
@@ -658,7 +658,7 @@ to be added to the `SUBSCRIPTION_MODEL_REGISTRY`, in
 `products/__init__.py`, as shown below.
 
 ```python
-from orchestrator.domain import SUBSCRIPTION_MODEL_REGISTRY
+from orchestrator.core.domain import SUBSCRIPTION_MODEL_REGISTRY
 from products.product_types.core_link import CoreLink
 
 SUBSCRIPTION_MODEL_REGISTRY.update(
@@ -676,7 +676,7 @@ an argument, see below. Notice that the name of the product and the
 product type need to match with the subscription model registry.
 
 ```python
-from orchestrator.migrations.helpers import create
+from orchestrator.core.migrations.helpers import create
 
 new_products = {
     "products": {

graphql_federation.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import strawberry
-from orchestrator.graphql.schemas import DEFAULT_GRAPHQL_MODELS
+from orchestrator.core.graphql.schemas import DEFAULT_GRAPHQL_MODELS
 
 from products.product_blocks.node import NodeBlockInactive as _NodeBlockInactive
 

main.py

@@ -12,10 +12,10 @@
 # limitations under the License.
 
 import typer
-from orchestrator import app_settings
-from orchestrator.cli.main import app as core_cli
-from orchestrator.db import init_database
-from orchestrator.log_config import LOGGER_OVERRIDES
+from orchestrator.core import app_settings
+from orchestrator.core.cli.main import app as core_cli
+from orchestrator.core.db import init_database
+from orchestrator.core.log_config import LOGGER_OVERRIDES
 
 import products  # noqa: F401  Registers SUBSCRIPTION_MODEL_REGISTRY entries
 from nwastdlib.logging import initialise_logging

migrations/env.py

@@ -1,7 +1,7 @@
 import structlog
 from alembic import context
-from orchestrator.db.database import BaseModel
-from orchestrator.settings import app_settings
+from orchestrator.core.db.database import BaseModel
+from orchestrator.core.settings import app_settings
 from sqlalchemy import engine_from_config, pool
 
 # this is the Alembic Config object, which provides

migrations/helpers.py

@@ -1,3 +1,3 @@
-# from orchestrator.migrations.helpers import *
+# from orchestrator.core.migrations.helpers import *
 
 # Write your own helper functions below this line.

migrations/versions/schema/2023-10-27_a84ca2e5e4db_add_node.py

@@ -9,14 +9,14 @@
 from uuid import uuid4
 
 from alembic import op
-from orchestrator.migrations.helpers import (
+from orchestrator.core.migrations.helpers import (
     create,
     create_workflow,
     delete,
     delete_workflow,
     ensure_default_workflows,
 )
-from orchestrator.targets import Target
+from orchestrator.core.targets import Target
 
 # revision identifiers, used by Alembic.
 revision = "a84ca2e5e4db"

migrations/versions/schema/2023-11-02_c044b0da4126_add_port.py

@@ -9,14 +9,14 @@
 from uuid import uuid4
 
 from alembic import op
-from orchestrator.migrations.helpers import (
+from orchestrator.core.migrations.helpers import (
     create,
     create_workflow,
     delete,
     delete_workflow,
     ensure_default_workflows,
 )
-from orchestrator.targets import Target
+from orchestrator.core.targets import Target
 
 from products.product_types.port import PortSpeed
 

migrations/versions/schema/2023-11-16_1faddadd7aae_add_core_link.py

@@ -9,14 +9,14 @@
 from uuid import uuid4
 
 from alembic import op
-from orchestrator.migrations.helpers import (
+from orchestrator.core.migrations.helpers import (
     create,
     create_workflow,
     delete,
     delete_workflow,
     ensure_default_workflows,
 )
-from orchestrator.targets import Target
+from orchestrator.core.targets import Target
 
 from products.product_types.core_link import CoreLinkSpeed
 

migrations/versions/schema/2023-11-17_e2a0fed2a4c7_add_l2vpn.py

@@ -9,14 +9,14 @@
 from uuid import uuid4
 
 from alembic import op
-from orchestrator.migrations.helpers import (
+from orchestrator.core.migrations.helpers import (
     create,
     create_workflow,
     delete,
     delete_workflow,
     ensure_default_workflows,
 )
-from orchestrator.targets import Target
+from orchestrator.core.targets import Target
 
 # revision identifiers, used by Alembic.
 revision = "e2a0fed2a4c7"

migrations/versions/schema/2023-12-04_d946c20663d3_add_netbox_tasks.py

@@ -8,8 +8,8 @@
 
 import sqlalchemy as sa
 from alembic import op
-from orchestrator.migrations.helpers import delete_workflow
-from orchestrator.targets import Target
+from orchestrator.core.migrations.helpers import delete_workflow
+from orchestrator.core.targets import Target
 
 # revision identifiers, used by Alembic.
 revision = "d946c20663d3"

migrations/versions/schema/2025-08-28_0e8d17ce0f06_reconcile_workflows_l2vpn.py

@@ -7,7 +7,7 @@
 """
 
 from alembic import op
-from orchestrator.migrations.helpers import create_workflow, delete_workflow
+from orchestrator.core.migrations.helpers import create_workflow, delete_workflow
 
 # revision identifiers, used by Alembic.
 revision = "0e8d17ce0f06"

migrations/versions/schema/2025-09-30_a87d11eb8dd1_add_nsistp.py

@@ -9,8 +9,14 @@
 from uuid import uuid4
 
 from alembic import op
-from orchestrator.migrations.helpers import create, create_workflow, delete, delete_workflow, ensure_default_workflows
-from orchestrator.targets import Target
+from orchestrator.core.migrations.helpers import (
+    create,
+    create_workflow,
+    delete,
+    delete_workflow,
+    ensure_default_workflows,
+)
+from orchestrator.core.targets import Target
 
 # revision identifiers, used by Alembic.
 revision = "a87d11eb8dd1"

migrations/versions/schema/2026-02-04_f8dc5901fe6d_add_nsip2p.py

@@ -9,8 +9,14 @@
 from uuid import uuid4
 
 from alembic import op
-from orchestrator.migrations.helpers import create, create_workflow, delete, delete_workflow, ensure_default_workflows
-from orchestrator.targets import Target
+from orchestrator.core.migrations.helpers import (
+    create,
+    create_workflow,
+    delete,
+    delete_workflow,
+    ensure_default_workflows,
+)
+from orchestrator.core.targets import Target
 
 # revision identifiers, used by Alembic.
 revision = "f8dc5901fe6d"

products/__init__.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 
-from orchestrator.domain import SUBSCRIPTION_MODEL_REGISTRY
+from orchestrator.core.domain import SUBSCRIPTION_MODEL_REGISTRY
 
 from products.product_types.core_link import CoreLink
 from products.product_types.l2vpn import L2vpn

products/product_blocks/core_link.py

@@ -15,8 +15,8 @@
 from typing import Annotated
 
 from annotated_types import Len
-from orchestrator.domain.base import ProductBlockModel
-from orchestrator.types import SI, SubscriptionLifecycle
+from orchestrator.core.domain.base import ProductBlockModel
+from orchestrator.core.types import SI, SubscriptionLifecycle
 from pydantic import computed_field
 
 from products.product_blocks.core_port import CorePortBlock, CorePortBlockInactive, CorePortBlockProvisioning

products/product_blocks/core_port.py

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 
-from orchestrator.domain.base import ProductBlockModel
-from orchestrator.types import SubscriptionLifecycle
+from orchestrator.core.domain.base import ProductBlockModel
+from orchestrator.core.types import SubscriptionLifecycle
 from pydantic import computed_field
 
 from products.product_blocks.node import NodeBlock, NodeBlockInactive, NodeBlockProvisioning

products/product_blocks/node.py

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 
-from orchestrator.domain.base import ProductBlockModel
-from orchestrator.types import SubscriptionLifecycle
+from orchestrator.core.domain.base import ProductBlockModel
+from orchestrator.core.types import SubscriptionLifecycle
 from pydantic import computed_field
 
 

products/product_blocks/nsistp.py

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 
-from orchestrator.domain.base import ProductBlockModel
-from orchestrator.types import SubscriptionLifecycle
+from orchestrator.core.domain.base import ProductBlockModel
+from orchestrator.core.types import SubscriptionLifecycle
 from pydantic import computed_field
 
 from products.product_blocks.sap import SAPBlock, SAPBlockInactive, SAPBlockProvisioning

products/product_blocks/port.py

@@ -14,8 +14,8 @@
 
 from typing import List
 
-from orchestrator.domain.base import ProductBlockModel
-from orchestrator.types import SubscriptionLifecycle
+from orchestrator.core.domain.base import ProductBlockModel
+from orchestrator.core.types import SubscriptionLifecycle
 from pydantic import computed_field
 
 from products.product_blocks.node import NodeBlock, NodeBlockInactive, NodeBlockProvisioning

products/product_blocks/sap.py

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 
-from orchestrator.domain.base import ProductBlockModel
-from orchestrator.types import SubscriptionLifecycle
+from orchestrator.core.domain.base import ProductBlockModel
+from orchestrator.core.types import SubscriptionLifecycle
 from pydantic import computed_field
 
 from nwastdlib.vlans import VlanRanges

products/product_blocks/virtual_circuit.py

@@ -15,8 +15,8 @@
 from typing import Annotated
 
 from annotated_types import Len
-from orchestrator.domain.base import ProductBlockModel
-from orchestrator.types import SI, SubscriptionLifecycle
+from orchestrator.core.domain.base import ProductBlockModel
+from orchestrator.core.types import SI, SubscriptionLifecycle
 from pydantic import computed_field
 
 from products.product_blocks.sap import SAPBlock, SAPBlockInactive, SAPBlockProvisioning

products/product_types/core_link.py

@@ -14,8 +14,8 @@
 
 from enum import IntEnum
 
-from orchestrator.domain.base import SubscriptionModel
-from orchestrator.types import SubscriptionLifecycle
+from orchestrator.core.domain.base import SubscriptionModel
+from orchestrator.core.types import SubscriptionLifecycle
 
 from products.product_blocks.core_link import CoreLinkBlock, CoreLinkBlockInactive, CoreLinkBlockProvisioning
 

products/product_types/l2vpn.py

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 
-from orchestrator.domain.base import SubscriptionModel
-from orchestrator.types import SubscriptionLifecycle
+from orchestrator.core.domain.base import SubscriptionModel
+from orchestrator.core.types import SubscriptionLifecycle
 
 from products.product_blocks.virtual_circuit import (
     VirtualCircuitBlock,

products/product_types/node.py

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 
-from orchestrator.domain.base import SubscriptionModel
-from orchestrator.types import SubscriptionLifecycle
+from orchestrator.core.domain.base import SubscriptionModel
+from orchestrator.core.types import SubscriptionLifecycle
 
 from products.product_blocks.node import NodeBlock, NodeBlockInactive, NodeBlockProvisioning
 from pydantic_forms.types import strEnum

products/product_types/nsip2p.py

@@ -11,8 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from orchestrator.domain.base import SubscriptionModel
-from orchestrator.types import SubscriptionLifecycle
+from orchestrator.core.domain.base import SubscriptionModel
+from orchestrator.core.types import SubscriptionLifecycle
 from pydantic import model_validator
 
 from products.product_blocks.virtual_circuit import (

products/product_types/nsistp.py

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 
-from orchestrator.domain.base import SubscriptionModel
-from orchestrator.types import SubscriptionLifecycle
+from orchestrator.core.domain.base import SubscriptionModel
+from orchestrator.core.types import SubscriptionLifecycle
 
 from nwastdlib.vlans import VlanRanges
 from products.product_blocks.nsistp import NsistpBlock, NsistpBlockInactive, NsistpBlockProvisioning

products/product_types/port.py

@@ -14,8 +14,8 @@
 
 from enum import IntEnum
 
-from orchestrator.domain.base import SubscriptionModel
-from orchestrator.types import SubscriptionLifecycle
+from orchestrator.core.domain.base import SubscriptionModel
+from orchestrator.core.types import SubscriptionLifecycle
 
 from products.product_blocks.port import PortBlock, PortBlockInactive, PortBlockProvisioning
 

products/services/description.py

@@ -15,7 +15,7 @@
 from functools import singledispatch
 from typing import Union
 
-from orchestrator.domain.base import ProductBlockModel, ProductModel, SubscriptionModel
+from orchestrator.core.domain.base import ProductBlockModel, ProductModel, SubscriptionModel
 
 from products.product_blocks.core_port import CorePortBlockProvisioning
 from products.product_blocks.sap import SAPBlockProvisioning

products/services/netbox/netbox.py

@@ -15,7 +15,7 @@
 from functools import singledispatch
 from typing import Any
 
-from orchestrator.domain.base import ProductBlockModel, SubscriptionModel
+from orchestrator.core.domain.base import ProductBlockModel, SubscriptionModel
 
 from products.product_blocks.core_link import CoreLinkBlockProvisioning
 from products.product_blocks.core_port import CorePortBlockProvisioning

products/services/netbox/payload/core_link.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 
-from orchestrator.domain import SubscriptionModel
+from orchestrator.core.domain import SubscriptionModel
 
 from products.product_blocks.core_link import CoreLinkBlockProvisioning
 from services import netbox

products/services/netbox/payload/core_port.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 
-from orchestrator.domain import SubscriptionModel
+from orchestrator.core.domain import SubscriptionModel
 
 from products.product_blocks.core_port import CorePortBlockProvisioning
 from services import netbox

products/services/netbox/payload/l2vpn.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 
-from orchestrator.domain import SubscriptionModel
+from orchestrator.core.domain import SubscriptionModel
 
 from products.product_blocks.virtual_circuit import VirtualCircuitBlockProvisioning
 from products.services.description import description