update api-client

Signed-off-by: Teo Koon Peng <[email protected]>

packages/api-client/lib/openapi/api.ts

@@ -1713,10 +1713,10 @@ export interface ScheduledTask {
   id: number;
   /**
    *
-   * @type {object}
+   * @type {TaskRequest}
    * @memberof ScheduledTask
    */
-  task_request: object;
+  task_request: TaskRequest;
   /**
    *
    * @type {string}

packages/api-client/lib/version.ts

@@ -3,6 +3,6 @@ import { version as rmfModelVer } from 'rmf-models';
 
 export const version = {
   rmfModels: rmfModelVer,
-  rmfServer: '757c200c2133f69e3321bc6bc2ba392fb522f3c9',
+  rmfServer: '0c773dc3f4b1a5df8bccb1b9da9d66fc3b075b28',
   openapiGenerator: '',
 };

packages/api-client/schema/index.ts

@@ -3579,7 +3579,7 @@ export default {
       ScheduledTask: {
         properties: {
           id: { type: 'integer', title: 'Id' },
-          task_request: { type: 'object', title: 'Task Request' },
+          task_request: { $ref: '#/components/schemas/TaskRequest' },
           created_by: { type: 'string', title: 'Created By' },
           schedules: {
             items: { $ref: '#/components/schemas/ScheduledTaskSchedule' },

packages/api-server/api_server/models/tasks.py

@@ -3,6 +3,7 @@
 
 from pydantic import BaseModel, ConfigDict
 
+from .rmf_api.task_request import TaskRequest
 from .tortoise_support import TortoiseReverseRelation
 
 
@@ -32,7 +33,7 @@ class ScheduledTask(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
     id: int
-    task_request: dict
+    task_request: TaskRequest
     created_by: str
     schedules: TortoiseReverseRelation[ScheduledTaskSchedule]
     last_ran: datetime | None = None

packages/dashboard/package.json

@@ -61,7 +61,7 @@
     "@types/three": "^0.156.0",
     "ajv": "^8.10.0",
     "api-client": "workspace:*",
-    "axios": "^1.6.8",
+    "axios": "^0.21.1",
     "date-fns": "^2.21.3",
     "debug": "^4.2.0",
     "eventemitter3": "^4.0.7",

packages/dashboard/src/components/alert-store.tsx

@@ -1,4 +1,4 @@
-import { ApiServerModelsTortoiseModelsAlertsAlertLeaf as Alert } from 'api-client';
+import { TortoiseContribPydanticCreatorApiServerModelsTortoiseModelsAlertsAlertLeaf as Alert } from 'api-client';
 import { AppEvents } from './app-events';
 import React from 'react';
 import { RmfAppContext } from './rmf-app';

packages/dashboard/src/components/app-events.ts

@@ -1,5 +1,5 @@
 import {
-  ApiServerModelsTortoiseModelsAlertsAlertLeaf as Alert,
+  TortoiseContribPydanticCreatorApiServerModelsTortoiseModelsAlertsAlertLeaf as Alert,
   Dispenser,
   Door,
   Ingestor,

packages/dashboard/src/components/appbar.tsx

@@ -25,7 +25,7 @@ import {
   Typography,
 } from '@mui/material';
 import {
-  ApiServerModelsTortoiseModelsAlertsAlertLeaf as Alert,
+  TortoiseContribPydanticCreatorApiServerModelsTortoiseModelsAlertsAlertLeaf as Alert,
   TaskFavoritePydantic as TaskFavorite,
   TaskRequest,
 } from 'api-client';

packages/dashboard/src/components/beacons-app.tsx

@@ -1,4 +1,4 @@
-import { ApiServerModelsTortoiseModelsBeaconsBeaconStateLeaf as BeaconState } from 'api-client';
+import { TortoiseContribPydanticCreatorApiServerModelsTortoiseModelsBeaconsBeaconStateLeaf as BeaconState } from 'api-client';
 import React from 'react';
 import { BeaconDataGridTable } from 'react-components';
 import { createMicroApp } from './micro-app';

packages/dashboard/src/components/map-app.tsx

@@ -1,11 +1,5 @@
 import { styled } from '@mui/material';
-import {
-  BuildingMap,
-  Dispenser,
-  ApiServerModelsRmfApiFleetStateFleetState,
-  Ingestor,
-  Level,
-} from 'api-client';
+import { BuildingMap, Dispenser, FleetState, Ingestor, Level } from 'api-client';
 import Debug from 'debug';
 import React, { ChangeEvent, Suspense } from 'react';
 import {
@@ -35,8 +29,6 @@ import { Line } from '@react-three/drei';
 import { CameraControl, LayersController } from './three-fiber';
 import { Lifts, Door, RobotThree } from './three-fiber';
 
-type FleetState = ApiServerModelsRmfApiFleetStateFleetState;
-
 const debug = Debug('MapApp');
 
 const TrajectoryUpdateInterval = 2000;

packages/dashboard/src/components/rmf-app/rmf-ingress.ts

@@ -1,8 +1,8 @@
 import {
   AdminApi,
   AlertsApi,
-  ApiServerModelsTortoiseModelsAlertsAlertLeaf,
-  ApiServerModelsTortoiseModelsBeaconsBeaconStateLeaf as BeaconState,
+  TortoiseContribPydanticCreatorApiServerModelsTortoiseModelsAlertsAlertLeaf as Alert,
+  TortoiseContribPydanticCreatorApiServerModelsTortoiseModelsBeaconsBeaconStateLeaf as BeaconState,
   BeaconsApi,
   BuildingApi,
   BuildingMap,
@@ -15,7 +15,7 @@ import {
   DoorsApi,
   DoorState,
   FleetsApi,
-  ApiServerModelsRmfApiFleetStateFleetState,
+  FleetState,
   Ingestor,
   IngestorsApi,
   IngestorState,
@@ -37,9 +37,6 @@ import {
   RobotTrajectoryManager,
 } from '../../managers/robot-trajectory-manager';
 
-type Alert = ApiServerModelsTortoiseModelsAlertsAlertLeaf;
-type FleetState = ApiServerModelsRmfApiFleetStateFleetState;
-
 export class RmfIngress {
   // This should be private because socketio does not support "replaying" subscription. If
   // subscription is made before the one made by the observables, the replays will not work

packages/dashboard/src/components/robots/robot-info-app.tsx

@@ -63,9 +63,9 @@ export const RobotInfoApp = createMicroApp('Robot Info', () => {
       {robotState ? (
         <RobotInfo
           robotName={robotState.name || 'unknown'}
-          assignedTask={robotState.task_id}
-          battery={robotState.battery && +robotState.battery.toFixed(2)}
-          estFinishTime={taskState?.unix_millis_finish_time}
+          assignedTask={robotState.task_id ?? undefined}
+          battery={robotState.battery != null ? +robotState.battery.toFixed(2) : undefined}
+          estFinishTime={taskState?.unix_millis_finish_time ?? undefined}
           taskProgress={taskProgress}
           taskStatus={taskState?.status}
         />

packages/dashboard/src/components/robots/robot-summary.tsx

@@ -17,7 +17,11 @@ import { makeStyles, createStyles } from '@mui/styles';
 import React from 'react';
 import { RmfAppContext } from '../rmf-app';
 import { RobotTableData, base } from 'react-components';
-import { RobotState, Status2, TaskState } from 'api-client';
+import {
+  RobotState,
+  ApiServerModelsRmfApiRobotStateStatus as RobotStatus,
+  TaskState,
+} from 'api-client';
 import { EMPTY, combineLatest, mergeMap, of } from 'rxjs';
 import { TaskInspector } from '../tasks/task-inspector';
 import {
@@ -44,16 +48,16 @@ const useStyles = makeStyles((theme: Theme) =>
   }),
 );
 
-const setTaskDialogColor = (robotStatus: Status2 | undefined) => {
+const setTaskDialogColor = (robotStatus?: RobotStatus | null) => {
   if (!robotStatus) {
     return base.palette.background.default;
   }
 
   switch (robotStatus) {
-    case Status2.Error:
+    case RobotStatus.Error:
       return base.palette.error.dark;
 
-    case Status2.Working:
+    case RobotStatus.Working:
       return base.palette.success.dark;
 
     default:
@@ -82,7 +86,7 @@ interface RobotSummaryProps {
 }
 
 const showBatteryIcon = (robot: RobotState, robotBattery: number) => {
-  if (robot.status === Status2.Charging) {
+  if (robot.status === RobotStatus.Charging) {
     return <BatteryChargingFull />;
   }
 

packages/dashboard/src/components/robots/robots-app.tsx

@@ -71,12 +71,13 @@ export const RobotsApp = createMicroApp('Robots', () => {
               ? Object.entries(fleet.robots).map<RobotTableData>(([name, robot]) => ({
                   fleet: fleet.name || '',
                   name,
-                  battery: robot.battery && +robot.battery.toFixed(2),
+                  battery: robot.battery != null ? +robot.battery.toFixed(2) : undefined,
                   status: robot.status,
                   estFinishTime:
-                    robot.task_id && tasks[robot.task_id]
-                      ? tasks[robot.task_id].unix_millis_finish_time
-                      : undefined,
+                    (robot.task_id &&
+                      tasks[robot.task_id] &&
+                      tasks[robot.task_id].unix_millis_finish_time) ||
+                    undefined,
                   lastUpdateTime: robot.unix_millis_time ? robot.unix_millis_time : undefined,
                   level: robot.location?.map || 'N/A',
                 }))

packages/dashboard/src/components/tasks/task-alert.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import {
-  ApiServerModelsTortoiseModelsAlertsAlertLeaf,
+  TortoiseContribPydanticCreatorApiServerModelsTortoiseModelsAlertsAlertLeaf as Alert,
   LogEntry,
-  Status,
+  ApiServerModelsRmfApiTaskStateStatus as TaskStatus,
   TaskEventLog,
   TaskState,
   Tier,
@@ -13,8 +13,6 @@ import { AlertContent, AlertDialog } from 'react-components';
 import { base } from 'react-components';
 import { TaskInspector } from './task-inspector';
 
-type Alert = ApiServerModelsTortoiseModelsAlertsAlertLeaf;
-
 interface TaskAlert extends TaskEventLog {
   title: string;
   progress?: number;
@@ -51,7 +49,7 @@ export function TaskAlertDialog({ alert, removeAlert }: TaskAlertDialogProps): J
   };
 
   const getAlertTitle = (state: TaskState, errorLogEntries: LogEntry[]) => {
-    if (state.status && state.status === Status.Completed) {
+    if (state.status && state.status === TaskStatus.Completed) {
       return 'Task completed';
     }
     if (errorLogEntries.length !== 0) {
@@ -61,7 +59,7 @@ export function TaskAlertDialog({ alert, removeAlert }: TaskAlertDialogProps): J
   };
 
   const getTaskProgress = (state: TaskState) => {
-    if (state.status && state.status === Status.Completed) {
+    if (state.status && state.status === TaskStatus.Completed) {
       return 1;
     }
 
@@ -104,7 +102,7 @@ export function TaskAlertDialog({ alert, removeAlert }: TaskAlertDialogProps): J
 
     // If the task happen to complete anyway, we mention that it has completed
     // in a separate log
-    if (state.status && state.status === Status.Completed) {
+    if (state.status && state.status === TaskStatus.Completed) {
       const completionTimeString = state.unix_millis_finish_time
         ? `${new Date(state.unix_millis_finish_time).toLocaleString()} - `
         : '';
@@ -124,11 +122,11 @@ export function TaskAlertDialog({ alert, removeAlert }: TaskAlertDialogProps): J
   const getAlertColor = (state: TaskState, errorLogs: LogEntry[]) => {
     if (state.status) {
       switch (state.status) {
-        case Status.Completed:
+        case TaskStatus.Completed:
           return base.palette.success.dark;
 
-        case Status.Error:
-        case Status.Failed:
+        case TaskStatus.Error:
+        case TaskStatus.Failed:
           return base.palette.error.dark;
 
         default:

packages/dashboard/src/components/tasks/task-logs.tsx

@@ -1,5 +1,10 @@
 import { Box, Divider, Grid, Paper, Typography, useTheme } from '@mui/material';
-import { EventState, Status, TaskEventLog, TaskState } from 'api-client';
+import {
+  EventState,
+  ApiServerModelsRmfApiTaskStateStatus as TaskStatus,
+  TaskEventLog,
+  TaskState,
+} from 'api-client';
 import { format } from 'date-fns';
 
 interface TaskLogProps {
@@ -19,28 +24,28 @@ export function TaskLogs({ taskLog, taskState, title }: TaskLogProps) {
     if (event == null || event.status == null) return theme.palette.warning.light;
 
     switch (event.status) {
-      case Status.Uninitialized:
-      case Status.Blocked:
-      case Status.Error:
-      case Status.Failed:
+      case TaskStatus.Uninitialized:
+      case TaskStatus.Blocked:
+      case TaskStatus.Error:
+      case TaskStatus.Failed:
         return theme.palette.error.dark;
 
-      case Status.Queued:
-      case Status.Standby:
+      case TaskStatus.Queued:
+      case TaskStatus.Standby:
         return theme.palette.info.light;
 
-      case Status.Underway:
+      case TaskStatus.Underway:
         return theme.palette.success.light;
 
-      case Status.Delayed:
+      case TaskStatus.Delayed:
         return theme.palette.warning.main;
 
-      case Status.Skipped:
-      case Status.Canceled:
-      case Status.Killed:
+      case TaskStatus.Skipped:
+      case TaskStatus.Canceled:
+      case TaskStatus.Killed:
         return theme.palette.error.light;
 
-      case Status.Completed:
+      case TaskStatus.Completed:
         return theme.palette.info.light;
 
       default:

packages/dashboard/src/components/tasks/task-schedule-utils.ts

@@ -1,8 +1,5 @@
 import { ProcessedEvent } from '@aldabil/react-scheduler/types';
-import {
-  ApiServerModelsTortoiseModelsScheduledTaskScheduledTask as ScheduledTask,
-  ApiServerModelsTortoiseModelsScheduledTaskScheduledTaskScheduleLeaf as ApiSchedule,
-} from 'api-client';
+import { ScheduledTask, ScheduledTaskSchedule as ApiSchedule } from 'api-client';
 import {
   addMinutes,
   endOfDay,
@@ -103,7 +100,7 @@ export const scheduleToEvents = (
     ) {
       const curToIso = cur.toISOString();
       const curFormatted = `${curToIso.slice(0, 10)}`;
-      if (!task.except_dates.includes(curFormatted)) {
+      if (!task.except_dates?.includes(curFormatted)) {
         events.push({
           start: cur,
           end: addMinutes(cur, 45),
@@ -162,5 +159,5 @@ export const getScheduledTaskTitle = (task: ScheduledTask): string => {
     return `[${task.id}] Unknown`;
   }
 
-  return `${getShortDescription(task.task_request)}`;
+  return task.task_request ? getShortDescription(task.task_request) : '';
 };

packages/dashboard/src/components/tasks/task-schedule.tsx

@@ -6,10 +6,7 @@ import {
   SchedulerProps,
 } from '@aldabil/react-scheduler/types';
 import { Button } from '@mui/material';
-import {
-  ApiServerModelsTortoiseModelsScheduledTaskScheduledTask as ScheduledTask,
-  ApiServerModelsTortoiseModelsScheduledTaskScheduledTaskScheduleLeaf as ApiSchedule,
-} from 'api-client';
+import { ScheduledTask, ScheduledTaskSchedule as ApiSchedule } from 'api-client';
 import React from 'react';
 import {
   ConfirmationDialog,

packages/dashboard/src/components/tasks/task-summary.tsx

@@ -14,7 +14,7 @@ import DialogActions from '@mui/material/DialogActions';
 import DialogContent from '@mui/material/DialogContent';
 import DialogTitle from '@mui/material/DialogTitle';
 import { makeStyles, createStyles } from '@mui/styles';
-import { Status, TaskState } from 'api-client';
+import { ApiServerModelsRmfApiTaskStateStatus as TaskStatus, TaskState } from 'api-client';
 import { base } from 'react-components';
 import { TaskInspector } from './task-inspector';
 import { RmfAppContext } from '../rmf-app';
@@ -45,19 +45,19 @@ const LinearProgressWithLabel = (props: LinearProgressProps & { value: number })
   );
 };
 
-const setTaskDialogColor = (taskStatus: Status | undefined) => {
+const setTaskDialogColor = (taskStatus?: TaskStatus | null) => {
   if (!taskStatus) {
     return base.palette.background.default;
   }
 
   switch (taskStatus) {
-    case Status.Failed:
+    case TaskStatus.Failed:
       return base.palette.error.dark;
 
-    case Status.Underway:
+    case TaskStatus.Underway:
       return base.palette.success.dark;
 
-    case Status.Queued:
+    case TaskStatus.Queued:
       return base.palette.info.main;
 
     default: