Hammer/generic alerts

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

@@ -1838,6 +1838,31 @@ export interface MutexGroups {
    */
   requesting?: Array<string>;
 }
+/**
+ *
+ * @export
+ * @interface Pagination
+ */
+export interface Pagination {
+  /**
+   *
+   * @type {number}
+   * @memberof Pagination
+   */
+  limit: number;
+  /**
+   *
+   * @type {number}
+   * @memberof Pagination
+   */
+  offset: number;
+  /**
+   *
+   * @type {Array<string>}
+   * @memberof Pagination
+   */
+  order_by: Array<string>;
+}
 /**
  *
  * @export
@@ -5033,10 +5058,12 @@ export const AlertsApiAxiosParamCreator = function (configuration?: Configuratio
     /**
      * Returns the list of alert IDs that have yet to be responded to, while a response was required.
      * @summary Get Unresponded Alerts
+     * @param {Pagination} [pagination]
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
     getUnrespondedAlertsAlertsUnrespondedRequestsGet: async (
+      pagination?: Pagination,
       options: AxiosRequestConfig = {},
     ): Promise<RequestArgs> => {
       const localVarPath = `/alerts/unresponded_requests`;
@@ -5051,13 +5078,20 @@ export const AlertsApiAxiosParamCreator = function (configuration?: Configuratio
       const localVarHeaderParameter = {} as any;
       const localVarQueryParameter = {} as any;
 
+      localVarHeaderParameter['Content-Type'] = 'application/json';
+
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = {
         ...localVarHeaderParameter,
         ...headersFromBaseOptions,
         ...options.headers,
       };
+      localVarRequestOptions.data = serializeDataIfNeeded(
+        pagination,
+        localVarRequestOptions,
+        configuration,
+      );
 
       return {
         url: toPathString(localVarUrlObj),
@@ -5199,14 +5233,19 @@ export const AlertsApiFp = function (configuration?: Configuration) {
     /**
      * Returns the list of alert IDs that have yet to be responded to, while a response was required.
      * @summary Get Unresponded Alerts
+     * @param {Pagination} [pagination]
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
     async getUnrespondedAlertsAlertsUnrespondedRequestsGet(
+      pagination?: Pagination,
       options?: AxiosRequestConfig,
     ): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<AlertRequest>>> {
       const localVarAxiosArgs =
-        await localVarAxiosParamCreator.getUnrespondedAlertsAlertsUnrespondedRequestsGet(options);
+        await localVarAxiosParamCreator.getUnrespondedAlertsAlertsUnrespondedRequestsGet(
+          pagination,
+          options,
+        );
       return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
     },
     /**
@@ -5306,14 +5345,16 @@ export const AlertsApiFactory = function (
     /**
      * Returns the list of alert IDs that have yet to be responded to, while a response was required.
      * @summary Get Unresponded Alerts
+     * @param {Pagination} [pagination]
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
     getUnrespondedAlertsAlertsUnrespondedRequestsGet(
+      pagination?: Pagination,
       options?: any,
     ): AxiosPromise<Array<AlertRequest>> {
       return localVarFp
-        .getUnrespondedAlertsAlertsUnrespondedRequestsGet(options)
+        .getUnrespondedAlertsAlertsUnrespondedRequestsGet(pagination, options)
         .then((request) => request(axios, basePath));
     },
     /**
@@ -5410,13 +5451,17 @@ export class AlertsApi extends BaseAPI {
   /**
    * Returns the list of alert IDs that have yet to be responded to, while a response was required.
    * @summary Get Unresponded Alerts
+   * @param {Pagination} [pagination]
    * @param {*} [options] Override http request option.
    * @throws {RequiredError}
    * @memberof AlertsApi
    */
-  public getUnrespondedAlertsAlertsUnrespondedRequestsGet(options?: AxiosRequestConfig) {
+  public getUnrespondedAlertsAlertsUnrespondedRequestsGet(
+    pagination?: Pagination,
+    options?: AxiosRequestConfig,
+  ) {
     return AlertsApiFp(this.configuration)
-      .getUnrespondedAlertsAlertsUnrespondedRequestsGet(options)
+      .getUnrespondedAlertsAlertsUnrespondedRequestsGet(pagination, options)
       .then((request) => request(this.axios, this.basePath));
   }
 

packages/api-client/lib/version.ts

@@ -3,6 +3,6 @@ import { version as rmfModelVer } from 'rmf-models';
 
 export const version = {
   rmfModels: rmfModelVer,
-  rmfServer: 'cb1b563ab8f827756f9a453ec944362d92a3ab57',
+  rmfServer: '06e5475f096ec8f2eae05aae7c939a612aaa11e6',
   openapiGenerator: '6.2.1',
 };

packages/api-client/schema/index.ts

@@ -242,6 +242,9 @@ export default {
         description:
           'Returns the list of alert IDs that have yet to be responded to, while a\nresponse was required.',
         operationId: 'get_unresponded_alerts_alerts_unresponded_requests_get',
+        requestBody: {
+          content: { 'application/json': { schema: { $ref: '#/components/schemas/Pagination' } } },
+        },
         responses: {
           '200': {
             description: 'Successful Response',
@@ -255,6 +258,12 @@ export default {
               },
             },
           },
+          '422': {
+            description: 'Validation Error',
+            content: {
+              'application/json': { schema: { $ref: '#/components/schemas/HTTPValidationError' } },
+            },
+          },
         },
       },
     },
@@ -3470,6 +3479,16 @@ export default {
           },
         },
       },
+      Pagination: {
+        title: 'Pagination',
+        required: ['limit', 'offset', 'order_by'],
+        type: 'object',
+        properties: {
+          limit: { title: 'Limit', type: 'integer' },
+          offset: { title: 'Offset', type: 'integer' },
+          order_by: { title: 'Order By', type: 'array', items: { type: 'string' } },
+        },
+      },
       Param: {
         title: 'Param',
         required: ['name', 'type', 'value_int', 'value_float', 'value_string', 'value_bool'],

packages/api-server/api_server/exceptions.py

@@ -0,0 +1,16 @@
+class AlreadyExistsError(Exception):
+    """
+    Raised when an a resource already exists and there is a conflict.
+    """
+
+
+class NotFoundError(Exception):
+    """
+    Raised when a resource is not found.
+    """
+
+
+class InvalidInputError(Exception):
+    """
+    Raised when an input is invalid.
+    """

packages/api-server/api_server/gateway.py

@@ -289,8 +289,7 @@ def convert_alert(alert: RmfAlert):
             )
 
         def handle_alert(alert: AlertRequest):
-            logging.info("Received alert:")
-            logging.info(alert)
+            logging.info(f"Received alert: {alert}")
             alert_events.alert_requests.on_next(alert)
 
         alert_sub = ros_node().create_subscription(
@@ -314,8 +313,7 @@ def convert_alert_response(alert_response: RmfAlertResponse):
             )
 
         def handle_alert_response(alert_response: AlertResponse):
-            logging.info("Received alert response:")
-            logging.info(alert_response)
+            logging.info(f"Received alert response: {alert_response}")
             alert_events.alert_responses.on_next(alert_response)
 
         alert_response_sub = ros_node().create_subscription(

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

@@ -49,7 +49,9 @@
 from .rmf_api.task_log_response import TaskLogResponse
 from .rmf_api.task_log_update import TaskEventLogUpdate
 from .rmf_api.task_request import TaskRequest
-from .rmf_api.task_state import Status, Status1, TaskState
+from .rmf_api.task_state import Status
+from .rmf_api.task_state import Status1 as DispatchStatus
+from .rmf_api.task_state import TaskState
 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

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

@@ -1,3 +1,4 @@
+from datetime import datetime
 from enum import Enum
 from typing import List, Optional
 
@@ -23,6 +24,10 @@ def from_tortoise(tortoise: ttm.AlertResponse) -> "AlertResponse":
     async def save(self) -> None:
         await ttm.AlertResponse.update_or_create(
             {
+                "response_time": datetime.fromtimestamp(
+                    self.unix_millis_response_time / 1000
+                ),
+                "response": self.response,
                 "data": self.json(),
             },
             id=self.id,
@@ -53,9 +58,12 @@ def from_tortoise(tortoise: ttm.AlertRequest) -> "AlertRequest":
     async def save(self) -> None:
         await ttm.AlertRequest.update_or_create(
             {
-                "data": self.json(),
+                "request_time": datetime.fromtimestamp(
+                    self.unix_millis_alert_time / 1000
+                ),
                 "response_expected": (len(self.responses_available) > 0),
                 "task_id": self.task_id,
+                "data": self.json(),
             },
             id=self.id,
         )

packages/api-server/api_server/models/tortoise_models/alerts.py

@@ -1,6 +1,7 @@
 from tortoise.fields import (
     BooleanField,
     CharField,
+    DatetimeField,
     JSONField,
     OneToOneField,
     ReverseRelation,
@@ -10,15 +11,18 @@
 
 class AlertResponse(Model):
     id = CharField(255, pk=True)
+    response_time = DatetimeField(null=False, index=True)
+    response = CharField(255, null=False, index=True)
+    data = JSONField()
     alert_request = OneToOneField(
         "models.AlertRequest", null=False, related_name="alert_response"
     )
-    data = JSONField()
 
 
 class AlertRequest(Model):
     id = CharField(255, pk=True)
-    data = JSONField()
+    request_time = DatetimeField(null=False, index=True)
     response_expected = BooleanField(null=False, index=True)
     task_id = CharField(255, null=True, index=True)
+    data = JSONField()
     alert_response = ReverseRelation["AlertResponse"]

packages/api-server/api_server/repositories/__init__.py

@@ -1,10 +1,4 @@
-from .alerts import (
-    AlertAlreadyExistsError,
-    AlertNotFoundError,
-    AlertRepository,
-    AlertResponseNotFoundError,
-    InvalidAlertResponseError,
-)
+from .alerts import AlertRepository
 from .cached_files import CachedFilesRepository, cached_files_repo
 from .fleets import FleetRepository
 from .rmf import RmfRepository