Merge remote-tracking branch 'origin/master' into query-2

Author: adamtheturtle

src/vws/query.py

@@ -24,14 +24,13 @@ def __init__(
         self,
         client_access_key: str,
         client_secret_key: str,
-        # TODO - instead use/call this vwq URL
-        base_vws_url: str = 'https://cloudreco.vuforia.com',
+        base_vwq_url: str = 'https://cloudreco.vuforia.com',
     ) -> None:
         """
         Args:
             client_access_key: A VWS client access key.
             client_secret_key: A VWS client secret key.
-            base_vws_url: The base URL for the VWS API.
+            base_vwq_url: The base URL for the VWQ API.
         """
         self._client_access_key = client_access_key.encode()
         self._client_secret_key = client_secret_key.encode()
@@ -84,7 +83,7 @@ def query(
 
         response = requests.request(
             method=method,
-            url=urljoin(base=self._base_vws_url, url=request_path),
+            url=urljoin(base=self._base_vwq_url, url=request_path),
             headers=headers,
             data=content,
         )

tests/test_query.py

@@ -8,6 +8,9 @@
 
 import pytest
 
+from mock_vws import MockVWS
+from mock_vws.database import VuforiaDatabase
+
 from vws import VWS, CloudRecoService
 from vws.exceptions import AuthenticationFailure, MaxNumResultsOutOfRange
 
@@ -47,6 +50,43 @@ def test_match(
         assert matching_target['target_id'] == target_id
 
 
+class TestCustomBaseVWQURL:
+    """
+    Tests for using a custom base VWQ URL.
+    """
+
+    def test_custom_base_url(self, high_quality_image: io.BytesIO) -> None:
+        """
+        It is possible to use query a target to a database under a custom VWQ
+        URL.
+        """
+        base_vwq_url = 'http://example.com'
+        with MockVWS(base_vwq_url=base_vwq_url) as mock:
+            database = VuforiaDatabase()
+            mock.add_database(database=database)
+            vws_client = VWS(
+                server_access_key=database.server_access_key,
+                server_secret_key=database.server_secret_key,
+            )
+
+            target_id = vws_client.add_target(
+                name='x',
+                width=1,
+                image=high_quality_image,
+            )
+
+            vws_client.wait_for_target_processed(target_id=target_id)
+
+            cloud_reco_client = CloudRecoService(
+                client_access_key=database.client_access_key,
+                client_secret_key=database.client_secret_key,
+                base_vwq_url=base_vwq_url,
+            )
+
+            [match] = cloud_reco_client.query(image=high_quality_image)
+            assert match['target_id'] == target_id
+
+
 class TestMaxNumResults:
     """
     Tests for the ``max_num_results`` parameter of ``query``.