One test passing

Author: adamtheturtle

dev-requirements.txt

@@ -5,7 +5,7 @@ PyYAML==5.4.1
 Pygments==2.8.1
 Sphinx-Substitution-Extensions==2020.9.30.0
 Sphinx==3.5.3
-VWS-Python-Mock==2020.10.3.0
+VWS-Python-Mock==2021.3.27.1
 VWS-Test-Fixtures==2020.9.25.1
 autoflake==1.4
 check-manifest==0.46

src/vws/exceptions/custom_exceptions.py

@@ -16,10 +16,9 @@ class UnknownVWSErrorPossiblyBadName(Exception):
     """
 
 
-class ConnectionErrorPossiblyImageTooLarge(requests.ConnectionError):
+class RequestEntityTooLarge(Exception):
     """
-    Exception raised when a ConnectionError is raised from a query. This has
-    been seen to happen when the given image is too large.
+    Exception raised when the given image is too large.
     """
 
 

src/vws/query.py

@@ -5,6 +5,7 @@
 from __future__ import annotations
 
 import datetime
+from http import HTTPStatus
 import io
 from urllib.parse import urljoin
 
@@ -21,7 +22,7 @@
     RequestTimeTooSkewed,
 )
 from vws.exceptions.custom_exceptions import (
-    ConnectionErrorPossiblyImageTooLarge,
+    RequestEntityTooLarge,
 )
 from vws.include_target_data import CloudRecoIncludeTargetData
 from vws.reports import QueryResult, TargetData
@@ -82,13 +83,13 @@ def query(
                 deleted and Vuforia returns an error in this case.
             ~vws.exceptions.cloud_reco_exceptions.InactiveProject: The project
                 is inactive.
-            ~vws.exceptions.custom_exceptions.ConnectionErrorPossiblyImageTooLarge:
-                The given image is too large.
             ~vws.exceptions.cloud_reco_exceptions.RequestTimeTooSkewed: There
                 is an error with the time sent to Vuforia.
             ~vws.exceptions.cloud_reco_exceptions.BadImage: There is a problem
                 with the given image.  For example, it must be a JPEG or PNG
                 file in the grayscale or RGB color space.
+            ~vws.exceptions.custom_exceptions.RequestEntityTooLarge:
+                The given image is too large.
 
         Returns:
             An ordered list of target details of matching targets.
@@ -125,18 +126,15 @@ def query(
             'Content-Type': content_type_header,
         }
 
-        try:
-            response = requests.request(
-                method=method,
-                url=urljoin(base=self._base_vwq_url, url=request_path),
-                headers=headers,
-                data=content,
-            )
-        except requests.exceptions.ConnectionError as exc:
-            raise ConnectionErrorPossiblyImageTooLarge(
-                request=exc.request,
-                response=exc.response,
-            ) from exc
+        response = requests.request(
+            method=method,
+            url=urljoin(base=self._base_vwq_url, url=request_path),
+            headers=headers,
+            data=content,
+        )
+
+        if response.status_code == HTTPStatus.REQUEST_ENTITY_TOO_LARGE:
+            raise RequestEntityTooLarge
 
         if 'Integer out of range' in response.text:
             raise MaxNumResultsOutOfRange(response=response)

tests/test_cloud_reco_exceptions.py

@@ -20,7 +20,7 @@
     MaxNumResultsOutOfRange,
 )
 from vws.exceptions.custom_exceptions import (
-    ConnectionErrorPossiblyImageTooLarge,
+    RequestEntityTooLarge,
 )
 
 
@@ -50,15 +50,12 @@ def test_image_too_large(
     png_too_large: io.BytesIO,
 ) -> None:
     """
-    A ``ConnectionErrorPossiblyImageTooLarge`` exception is raised if an
-    image which is too large is given.
+    A ``RequestEntityTooLarge`` exception is raised if an image which is too
+    large is given.
     """
-    with pytest.raises(ConnectionErrorPossiblyImageTooLarge) as exc:
+    with pytest.raises(RequestEntityTooLarge) as exc:
         cloud_reco_client.query(image=png_too_large)
 
-    assert isinstance(exc.value, requests.ConnectionError)
-
-
 def test_cloudrecoexception_inheritance() -> None:
     """
     CloudRecoService-specific exceptions inherit from CloudRecoException.