new round

Author: pcrespov

packages/models-library/src/models_library/api_schemas_directorv2/clusters.py

@@ -20,10 +20,10 @@ class TaskCounts(BaseModel):
 
 
 class WorkerMetrics(BaseModel):
-    cpu: float = Field(..., description="consumed % of cpus")
-    memory: ByteSize = Field(..., description="consumed memory")
-    num_fds: int = Field(..., description="consumed file descriptors")
-    task_counts: TaskCounts = Field(..., description="task details")
+    cpu: Annotated[float, Field(description="consumed % of cpus")]
+    memory: Annotated[ByteSize, Field(description="consumed memory")]
+    num_fds: Annotated[int, Field(description="consumed file descriptors")]
+    task_counts: Annotated[TaskCounts, Field(description="task details")]
 
 
 AvailableResources: TypeAlias = DictModel[str, PositiveFloat]
@@ -54,7 +54,7 @@ class Worker(BaseModel):
 
 
 class Scheduler(BaseModel):
-    status: str = Field(..., description="The running status of the scheduler")
+    status: Annotated[str, Field(description="The running status of the scheduler")]
     workers: Annotated[WorkersDict | None, Field(default_factory=dict)]
 
     @field_validator("workers", mode="before")
@@ -66,10 +66,5 @@ def ensure_workers_is_empty_dict(cls, v):
 
 
 class ClusterDetails(BaseModel):
-    scheduler: Scheduler = Field(
-        ...,
-        description="This contains dask scheduler information given by the underlying dask library",
-    )
-    dashboard_link: AnyUrl = Field(
-        ..., description="Link to this scheduler's dashboard"
-    )
+    scheduler: Annotated[Scheduler, Field(description="scheduler information")]
+    dashboard_link: Annotated[AnyUrl, Field(description="Link to the dask dashboard")]

packages/models-library/src/models_library/api_schemas_directorv2/errors.py

@@ -1,14 +1,16 @@
+from typing import Annotated
+
 from pydantic import BaseModel, Field
 
 
 class Error(BaseModel):
-    code: str | None = Field(None, description="Server Exception")
+    code: Annotated[str | None, Field(description="Server Exception")] = None
 
 
 class ErrorType(BaseModel):
-    message: str = Field(..., description="Error message")
+    message: Annotated[str, Field(description="Error message")]
+    status: Annotated[int, Field(description="Error code")]
     errors: list[Error] | None = None
-    status: int = Field(..., description="Error code")
 
 
 class ErrorEnveloped(BaseModel):

packages/models-library/src/models_library/api_schemas_long_running_tasks/base.py

@@ -18,9 +18,9 @@ class TaskProgress(BaseModel):
     defined as a float bound between 0.0 and 1.0
     """
 
-    task_id: TaskId | None = Field(default=None)
-    message: ProgressMessage = Field(default="")
-    percent: ProgressPercent = Field(default=0.0)
+    task_id: TaskId | None = None
+    message: ProgressMessage = ""
+    percent: ProgressPercent = 0.0
 
     @validate_call
     def update(