Merge branch 'main' into scd0010

monitoring/uss_qualifier/configurations/dev/library/resources.yaml

@@ -134,7 +134,7 @@ che_conflicting_flights:
     file:
       path: file://./test_data/che/flight_intents/conflicting_flights.yaml
       # Note that this hash_sha512 field can be safely deleted if the content changes
-      hash_sha512: c35e3536d63b7dd521042cefa094dd1ecd2d3feaf31997ce6a2902361b85c42dec636bec62df853157e46e08d3fc811c00fedfd6dfe4b8bbd0506149cfeb4a17
+      hash_sha512: 26ee66a5065e555512f8b1e354334678dfe1614c6fbba4898a1541e6306341620e96de8b48e4095c7b03ab6fd58d0aeeee9e69cf367e1b7346e0c5f287460792
 
 che_invalid_flight_intents:
   $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json

monitoring/uss_qualifier/resources/flight_planning/flight_intent_validation.py

@@ -0,0 +1,203 @@
+from dataclasses import dataclass
+from datetime import timedelta
+from typing import Optional, List, Dict, Iterator
+
+import arrow
+
+from monitoring.monitorlib.clients.flight_planning.flight_info import (
+    AirspaceUsageState,
+    UasState,
+    FlightInfo,
+)
+from monitoring.monitorlib.clients.flight_planning.flight_info_template import (
+    FlightInfoTemplate,
+)
+from monitoring.monitorlib.temporal import TimeDuringTest, Time
+from monitoring.uss_qualifier.resources.flight_planning.flight_intent import (
+    FlightIntentID,
+)
+
+FlightIntentName = str
+
+MAX_TEST_RUN_DURATION = timedelta(minutes=30)
+"""The longest a test run might take (to estimate flight intent timestamps prior to scenario execution)"""
+
+
+@dataclass
+class ExpectedFlightIntent(object):
+    intent_id: FlightIntentID
+    name: FlightIntentName
+    must_conflict_with: Optional[List[FlightIntentName]] = None
+    must_not_conflict_with: Optional[List[FlightIntentName]] = None
+    usage_state: Optional[AirspaceUsageState] = None
+    uas_state: Optional[UasState] = None
+    f3548v21_priority_higher_than: Optional[List[FlightIntentName]] = None
+    f3548v21_priority_equal_to: Optional[List[FlightIntentName]] = None
+
+
+def validate_flight_intent_templates(
+    templates: Dict[FlightIntentID, FlightInfoTemplate],
+    expected_intents: List[ExpectedFlightIntent],
+) -> None:
+    now = Time(arrow.utcnow().datetime)
+    times = {
+        TimeDuringTest.StartOfTestRun: now,
+        TimeDuringTest.StartOfScenario: now,
+        TimeDuringTest.TimeOfEvaluation: now,
+    }
+    flight_intents = {k: v.resolve(times) for k, v in templates.items()}
+    validate_flight_intents(flight_intents, expected_intents, now)
+
+    later = Time(now.datetime + MAX_TEST_RUN_DURATION)
+    times = {
+        TimeDuringTest.StartOfTestRun: now,
+        TimeDuringTest.StartOfScenario: later,
+        TimeDuringTest.TimeOfEvaluation: later,
+    }
+    flight_intents = {k: v.resolve(times) for k, v in templates.items()}
+    validate_flight_intents(flight_intents, expected_intents, later)
+
+
+def validate_flight_intents(
+    intents: Dict[FlightIntentID, FlightInfo],
+    expected_intents: List[ExpectedFlightIntent],
+    now: Time,
+) -> None:
+    """Validate that `intents` contains all intents meeting all the criteria in `expected_intents`.
+
+    Args:
+        intents: Flight intents we actually have.
+        expected_intents: Criteria that our flight intents are expected to meet.
+        now: Current time, for validation that in-use intents include this time.
+
+    Raises:
+        * ValueError when a validation criterion is not met.
+    """
+
+    # Ensure all intents are present
+    for expected_intent in expected_intents:
+        if expected_intent.intent_id not in intents:
+            raise ValueError(f"Missing flight intent `{expected_intent.intent_id}`")
+
+    for expected_intent in expected_intents:
+        intent = intents[expected_intent.intent_id]
+
+        # Ensure in-use intent includes now
+        if intent.basic_information.usage_state == AirspaceUsageState.InUse:
+            start_time = intent.basic_information.area.time_start
+            if start_time is None:
+                raise ValueError(
+                    f"At least one volume in `{expected_intent.intent_id}` is missing a start time"
+                )
+            if now.datetime < start_time.datetime:
+                raise ValueError(
+                    f"When evaluated at {now.datetime.isoformat()}, `{expected_intent.intent_id}`'s start time {start_time.datetime.isoformat()} is in the future even though the intent is indicated as InUse"
+                )
+            end_time = intent.basic_information.area.time_end
+            if end_time is None:
+                raise ValueError(
+                    f"At least one volume in `{expected_intent.intent_id}` is missing an end time"
+                )
+            if now.datetime > end_time.datetime:
+                raise ValueError(
+                    f"When evaluated at {now.datetime.isoformat()}, `{expected_intent.intent_id}`'s end time {end_time.datetime.isoformat()} is in the past even though the intent is indicated as InUse"
+                )
+
+        # Ensure not-in-use intent does not indicate an off-nominal UAS
+        if intent.basic_information.usage_state != AirspaceUsageState.InUse:
+            if intent.basic_information.uas_state != UasState.Nominal:
+                raise ValueError(
+                    f"`{expected_intent.intent_id}` indicates the intent is not in use ({intent.basic_information.usage_state}), but the UAS state is specified as off-nominal ({intent.basic_information.uas_state})"
+                )
+
+        def named_intents(
+            name: FlightIntentName,
+            exclude: ExpectedFlightIntent,
+            no_matches_message: str,
+        ) -> Iterator[ExpectedFlightIntent]:
+            found = False
+            for expected_intent in expected_intents:
+                if expected_intent is exclude:
+                    continue
+                if expected_intent.name != name:
+                    continue
+                found = True
+                yield expected_intent
+            if not found:
+                raise ValueError(no_matches_message)
+
+        # Ensure conflicts with other intents
+        if expected_intent.must_conflict_with:
+            for conflict_name in expected_intent.must_conflict_with:
+                msg = f"Invalid flight intent expectation: `{expected_intent.intent_id}` must conflict with intent name `{conflict_name}` but there are no expected flight intents with that name"
+                for other_expected_intent in named_intents(
+                    conflict_name, expected_intent, msg
+                ):
+                    other_intent = intents[other_expected_intent.intent_id]
+                    if not intent.basic_information.area.intersects_vol4s(
+                        other_intent.basic_information.area
+                    ):
+                        raise ValueError(
+                            f"Flight intent `{expected_intent.intent_id}` must conflict with intent name `{conflict_name}` but there are no conflicts with `{other_expected_intent.intent_id}`"
+                        )
+
+        # Ensure free of conflicts with other intents
+        if expected_intent.must_not_conflict_with:
+            for conflict_name in expected_intent.must_not_conflict_with:
+                msg = f"Invalid flight intent expectation: `{expected_intent.intent_id}` must not conflict with intent name `{conflict_name}` but there are no expected flight intents with that name"
+                for other_expected_intent in named_intents(
+                    conflict_name, expected_intent, msg
+                ):
+                    other_intent = intents[other_expected_intent.intent_id]
+                    if intent.basic_information.area.intersects_vol4s(
+                        other_intent.basic_information.area
+                    ):
+                        raise ValueError(
+                            f"Flight intent `{expected_intent.intent_id}` must not conflict with intent name `{conflict_name}` but there is a conflict with `{other_expected_intent.intent_id}`"
+                        )
+
+        # Ensure usage state
+        if expected_intent.usage_state:
+            if intent.basic_information.usage_state != expected_intent.usage_state:
+                raise ValueError(
+                    f"Flight intent `{expected_intent.intent_id}` must have usage_state {expected_intent.usage_state}, but instead has usage_state {intent.basic_information.usage_state}"
+                )
+
+        # Ensure UAS state
+        if expected_intent.uas_state:
+            if intent.basic_information.uas_state != expected_intent.uas_state:
+                raise ValueError(
+                    f"Flight intent `{expected_intent.intent_id}` must have uas_state {expected_intent.uas_state}, but instead has uas_state {intent.basic_information.uas_state}"
+                )
+
+        # Ensure ASTM F3548-21 priority higher than other intents
+        if expected_intent.f3548v21_priority_higher_than:
+            for priority_name in expected_intent.f3548v21_priority_higher_than:
+                msg = f"Invalid flight intent expectation: `{expected_intent.intent_id}` must be higher ASTM F3548-21 priority than intent `{priority_name}` but there are no expected flight intents with that name"
+                for other_expected_intent in named_intents(
+                    priority_name, expected_intent, msg
+                ):
+                    other_intent = intents[other_expected_intent.intent_id]
+                    if (
+                        intent.astm_f3548_21.priority
+                        <= other_intent.astm_f3548_21.priority
+                    ):
+                        raise ValueError(
+                            f"Flight intent `{expected_intent.intent_id}` with ASTM F3548-21 priority {intent.astm_f3548_21.priority} must be higher priority than intent name `{priority_name}` but `{other_expected_intent.intent_id}` has priority {other_intent.astm_f3548_21.priority}"
+                        )
+
+        # Ensure ASTM F3548-21 priority equal to other intents
+        if expected_intent.f3548v21_priority_equal_to:
+            for priority_name in expected_intent.f3548v21_priority_equal_to:
+                msg = f"Invalid flight intent expectation: `{expected_intent.intent_id}` must be equal ASTM F3548-21 priority to intent `{priority_name}` but there are no expected flight intents with that name"
+                for other_expected_intent in named_intents(
+                    priority_name, expected_intent, msg
+                ):
+                    other_intent = intents[other_expected_intent.intent_id]
+                    if (
+                        intent.astm_f3548_21.priority
+                        != other_intent.astm_f3548_21.priority
+                    ):
+                        raise ValueError(
+                            f"Flight intent `{expected_intent.intent_id}` with ASTM F3548-21 priority {intent.astm_f3548_21.priority} must be equal priority to intent name `{priority_name}` but `{other_expected_intent.intent_id}` has priority {other_intent.astm_f3548_21.priority}"
+                        )

monitoring/uss_qualifier/scenarios/astm/utm/nominal_planning/conflict_equal_priority_not_permitted/assets/make_assets.py

@@ -259,21 +259,21 @@ def make_attempt_to_modify_activated_flight_into_conflict():
 def make_modify_activated_flight_with_preexisting_conflict():
     elements = [
         svg.Polygon(
-            points=flight2_points,
+            points=flight1_points,
             stroke=outline,
-            fill=nonconforming,
+            fill=activated,
             fill_opacity=0.4,
             stroke_width=8,
         ),
-        svg.Text(x=60, y=90, class_=["heavy"], text="Flight 2"),
+        svg.Text(x=222, y=145, class_=["heavy"], text="Flight 1"),
         svg.Polygon(
-            points=flight1_points,
+            points=flight2_points,
             stroke=outline,
-            fill=activated,
+            fill=nonconforming,
             fill_opacity=0.4,
             stroke_width=8,
         ),
-        svg.Text(x=222, y=145, class_=["heavy"], text="Flight 1"),
+        svg.Text(x=60, y=90, class_=["heavy"], text="Flight 2"),
         svg.Polygon(
             points=translate(flight2_points, 440, 0),
             stroke=outline,