Merge pull request #170 from python-astrodynamics/feature/parse-types-metadata

Fix parse_types with metadata=True

Author: RazerM

newsfragments/170.fixed.rst

@@ -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.

src/spacetrack/base.py

@@ -752,7 +752,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)

tests/test_spacetrack.py

@@ -857,6 +857,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(