Remove ties of result code handling from VWS and VWQ

Author: adamtheturtle

src/vws/_result_codes.py

@@ -11,14 +11,19 @@
 from urllib3.filepost import encode_multipart_formdata
 from vws_auth_tools import authorization_header, rfc_1123_date
 
-from vws._result_codes import raise_for_result_code
 from vws.exceptions.cloud_reco_exceptions import (
+    InactiveProject,
     MatchProcessing,
     MaxNumResultsOutOfRange,
 )
 from vws.exceptions.custom_exceptions import (
     ConnectionErrorPossiblyImageTooLarge,
 )
+from vws.exceptions.vws_exceptions import (
+    AuthenticationFailure,
+    BadImage,
+    RequestTimeTooSkewed,
+)
 from vws.include_target_data import CloudRecoIncludeTargetData
 from vws.reports import QueryResult, TargetData
 
@@ -140,10 +145,15 @@ def query(
         if 'No content to map due to end-of-input' in response.text:
             raise MatchProcessing(response=response)
 
-        raise_for_result_code(
-            response=response,
-            expected_result_code='Success',
-        )
+        result_code = response.json()['result_code']
+        if result_code != 'Success':
+            exception = {
+                'AuthenticationFailure': AuthenticationFailure,
+                'BadImage': BadImage,
+                'InactiveProject': InactiveProject,
+                'RequestTimeTooSkewed': RequestTimeTooSkewed,
+            }[result_code]
+            raise exception(response=response)
 
         result = []
         result_list = list(response.json()['results'])

src/vws/query.py

@@ -16,8 +16,28 @@
 from requests import Response
 from vws_auth_tools import authorization_header, rfc_1123_date
 
-from vws._result_codes import raise_for_result_code
-from vws.exceptions.custom_exceptions import TargetProcessingTimeout
+from vws.exceptions.custom_exceptions import (
+    TargetProcessingTimeout,
+    UnknownVWSErrorPossiblyBadName,
+)
+from vws.exceptions.vws_exceptions import (
+    AuthenticationFailure,
+    BadImage,
+    DateRangeError,
+    Fail,
+    ImageTooLarge,
+    MetadataTooLarge,
+    ProjectHasNoAPIAccess,
+    ProjectInactive,
+    ProjectSuspended,
+    RequestQuotaReached,
+    RequestTimeTooSkewed,
+    TargetNameExist,
+    TargetQuotaReached,
+    TargetStatusNotSuccess,
+    TargetStatusProcessing,
+    UnknownTarget,
+)
 from vws.reports import (
     DatabaseSummaryReport,
     TargetRecord,
@@ -138,12 +158,35 @@ def _make_request(
             base_vws_url=self._base_vws_url,
         )
 
-        raise_for_result_code(
-            response=response,
-            expected_result_code=expected_result_code,
-        )
-
-        return response
+        try:
+            result_code = response.json()['result_code']
+        except json.decoder.JSONDecodeError as exc:
+            assert 'Oops' in response.text
+            raise UnknownVWSErrorPossiblyBadName() from exc
+
+        if result_code == expected_result_code:
+            return response
+
+        exception = {
+            'AuthenticationFailure': AuthenticationFailure,
+            'BadImage': BadImage,
+            'DateRangeError': DateRangeError,
+            'Fail': Fail,
+            'ImageTooLarge': ImageTooLarge,
+            'MetadataTooLarge': MetadataTooLarge,
+            'ProjectHasNoAPIAccess': ProjectHasNoAPIAccess,
+            'ProjectInactive': ProjectInactive,
+            'ProjectSuspended': ProjectSuspended,
+            'RequestQuotaReached': RequestQuotaReached,
+            'RequestTimeTooSkewed': RequestTimeTooSkewed,
+            'TargetNameExist': TargetNameExist,
+            'TargetQuotaReached': TargetQuotaReached,
+            'TargetStatusNotSuccess': TargetStatusNotSuccess,
+            'TargetStatusProcessing': TargetStatusProcessing,
+            'UnknownTarget': UnknownTarget,
+        }[result_code]
+
+        raise exception(response=response)
 
     def add_target(
         self,

src/vws/vws.py

@@ -191,6 +191,7 @@ def test_project_inactive(high_quality_image: io.BytesIO) -> None:
 
         assert exc.value.response.status_code == HTTPStatus.FORBIDDEN
 
+
 def test_inactive_project(high_quality_image: io.BytesIO) -> None:
     """
     An ``InactiveProject`` exception is raised when querying an inactive