refactor

Author: Andrei Neagu

packages/service-library/src/servicelib/deferred_tasks/_task_schedule.py

@@ -1,7 +1,9 @@
 from datetime import datetime, timedelta
 from enum import Enum
+from typing import Annotated
 
 import arrow
+from common_library.basic_types import DEFAULT_FACTORY
 from pydantic import BaseModel, Field, NonNegativeInt
 
 from ._base_deferred_handler import StartContext
@@ -23,42 +25,59 @@ class TaskState(str, Enum):
 
 
 class TaskScheduleModel(BaseModel):
-    timeout: timedelta = Field(
-        ..., description="Amount of time after which the task execution will time out"
-    )
-    class_unique_reference: ClassUniqueReference = Field(
-        ...,
-        description="reference to the class containing the code and handlers for the execution of the task",
-    )
-    start_context: StartContext = Field(
-        ...,
-        description="data used to assemble the ``StartContext``",
-    )
+    timeout: Annotated[
+        timedelta,
+        Field(
+            description="Amount of time after which the task execution will time out"
+        ),
+    ]
+    class_unique_reference: Annotated[
+        ClassUniqueReference,
+        Field(
+            description="reference to the class containing the code and handlers for the execution of the task",
+        ),
+    ]
+    start_context: Annotated[
+        StartContext,
+        Field(
+            description="data used to assemble the ``StartContext``",
+        ),
+    ]
 
-    state: TaskState = Field(
-        ..., description="represents the execution step of the task"
-    )
+    state: Annotated[
+        TaskState, Field(description="represents the execution step of the task")
+    ]
 
-    total_attempts: NonNegativeInt = Field(
-        ...,
-        description="maximum number of attempts before giving up (0 means no retries)",
-    )
+    total_attempts: Annotated[
+        NonNegativeInt,
+        Field(
+            description="maximum number of attempts before giving up (0 means no retries)"
+        ),
+    ]
 
-    execution_attempts: NonNegativeInt = Field(
-        ...,
-        description="remaining attempts to run the code, only retries if this is > 0",
-    )
+    execution_attempts: Annotated[
+        NonNegativeInt,
+        Field(
+            description="remaining attempts to run the code, only retries if this is > 0",
+        ),
+    ]
 
-    time_started: datetime = Field(
-        default_factory=lambda: arrow.utcnow().datetime,
-        description="time when task schedule was created, used for statistics",
-    )
+    time_started: Annotated[
+        datetime,
+        Field(
+            default_factory=lambda: arrow.utcnow().datetime,
+            description="time when task schedule was created, used for statistics",
+        ),
+    ] = DEFAULT_FACTORY
 
-    result: TaskExecutionResult | None = Field(
-        default=None,
-        description=(
-            f"Populated by {TaskState.WORKER}. It always has a value after worker handles it."
-            "Will be used "
+    result: Annotated[
+        TaskExecutionResult | None,
+        Field(
+            default=None,
+            description=(
+                f"Populated by {TaskState.WORKER}. It always has a value after worker handles it."
+                "Will be used "
+            ),
+            discriminator="result_type",
         ),
-        discriminator="result_type",
-    )
+    ] = None