Passing new test

Author: adamtheturtle

src/vws/query.py

@@ -2,6 +2,7 @@
 Tools for interacting with the Vuforia Cloud Recognition Web APIs.
 """
 
+import datetime
 import io
 from typing import List
 from urllib.parse import urljoin
@@ -17,9 +18,12 @@
     MaxNumResultsOutOfRange,
 )
 from vws.include_target_data import CloudRecoIncludeTargetData
-from vws.reports import QueryResult
+from vws.reports import QueryResult, TargetData
 
 
+def _cloud_reco_response_item_to_query_result():
+    pass
+
 class CloudRecoService:
     """
     An interface to the Vuforia Cloud Recognition Web APIs.
@@ -133,4 +137,29 @@ def query(
             response=response,
             expected_result_code='Success',
         )
-        return list(response.json()['results'])
+
+        result = []
+        result_list = list(response.json()['results'])
+        for item in result_list:
+            if 'target_data' in item:
+                target_data_dict = item['target_data']
+                metadata = target_data_dict['application_metadata']
+                timestamp_string = target_data_dict['target_timestamp']
+                target_timestamp = datetime.datetime.utcfromtimestamp(
+                    timestamp_string,
+                )
+                target_data = TargetData(
+                    name=target_data_dict['name'],
+                    application_metadata=metadata,
+                    target_timestamp=target_timestamp,
+                )
+            else:
+                target_data = None
+
+            query_result = QueryResult(
+                target_id=item['target_id'],
+                target_data=target_data,
+            )
+
+            result.append(query_result)
+        return result

tests/test_query.py

@@ -51,7 +51,7 @@ def test_match(
         )
         vws_client.wait_for_target_processed(target_id=target_id)
         [matching_target] = cloud_reco_client.query(image=high_quality_image)
-        assert matching_target['target_id'] == target_id
+        assert matching_target.target_id == target_id
 
     def test_too_large(
         self,
@@ -102,7 +102,7 @@ def test_custom_base_url(self, high_quality_image: io.BytesIO) -> None:
             )
 
             [match] = cloud_reco_client.query(image=high_quality_image)
-            assert match['target_id'] == target_id
+            assert match.target_id == target_id
 
 
 class TestMaxNumResults:
@@ -233,8 +233,8 @@ def test_default(
             image=high_quality_image,
             max_num_results=2,
         )
-        assert 'target_data' in top_match
-        assert 'target_data' not in second_match
+        assert top_match.target_data is not None
+        assert second_match.target_data is None
 
     def test_top(
         self,
@@ -267,8 +267,8 @@ def test_top(
             max_num_results=2,
             include_target_data=CloudRecoIncludeTargetData.TOP,
         )
-        assert 'target_data' in top_match
-        assert 'target_data' not in second_match
+        assert top_match.target_data is not None
+        assert second_match.target_data is None
 
     def test_none(
         self,
@@ -301,8 +301,8 @@ def test_none(
             max_num_results=2,
             include_target_data=CloudRecoIncludeTargetData.NONE,
         )
-        assert 'target_data' not in top_match
-        assert 'target_data' not in second_match
+        assert top_match.target_data is None
+        assert second_match.target_data is None
 
     def test_all(
         self,
@@ -335,5 +335,5 @@ def test_all(
             max_num_results=2,
             include_target_data=CloudRecoIncludeTargetData.ALL,
         )
-        assert 'target_data' in top_match
-        assert 'target_data' in second_match
+        assert top_match.target_data is not None
+        assert second_match.target_data is not None

tests/test_vws.py

@@ -65,9 +65,9 @@ def test_add_target(
         matching_targets = cloud_reco_client.query(image=high_quality_image)
         if active_flag:
             [matching_target] = matching_targets
-            assert matching_target['target_id'] == target_id
-            query_target_data = matching_target['target_data']
-            query_metadata = query_target_data['application_metadata']
+            assert matching_target.target_id == target_id
+            assert matching_target.target_data is not None
+            query_metadata = matching_target.target_data.application_metadata
             assert query_metadata == encoded_metadata
         else:
             assert matching_targets == []
@@ -500,9 +500,10 @@ def test_update_target(
         )
         vws_client.wait_for_target_processed(target_id=target_id)
         [matching_target] = cloud_reco_client.query(image=high_quality_image)
-        assert matching_target['target_id'] == target_id
-        query_target_data = matching_target['target_data']
-        query_metadata = query_target_data['application_metadata']
+        assert matching_target.target_id == target_id
+        query_target_data = matching_target.target_data
+        assert query_target_data is not None
+        query_metadata = query_target_data.application_metadata
         assert query_metadata is None
 
         new_name = uuid.uuid4().hex