Progress

Author: adamtheturtle

src/vws/__init__.py

@@ -3,8 +3,8 @@
 """
 
 from ._version import get_versions
-from .vws import VWS
 from .query import CloudRecoService
+from .vws import VWS
 
 __all__ = [
     'CloudRecoService',

src/vws/query.py

@@ -1,4 +1,11 @@
 import io
+from urllib.parse import urljoin
+
+import requests
+from urllib3.filepost import encode_multipart_formdata
+
+from ._authorization import authorization_header, rfc_1123_date
+
 
 class CloudRecoService:
     """
@@ -9,8 +16,8 @@ def __init__(
         self,
         client_access_key: str,
         client_secret_key: str,
-        # TODO - instead use vwq URL
-        base_vws_url: str = 'https://vws.vuforia.com',
+        # TODO - instead use/call this vwq URL
+        base_vws_url: str = 'https://cloudreco.vuforia.com',
     ) -> None:
         """
         Args:
@@ -29,4 +36,37 @@ def query(
         """
         TODO docstring
         """
-        pass
+        image_content = image.getvalue()
+        body = {'image': ('image.jpeg', image_content, 'image/jpeg')}
+        date = rfc_1123_date()
+        request_path = '/v1/query'
+        content, content_type_header = encode_multipart_formdata(body)
+        method = 'POST'
+
+        authorization_string = authorization_header(
+            access_key=self._client_access_key,
+            secret_key=self._client_secret_key,
+            method=method,
+            content=content,
+            # Note that this is not the actual Content-Type header value sent.
+            content_type='multipart/form-data',
+            date=date,
+            request_path=request_path,
+        )
+
+        headers = {
+            'Authorization': authorization_string,
+            'Date': date,
+            'Content-Type': content_type_header,
+        }
+
+        response = requests.request(
+            method=method,
+            url=urljoin(base=self._base_vws_url, url=request_path),
+            headers=headers,
+            data=content,
+        )
+
+        return response.json()['results']
+        import pdb; pdb.set_trace()
+        return response

tests/conftest.py

@@ -8,7 +8,7 @@
 from mock_vws import MockVWS
 from mock_vws.database import VuforiaDatabase
 
-from vws import VWS
+from vws import CloudRecoService, VWS
 
 pytest_plugins = [  # pylint: disable=invalid-name
     'tests.fixtures.images',

tests/test_query.py

@@ -3,14 +3,8 @@
 """
 
 import io
-from typing import Optional
 
-import pytest
-from mock_vws import MockVWS
-from mock_vws.database import VuforiaDatabase
-
-from vws import CloudRecoService, VWS
-from vws.exceptions import TargetProcessingTimeout
+from vws import VWS, CloudRecoService
 
 
 class TestQuery:
@@ -20,21 +14,20 @@ class TestQuery:
 
     def test_query(
         self,
-        client: VWS,
+        cloud_reco_client: CloudRecoService,
         high_quality_image: io.BytesIO,
     ) -> None:
         """
         TODO docstring
         """
-        cloud_reco_client = CloudRecoService(
-            client_access_key='foo',
-            client_secret_key='bar',
-        )
         result = cloud_reco_client.query(image=high_quality_image)
         assert result == []
 
+
 # TODO test custom base URL
 # TODO test bad credentials
 # TODO test no results
 # TODO test some results
-# TODO do we give an image type? Infer it? What happens if we just always give jpeg?
+
+# TODO do we give an image type? Infer it?
+# What happens if we just always give jpeg?