Use specific model for TaskQueueEntry instead of pydantic_model_creator

aaronchongth · aaronchongth · commit f98736398037 · 2024-01-31T14:05:45.000Z
Signed-off-by: Aaron Chong &lt;aaronchongth@gmail.com&gt;
diff --git a/packages/api-client/lib/openapi/api.ts b/packages/api-client/lib/openapi/api.ts
@@ -463,67 +463,6 @@ export interface ApiServerModelsTortoiseModelsTasksTaskFavoriteLeaf {
    */
   user: string;
 }
-/**
- *
- * @export
- * @interface ApiServerModelsTortoiseModelsTasksTaskStateLeaf
- */
-export interface ApiServerModelsTortoiseModelsTasksTaskStateLeaf {
-  /**
-   *
-   * @type {string}
-   * @memberof ApiServerModelsTortoiseModelsTasksTaskStateLeaf
-   */
-  id_: string;
-  /**
-   *
-   * @type {string}
-   * @memberof ApiServerModelsTortoiseModelsTasksTaskStateLeaf
-   */
-  assigned_to?: string | null;
-  /**
-   *
-   * @type {string}
-   * @memberof ApiServerModelsTortoiseModelsTasksTaskStateLeaf
-   */
-  unix_millis_start_time?: string | null;
-  /**
-   *
-   * @type {string}
-   * @memberof ApiServerModelsTortoiseModelsTasksTaskStateLeaf
-   */
-  unix_millis_finish_time?: string | null;
-  /**
-   *
-   * @type {string}
-   * @memberof ApiServerModelsTortoiseModelsTasksTaskStateLeaf
-   */
-  status?: string | null;
-  /**
-   *
-   * @type {string}
-   * @memberof ApiServerModelsTortoiseModelsTasksTaskStateLeaf
-   */
-  unix_millis_request_time?: string | null;
-  /**
-   *
-   * @type {string}
-   * @memberof ApiServerModelsTortoiseModelsTasksTaskStateLeaf
-   */
-  requester?: string | null;
-  /**
-   *
-   * @type {string}
-   * @memberof ApiServerModelsTortoiseModelsTasksTaskStateLeaf
-   */
-  pickup?: string | null;
-  /**
-   *
-   * @type {string}
-   * @memberof ApiServerModelsTortoiseModelsTasksTaskStateLeaf
-   */
-  destination?: string | null;
-}
 /**
  * Which agent (robot) is the task assigned to
  * @export
@@ -2645,6 +2584,73 @@ export const TaskPhaseSkipRequestTypeEnum = {
 export type TaskPhaseSkipRequestTypeEnum =
   typeof TaskPhaseSkipRequestTypeEnum[keyof typeof TaskPhaseSkipRequestTypeEnum];
 
+/**
+ *
+ * @export
+ * @interface TaskQueueEntry
+ */
+export interface TaskQueueEntry {
+  /**
+   *
+   * @type {string}
+   * @memberof TaskQueueEntry
+   */
+  id: string;
+  /**
+   *
+   * @type {string}
+   * @memberof TaskQueueEntry
+   */
+  assigned_to: string;
+  /**
+   *
+   * @type {number}
+   * @memberof TaskQueueEntry
+   */
+  unix_millis_start_time?: number;
+  /**
+   *
+   * @type {number}
+   * @memberof TaskQueueEntry
+   */
+  unix_millis_finish_time?: number;
+  /**
+   *
+   * @type {string}
+   * @memberof TaskQueueEntry
+   */
+  status?: string;
+  /**
+   *
+   * @type {number}
+   * @memberof TaskQueueEntry
+   */
+  unix_millis_request_time?: number;
+  /**
+   *
+   * @type {string}
+   * @memberof TaskQueueEntry
+   */
+  requester?: string;
+  /**
+   *
+   * @type {number}
+   * @memberof TaskQueueEntry
+   */
+  unix_millis_warn_time?: number;
+  /**
+   *
+   * @type {string}
+   * @memberof TaskQueueEntry
+   */
+  pickup?: string;
+  /**
+   *
+   * @type {string}
+   * @memberof TaskQueueEntry
+   */
+  destination?: string;
+}
 /**
  *
  * @export
@@ -9939,12 +9945,7 @@ export const TasksApiFp = function (configuration?: Configuration) {
       offset?: number,
       orderBy?: string,
       options?: AxiosRequestConfig,
-    ): Promise<
-      (
-        axios?: AxiosInstance,
-        basePath?: string,
-      ) => AxiosPromise<Array<ApiServerModelsTortoiseModelsTasksTaskStateLeaf>>
-    > {
+    ): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<TaskQueueEntry>>> {
       const localVarAxiosArgs =
         await localVarAxiosParamCreator.queryTaskQueueEntryTasksQueueEntryGet(
           taskId,
@@ -10447,7 +10448,7 @@ export const TasksApiFactory = function (
       offset?: number,
       orderBy?: string,
       options?: any,
-    ): AxiosPromise<Array<ApiServerModelsTortoiseModelsTasksTaskStateLeaf>> {
+    ): AxiosPromise<Array<TaskQueueEntry>> {
       return localVarFp
         .queryTaskQueueEntryTasksQueueEntryGet(
           taskId,
diff --git a/packages/api-client/lib/version.ts b/packages/api-client/lib/version.ts
@@ -3,6 +3,6 @@ import { version as rmfModelVer } from 'rmf-models';
 
 export const version = {
   rmfModels: rmfModelVer,
-  rmfServer: '256aea8c511c08878cd664dff5017763d54981db',
+  rmfServer: '79ae3d516580a3c108233cdfc64063539fac601a',
   openapiGenerator: '6.2.1',
 };
diff --git a/packages/api-client/schema/index.ts b/packages/api-client/schema/index.ts
@@ -1206,9 +1206,7 @@ export default {
                 schema: {
                   title: 'Response Query Task Queue Entry Tasks Queue Entry Get',
                   type: 'array',
-                  items: {
-                    $ref: '#/components/schemas/api_server.models.tortoise_models.tasks.TaskState.leaf',
-                  },
+                  items: { $ref: '#/components/schemas/TaskQueueEntry' },
                 },
               },
             },
@@ -3902,6 +3900,23 @@ export default {
           },
         },
       },
+      TaskQueueEntry: {
+        title: 'TaskQueueEntry',
+        required: ['id', 'assigned_to'],
+        type: 'object',
+        properties: {
+          id: { title: 'Id', type: 'string' },
+          assigned_to: { title: 'Assigned To', type: 'string' },
+          unix_millis_start_time: { title: 'Unix Millis Start Time', type: 'integer' },
+          unix_millis_finish_time: { title: 'Unix Millis Finish Time', type: 'integer' },
+          status: { title: 'Status', type: 'string' },
+          unix_millis_request_time: { title: 'Unix Millis Request Time', type: 'integer' },
+          requester: { title: 'Requester', type: 'string' },
+          unix_millis_warn_time: { title: 'Unix Millis Warn Time', type: 'integer' },
+          pickup: { title: 'Pickup', type: 'string' },
+          destination: { title: 'Destination', type: 'string' },
+        },
+      },
       TaskRequest: {
         title: 'TaskRequest',
         required: ['category', 'description'],
@@ -4379,38 +4394,6 @@ export default {
         },
         additionalProperties: false,
       },
-      'api_server.models.tortoise_models.tasks.TaskState.leaf': {
-        title: 'TaskState',
-        required: ['id_'],
-        type: 'object',
-        properties: {
-          id_: { title: 'Id ', maxLength: 255, type: 'string' },
-          assigned_to: { title: 'Assigned To', maxLength: 255, type: 'string', nullable: true },
-          unix_millis_start_time: {
-            title: 'Unix Millis Start Time',
-            type: 'string',
-            format: 'date-time',
-            nullable: true,
-          },
-          unix_millis_finish_time: {
-            title: 'Unix Millis Finish Time',
-            type: 'string',
-            format: 'date-time',
-            nullable: true,
-          },
-          status: { title: 'Status', maxLength: 255, type: 'string', nullable: true },
-          unix_millis_request_time: {
-            title: 'Unix Millis Request Time',
-            type: 'string',
-            format: 'date-time',
-            nullable: true,
-          },
-          requester: { title: 'Requester', maxLength: 255, type: 'string', nullable: true },
-          pickup: { title: 'Pickup', maxLength: 255, type: 'string', nullable: true },
-          destination: { title: 'Destination', maxLength: 255, type: 'string', nullable: true },
-        },
-        additionalProperties: false,
-      },
       api_server__models__rmf_api__fleet_log__FleetState: {
         title: 'FleetState',
         type: 'object',
diff --git a/packages/api-server/api_server/models/__init__.py b/packages/api-server/api_server/models/__init__.py
@@ -45,4 +45,5 @@
 from .rmf_api.task_state_update import TaskStateUpdate
 from .rmf_api.undo_skip_phase_request import UndoPhaseSkipRequest
 from .rmf_api.undo_skip_phase_response import UndoPhaseSkipResponse
+from .task_queue_entry import *
 from .user import *
diff --git a/packages/api-server/api_server/models/task_queue_entry.py b/packages/api-server/api_server/models/task_queue_entry.py
@@ -0,0 +1,16 @@
+from typing import Optional, cast
+
+from pydantic import BaseModel
+
+
+class TaskQueueEntry(BaseModel):
+    id: str
+    assigned_to: str
+    unix_millis_start_time: Optional[int]
+    unix_millis_finish_time: Optional[int]
+    status: Optional[str]
+    unix_millis_request_time: Optional[int]
+    requester: Optional[str]
+    unix_millis_warn_time: Optional[int]
+    pickup: Optional[str]
+    destination: Optional[str]
diff --git a/packages/api-server/api_server/models/tortoise_models/__init__.py b/packages/api-server/api_server/models/tortoise_models/__init__.py
@@ -27,7 +27,6 @@
     TaskEventLogPhasesLog,
     TaskFavorite,
     TaskFavoritePydantic,
-    TaskQueueEntryPydantic,
     TaskRequest,
     TaskState,
 )
diff --git a/packages/api-server/api_server/models/tortoise_models/tasks.py b/packages/api-server/api_server/models/tortoise_models/tasks.py
@@ -82,7 +82,4 @@ class TaskFavorite(Model):
     user = CharField(255, null=False, index=True)
 
 
-TaskQueueEntryPydantic = pydantic_model_creator(
-    TaskState, exclude=("data", "category", "unix_millis_warn_time")
-)
 TaskFavoritePydantic = pydantic_model_creator(TaskFavorite)
diff --git a/packages/api-server/api_server/repositories/tasks.py b/packages/api-server/api_server/repositories/tasks.py
@@ -15,14 +15,14 @@
     Pagination,
     Phases,
     TaskEventLog,
+    TaskQueueEntry,
     TaskRequest,
     TaskState,
     User,
 )
 from api_server.models import tortoise_models as ttm
 from api_server.models.rmf_api.log_entry import Tier
 from api_server.models.rmf_api.task_state import Category, Id, Phase
-from api_server.models.tortoise_models import TaskQueueEntryPydantic
 from api_server.models.tortoise_models import TaskRequest as DbTaskRequest
 from api_server.models.tortoise_models import TaskState as DbTaskState
 from api_server.query import add_pagination
@@ -245,7 +245,7 @@ async def get_task_state(self, task_id: str) -> Optional[TaskState]:
 
     async def query_task_queue_entry(
         self, query: QuerySet[DbTaskState], pagination: Optional[Pagination] = None
-    ) -> List[TaskQueueEntryPydantic]:
+    ) -> List[TaskQueueEntry]:
         try:
             if pagination:
                 query = add_pagination(query, pagination)
@@ -263,13 +263,36 @@ async def query_task_queue_entry(
             )
             entries = []
             for r in results:
-                status = r["status"]
-                if "Status." in status:
-                    r["status"] = r["status"].split("Status.")[1]
-                entries.append(TaskQueueEntryPydantic(**r))
-            return entries
+                print(r)
+                print(type(r["unix_millis_start_time"]))
+                print(type(r["destination"]))
+                entries.append(
+                    TaskQueueEntry(
+                        id=r["id_"],
+                        assigned_to=r["assigned_to"],
+                        unix_millis_start_time=datetime.timestamp(
+                            r["unix_millis_start_time"]
+                        ),
+                        unix_millis_finish_time=datetime.timestamp(
+                            r["unix_millis_finish_time"]
+                        ),
+                        status=r["status"],
+                        unix_millis_request_time=datetime.timestamp(
+                            r["unix_millis_request_time"]
+                        ),
+                        requester=r["requester"],
+                        pickup=r["pickup"],
+                        destination=r["destination"],
+                    )
+                )
+        #         status = r["status"]
+        #         if "Status." in status:
+        #             r["status"] = r["status"].split("Status.")[1]
+        #         entries.append(TaskQueueEntry(**r))
+        #     return entries
         except FieldError as e:
             raise HTTPException(422, str(e)) from e
+        return entries
 
     async def get_task_log(
         self, task_id: str, between: Tuple[int, int]
diff --git a/packages/api-server/api_server/routes/tasks/tasks.py b/packages/api-server/api_server/routes/tasks/tasks.py
@@ -14,7 +14,6 @@
     start_time_between_query,
 )
 from api_server.fast_io import FastIORouter, SubscriptionRequest
-from api_server.models.tortoise_models import TaskQueueEntryPydantic
 from api_server.models.tortoise_models import TaskState as DbTaskState
 from api_server.repositories import TaskRepository, task_repo_dep
 from api_server.response import RawJSONResponse
@@ -139,7 +138,7 @@ async def get_task_state(
     return result
 
 
-@router.get("/queue_entry", response_model=List[TaskQueueEntryPydantic])
+@router.get("/queue_entry", response_model=List[mdl.TaskQueueEntry])
 async def query_task_queue_entry(
     task_repo: TaskRepository = Depends(task_repo_dep),
     task_id: Optional[str] = Query(
diff --git a/packages/dashboard/src/components/tasks/tasks-app.tsx b/packages/dashboard/src/components/tasks/tasks-app.tsx
diff --git a/packages/react-components/lib/tasks/task-table-datagrid.tsx b/packages/react-components/lib/tasks/task-table-datagrid.tsx

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`TaskEventLogPhasesLog,`
`28`	`28`	`TaskFavorite,`
`29`	`29`	`TaskFavoritePydantic,`
`30`		`- TaskQueueEntryPydantic,`
`31`	`30`	`TaskRequest,`
`32`	`31`	`TaskState,`
`33`	`32`	`)`