refactor old broken stuff

Author: Andrei Neagu

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

@@ -11,7 +11,7 @@
 
 
 class AioDockerContainerSpec(ContainerSpec):
-    Env: dict[str, str | None] | None = Field(  # type: ignore
+    Env: dict[str, str | None] | None = Field(
         default=None,
         description="aiodocker expects here a dictionary and re-convert it back internally`.\n",
     )

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

@@ -2,7 +2,7 @@
 from enum import StrEnum
 from typing import Annotated, TypeAlias
 
-from pydantic import ConstrainedInt, Field, HttpUrl, PositiveInt, StringConstraints
+from pydantic import Field, HttpUrl, PositiveInt, StringConstraints
 
 from .basic_regex import (
     PROPERTY_KEY_RE,
@@ -26,9 +26,7 @@
 
 
 # https://en.wikipedia.org/wiki/List_of_TCP_and_UDP_port_numbers#Registered_ports
-class RegisteredPortInt(ConstrainedInt):
-    gt = 1024
-    lt = 65535
+RegisteredPortInt: TypeAlias = Annotated[int, Field(gt=1024, lt=65535)]
 
 
 # e.g. 'v5'

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

@@ -192,7 +192,7 @@ def routing_key(self) -> str | None:
 
 class DynamicServiceRunningMessage(RabbitMessageBase):
     channel_name: Literal["io.simcore.service.dynamic-service-running"] = Field(
-        default="io.simcore.service.dynamic-service-running", const=True
+        default="io.simcore.service.dynamic-service-running"
     )
 
     project_id: ProjectID

services/api-server/src/simcore_service_api_server/models/schemas/jobs.py

@@ -1,15 +1,14 @@
 import datetime
 import hashlib
 import logging
-from typing import Any, ClassVar, TypeAlias
+from typing import Annotated, Any, ClassVar, TypeAlias
 from uuid import UUID, uuid4
 
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.projects_state import RunningState
 from pydantic import (
     BaseModel,
-    ConstrainedInt,
     Extra,
     Field,
     HttpUrl,
@@ -247,9 +246,7 @@ def resource_name(self) -> str:
         return self.name
 
 
-class PercentageInt(ConstrainedInt):
-    ge = 0
-    le = 100
+PercentageInt: TypeAlias = Annotated[int, Field(ge=0, le=100)]
 
 
 class JobStatus(BaseModel):

services/web/server/src/simcore_service_webserver/meta_modeling/_results.py

@@ -5,20 +5,17 @@
 
 """
 
-
 import logging
-from typing import Any
+from ast import TypeAlias
+from typing import Annotated, Any
 
 from models_library.projects_nodes import OutputsDict
 from models_library.projects_nodes_io import NodeIDStr
-from pydantic import BaseModel, ConstrainedInt, Field
+from pydantic import BaseModel, Field
 
 _logger = logging.getLogger(__name__)
 
-
-class ProgressInt(ConstrainedInt):
-    ge = 0
-    le = 100
+ProgressInt: TypeAlias = Annotated[int, Field(ge=0, le=100)]
 
 
 class ExtractedResults(BaseModel):