Separate 'ProjectInactive' and 'InactiveProject' exceptions

Author: adamtheturtle

src/vws/_result_codes.py

@@ -7,6 +7,7 @@
 from requests import Response
 
 from vws.exceptions.custom_exceptions import UnknownVWSErrorPossiblyBadName
+from vws.exceptions.cloud_reco_exceptions import InactiveProject
 from vws.exceptions.vws_exceptions import (
     AuthenticationFailure,
     BadImage,
@@ -60,7 +61,7 @@ def raise_for_result_code(
         'DateRangeError': DateRangeError,
         'Fail': Fail,
         'ImageTooLarge': ImageTooLarge,
-        'InactiveProject': ProjectInactive,
+        'InactiveProject': InactiveProject,
         'MetadataTooLarge': MetadataTooLarge,
         'ProjectHasNoAPIAccess': ProjectHasNoAPIAccess,
         'ProjectInactive': ProjectInactive,

src/vws/exceptions/cloud_reco_exceptions.py

@@ -18,3 +18,10 @@ class MaxNumResultsOutOfRange(CloudRecoException):
     Exception raised when the ``max_num_results`` given to the Cloud
     Recognition Web API query endpoint is out of range.
     """
+
+
+class InactiveProject(CloudRecoException):
+    """
+    Exception raised when Vuforia returns a response with a result code
+    'InactiveProject'.
+    """

src/vws/exceptions/vws_exceptions.py

@@ -108,7 +108,7 @@ class ProjectHasNoAPIAccess(VWSException):  # pragma: no cover
 class ProjectInactive(VWSException):
     """
     Exception raised when Vuforia returns a response with a result code
-    'ProjectInactive' or 'InactiveProject'.
+    'ProjectInactive'.
     """
 
 

src/vws/query.py

@@ -76,8 +76,8 @@ def query(
             ~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.vws_exceptions.ProjectInactive: The project is
-                inactive.
+            ~vws.exceptions.cloud_reco_exceptions.InactiveProject: The project
+                is inactive.
             ~vws.exceptions.custom_exceptions.ConnectionErrorPossiblyImageTooLarge:
                 The given image is too large.
             ~vws.exceptions.vws_exceptions.RequestTimeTooSkewed: There is an

tests/test_exceptions.py

@@ -14,6 +14,7 @@
 from vws import VWS, CloudRecoService
 from vws.exceptions.base_exceptions import CloudRecoException, VWSException
 from vws.exceptions.cloud_reco_exceptions import (
+    InactiveProject,
     MatchProcessing,
     MaxNumResultsOutOfRange,
 )
@@ -161,10 +162,7 @@ def test_target_name_exist(
     assert exc.value.target_name == 'x'
 
 
-def test_project_inactive(
-    vws_client: VWS,
-    high_quality_image: io.BytesIO,
-) -> None:
+def test_project_inactive(high_quality_image: io.BytesIO) -> None:
     """
     A ``ProjectInactive`` exception is raised if adding a target to an
     inactive database.
@@ -193,7 +191,20 @@ def test_project_inactive(
 
         assert exc.value.response.status_code == HTTPStatus.FORBIDDEN
 
-        with pytest.raises(ProjectInactive) as exc:
+def test_inactive_project(high_quality_image: io.BytesIO) -> None:
+    """
+    An ``InactiveProject`` exception is raised when querying an inactive
+    database.
+    """
+    database = VuforiaDatabase(state=States.PROJECT_INACTIVE)
+    with MockVWS() as mock:
+        mock.add_database(database=database)
+        cloud_reco_client = CloudRecoService(
+            client_access_key=database.client_access_key,
+            client_secret_key=database.client_secret_key,
+        )
+
+        with pytest.raises(InactiveProject) as exc:
             cloud_reco_client.query(image=high_quality_image)
 
         assert exc.value.response.status_code == HTTPStatus.FORBIDDEN