[uss_qualifier] Update verification approach for SCD0090 and SCD0095 (#1167)

Author: BenjaminPelletier

monitoring/mock_uss/database.py

@@ -2,7 +2,6 @@
 
 from implicitdict import ImplicitDict, StringBasedDateTime, StringBasedTimeDelta
 
-from monitoring.monitorlib.clients.flight_planning.planning import UserNotification
 from monitoring.monitorlib.errors import stacktrace_string
 from monitoring.monitorlib.multiprocessing import SynchronizedValue
 
@@ -47,9 +46,6 @@ class Database(ImplicitDict):
     most_recent_periodic_check: StringBasedDateTime | None
     """Timestamp of most recent time periodic task loop iterated"""
 
-    flight_planning_notifications: list[UserNotification]
-    """List of notifications send during flight planning operations"""
-
 
 db = SynchronizedValue(
     Database(

monitoring/mock_uss/f3548v21/flight_planning.py

@@ -90,47 +90,38 @@ def validate_request(op_intent: f3548_v21.OperationalIntent) -> None:
         )
 
 
-def check_for_local_conflits(
-    op_intent: f3548_v21.OperationalIntent, flights: list[FlightRecord]
+def conflicts_with_flightrecords(
+    op_intent: f3548_v21.OperationalIntent, flights: list[FlightRecord | None]
 ) -> bool:
     """
-    Return true if an OperationalIntent conflict with any of existing flights
+    Return true if the OperationalIntent conflicts with (intersects) any of the specified FlightRecords that do not
+    correspond with op_intent.
     """
 
-    if op_intent.reference.state not in (
-        scd_api.OperationalIntentState.Accepted,
-        scd_api.OperationalIntentState.Activated,
-    ):
-        # No conflicts are disallowed if the flight is not nominal
-        return False
-
-    v1 = Volume4DCollection.from_f3548v21(
+    vc1 = Volume4DCollection.from_f3548v21(
         (op_intent.details.volumes or [])
         + (op_intent.details.off_nominal_volumes or [])
     )
 
     for other_flight in flights:
-        if other_flight.op_intent.reference.state not in (
-            scd_api.OperationalIntentState.Accepted,
-            scd_api.OperationalIntentState.Activated,
-        ):
+        if not other_flight:
             continue
 
         if other_flight.op_intent.reference.id == op_intent.reference.id:  # Same flight
             continue
 
-        v2 = Volume4DCollection.from_f3548v21(
+        vc2 = Volume4DCollection.from_f3548v21(
             (other_flight.op_intent.details.volumes or [])
             + (other_flight.op_intent.details.off_nominal_volumes or [])
         )
 
-        if v1.intersects_vol4s(v2):
+        if vc1.intersects_vol4s(vc2):
             return True
 
     return False
 
 
-def check_for_disallowed_conflicts(
+def check_for_conflicts(
     new_op_intent: f3548_v21.OperationalIntent,
     existing_flight: FlightRecord | None,
     op_intents: list[f3548_v21.OperationalIntent],
@@ -162,7 +153,7 @@ def log(msg):
 
     v1 = Volume4DCollection.from_interuss_scd_api(new_op_intent.details.volumes)
 
-    found_conflict = False
+    allowed_conflict = False
 
     for op_intent in op_intents:
         if (
@@ -182,18 +173,18 @@ def log(msg):
         old_priority = priority_of(op_intent.details)
         if new_priority > old_priority:
             log(
-                f"intersection with {op_intent.reference.id} not considered: intersection with lower-priority operational intents"
+                f"intersection with {op_intent.reference.id} allowed: intersection with lower-priority operational intents"
             )
 
-            found_conflict |= v1.intersects_vol4s(v2)
+            allowed_conflict |= v1.intersects_vol4s(v2)
             continue
         if new_priority == old_priority and locality.allows_same_priority_intersections(
             old_priority
         ):
             log(
-                f"intersection with {op_intent.reference.id} not considered: intersection with same-priority operational intents (if allowed)"
+                f"intersection with {op_intent.reference.id} allowed: intersection with same-priority operational intents (if allowed)"
             )
-            found_conflict |= v1.intersects_vol4s(v2)
+            allowed_conflict |= v1.intersects_vol4s(v2)
             continue
 
         modifying_activated = (
@@ -208,7 +199,7 @@ def log(msg):
             ).intersects_vol4s(v2)
             if preexisting_conflict:
                 log(
-                    f"intersection with {op_intent.reference.id} not considered: modification of Activated operational intent with a pre-existing conflict"
+                    f"intersection with {op_intent.reference.id} allowed: modification of Activated operational intent with a pre-existing conflict"
                 )
                 continue
 
@@ -217,7 +208,7 @@ def log(msg):
                 f"Requested flight (priority {new_priority}) intersected {op_intent.reference.manager}'s operational intent {op_intent.reference.id} (priority {old_priority})"
             )
 
-    return found_conflict
+    return allowed_conflict
 
 
 def op_intent_transition_valid(
@@ -490,7 +481,7 @@ def get_down_uss_op_intent(
 
     Note: This function will populate volumes (for accepted or activated states) and off_nominal_volumes (for contingent
      and non-conforming states) with the area of interest that was requested. The reason is that later on the function
-     `check_for_disallowed_conflicts` will need to evaluate again those conflicts to determine pre-existing conflicts.
+     `check_for_conflicts` will need to evaluate again those conflicts to determine pre-existing conflicts.
     TODO: A better approach to this issue would be to store the area in conflict when a flight is planned with a
      conflict, that way we can just retrieve the conflicting area instead of having to compute again the intersection
      between the flight to be planned and the conflicting operational intent.
@@ -586,7 +577,7 @@ def check_op_intent(
         log(
             f"Checking for intersections with {', '.join(op_intent.reference.id for op_intent in op_intents)}"
         )
-        has_conflicts = check_for_disallowed_conflicts(
+        has_conflicts = check_for_conflicts(
             new_flight.op_intent, existing_flight, op_intents, locality, log
         )
 
@@ -707,11 +698,7 @@ def notify_subscribers(
     :return: Notification errors if any, by subscriber.
     """
     notif_errors: dict[f3548_v21.SubscriptionUssBaseURL, Exception] = {}
-    base_url = f"{webapp.config[KEY_BASE_URL]}/mock/scd"
     for subscriber in subscribers:
-        if subscriber.uss_base_url == base_url:
-            # Do not notify ourselves
-            continue
         update = f3548_v21.PutOperationalIntentDetailsParameters(
             operational_intent_id=op_intent_id,
             operational_intent=op_intent,

monitoring/mock_uss/f3548v21/routes_scd.py

@@ -12,17 +12,20 @@
     OperationalIntentState,
     PutOperationalIntentDetailsParameters,
 )
-from uas_standards.interuss.automated_testing.flight_planning.v1 import api
 
 from monitoring.mock_uss import webapp
 from monitoring.mock_uss.auth import requires_scope
-from monitoring.mock_uss.database import db as core_db
 from monitoring.mock_uss.f3548v21.flight_planning import (
-    check_for_local_conflits,
+    conflicts_with_flightrecords,
     op_intent_from_flightrecord,
 )
 from monitoring.mock_uss.flights.database import FlightRecord, db
+from monitoring.mock_uss.user_interactions.notifications import (
+    UserNotification,
+    UserNotificationType,
+)
 from monitoring.monitorlib import scd
+from monitoring.monitorlib.clients.flight_planning.planning import Conflict
 
 
 @webapp.route("/mock/scd/uss/v1/operational_intents/<entityid>", methods=["GET"])
@@ -111,7 +114,7 @@ def scdsc_get_operational_intent_telemetry(entityid: str):
 def scdsc_notify_operational_intent_details_changed():
     """Implements notifyOperationalIntentDetailsChanged in ASTM SCD API."""
 
-    # We check if there is a conflits with our own flights
+    # Parse the notification payload
     try:
         op_intent_data: PutOperationalIntentDetailsParameters = ImplicitDict.parse(
             flask.request.json or {}, PutOperationalIntentDetailsParameters
@@ -123,19 +126,19 @@ def scdsc_notify_operational_intent_details_changed():
         )
 
     if "operational_intent" in op_intent_data and op_intent_data.operational_intent:
+        # An op intent is being created or modified; check if it conflicts with any flights we're managing
         with db as tx:
-            if check_for_local_conflits(
+            if conflicts_with_flightrecords(
                 op_intent_data.operational_intent, tx.flights.values()
             ):
-                with core_db as core_tx:
-                    core_tx.flight_planning_notifications.append(
-                        api.UserNotification(
-                            observed_at=api.Time(
-                                value=StringBasedDateTime(arrow.utcnow().datetime)
-                            ),
-                            conflicts="Single",
-                        )
+                # Virtually notify user that another op intent conflicts with their flight
+                tx.flight_planning_notifications.append(
+                    UserNotification(
+                        type=UserNotificationType.DetectedConflict,
+                        observed_at=StringBasedDateTime(arrow.utcnow().datetime),
+                        conflicts=Conflict.Single,  # TODO: detect multiple conflicts
                     )
+                )
 
     # Do nothing else because this USS is unsophisticated and polls the DSS for
     # every change in its operational intents

monitoring/mock_uss/flight_planning/routes.py

@@ -4,17 +4,16 @@
 
 import arrow
 import flask
-from implicitdict import ImplicitDict, StringBasedDateTime
+from implicitdict import ImplicitDict
 from loguru import logger
 from uas_standards.interuss.automated_testing.flight_planning.v1 import api
 from uas_standards.interuss.automated_testing.flight_planning.v1.constants import Scope
 
 from monitoring.mock_uss import require_config_value, webapp
 from monitoring.mock_uss.auth import requires_scope
 from monitoring.mock_uss.config import KEY_BASE_URL
-from monitoring.mock_uss.database import db
 from monitoring.mock_uss.f3548v21.flight_planning import op_intent_from_flightinfo
-from monitoring.mock_uss.flights.database import FlightRecord
+from monitoring.mock_uss.flights.database import FlightRecord, db
 from monitoring.mock_uss.scd_injection.routes_injection import (
     clear_area,
     delete_flight,
@@ -87,28 +86,6 @@ def log(msg: str) -> None:
 
         inject_resp = inject_flight(flight_plan_id, new_flight, existing_flight)
 
-        if "has_conflict" in inject_resp and inject_resp.has_conflict:
-            with db as tx:
-                tx.flight_planning_notifications.append(
-                    api.UserNotification(
-                        observed_at=api.Time(
-                            value=StringBasedDateTime(arrow.utcnow().datetime)
-                        ),
-                        conflicts="Single",
-                    )
-                )
-
-        if "has_local_conflict" in inject_resp and inject_resp.has_local_conflict:
-            with db as tx:
-                tx.flight_planning_notifications.append(
-                    api.UserNotification(
-                        observed_at=api.Time(
-                            value=StringBasedDateTime(arrow.utcnow().datetime)
-                        ),
-                        conflicts="Single",
-                    )
-                )
-
     finally:
         release_flight_lock(flight_plan_id, log)
 
@@ -197,15 +174,16 @@ def flight_planning_v1_user_notifications() -> tuple[str, int]:
             400,
         )
 
-    final_list = []
+    final_list: list[api.UserNotification] = []
 
     for user_notification in db.value.flight_planning_notifications:
-        if (
-            after.datetime
-            <= user_notification.observed_at.value.datetime
-            <= before.datetime
-        ):
-            final_list.append(user_notification)
+        if after.datetime <= user_notification.observed_at.datetime <= before.datetime:
+            final_list.append(
+                api.UserNotification(
+                    observed_at=api.Time(value=user_notification.observed_at),
+                    conflicts=user_notification.conflicts.to_api(),
+                )
+            )
 
     r = api.QueryUserNotificationsResponse(user_notifications=final_list)
 

monitoring/mock_uss/flights/database.py

@@ -4,6 +4,7 @@
 from implicitdict import ImplicitDict
 from uas_standards.astm.f3548.v21.api import OperationalIntent
 
+from monitoring.mock_uss.user_interactions.notifications import UserNotification
 from monitoring.monitorlib.clients.flight_planning.flight_info import FlightInfo
 from monitoring.monitorlib.clients.mock_uss.mock_uss_scd_injection_api import (
     MockUssFlightBehavior,
@@ -28,6 +29,9 @@ class Database(ImplicitDict):
     flights: dict[str, FlightRecord | None] = {}
     cached_operations: dict[str, OperationalIntent] = {}
 
+    flight_planning_notifications: list[UserNotification] = []
+    """List of notifications sent during flight planning operations"""
+
 
 db = SynchronizedValue(
     Database(),

monitoring/mock_uss/scd_injection/routes_injection.py

@@ -1,6 +1,7 @@
 import os
 from datetime import UTC, datetime, timedelta
 
+import arrow
 import flask
 import requests.exceptions
 from implicitdict import ImplicitDict, StringBasedDateTime
@@ -23,7 +24,6 @@
 from monitoring.mock_uss.f3548v21 import utm_client
 from monitoring.mock_uss.f3548v21.flight_planning import (
     PlanningError,
-    check_for_local_conflits,
     check_op_intent,
     delete_op_intent,
     op_intent_from_flightinfo,
@@ -36,6 +36,10 @@
     lock_flight,
     release_flight_lock,
 )
+from monitoring.mock_uss.user_interactions.notifications import (
+    UserNotification,
+    UserNotificationType,
+)
 from monitoring.mock_uss.uspace import flight_auth
 from monitoring.monitorlib import versioning
 from monitoring.monitorlib.clients import scd as scd_client
@@ -45,6 +49,7 @@
 )
 from monitoring.monitorlib.clients.flight_planning.planning import (
     ClearAreaResponse,
+    Conflict,
     FlightPlanStatus,
     PlanningActivityResponse,
     PlanningActivityResult,
@@ -201,10 +206,15 @@ def unsuccessful(
         log("Storing flight in database")
         with db as tx:
             tx.flights[flight_id] = record
-
-            has_local_conflict = check_for_local_conflits(
-                record.op_intent, tx.flights.values()
-            )
+            if has_conflict:
+                # Record virtual user notification that this flight caused/has a conflict
+                tx.flight_planning_notifications.append(
+                    UserNotification(
+                        type=UserNotificationType.CausedConflict,
+                        observed_at=StringBasedDateTime(arrow.utcnow().datetime),
+                        conflicts=Conflict.Single,
+                    )
+                )
 
         step_name = "returning final successful result"
         log("Complete.")
@@ -215,8 +225,6 @@ def unsuccessful(
             activity_result=PlanningActivityResult.Completed,
             flight_plan_status=FlightPlanStatus.from_flightinfo(record.flight_info),
             notes=notes,
-            has_conflict=has_conflict,
-            has_local_conflict=has_local_conflict,
         )
     except (ValueError, ConnectionError) as e:
         notes = (

monitoring/mock_uss/user_interactions/notifications.py

@@ -0,0 +1,21 @@
+from enum import Enum
+
+from implicitdict import ImplicitDict, StringBasedDateTime
+
+from monitoring.monitorlib.clients.flight_planning.planning import Conflict
+
+
+class UserNotificationType(str, Enum):
+    """Type of notification the virtual user received"""
+
+    CausedConflict = "CausedConflict"
+    """User's flight caused or has a conflict with another flight"""
+
+    DetectedConflict = "DetectedConflict"
+    """Another flight created a conflict with one of the user's flights"""
+
+
+class UserNotification(ImplicitDict):
+    type: UserNotificationType
+    observed_at: StringBasedDateTime
+    conflicts: Conflict