🐛 report correct status on user service fail (ITISFoundation#3610)

Author: GitHK

packages/models-library/src/models_library/generated_models/docker_rest_api.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  https://docs.docker.com/engine/api/v1.41.yaml
-#   timestamp: 2022-11-19T13:23:51+00:00
+#   timestamp: 2022-11-28T14:56:37+00:00
 
 from __future__ import annotations
 
@@ -15,7 +15,7 @@ class Model(BaseModel):
     __root__: Any
 
 
-class Type(Enum):
+class Type(str, Enum):
     tcp = "tcp"
     udp = "udp"
     sctp = "sctp"
@@ -34,7 +34,7 @@ class Port(BaseModel):
     Type: Type
 
 
-class Type1(Enum):
+class Type1(str, Enum):
     """
         The mount type:
 
@@ -136,7 +136,7 @@ class ThrottleDevice(BaseModel):
     Rate: Optional[int] = Field(None, description="Rate", ge=0)
 
 
-class Propagation(Enum):
+class Propagation(str, Enum):
     """
     A propagation mode with the value `[r]private`, `[r]shared`, or `[r]slave`.
     """
@@ -232,7 +232,7 @@ class Mount(BaseModel):
     )
 
 
-class Name(Enum):
+class Name(str, Enum):
     """
         - Empty string means not to restart
     - `no` Do not automatically restart
@@ -482,7 +482,7 @@ class HealthConfig(BaseModel):
     )
 
 
-class Status(Enum):
+class Status(str, Enum):
     """
         Status is one of `none`, `starting`, `healthy` or `unhealthy`
 
@@ -523,7 +523,7 @@ class HealthcheckResult(BaseModel):
     Output: Optional[str] = Field(None, description="Output from last check")
 
 
-class Type3(Enum):
+class Type3(str, Enum):
     json_file = "json-file"
     syslog = "syslog"
     journald = "journald"
@@ -544,7 +544,7 @@ class LogConfig(BaseModel):
     Config_: Optional[dict[str, str]] = Field(None, alias="Config")
 
 
-class CgroupnsMode(Enum):
+class CgroupnsMode(str, Enum):
     """
         cgroup namespace mode for the container. Possible values are:
 
@@ -564,7 +564,7 @@ class ConsoleSizeItem(BaseModel):
     __root__: int = Field(..., ge=0)
 
 
-class Isolation(Enum):
+class Isolation(str, Enum):
     """
     Isolation technology of the container. (Windows only)
 
@@ -963,7 +963,7 @@ class ProcessConfig(BaseModel):
     arguments: Optional[list[str]] = None
 
 
-class Scope(Enum):
+class Scope(str, Enum):
     """
         The level at which the volume exists. Either `global` for cluster-wide,
     or `local` for machine level.
@@ -1080,7 +1080,7 @@ class NetworkContainer(BaseModel):
     IPv6Address: Optional[str] = None
 
 
-class Type4(Enum):
+class Type4(str, Enum):
     """
     Cache record type.
 
@@ -1242,7 +1242,7 @@ class Settings(BaseModel):
     Devices: list[PluginDevice]
 
 
-class ProtocolScheme(Enum):
+class ProtocolScheme(str, Enum):
     """
     Protocol to use for clients connecting to the plugin.
     """
@@ -1382,7 +1382,7 @@ class ObjectVersion(BaseModel):
     Index: Optional[int] = Field(None, example=373531)
 
 
-class Role(Enum):
+class Role(str, Enum):
     """
     Role of the node.
     """
@@ -1391,7 +1391,7 @@ class Role(Enum):
     manager = "manager"
 
 
-class Availability(Enum):
+class Availability(str, Enum):
     """
     Availability of the node.
     """
@@ -1491,7 +1491,7 @@ class TLSInfo(BaseModel):
     )
 
 
-class NodeState(Enum):
+class NodeState(str, Enum):
     """
     NodeState represents the state of a node.
     """
@@ -1502,7 +1502,7 @@ class NodeState(Enum):
     disconnected = "disconnected"
 
 
-class Reachability(Enum):
+class Reachability(str, Enum):
     """
     Reachability represents the reachability of a node.
     """
@@ -1565,7 +1565,7 @@ class Dispatcher(BaseModel):
     )
 
 
-class Protocol(Enum):
+class Protocol(str, Enum):
     """
         Protocol for communication with the external CA (currently
     only `cfssl` is supported).
@@ -2044,7 +2044,7 @@ class NetworkAttachmentSpec(BaseModel):
     )
 
 
-class Condition(Enum):
+class Condition(str, Enum):
     """
     Condition for restart.
     """
@@ -2125,7 +2125,7 @@ class LogDriver1(BaseModel):
     Options: Optional[dict[str, str]] = None
 
 
-class TaskState(Enum):
+class TaskState(str, Enum):
     new = "new"
     allocated = "allocated"
     pending = "pending"
@@ -2194,7 +2194,7 @@ class Mode(BaseModel):
     )
 
 
-class FailureAction(Enum):
+class FailureAction(str, Enum):
     """
         Action to take if an updated task fails to run, or stops running
     during the update.
@@ -2206,7 +2206,7 @@ class FailureAction(Enum):
     rollback = "rollback"
 
 
-class Order(Enum):
+class Order(str, Enum):
     """
         The order of operations when rolling out an updated task. Either
     the old task is shut down before the new task is started, or the
@@ -2248,7 +2248,7 @@ class UpdateConfig(BaseModel):
     )
 
 
-class FailureAction1(Enum):
+class FailureAction1(str, Enum):
     """
         Action to take if an rolled back task fails to run, or stops
     running during the rollback.
@@ -2290,7 +2290,7 @@ class RollbackConfig(BaseModel):
     )
 
 
-class PublishMode(Enum):
+class PublishMode(str, Enum):
     """
         The mode in which port is published.
 
@@ -2324,7 +2324,7 @@ class EndpointPortConfig(BaseModel):
     )
 
 
-class Mode1(Enum):
+class Mode1(str, Enum):
     """
     The mode of resolution to use for internal load balancing between tasks.
 
@@ -2360,7 +2360,7 @@ class Endpoint(BaseModel):
     VirtualIPs: Optional[list[VirtualIP]] = None
 
 
-class State(Enum):
+class State(str, Enum):
     updating = "updating"
     paused = "paused"
     completed = "completed"
@@ -2508,7 +2508,7 @@ class Config2(BaseModel):
     Spec: Optional[ConfigSpec] = None
 
 
-class Status2(Enum):
+class Status2(str, Enum):
     """
         String representation of the container state. Can be one of "created",
     "running", "paused", "restarting", "removing", "exited", or "dead".
@@ -2607,7 +2607,7 @@ class SystemVersion(BaseModel):
     )
 
 
-class CgroupDriver(Enum):
+class CgroupDriver(str, Enum):
     """
     The driver to use for managing cgroups.
 
@@ -2618,7 +2618,7 @@ class CgroupDriver(Enum):
     none = "none"
 
 
-class CgroupVersion(Enum):
+class CgroupVersion(str, Enum):
     """
     The version of the cgroup.
 
@@ -2628,7 +2628,7 @@ class CgroupVersion(Enum):
     field_2 = "2"
 
 
-class Isolation2(Enum):
+class Isolation2(str, Enum):
     """
         Represents the isolation technology to use as a default for containers.
     The supported values are platform-specific.
@@ -2770,7 +2770,7 @@ class Commit(BaseModel):
     )
 
 
-class LocalNodeState(Enum):
+class LocalNodeState(str, Enum):
     """
     Current local status of this node.
     """
@@ -2838,7 +2838,7 @@ class EventActor(BaseModel):
     )
 
 
-class Type5(Enum):
+class Type5(str, Enum):
     """
     The type of object emitting the event
     """
@@ -2856,7 +2856,7 @@ class Type5(Enum):
     volume = "volume"
 
 
-class Scope1(Enum):
+class Scope1(str, Enum):
     """
         Scope of the event. Engine events are `local` scope. Cluster (Swarm)
     events are `swarm` scope.
@@ -4026,6 +4026,3 @@ class SystemInfo(BaseModel):
             "WARNING: bridge-nf-call-ip6tables is disabled",
         ],
     )
-
-
-# nopycln: file

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

@@ -2,7 +2,7 @@
     Models Front-end UI
 """
 
-from typing import Dict, Literal, Optional, TypedDict
+from typing import Literal, Optional, TypedDict
 
 from pydantic import BaseModel, Extra, Field
 from pydantic.color import Color
@@ -24,13 +24,13 @@ class _SlideshowRequired(TypedDict):
 
 
 class Slideshow(_SlideshowRequired, total=False):
-    instructions: Optional[str] # "Instructions about what to do in this step"
+    instructions: Optional[str]  # "Instructions about what to do in this step"
 
 
 class Annotation(BaseModel):
     type: Literal["rect", "text"] = Field(...)
     color: Color = Field(...)
-    attributes: Dict = Field(..., description="svg attributes")
+    attributes: dict = Field(..., description="svg attributes")
 
     class Config:
         extra = Extra.forbid
@@ -51,10 +51,10 @@ class Config:
 
 
 class StudyUI(BaseModel):
-    workbench: Optional[Dict[NodeIDStr, WorkbenchUI]] = None
-    slideshow: Optional[Dict[NodeIDStr, Slideshow]] = None
+    workbench: Optional[dict[NodeIDStr, WorkbenchUI]] = None
+    slideshow: Optional[dict[NodeIDStr, Slideshow]] = None
     current_node_id: Optional[NodeID] = Field(None, alias="currentNodeId")
-    annotations: Optional[Dict[NodeIDStr, Annotation]] = None
+    annotations: Optional[dict[NodeIDStr, Annotation]] = None
 
     class Config:
         extra = Extra.allow

scripts/openapi-pydantic-models-generator.bash

@@ -6,7 +6,7 @@ set -o nounset
 set -o pipefail
 IFS=$'\n\t'
 
-PYTHON_VERSION=3.9.12
+PYTHON_VERSION=3.9
 IMAGE_NAME="local/datamodel-code-generator:${PYTHON_VERSION}"
 WORKDIR="$(pwd)"
 
@@ -29,6 +29,7 @@ ENTRYPOINT ["datamodel-codegen", \
           "--reuse-model", \
           "--set-default-enum-member", \
           "--use-title-as-name", \
+          "--use-subclass-enum", \
           "--target-python-version=${PYTHON_VERSION}", \
           "--validation"]
 EOF