Skip to content

Commit

Permalink
Hammer/generic alerts (#948)
Browse files Browse the repository at this point in the history
* First iteration of generic alerts

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Route for unresponded alerts

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Basic location complete post route for task

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Tests for alert routes

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Test for location complete route

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Lint and tests

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Basic implementation

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Basic task based alerts working as expected

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Only display and list alerts that have display true

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Add doc to location_complete route about instability

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Refactored alert db interactions to repository, with lru cache for location alerts checking

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Regenerated docs and return early on gateway last location checking

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Lint and better typing with static methods

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Hammer/generic alerts without location (#951)

* First round of cleanup

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Regenerate API

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

---------

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Hammer/demo tasks (#925)

* Moved custom deliveries to separate file naively and import naively

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Moved patrol

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Moved custom-compose

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Added clean and delivery

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Added delivery, renamed to SimpleDelivery

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Clean task added

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Moved delivery-custom tests, added return type for forms

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Configurable supported tasks and name remapping

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Changed directory to types, since it doesn't just handle descriptions

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Fix test imports

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Using temporary task definition

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Refactoring new rename changes

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Clean up

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Removed problematic and unsused component and test

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Lint

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Updating pnpm version in github workflow

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Reverting update to pnpm version

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Fix build now that we use key value strings for labels

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Refactored last parts of hard coding categories and rendering forms

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Refactor callback names and error handling for misconfigs

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Display error as well

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Fixed more checks and failures

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Split configuration and definition, only handle configurations in resource manager level

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Lint

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Not using object as a type

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Address feedback

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Render using validTasks instead

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Use useMemo

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

---------

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Update ros2 pydantic messages, fix tests

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Revert update of pnpm lock file

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Lint

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Use specific exceptions and more clean up

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Port CI fixes from #955 but targeting ubuntu 22 and ROS 2 Humble

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Revert "Port CI fixes from #955 but targeting ubuntu 22 and ROS 2 Humble"

This reverts commit 1fd22ee.

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Update pnpm version

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Setup pnpm and node manually

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Using HOME env var of runner

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* workflow

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* workflow

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Workflow

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Address feedback on frontend

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Address comments that don't break behavior

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Started generic exceptions

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Proper db schema for alert request and response

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Updated alerts model, frontend tweaks for subscription, using pagination for unackw query, updated API

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Attempt to setup minimal RMF during bootstrap step

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Fix mistake on ci path

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Fix workflow

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Revert CI changes

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Updated API, renamed event to pushAlert, filter before

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

---------

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
  • Loading branch information
aaronchongth authored Jul 9, 2024
1 parent 44f4209 commit 090dd9b
Show file tree
Hide file tree
Showing 61 changed files with 2,971 additions and 1,088 deletions.
13 changes: 8 additions & 5 deletions packages/api-client/lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Debug from 'debug';
import { io, Socket } from 'socket.io-client';
import {
ApiServerModelsTortoiseModelsAlertsAlertLeaf,
AlertRequest,
AlertResponse,
ApiServerModelsTortoiseModelsBeaconsBeaconStateLeaf as BeaconState,
BuildingMap,
DeliveryAlert,
Expand All @@ -19,8 +20,6 @@ import {
TaskState,
} from './openapi';

type Alert = ApiServerModelsTortoiseModelsAlertsAlertLeaf;

const debug = Debug('rmf-client');

// https://stackoverflow.com/questions/52667959/what-is-the-purpose-of-bivariancehack-in-typescript-types
Expand Down Expand Up @@ -102,8 +101,12 @@ export class SioClient {
return this.subscribe<TaskEventLog>(`/tasks/${taskId}/log`, listener);
}

subscribeAlerts(listener: Listener<Alert>): Subscription {
return this.subscribe<Alert>(`/alerts`, listener);
subscribeAlertRequests(listener: Listener<AlertRequest>): Subscription {
return this.subscribe<AlertRequest>(`/alerts/requests`, listener);
}

subscribeAlertResponses(listener: Listener<AlertResponse>): Subscription {
return this.subscribe<AlertResponse>(`/alerts/responses`, listener);
}

subscribeDeliveryAlerts(listener: Listener<DeliveryAlert>): Subscription {
Expand Down
Loading

0 comments on commit 090dd9b

Please sign in to comment.