@sanderegg, @GitHK review: import unset constant

Author: pcrespov

packages/common-library/src/common_library/basic_types.py

@@ -1,11 +1,13 @@
 from enum import StrEnum
+from typing import Any
 
 from pydantic_core import PydanticUndefined
 
 # SEE https://github.com/fastapi/fastapi/blob/master/fastapi/_compat.py#L75-L78
-#
-# Use as default when default_factory
 Undefined = PydanticUndefined
+UNSET: Any = Undefined
+# Use `UNSET` as default when default_factory
+# SEE https://github.com/ITISFoundation/osparc-simcore/pull/6882
 
 
 class LogLevel(StrEnum):

packages/models-library/src/models_library/app_diagnostics.py

@@ -1,10 +1,8 @@
 from typing import Annotated, Any
 
-from common_library.basic_types import Undefined
+from common_library.basic_types import UNSET
 from pydantic import AnyUrl, BaseModel, Field
 
-_Unset: Any = Undefined
-
 
 class AppStatusCheck(BaseModel):
     app_name: str = Field(..., description="Application name")
@@ -16,7 +14,7 @@ class AppStatusCheck(BaseModel):
             description="Other backend services connected from this service",
             json_schema_extra={"default": {}},
         ),
-    ] = _Unset
+    ] = UNSET
 
     sessions: Annotated[
         dict[str, Any] | None,
@@ -25,7 +23,7 @@ class AppStatusCheck(BaseModel):
             description="Client sessions info. If single session per app, then is denoted as main",
             json_schema_extra={"default": {}},
         ),
-    ] = _Unset
+    ] = UNSET
 
     url: AnyUrl | None = Field(
         default=None,

packages/models-library/src/models_library/projects.py

@@ -7,7 +7,7 @@
 from typing import Annotated, Any, Final, TypeAlias
 from uuid import UUID
 
-from common_library.basic_types import Undefined
+from common_library.basic_types import UNSET
 from models_library.basic_types import ConstrainedStr
 from models_library.folders import FolderID
 from models_library.workspaces import WorkspaceID
@@ -25,9 +25,6 @@
     none_to_empty_str_pre_validator,
 )
 
-_Unset: Any = Undefined
-
-
 ProjectID: TypeAlias = UUID
 ClassifierID: TypeAlias = str
 
@@ -155,7 +152,7 @@ class Project(BaseProjectModel):
             description="Contains the reference to the project classifiers",
             examples=["some:id:to:a:classifier"],
         ),
-    ] = _Unset
+    ] = UNSET
 
     # Project state (SEE projects_state.py)
     state: ProjectState | None = None

packages/models-library/src/models_library/projects_nodes.py

@@ -4,7 +4,7 @@
 
 from typing import Annotated, Any, TypeAlias, Union
 
-from common_library.basic_types import Undefined
+from common_library.basic_types import UNSET
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -31,8 +31,6 @@
 from .projects_state import RunningState
 from .services import ServiceKey, ServiceVersion
 
-_Unset: Any = Undefined
-
 InputTypes = Union[
     # NOTE: WARNING the order in Union[*] below matters!
     StrictBool,
@@ -164,7 +162,7 @@ class Node(BaseModel):
     inputs: Annotated[
         InputsDict | None,
         Field(default_factory=dict, description="values of input properties"),
-    ] = _Unset
+    ] = UNSET
 
     inputs_required: Annotated[
         list[InputID],
@@ -173,7 +171,7 @@ class Node(BaseModel):
             description="Defines inputs that are required in order to run the service",
             alias="inputsRequired",
         ),
-    ] = _Unset
+    ] = UNSET
 
     inputs_units: Annotated[
         dict[InputID, UnitStr] | None,
@@ -198,13 +196,13 @@ class Node(BaseModel):
             description="node IDs of where the node is connected to",
             alias="inputNodes",
         ),
-    ] = _Unset
+    ] = UNSET
 
     # OUTPUT PORTS ---
     outputs: Annotated[
         OutputsDict | None,
         Field(default_factory=dict, description="values of output properties"),
-    ] = _Unset
+    ] = UNSET
 
     output_node: Annotated[
         bool | None, Field(deprecated=True, alias="outputNode")
@@ -236,7 +234,7 @@ class Node(BaseModel):
     state: Annotated[
         NodeState | None,
         Field(default_factory=NodeState, description="The node's state object"),
-    ] = _Unset
+    ] = UNSET
 
     boot_options: Annotated[
         dict[EnvVarKey, str] | None,

packages/service-integration/src/service_integration/osparc_config.py

@@ -16,7 +16,7 @@
 from pathlib import Path
 from typing import Annotated, Any, Final, Literal
 
-from common_library.basic_types import Undefined
+from common_library.basic_types import UNSET
 from models_library.basic_types import SHA256Str
 from models_library.callbacks_mapping import CallbacksMapping
 from models_library.service_settings_labels import (
@@ -65,8 +65,6 @@
     ServiceType.DYNAMIC: DYNAMIC_SERVICE_KEY_FORMAT,
 }
 
-_Unset: Any = Undefined
-
 
 class DockerComposeOverwriteConfig(ComposeSpecification):
     """Content of docker-compose.overwrite.yml configuration file"""
@@ -220,7 +218,7 @@ class RuntimeConfig(BaseModel):
 
     callbacks_mapping: Annotated[
         CallbacksMapping | None, Field(default_factory=dict)
-    ] = _Unset
+    ] = UNSET
 
     paths_mapping: PathMappingsLabel | None = None
 
@@ -232,7 +230,7 @@ class RuntimeConfig(BaseModel):
 
     containers_allowed_outgoing_internet: set[str] | None = None
 
-    settings: Annotated[list[SettingsItem], Field(default_factory=list)] = _Unset
+    settings: Annotated[list[SettingsItem], Field(default_factory=list)] = UNSET
 
     @model_validator(mode="before")
     @classmethod