vws-python 2026.2.21__tar.gz → 2026.2.22__tar.gz

{vws_python-2026.2.21 → vws_python-2026.2.22}/CHANGELOG.rst

@@ -4,6 +4,10 @@ Changelog
 Next
 ----
 
+2026.02.22
+----------
+
+
 2026.02.21
 ----------
 

{vws_python-2026.2.21/src/vws_python.egg-info → vws_python-2026.2.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vws-python
-Version: 2026.2.21
+Version: 2026.2.22
 Summary: Interact with the Vuforia Web Services (VWS) API.
 Author-email: Adam Dangoor <adamdangoor@gmail.com>
 License-Expression: MIT
@@ -60,7 +60,7 @@ Requires-Dist: torchvision>=0.20.1; extra == "dev"
 Requires-Dist: ty==0.0.17; extra == "dev"
 Requires-Dist: types-requests==2.32.4.20260107; extra == "dev"
 Requires-Dist: vulture==2.14; extra == "dev"
-Requires-Dist: vws-python-mock==2026.2.21; extra == "dev"
+Requires-Dist: vws-python-mock==2026.2.22.2; extra == "dev"
 Requires-Dist: vws-test-fixtures==2023.3.5; extra == "dev"
 Requires-Dist: yamlfix==1.19.1; extra == "dev"
 Requires-Dist: zizmor==1.22.0; extra == "dev"

{vws_python-2026.2.21 → vws_python-2026.2.22}/conftest.py

@@ -18,6 +18,7 @@ from sybil.parsers.rest import (
 )
 
 
+@beartype
 def pytest_collection_modifyitems(items: list[pytest.Item]) -> None:
     """Apply the beartype decorator to all collected test functions."""
     for item in items:

{vws_python-2026.2.21 → vws_python-2026.2.22}/pyproject.toml

@@ -82,7 +82,7 @@ optional-dependencies.dev = [
     "ty==0.0.17",
     "types-requests==2.32.4.20260107",
     "vulture==2.14",
-    "vws-python-mock==2026.2.21",
+    "vws-python-mock==2026.2.22.2",
     "vws-test-fixtures==2023.3.5",
     "yamlfix==1.19.1",
     "zizmor==1.22.0",
@@ -301,8 +301,8 @@ keep_full_version = true
 max_supported_python = "3.14"
 
 [tool.pytest]
-ini_options.xfail_strict = true
-ini_options.log_cli = true
+xfail_strict = true
+log_cli = true
 
 [tool.coverage]
 run.branch = true

{vws_python-2026.2.21 → vws_python-2026.2.22}/src/vws/_vws_request.py

@@ -2,8 +2,6 @@
 API.
 """
 
-from urllib.parse import urljoin
-
 import requests
 from beartype import BeartypeConf, beartype
 from vws_auth_tools import authorization_header, rfc_1123_date
@@ -64,7 +62,7 @@ def target_api_request(
         **extra_headers,
     }
 
-    url = urljoin(base=base_vws_url, url=request_path)
+    url = base_vws_url.rstrip("/") + request_path
 
     requests_response = requests.request(
         method=method,

{vws_python-2026.2.21 → vws_python-2026.2.22}/src/vws/query.py

@@ -5,7 +5,6 @@ import io
 import json
 from http import HTTPMethod, HTTPStatus
 from typing import Any, BinaryIO
-from urllib.parse import urljoin
 
 import requests
 from beartype import BeartypeConf, beartype
@@ -46,6 +45,7 @@ class CloudRecoService:
 
     def __init__(
         self,
+        *,
         client_access_key: str,
         client_secret_key: str,
         base_vwq_url: str = "https://cloudreco.vuforia.com",
@@ -68,6 +68,7 @@ class CloudRecoService:
 
     def query(
         self,
+        *,
         image: _ImageType,
         max_num_results: int = 1,
         include_target_data: CloudRecoIncludeTargetData = (
@@ -144,7 +145,7 @@ class CloudRecoService:
 
         requests_response = requests.request(
             method=method,
-            url=urljoin(base=self._base_vwq_url, url=request_path),
+            url=self._base_vwq_url.rstrip("/") + request_path,
             headers=headers,
             data=content,
             timeout=self._request_timeout_seconds,

{vws_python-2026.2.21 → vws_python-2026.2.22}/src/vws/vws.py

@@ -63,6 +63,7 @@ class VWS:
 
     def __init__(
         self,
+        *,
         server_access_key: str,
         server_secret_key: str,
         base_vws_url: str = "https://vws.vuforia.com",
@@ -171,11 +172,11 @@ class VWS:
 
     def add_target(
         self,
+        *,
         name: str,
         width: float,
         image: _ImageType,
         application_metadata: str | None,
-        *,
         active_flag: bool,
     ) -> str:
         """Add a target to a Vuforia Web Services database.
@@ -302,6 +303,7 @@ class VWS:
 
     def wait_for_target_processed(
         self,
+        *,
         target_id: str,
         seconds_between_requests: float = 0.2,
         timeout_seconds: float = 60 * 5,

{vws_python-2026.2.21 → vws_python-2026.2.22/src/vws_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vws-python
-Version: 2026.2.21
+Version: 2026.2.22
 Summary: Interact with the Vuforia Web Services (VWS) API.
 Author-email: Adam Dangoor <adamdangoor@gmail.com>
 License-Expression: MIT
@@ -60,7 +60,7 @@ Requires-Dist: torchvision>=0.20.1; extra == "dev"
 Requires-Dist: ty==0.0.17; extra == "dev"
 Requires-Dist: types-requests==2.32.4.20260107; extra == "dev"
 Requires-Dist: vulture==2.14; extra == "dev"
-Requires-Dist: vws-python-mock==2026.2.21; extra == "dev"
+Requires-Dist: vws-python-mock==2026.2.22.2; extra == "dev"
 Requires-Dist: vws-test-fixtures==2023.3.5; extra == "dev"
 Requires-Dist: yamlfix==1.19.1; extra == "dev"
 Requires-Dist: zizmor==1.22.0; extra == "dev"

{vws_python-2026.2.21 → vws_python-2026.2.22}/src/vws_python.egg-info/requires.txt

@@ -42,7 +42,7 @@ torchvision>=0.20.1
 ty==0.0.17
 types-requests==2.32.4.20260107
 vulture==2.14
-vws-python-mock==2026.2.21
+vws-python-mock==2026.2.22.2
 vws-test-fixtures==2023.3.5
 yamlfix==1.19.1
 zizmor==1.22.0

{vws_python-2026.2.21 → vws_python-2026.2.22}/tests/test_cloud_reco_exceptions.py

@@ -24,6 +24,7 @@ from vws.exceptions.custom_exceptions import (
 
 
 def test_too_many_max_results(
+    *,
     cloud_reco_client: CloudRecoService,
     high_quality_image: io.BytesIO,
 ) -> None:
@@ -45,6 +46,7 @@ def test_too_many_max_results(
 
 
 def test_image_too_large(
+    *,
     cloud_reco_client: CloudRecoService,
     png_too_large: io.BytesIO | io.BufferedRandom,
 ) -> None:

{vws_python-2026.2.21 → vws_python-2026.2.22}/tests/test_query.py

@@ -20,6 +20,7 @@ class TestQuery:
 
     @staticmethod
     def test_no_matches(
+        *,
         cloud_reco_client: CloudRecoService,
         image: io.BytesIO | BinaryIO,
     ) -> None:
@@ -29,6 +30,7 @@ class TestQuery:
 
     @staticmethod
     def test_match(
+        *,
         vws_client: VWS,
         cloud_reco_client: CloudRecoService,
         image: io.BytesIO | BinaryIO,
@@ -55,8 +57,8 @@ class TestDefaultRequestTimeout:
         argvalues=[(29, False), (31, True)],
     )
     def test_default_timeout(
-        image: io.BytesIO | BinaryIO,
         *,
+        image: io.BytesIO | BinaryIO,
         response_delay_seconds: int,
         expect_timeout: bool,
     ) -> None:
@@ -110,8 +112,8 @@ class TestCustomRequestTimeout:
         ],
     )
     def test_custom_timeout(
-        image: io.BytesIO | BinaryIO,
         *,
+        image: io.BytesIO | BinaryIO,
         custom_timeout: float | tuple[float, float],
         response_delay_seconds: float,
         expect_timeout: bool,
@@ -188,12 +190,46 @@ class TestCustomBaseVWQURL:
             match = matches[0]
             assert match.target_id == target_id
 
+    @staticmethod
+    def test_custom_base_url_with_path_prefix(
+        image: io.BytesIO | BinaryIO,
+    ) -> None:
+        """
+        A base VWQ URL with a path prefix is used as-is, without the
+        prefix being dropped.
+        """
+        base_vwq_url = "http://example.com/prefix"
+        with MockVWS(base_vwq_url=base_vwq_url) as mock:
+            database = CloudDatabase()
+            mock.add_cloud_database(cloud_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=image,
+                active_flag=True,
+                application_metadata=None,
+            )
+            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,
+            )
+
+            matches = cloud_reco_client.query(image=image)
+            assert len(matches) == 1
+
 
 class TestMaxNumResults:
     """Tests for the ``max_num_results`` parameter of ``query``."""
 
     @staticmethod
     def test_default(
+        *,
         vws_client: VWS,
         cloud_reco_client: CloudRecoService,
         image: io.BytesIO | BinaryIO,
@@ -220,6 +256,7 @@ class TestMaxNumResults:
 
     @staticmethod
     def test_custom(
+        *,
         vws_client: VWS,
         cloud_reco_client: CloudRecoService,
         image: io.BytesIO | BinaryIO,
@@ -262,6 +299,7 @@ class TestIncludeTargetData:
 
     @staticmethod
     def test_default(
+        *,
         vws_client: VWS,
         cloud_reco_client: CloudRecoService,
         image: io.BytesIO | BinaryIO,
@@ -292,6 +330,7 @@ class TestIncludeTargetData:
 
     @staticmethod
     def test_top(
+        *,
         vws_client: VWS,
         cloud_reco_client: CloudRecoService,
         image: io.BytesIO | BinaryIO,
@@ -327,6 +366,7 @@ class TestIncludeTargetData:
 
     @staticmethod
     def test_none(
+        *,
         vws_client: VWS,
         cloud_reco_client: CloudRecoService,
         image: io.BytesIO | BinaryIO,
@@ -363,6 +403,7 @@ class TestIncludeTargetData:
 
     @staticmethod
     def test_all(
+        *,
         vws_client: VWS,
         cloud_reco_client: CloudRecoService,
         image: io.BytesIO | BinaryIO,

{vws_python-2026.2.21 → vws_python-2026.2.22}/tests/test_vws.py

@@ -34,11 +34,11 @@ class TestAddTarget:
     )
     @pytest.mark.parametrize(argnames="active_flag", argvalues=[True, False])
     def test_add_target(
+        *,
         vws_client: VWS,
         image: io.BytesIO | BinaryIO,
         application_metadata: bytes | None,
         cloud_reco_client: CloudRecoService,
-        *,
         active_flag: bool,
     ) -> None:
         """No exception is raised when adding one target."""
@@ -76,6 +76,7 @@ class TestAddTarget:
 
     @staticmethod
     def test_add_two_targets(
+        *,
         vws_client: VWS,
         image: io.BytesIO | BinaryIO,
     ) -> None:
@@ -103,8 +104,8 @@ class TestDefaultRequestTimeout:
         argvalues=[(29, False), (31, True)],
     )
     def test_default_timeout(
-        image: io.BytesIO | BinaryIO,
         *,
+        image: io.BytesIO | BinaryIO,
         response_delay_seconds: int,
         expect_timeout: bool,
     ) -> None:
@@ -169,8 +170,8 @@ class TestCustomRequestTimeout:
         ],
     )
     def test_custom_timeout(
-        image: io.BytesIO | BinaryIO,
         *,
+        image: io.BytesIO | BinaryIO,
         custom_timeout: float | tuple[float, float],
         response_delay_seconds: float,
         expect_timeout: bool,
@@ -245,12 +246,31 @@ class TestCustomBaseVWSURL:
                 application_metadata=None,
             )
 
+    @staticmethod
+    def test_custom_base_url_with_path_prefix() -> None:
+        """
+        A base VWS URL with a path prefix is used as-is, without the
+        prefix being dropped.
+        """
+        base_vws_url = "http://example.com/prefix"
+        with MockVWS(base_vws_url=base_vws_url) as mock:
+            database = CloudDatabase()
+            mock.add_cloud_database(cloud_database=database)
+            vws_client = VWS(
+                server_access_key=database.server_access_key,
+                server_secret_key=database.server_secret_key,
+                base_vws_url=base_vws_url,
+            )
+
+            assert not vws_client.list_targets()
+
 
 class TestListTargets:
     """Tests for listing targets."""
 
     @staticmethod
     def test_list_targets(
+        *,
         vws_client: VWS,
         image: io.BytesIO | BinaryIO,
     ) -> None:
@@ -277,6 +297,7 @@ class TestDelete:
 
     @staticmethod
     def test_delete_target(
+        *,
         vws_client: VWS,
         image: io.BytesIO | BinaryIO,
     ) -> None:
@@ -300,6 +321,7 @@ class TestGetTargetSummaryReport:
 
     @staticmethod
     def test_get_target_summary_report(
+        *,
         vws_client: VWS,
         image: io.BytesIO | BinaryIO,
     ) -> None:
@@ -398,6 +420,7 @@ class TestGetTargetRecord:
 
     @staticmethod
     def test_get_target_record(
+        *,
         vws_client: VWS,
         image: io.BytesIO | BinaryIO,
     ) -> None:
@@ -444,6 +467,7 @@ class TestGetTargetRecord:
 
     @staticmethod
     def test_get_failed(
+        *,
         vws_client: VWS,
         image_file_failed_state: io.BytesIO,
     ) -> None:
@@ -467,6 +491,7 @@ class TestWaitForTargetProcessed:
 
     @staticmethod
     def test_wait_for_target_processed(
+        *,
         vws_client: VWS,
         image: io.BytesIO | BinaryIO,
     ) -> None:
@@ -628,6 +653,7 @@ class TestGetDuplicateTargets:
 
     @staticmethod
     def test_get_duplicate_targets(
+        *,
         vws_client: VWS,
         image: io.BytesIO | BinaryIO,
     ) -> None:
@@ -658,6 +684,7 @@ class TestUpdateTarget:
 
     @staticmethod
     def test_update_target(
+        *,
         vws_client: VWS,
         image: io.BytesIO | BinaryIO,
         different_high_quality_image: io.BytesIO,
@@ -717,6 +744,7 @@ class TestUpdateTarget:
 
     @staticmethod
     def test_no_fields_given(
+        *,
         vws_client: VWS,
         image: io.BytesIO | BinaryIO,
     ) -> None:
@@ -745,6 +773,7 @@ class TestGenerateVumarkInstance:
         ],
     )
     def test_generate_vumark_instance(
+        *,
         vumark_service_client: VuMarkService,
         vumark_target_id: str,
         accept: VuMarkAccept,

{vws_python-2026.2.21 → vws_python-2026.2.22}/tests/test_vws_exceptions.py

@@ -41,6 +41,7 @@ from vws.vumark_accept import VuMarkAccept
 
 
 def test_image_too_large(
+    *,
     vws_client: VWS,
     png_too_large: io.BytesIO | io.BufferedRandom,
 ) -> None:
@@ -75,7 +76,11 @@ def test_invalid_given_id(vws_client: VWS) -> None:
     assert exc.value.target_id == target_id
 
 
-def test_add_bad_name(vws_client: VWS, high_quality_image: io.BytesIO) -> None:
+def test_add_bad_name(
+    *,
+    vws_client: VWS,
+    high_quality_image: io.BytesIO,
+) -> None:
     """
     When a name with a bad character is given, a ``ServerError``
     exception
@@ -143,6 +148,7 @@ def test_bad_image(vws_client: VWS) -> None:
 
 
 def test_target_name_exist(
+    *,
     vws_client: VWS,
     high_quality_image: io.BytesIO,
 ) -> None:
@@ -201,6 +207,7 @@ def test_project_inactive(
 
 
 def test_target_status_processing(
+    *,
     vws_client: VWS,
     high_quality_image: io.BytesIO,
 ) -> None:
@@ -225,6 +232,7 @@ def test_target_status_processing(
 
 
 def test_metadata_too_large(
+    *,
     vws_client: VWS,
     high_quality_image: io.BytesIO,
 ) -> None:
@@ -246,6 +254,7 @@ def test_metadata_too_large(
 
 
 def test_request_time_too_skewed(
+    *,
     vws_client: VWS,
     high_quality_image: io.BytesIO,
 ) -> None:
@@ -316,6 +325,7 @@ def test_authentication_failure(
 
 
 def test_target_status_not_success(
+    *,
     vws_client: VWS,
     high_quality_image: io.BytesIO,
 ) -> None:
@@ -368,6 +378,7 @@ def test_vwsexception_inheritance() -> None:
 
 
 def test_invalid_instance_id(
+    *,
     vumark_service_client: VuMarkService,
     vumark_target_id: str,
 ) -> None:
@@ -423,6 +434,7 @@ def test_invalid_target_type(
 
 
 def test_base_exception(
+    *,
     vws_client: VWS,
     high_quality_image: io.BytesIO,
 ) -> None: