Use make_request in generate_vumark_instance

Adds extra_headers and optional expected_result_code (None = binary/HTTP-200
success) to make_request, and adds VuMark-specific result codes to its error
dispatch dict, so generate_vumark_instance no longer needs to call
_target_api_request directly.

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

Author: adamtheturtle

src/vws/vws.py

@@ -187,8 +187,9 @@ def make_request(
         method: str,
         data: bytes,
         request_path: str,
-        expected_result_code: str,
+        expected_result_code: str | None,
         content_type: str,
+        extra_headers: dict[str, str] | None = None,
     ) -> Response:
         """Make a request to the Vuforia Target API.
 
@@ -201,7 +202,11 @@ def make_request(
                 request.
             expected_result_code: See "VWS API Result Codes" on
                 https://developer.vuforia.com/library/web-api/cloud-targets-web-services-api.
+                Pass ``None`` for endpoints that return a non-JSON success
+                response (e.g. binary data); success is then determined by an
+                HTTP 200 status code.
             content_type: The content type of the request.
+            extra_headers: Additional headers to include in the request.
 
         Returns:
             The response to the request made by `requests`.
@@ -224,8 +229,15 @@ def make_request(
             request_path=request_path,
             base_vws_url=self._base_vws_url,
             request_timeout_seconds=self._request_timeout_seconds,
+            extra_headers=extra_headers,
         )
 
+        if (
+            response.status_code == HTTPStatus.OK
+            and expected_result_code is None
+        ):
+            return response
+
         result_code = json.loads(s=response.text)["result_code"]
 
         if result_code == expected_result_code:
@@ -234,9 +246,12 @@ def make_request(
         exception = {
             "AuthenticationFailure": AuthenticationFailureError,
             "BadImage": BadImageError,
+            "BadRequest": BadRequestError,
             "DateRangeError": DateRangeError,
             "Fail": FailError,
             "ImageTooLarge": ImageTooLargeError,
+            "InvalidAcceptHeader": InvalidAcceptHeaderError,
+            "InvalidInstanceId": InvalidInstanceIdError,
             "MetadataTooLarge": MetadataTooLargeError,
             "ProjectHasNoAPIAccess": ProjectHasNoAPIAccessError,
             "ProjectInactive": ProjectInactiveError,
@@ -765,33 +780,13 @@ def generate_vumark_instance(
             encoding="utf-8",
         )
 
-        response = _target_api_request(
-            content_type=content_type,
-            server_access_key=self._server_access_key,
-            server_secret_key=self._server_secret_key,
+        response = self.make_request(
             method=HTTPMethod.POST,
             data=request_data,
             request_path=request_path,
-            base_vws_url=self._base_vws_url,
-            request_timeout_seconds=self._request_timeout_seconds,
+            expected_result_code=None,
+            content_type=content_type,
             extra_headers={"Accept": accept},
         )
 
-        if response.status_code == HTTPStatus.OK:
-            return response.content
-
-        result_code = json.loads(s=response.text)["result_code"]
-
-        exception = {
-            "AuthenticationFailure": AuthenticationFailureError,
-            "BadRequest": BadRequestError,
-            "DateRangeError": DateRangeError,
-            "Fail": FailError,
-            "InvalidAcceptHeader": InvalidAcceptHeaderError,
-            "InvalidInstanceId": InvalidInstanceIdError,
-            "RequestTimeTooSkewed": RequestTimeTooSkewedError,
-            "TargetStatusNotSuccess": TargetStatusNotSuccessError,
-            "UnknownTarget": UnknownTargetError,
-        }[result_code]
-
-        raise exception(response=response)
+        return response.content