Start updating exceptions and exception handling to match new Vuforia behaviour

Author: adamtheturtle

CHANGELOG.rst

@@ -6,14 +6,8 @@ Changelog
 Next
 ----
 
-2020.09.28.0
-------------
-
-2020.09.25.0
-------------
-
-2020.09.08.0
-------------
+* Breaking change: The ``vws.exceptions.cloud_reco_exceptions.MatchProcessing`` is now ``vws.exceptions.custom_exceptions.ActiveMatchingTargetsDeleteProcessing``.
+* Added new exception ``vws.exceptions.custom_exceptions.RequestEntityTooLarge``.
 
 2020.09.07.0
 ------------

src/vws/query.py

@@ -17,12 +17,12 @@
     AuthenticationFailure,
     BadImage,
     InactiveProject,
-    MatchProcessing,
     MaxNumResultsOutOfRange,
     RequestTimeTooSkewed,
 )
 from vws.exceptions.custom_exceptions import (
     RequestEntityTooLarge,
+    ActiveMatchingTargetsDeleteProcessing,
 )
 from vws.include_target_data import CloudRecoIncludeTargetData
 from vws.reports import QueryResult, TargetData
@@ -78,9 +78,9 @@ def query(
                 client access key pair is not correct.
             ~vws.exceptions.cloud_reco_exceptions.MaxNumResultsOutOfRange:
                 ``max_num_results`` is not within the range (1, 50).
-            ~vws.exceptions.cloud_reco_exceptions.MatchProcessing: The given
-                image matches a target which was recently added, updated or
-                deleted and Vuforia returns an error in this case.
+            ~vws.exceptions.cloud_reco_exceptions.ActiveMatchingTargetsDeleteProcessing: The given
+                image matches a target which was recently
+                deleted.
             ~vws.exceptions.cloud_reco_exceptions.InactiveProject: The project
                 is inactive.
             ~vws.exceptions.cloud_reco_exceptions.RequestTimeTooSkewed: There
@@ -140,7 +140,7 @@ def query(
             raise MaxNumResultsOutOfRange(response=response)
 
         if 'No content to map due to end-of-input' in response.text:
-            raise MatchProcessing(response=response)
+            raise ActiveMatchingTargetsDeleteProcessing(response=response)
 
         result_code = response.json()['result_code']
         if result_code != 'Success':

tests/test_cloud_reco_exceptions.py

@@ -3,6 +3,7 @@
 """
 
 import io
+import time
 from http import HTTPStatus
 
 import pytest
@@ -68,28 +69,6 @@ def test_cloudrecoexception_inheritance() -> None:
         assert issubclass(subclass, CloudRecoException)
 
 
-def test_base_exception(
-    vws_client: VWS,
-    cloud_reco_client: CloudRecoService,
-    high_quality_image: io.BytesIO,
-) -> None:
-    """
-    ``CloudRecoException``s has a response property.
-    """
-    vws_client.add_target(
-        name='x',
-        width=1,
-        image=high_quality_image,
-        active_flag=True,
-        application_metadata=None,
-    )
-
-    with pytest.raises(CloudRecoException) as exc:
-        cloud_reco_client.query(image=high_quality_image)
-
-    assert exc.value.response.status_code == HTTPStatus.INTERNAL_SERVER_ERROR
-
-
 def test_match_processing(
     vws_client: VWS,
     cloud_reco_client: CloudRecoService,
@@ -99,15 +78,19 @@ def test_match_processing(
     A ``MatchProcessing`` exception is raised when a target in processing is
     matched.
     """
-    vws_client.add_target(
+    target_id = vws_client.add_target(
         name='x',
         width=1,
         image=high_quality_image,
         active_flag=True,
         application_metadata=None,
     )
+    vws_client.wait_for_target_processed(target_id=target_id)
+    vws_client.delete_target(target_id=target_id)
+    time.sleep(0.2)
     with pytest.raises(MatchProcessing) as exc:
-        cloud_reco_client.query(image=high_quality_image)
+        response = cloud_reco_client.query(image=high_quality_image)
+
     assert exc.value.response.status_code == HTTPStatus.INTERNAL_SERVER_ERROR