Address PR comments: VuMark target type and target_id fix

- Fix target_id property extraction for /targets/{id}/instances URL pattern
- Add InvalidTargetTypeError exception
- Add vumark_vws_client and vumark_target_id fixtures using a pre-populated
  VuMark template target (requires vws-python-mock#2962)
- Update tests to use VuMark target instead of a standard cloud target
- Add test_invalid_target_type test (requires vws-python-mock#2961)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: adamtheturtle

src/vws/exceptions/vws_exceptions.py

@@ -24,9 +24,10 @@ class UnknownTargetError(VWSError):
     def target_id(self) -> str:
         """The unknown target ID."""
         path = urlparse(url=self.response.url).path
-        # Every HTTP path which can raise this error is in the format
-        # `/something/{target_id}`.
-        return path.split(sep="/", maxsplit=2)[-1]
+        # Every HTTP path which can raise this error has the target ID as the
+        # second path segment, e.g. `/something/{target_id}` or
+        # `/something/{target_id}/more`.
+        return path.split(sep="/")[2]
 
 
 @beartype
@@ -68,9 +69,10 @@ class TargetStatusProcessingError(VWSError):
     def target_id(self) -> str:
         """The processing target ID."""
         path = urlparse(url=self.response.url).path
-        # Every HTTP path which can raise this error is in the format
-        # `/something/{target_id}`.
-        return path.split(sep="/", maxsplit=2)[-1]
+        # Every HTTP path which can raise this error has the target ID as the
+        # second path segment, e.g. `/something/{target_id}` or
+        # `/something/{target_id}/more`.
+        return path.split(sep="/")[2]
 
 
 # This is not simulated by the mock.
@@ -157,9 +159,10 @@ class TargetStatusNotSuccessError(VWSError):
     def target_id(self) -> str:
         """The unknown target ID."""
         path = urlparse(url=self.response.url).path
-        # Every HTTP path which can raise this error is in the format
-        # `/something/{target_id}`.
-        return path.split(sep="/", maxsplit=2)[-1]
+        # Every HTTP path which can raise this error has the target ID as the
+        # second path segment, e.g. `/something/{target_id}` or
+        # `/something/{target_id}/more`.
+        return path.split(sep="/")[2]
 
 
 @beartype
@@ -192,3 +195,10 @@ class BadRequestError(VWSError):  # pragma: no cover
     """Exception raised when Vuforia returns a response with a result code
     ``BadRequest``.
     """
+
+
+@beartype
+class InvalidTargetTypeError(VWSError):
+    """Exception raised when Vuforia returns a response with a result code
+    ``InvalidTargetType``.
+    """

src/vws/vws.py

@@ -26,6 +26,7 @@
     ImageTooLargeError,
     InvalidAcceptHeaderError,
     InvalidInstanceIdError,
+    InvalidTargetTypeError,
     MetadataTooLargeError,
     ProjectHasNoAPIAccessError,
     ProjectInactiveError,
@@ -244,6 +245,7 @@ def make_request(
             "ImageTooLarge": ImageTooLargeError,
             "InvalidAcceptHeader": InvalidAcceptHeaderError,
             "InvalidInstanceId": InvalidInstanceIdError,
+            "InvalidTargetType": InvalidTargetTypeError,
             "MetadataTooLarge": MetadataTooLargeError,
             "ProjectHasNoAPIAccess": ProjectHasNoAPIAccessError,
             "ProjectInactive": ProjectInactiveError,
@@ -755,6 +757,8 @@ def generate_vumark_instance(
                 Accept header value is not supported.
             ~vws.exceptions.vws_exceptions.InvalidInstanceIdError: The
                 instance ID is invalid. For example, it may be empty.
+            ~vws.exceptions.vws_exceptions.InvalidTargetTypeError: The target
+                is not a VuMark template target.
             ~vws.exceptions.vws_exceptions.RequestTimeTooSkewedError: There is
                 an error with the time sent to Vuforia.
             ~vws.exceptions.vws_exceptions.TargetStatusNotSuccessError: The

tests/conftest.py

@@ -8,6 +8,8 @@
 import pytest
 from mock_vws import MockVWS
 from mock_vws.database import VuforiaDatabase
+from mock_vws.target import Target
+from mock_vws.target_raters import HardcodedTargetTrackingRater
 
 from vws import VWS, CloudRecoService
 
@@ -22,6 +24,45 @@ def fixture_mock_database() -> Generator[VuforiaDatabase]:
         yield database
 
 
+@pytest.fixture(name="_mock_vumark_database")
+def fixture_mock_vumark_database(
+    high_quality_image: io.BytesIO,
+) -> Generator[VuforiaDatabase]:
+    """Yield a mock VuMark ``VuforiaDatabase`` with a pre-populated
+    template target.
+    """
+    vumark_target = Target(
+        active_flag=True,
+        application_metadata=None,
+        image_value=high_quality_image.getvalue(),
+        is_vumark_template=True,
+        name="vumark-template",
+        processing_time_seconds=0,
+        target_tracking_rater=HardcodedTargetTrackingRater(rating=5),
+        width=1,
+    )
+    with MockVWS() as mock:
+        database = VuforiaDatabase(targets={vumark_target})
+        mock.add_database(database=database)
+        yield database
+
+
+@pytest.fixture
+def vumark_vws_client(_mock_vumark_database: VuforiaDatabase) -> VWS:
+    """A VWS client which connects to a mock VuMark database."""
+    return VWS(
+        server_access_key=_mock_vumark_database.server_access_key,
+        server_secret_key=_mock_vumark_database.server_secret_key,
+    )
+
+
+@pytest.fixture
+def vumark_target_id(_mock_vumark_database: VuforiaDatabase) -> str:
+    """The ID of the pre-populated VuMark template target."""
+    (target,) = _mock_vumark_database.targets
+    return target.target_id
+
+
 @pytest.fixture
 def vws_client(_mock_database: VuforiaDatabase) -> VWS:
     """A VWS client which connects to a mock database."""

tests/test_vws.py

@@ -745,22 +745,14 @@ class TestGenerateVumarkInstance:
         ],
     )
     def test_generate_vumark_instance(
-        vws_client: VWS,
-        high_quality_image: io.BytesIO,
+        vumark_vws_client: VWS,
+        vumark_target_id: str,
         accept: VuMarkAccept,
         expected_prefix: bytes,
     ) -> None:
         """The returned bytes match the requested format."""
-        target_id = vws_client.add_target(
-            name="x",
-            width=1,
-            image=high_quality_image,
-            active_flag=True,
-            application_metadata=None,
-        )
-        vws_client.wait_for_target_processed(target_id=target_id)
-        result = vws_client.generate_vumark_instance(
-            target_id=target_id,
+        result = vumark_vws_client.generate_vumark_instance(
+            target_id=vumark_target_id,
             instance_id="12345",
             accept=accept,
         )

tests/test_vws_exceptions.py

@@ -24,6 +24,7 @@
     ImageTooLargeError,
     InvalidAcceptHeaderError,
     InvalidInstanceIdError,
+    InvalidTargetTypeError,
     MetadataTooLargeError,
     ProjectHasNoAPIAccessError,
     ProjectInactiveError,
@@ -349,6 +350,7 @@ def test_vwsexception_inheritance() -> None:
         ImageTooLargeError,
         InvalidAcceptHeaderError,
         InvalidInstanceIdError,
+        InvalidTargetTypeError,
         MetadataTooLargeError,
         ProjectInactiveError,
         ProjectHasNoAPIAccessError,
@@ -366,13 +368,31 @@ def test_vwsexception_inheritance() -> None:
 
 
 def test_invalid_instance_id(
-    vws_client: VWS,
-    high_quality_image: io.BytesIO,
+    vumark_vws_client: VWS,
+    vumark_target_id: str,
 ) -> None:
     """
     An ``InvalidInstanceId`` exception is raised when an empty instance
     ID is given.
     """
+    with pytest.raises(expected_exception=InvalidInstanceIdError) as exc:
+        vumark_vws_client.generate_vumark_instance(
+            target_id=vumark_target_id,
+            instance_id="",
+            accept=VuMarkAccept.PNG,
+        )
+
+    assert exc.value.response.status_code == HTTPStatus.UNPROCESSABLE_ENTITY
+
+
+def test_invalid_target_type(
+    vws_client: VWS,
+    high_quality_image: io.BytesIO,
+) -> None:
+    """
+    An ``InvalidTargetType`` exception is raised when trying to generate
+    a VuMark instance from a non-VuMark target.
+    """
     target_id = vws_client.add_target(
         name="x",
         width=1,
@@ -381,14 +401,14 @@ def test_invalid_instance_id(
         application_metadata=None,
     )
     vws_client.wait_for_target_processed(target_id=target_id)
-    with pytest.raises(expected_exception=InvalidInstanceIdError) as exc:
+    with pytest.raises(expected_exception=InvalidTargetTypeError) as exc:
         vws_client.generate_vumark_instance(
             target_id=target_id,
-            instance_id="",
+            instance_id="12345",
             accept=VuMarkAccept.PNG,
         )
 
-    assert exc.value.response.status_code == HTTPStatus.UNPROCESSABLE_ENTITY
+    assert exc.value.response.status_code == HTTPStatus.FORBIDDEN
 
 
 def test_base_exception(