Update deprecated import statements

gso/cli/imports.py

@@ -12,8 +12,9 @@ import typer
 import yaml
 from orchestrator.db import db
 from orchestrator.services.processes import start_process
-from orchestrator.types import SubscriptionLifecycle, UUIDstr
+from orchestrator.types import SubscriptionLifecycle
 from pydantic import BaseModel, NonNegativeInt, ValidationError, field_validator, model_validator
+from pydantic_forms.types import UUIDstr
 from sqlalchemy.exc import SQLAlchemyError
 
 from gso.db.models import PartnerTable

gso/products/product_blocks/edge_port.py

@@ -5,7 +5,8 @@ different technological domain, still managed by GÉANT. In other words, an Edge
 """
 
 from orchestrator.domain.base import ProductBlockModel
-from orchestrator.types import SubscriptionLifecycle, strEnum
+from orchestrator.types import SubscriptionLifecycle
+from pydantic_forms.types import strEnum
 
 from gso.products.product_blocks.router import RouterBlock, RouterBlockInactive, RouterBlockProvisioning
 from gso.utils.types.interfaces import LAGMemberList, PhysicalPortCapacity

gso/products/product_blocks/iptrunk.py

@@ -5,8 +5,9 @@ from typing import Annotated
 
 from annotated_types import Len
 from orchestrator.domain.base import ProductBlockModel, T
-from orchestrator.types import SubscriptionLifecycle, strEnum
+from orchestrator.types import SubscriptionLifecycle
 from pydantic import AfterValidator
+from pydantic_forms.types import strEnum
 from pydantic_forms.validators import validate_unique_list
 from typing_extensions import Doc
 

gso/products/product_blocks/router.py

 """Product block for `Router` products."""
 
 from orchestrator.domain.base import ProductBlockModel
-from orchestrator.types import SubscriptionLifecycle, strEnum
+from orchestrator.types import SubscriptionLifecycle
+from pydantic_forms.types import strEnum
 
 from gso.products.product_blocks.site import (
     SiteBlock,

gso/products/product_blocks/site.py

 """The product block that describes a site subscription."""
 
 from orchestrator.domain.base import ProductBlockModel
-from orchestrator.types import SubscriptionLifecycle, strEnum
+from orchestrator.types import SubscriptionLifecycle
+from pydantic_forms.types import strEnum
 
 from gso.utils.types.coordinates import LatitudeCoordinate, LongitudeCoordinate
 from gso.utils.types.ip_address import IPAddress

gso/services/lso_client.py

@@ -11,11 +11,10 @@ import requests
 from orchestrator import step
 from orchestrator.config.assignee import Assignee
 from orchestrator.forms import SubmitFormPage
-from orchestrator.types import State
 from orchestrator.utils.errors import ProcessFailureError
 from orchestrator.workflow import Step, StepList, begin, callback_step, conditional, inputstep
 from pydantic import ConfigDict
-from pydantic_forms.types import FormGenerator
+from pydantic_forms.types import FormGenerator, State
 from pydantic_forms.validators import Label, LongText, ReadOnlyField
 from unidecode import unidecode
 

gso/services/netbox_client.py

@@ -5,7 +5,7 @@ from uuid import UUID
 
 import pydantic
 import pynetbox
-from orchestrator.types import UUIDstr
+from pydantic_forms.types import UUIDstr
 from pynetbox.models.dcim import Devices, DeviceTypes, Interfaces
 
 from gso.products.product_types.router import Router

gso/services/processes.py

@@ -5,8 +5,8 @@ or inconsistent when not careful. These methods are related to operations regard
 """
 
 from orchestrator.db import ProcessTable, WorkflowTable, db
-from orchestrator.types import UUIDstr
 from orchestrator.workflow import ProcessStatus
+from pydantic_forms.types import UUIDstr
 from sqlalchemy import ScalarResult, or_, select
 from sqlalchemy.orm import Query
 

gso/services/subscriptions.py

@@ -18,7 +18,8 @@ from orchestrator.db import (
 )
 from orchestrator.domain import SubscriptionModel
 from orchestrator.services.subscriptions import query_in_use_by_subscriptions
-from orchestrator.types import SubscriptionLifecycle, UUIDstr
+from orchestrator.types import SubscriptionLifecycle
+from pydantic_forms.types import UUIDstr
 from sqlalchemy import and_, text
 from sqlalchemy.exc import SQLAlchemyError
 

gso/settings.py

@@ -10,9 +10,8 @@ import logging
 import os
 from pathlib import Path
 
-from orchestrator.types import UUIDstr
 from pydantic import EmailStr
-from pydantic_forms.types import strEnum
+from pydantic_forms.types import UUIDstr, strEnum
 from pydantic_settings import BaseSettings
 
 from gso.utils.types.ip_address import IPv4Netmask, IPv6Netmask, PortNumber

gso/utils/types/netbox_router.py

@@ -2,8 +2,8 @@
 
 from typing import Annotated, TypeVar
 
-from orchestrator.types import UUIDstr
 from pydantic import AfterValidator
+from pydantic_forms.types import UUIDstr
 
 from gso.products.product_types.router import Router
 from gso.services.netbox_client import NetboxClient

gso/utils/workflow_steps.py

@@ -6,12 +6,11 @@ from typing import Any
 from orchestrator import inputstep, step
 from orchestrator.config.assignee import Assignee
 from orchestrator.forms import SubmitFormPage
-from orchestrator.types import State, UUIDstr
 from orchestrator.utils.errors import ProcessFailureError
 from orchestrator.utils.json import json_dumps
 from orchestrator.workflow import StepList, conditional
 from pydantic import ConfigDict
-from pydantic_forms.types import FormGenerator
+from pydantic_forms.types import FormGenerator, State, UUIDstr
 from pydantic_forms.validators import Label
 
 from gso.products.product_blocks.router import RouterRole

gso/workflows/edge_port/create_edge_port.py

@@ -7,12 +7,13 @@ from annotated_types import Len
 from orchestrator import step, workflow
 from orchestrator.forms import FormPage
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State, SubscriptionLifecycle, UUIDstr
+from orchestrator.types import SubscriptionLifecycle
 from orchestrator.utils.errors import ProcessFailureError
 from orchestrator.workflow import StepList, begin, done
 from orchestrator.workflows.steps import resync, set_status, store_process_subscription
 from orchestrator.workflows.utils import wrap_create_initial_input_form
 from pydantic import AfterValidator, ConfigDict, model_validator
+from pydantic_forms.types import FormGenerator, State, UUIDstr
 from pydantic_forms.validators import validate_unique_list
 from pynetbox.models.dcim import Interfaces
 

gso/workflows/edge_port/create_imported_edge_port.py

@@ -6,11 +6,11 @@ from uuid import uuid4
 from orchestrator import workflow
 from orchestrator.forms import SubmitFormPage
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State, SubscriptionLifecycle
+from orchestrator.types import SubscriptionLifecycle
 from orchestrator.workflow import StepList, begin, done, step
 from orchestrator.workflows.steps import resync, set_status, store_process_subscription
 from pydantic import AfterValidator, ConfigDict
-from pydantic_forms.types import UUIDstr
+from pydantic_forms.types import FormGenerator, State, UUIDstr
 from pydantic_forms.validators import validate_unique_list
 
 from gso.products import ProductName

gso/workflows/edge_port/import_edge_port.py

 """A modification workflow for migrating an ImportedEdgePort to an EdgePort subscription."""
 
 from orchestrator.targets import Target
-from orchestrator.types import State, UUIDstr
 from orchestrator.workflow import StepList, done, init, step, workflow
 from orchestrator.workflows.steps import resync, store_process_subscription, unsync
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
+from pydantic_forms.types import State, UUIDstr
 
 from gso.products import ProductName
 from gso.products.product_types.edge_port import EdgePort, ImportedEdgePort

gso/workflows/edge_port/migrate_edge_port.py

@@ -10,13 +10,13 @@ from orchestrator import step, workflow
 from orchestrator.config.assignee import Assignee
 from orchestrator.forms import FormPage, SubmitFormPage
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State, UUIDstr
 from orchestrator.utils.errors import ProcessFailureError
 from orchestrator.utils.json import json_dumps
 from orchestrator.workflow import StepList, begin, done, inputstep
 from orchestrator.workflows.steps import resync, store_process_subscription, unsync
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
 from pydantic import AfterValidator, ConfigDict, Field
+from pydantic_forms.types import FormGenerator, State, UUIDstr
 from pydantic_forms.validators import Divider, Label, ReadOnlyField, validate_unique_list
 from pynetbox.models.dcim import Interfaces
 

gso/workflows/edge_port/validate_edge_port.py

@@ -3,11 +3,11 @@
 from typing import Any
 
 from orchestrator.targets import Target
-from orchestrator.types import State, UUIDstr
 from orchestrator.utils.errors import ProcessFailureError
 from orchestrator.workflow import StepList, begin, done, step, workflow
 from orchestrator.workflows.steps import resync, store_process_subscription, unsync
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
+from pydantic_forms.types import State, UUIDstr
 
 from gso.products.product_types.edge_port import EdgePort
 from gso.services.lso_client import LSOState, anonymous_lso_interaction

gso/workflows/iptrunk/activate_iptrunk.py

@@ -8,10 +8,11 @@ from orchestrator.config.assignee import Assignee
 from orchestrator.forms import SubmitFormPage
 from orchestrator.forms.validators import Label
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, SubscriptionLifecycle, UUIDstr
+from orchestrator.types import SubscriptionLifecycle
 from orchestrator.workflow import StepList, begin, done, inputstep, workflow
 from orchestrator.workflows.steps import resync, set_status, store_process_subscription, unsync
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
+from pydantic_forms.types import FormGenerator, UUIDstr
 
 from gso.products.product_types.iptrunk import Iptrunk
 

gso/workflows/iptrunk/create_imported_iptrunk.py

@@ -7,10 +7,11 @@ from uuid import uuid4
 from orchestrator import workflow
 from orchestrator.forms import SubmitFormPage
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State, SubscriptionLifecycle
+from orchestrator.types import SubscriptionLifecycle
 from orchestrator.workflow import StepList, begin, done, step
 from orchestrator.workflows.steps import resync, set_status, store_process_subscription
 from pydantic import AfterValidator, ConfigDict
+from pydantic_forms.types import FormGenerator, State
 from pydantic_forms.validators import validate_unique_list
 
 from gso.products import ProductName

gso/workflows/iptrunk/create_iptrunk.py

@@ -34,7 +34,7 @@ from annotated_types import Len
 from orchestrator.forms import FormPage
 from orchestrator.forms.validators import Choice, Label
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State, SubscriptionLifecycle, UUIDstr
+from orchestrator.types import SubscriptionLifecycle
 from orchestrator.utils.errors import ProcessFailureError
 from orchestrator.utils.json import json_dumps
 from orchestrator.workflow import StepList, begin, conditional, done, step, step_group, workflow
@@ -42,6 +42,7 @@ from orchestrator.workflows.steps import resync, set_status, store_process_subsc
 from orchestrator.workflows.utils import wrap_create_initial_input_form
 from ping3 import ping
 from pydantic import ConfigDict
+from pydantic_forms.types import FormGenerator, State, UUIDstr
 from pydantic_forms.validators import ReadOnlyField
 from pynetbox.models.dcim import Interfaces