Merge pull request #1899 from VWS-Python/bump-mock

Remove ActiveMatchingTargetsDeleteProcessing - VWS no longer has this…

Author: adamtheturtle

CHANGELOG.rst

@@ -4,6 +4,8 @@ Changelog
 Next
 ----
 
+* Breaking change: the ``vws.exceptions.custom_exceptions.ActiveMatchingTargetsDeleteProcessing`` exception has been removed as Vuforia no longer returns this error.
+
 2023.03.25
 ------------
 

pyproject.toml

@@ -234,7 +234,7 @@ dev = [
     "Pygments==2.15.1",
     "Sphinx-Substitution-Extensions==2022.2.16",
     "Sphinx==7.0.1",
-    "VWS-Python-Mock==2023.4.8",
+    "VWS-Python-Mock==2023.5.21",
     "VWS-Test-Fixtures==2023.3.5",
     "black==23.3.0",
     "check-manifest==0.49",

src/vws/exceptions/custom_exceptions.py

@@ -24,10 +24,3 @@ class TargetProcessingTimeout(Exception):
     """
     Exception raised when waiting for a target to be processed times out.
     """
-
-
-class ActiveMatchingTargetsDeleteProcessing(Exception):
-    """
-    Exception raised when a query is made with an image which matches a target
-    which has recently been deleted.
-    """

src/vws/query.py

@@ -21,7 +21,6 @@
     RequestTimeTooSkewed,
 )
 from vws.exceptions.custom_exceptions import (
-    ActiveMatchingTargetsDeleteProcessing,
     RequestEntityTooLarge,
 )
 from vws.include_target_data import CloudRecoIncludeTargetData
@@ -95,8 +94,6 @@ def query(
                 file in the grayscale or RGB color space.
             ~vws.exceptions.custom_exceptions.RequestEntityTooLarge: The given
                 image is too large.
-            ~vws.exceptions.custom_exceptions.ActiveMatchingTargetsDeleteProcessing:
-                The given image matches a target which was recently deleted.
 
         Returns:
             An ordered list of target details of matching targets.
@@ -148,9 +145,6 @@ def query(
         if "Integer out of range" in response.text:
             raise MaxNumResultsOutOfRange(response=response)
 
-        if "No content to map due to end-of-input" in response.text:
-            raise ActiveMatchingTargetsDeleteProcessing
-
         result_code = response.json()["result_code"]
         if result_code != "Success":
             exception = {

tests/test_cloud_reco_exceptions.py

@@ -4,7 +4,6 @@
 
 from __future__ import annotations
 
-import time
 import uuid
 from http import HTTPStatus
 from typing import TYPE_CHECKING
@@ -13,7 +12,7 @@
 from mock_vws import MockVWS
 from mock_vws.database import VuforiaDatabase
 from mock_vws.states import States
-from vws import VWS, CloudRecoService
+from vws import CloudRecoService
 from vws.exceptions.base_exceptions import CloudRecoException
 from vws.exceptions.cloud_reco_exceptions import (
     AuthenticationFailure,
@@ -23,7 +22,6 @@
     RequestTimeTooSkewed,
 )
 from vws.exceptions.custom_exceptions import (
-    ActiveMatchingTargetsDeleteProcessing,
     RequestEntityTooLarge,
 )
 
@@ -79,32 +77,6 @@ def test_cloudrecoexception_inheritance() -> None:
         assert issubclass(subclass, CloudRecoException)
 
 
-def test_active_matching_targets_delete_processing(
-    vws_client: VWS,
-    cloud_reco_client: CloudRecoService,
-    high_quality_image: io.BytesIO,
-) -> None:
-    """
-    A ``ActiveMatchingTargetsDeleteProcessing`` exception is raised when a
-    target which has recently been deleted is matched.
-    """
-    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)
-    # This matches the "query_recognizes_deletion_seconds" setting to
-    # ``MockVWS``.
-    query_recognizes_deletion_seconds = 2
-    time.sleep(query_recognizes_deletion_seconds)
-    with pytest.raises(ActiveMatchingTargetsDeleteProcessing):
-        cloud_reco_client.query(image=high_quality_image)
-
-
 def test_authentication_failure(high_quality_image: io.BytesIO) -> None:
     """
     An ``AuthenticationFailure`` exception is raised when the client access key