Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions newsfragments/170.fixed.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
``parse_types=True`` now works together with ``metadata=True`` in :meth:`~spacetrack.base.SpaceTrackClient.generic_request` and the request class methods; previously the metadata-wrapped response made it fail after the request had succeeded.
6 changes: 5 additions & 1 deletion src/spacetrack/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,11 @@ def generic_request(
def _parse_types(data, predicates):
predicate_map = {p.name: p for p in predicates}

for obj in data:
# With metadata=true, the rows are wrapped in a dict alongside the
# request metadata.
rows = data.get("data", []) if isinstance(data, Mapping) else data

for obj in rows:
for key, value in obj.items():
if key.lower() in predicate_map:
obj[key] = predicate_map[key.lower()].parse(value)
Expand Down
15 changes: 15 additions & 0 deletions tests/test_spacetrack.py
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,21 @@ def test_parse_types(client, httpx2_mock, mock_auth):
assert "parse_types" in exc_info.value.args[0]


def test_parse_types_metadata(client, httpx2_mock, mock_auth, mock_gp_predicates):
httpx2_mock.add_response(
method="GET",
url=api_url("basicspacedata/query/class/gp/metadata/true"),
json={
"request_metadata": {"DataSize": "1"},
"data": [{"LAUNCH_DATE": "2017-01-01"}],
},
)

result = client.gp(parse_types=True, metadata=True)

assert result["data"][0]["LAUNCH_DATE"] == dt.date(2017, 1, 1)


def test_params(httpx2_mock, mock_auth):
data = b"hello\n"
httpx2_mock.add_response(
Expand Down