Progress

Author: adamtheturtle

src/vws/_result_codes.py

@@ -7,10 +7,13 @@
 from vws.exceptions import (
     AuthenticationFailure,
     BadImage,
+    DateRangeError,
     Fail,
     ImageTooLarge,
     MetadataTooLarge,
     ProjectInactive,
+    RequestQuotaReached,
+    RequestTimeTooSkewed,
     TargetNameExist,
     TargetStatusNotSuccess,
     TargetStatusProcessing,
@@ -38,14 +41,16 @@ def raise_for_result_code(
     exception = {
         'AuthenticationFailure': AuthenticationFailure,
         'BadImage': BadImage,
+        'DateRangeError': DateRangeError,
         'Fail': Fail,
         'ImageTooLarge': ImageTooLarge,
         'MetadataTooLarge': MetadataTooLarge,
         'ProjectInactive': ProjectInactive,
-        'InactiveProject': ProjectInactive,
+        'RequestQuotaReached': RequestQuotaReached,
+        'RequestTimeTooSkewed': RequestTimeTooSkewed,
         'TargetNameExist': TargetNameExist,
-        'TargetStatusProcessing': TargetStatusProcessing,
         'TargetStatusNotSuccess': TargetStatusNotSuccess,
+        'TargetStatusProcessing': TargetStatusProcessing,
         'UnknownTarget': UnknownTarget,
     }[result_code]
 

src/vws/vws.py

@@ -15,23 +15,7 @@
 
 from vws._authorization import authorization_header, rfc_1123_date
 from vws._result_codes import raise_for_result_code
-from vws.exceptions import (
-    AuthenticationFailure,
-    BadImage,
-    DateRangeError,
-    Fail,
-    ImageTooLarge,
-    InactiveProject,
-    MetadataTooLarge,
-    ProjectInactive,
-    RequestQuotaReached,
-    RequestTimeTooSkewed,
-    TargetNameExist,
-    TargetProcessingTimeout,
-    TargetStatusNotSuccess,
-    TargetStatusProcessing,
-    UnknownTarget,
-)
+from vws.exceptions import TargetProcessingTimeout
 
 
 def _target_api_request(
@@ -91,44 +75,6 @@ def _target_api_request(
     return response
 
 
-<<<<<<< HEAD
-def _raise_for_result_code(
-    response: Response,
-    expected_result_code: str,
-) -> None:
-    """
-    Raise an appropriate exception if the expected result code for a successful
-    request is not returned.
-
-    Args:
-        response: A response from Vuforia.
-        expected_result_code: See
-            https://library.vuforia.com/articles/Solution/How-To-Use-the-Vuforia-Web-Services-API.html#How-To-Interperete-VWS-API-Result-Codes
-    """
-    result_code = response.json()['result_code']
-    if result_code == expected_result_code:
-        return
-
-    exception = {
-        'AuthenticationFailure': AuthenticationFailure,
-        'BadImage': BadImage,
-        'DateRangeError': DateRangeError,
-        'Fail': Fail,
-        'ImageTooLarge': ImageTooLarge,
-        'InactiveProject': InactiveProject,
-        'MetadataTooLarge': MetadataTooLarge,
-        'ProjectInactive': ProjectInactive,
-        'RequestQuotaReached': RequestQuotaReached,
-        'RequestTimeTooSkewed': RequestTimeTooSkewed,
-        'TargetNameExist': TargetNameExist,
-        'TargetStatusNotSuccess': TargetStatusNotSuccess,
-        'TargetStatusProcessing': TargetStatusProcessing,
-        'UnknownTarget': UnknownTarget,
-    }[result_code]
-
-    raise exception(response=response)
-
-
 class VWS:
     """
     An interface to Vuforia Web Services APIs.