Skip to content

[uss_qualifier] Fix flight cleanup #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 29, 2025
Merged

[uss_qualifier] Fix flight cleanup #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ce3dba
Fix duplicate flight cleanups
BenjaminPelletier Sep 25, 2025
e49f9d9
Fix mock_uss delete flight response codes
BenjaminPelletier Sep 25, 2025
336bd40
Adjust implementation approach
BenjaminPelletier Sep 26, 2025
e28a10e
Merge remote-tracking branch 'interuss/main' into fix-duplicate-cleanup
BenjaminPelletier Sep 26, 2025
d388852
Clean up TestScenarioType, record_queries placement
BenjaminPelletier Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 0 additions & 170 deletions .basedpyright/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3012,16 +3012,6 @@
}
}
],
"./monitoring/monitorlib/clients/flight_planning/client.py": [
{
"code": "reportRedeclaration",
"range": {
"startColumn": 4,
"endColumn": 22,
"lineCount": 1
}
}
],
"./monitoring/monitorlib/clients/flight_planning/client_scd.py": [
{
"code": "reportOptionalMemberAccess",
Expand Down Expand Up @@ -21959,54 +21949,6 @@
}
],
"./monitoring/uss_qualifier/scenarios/flight_planning/test_steps.py": [
{
"code": "reportInvalidTypeVarUse",
"range": {
"startColumn": 14,
"endColumn": 30,
"lineCount": 1
}
},
{
"code": "reportInvalidTypeVarUse",
"range": {
"startColumn": 14,
"endColumn": 30,
"lineCount": 1
}
},
{
"code": "reportInvalidTypeVarUse",
"range": {
"startColumn": 14,
"endColumn": 30,
"lineCount": 1
}
},
{
"code": "reportInvalidTypeVarUse",
"range": {
"startColumn": 14,
"endColumn": 30,
"lineCount": 1
}
},
{
"code": "reportInvalidTypeVarUse",
"range": {
"startColumn": 14,
"endColumn": 30,
"lineCount": 1
}
},
{
"code": "reportInvalidTypeVarUse",
"range": {
"startColumn": 14,
"endColumn": 30,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
Expand Down Expand Up @@ -22142,118 +22084,6 @@
"endColumn": 15,
"lineCount": 1
}
},
{
"code": "reportInvalidTypeVarUse",
"range": {
"startColumn": 14,
"endColumn": 30,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 30,
"endColumn": 35,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 29,
"endColumn": 33,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 57,
"endColumn": 61,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 66,
"endColumn": 70,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 12,
"endColumn": 16,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 16,
"endColumn": 20,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 19,
"endColumn": 23,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 64,
"endColumn": 68,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 111,
"endColumn": 115,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 69,
"endColumn": 73,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 116,
"endColumn": 120,
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 34,
"endColumn": 39,
"lineCount": 1
}
},
{
"code": "reportInvalidTypeVarUse",
"range": {
"startColumn": 14,
"endColumn": 30,
"lineCount": 1
}
}
],
"./monitoring/uss_qualifier/scenarios/interuss/flight_authorization/general_flight_authorization.py": [
Expand Down
9 changes: 6 additions & 3 deletions monitoring/mock_uss/scd_injection/routes_injection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,20 +315,23 @@ def unsuccessful(msg: str) -> PlanningActivityResponse:
f"{e.__class__.__name__} while {step_name} for flight {flight_id}: {str(e)}"
)
log(notes)
return unsuccessful(notes), 500
# Activity result is Failed, but we executed the activity successfully
return unsuccessful(notes), 200
Copy link
Contributor

@barroco barroco Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in this file may be good candidates for a note in the NEXT_RELEASE_NOTE.

Copy link
Member Author

@BenjaminPelletier BenjaminPelletier Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the change to 500 from 200 was relatively recent and this just fixes a bug rather than changing an intended behavior

except requests.exceptions.ConnectionError as e:
notes = f"Connection error to {e.request.method} {e.request.url} while {step_name} for flight {flight_id}: {str(e)}"
log(notes)
response = unsuccessful(notes)
response["stacktrace"] = stacktrace_string(e)
return response, 500
# Activity result is Failed, but we executed the activity successfully
return response, 200
except QueryError as e:
notes = f"Unexpected response from remote server while {step_name} for flight {flight_id}: {str(e)}"
log(notes)
response = unsuccessful(notes)
response["queries"] = e.queries
response["stacktrace"] = e.stacktrace
return response, 500
# Activity result is Failed, but we executed the activity successfully
return response, 200

log("Complete.")
return (
Expand Down
2 changes: 1 addition & 1 deletion monitoring/monitorlib/clients/flight_planning/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class FlightPlannerClient(ABC):

def __init__(self, participant_id: ParticipantID):
self.participant_id = participant_id
self.created_flight_ids: set[FlightID] = set()
self.created_flight_ids = set()

# ===== Emulation of user actions =====

Expand Down
Loading
Loading