Start of switching to responses

Author: adamtheturtle

src/mock_vws/_requests_mock_server/__init__.py

@@ -1,3 +1,3 @@
 """
-An interface to the mock Vuforia which uses ``requests_mock``.
+An interface to the mock Vuforia which uses ``responses``.
 """

src/mock_vws/_requests_mock_server/decorators.py

@@ -8,7 +8,7 @@
 from urllib.parse import urljoin, urlparse
 
 import requests
-from requests_mock.mocker import Mocker
+from responses import RequestsMock
 
 from mock_vws.database import VuforiaDatabase
 from mock_vws.image_matchers import (
@@ -69,7 +69,7 @@ def __init__(
         """
         super().__init__()
         self._real_http = real_http
-        self._mock: Mocker
+        self._mock: RequestsMock
         self._target_manager = TargetManager()
 
         self._base_vws_url = base_vws_url
@@ -116,35 +116,47 @@ def __enter__(self) -> Self:
         Returns:
             ``self``.
         """
-        with Mocker(real_http=self._real_http) as mock:
+        compiled_url_patterns: set[re.Pattern[str]] = set()
+
+        with RequestsMock(assert_all_requests_are_fired=False) as mock:
             for vws_route in self._mock_vws_api.routes:
                 url_pattern = urljoin(
                     base=self._base_vws_url,
                     url=f"{vws_route.path_pattern}$",
                 )
+                compiled_url_pattern = re.compile(pattern=url_pattern)
+                compiled_url_patterns.add(compiled_url_pattern)
 
                 for vws_http_method in vws_route.http_methods:
-                    mock.register_uri(
+                    mock.add_callback(
                         method=vws_http_method,
-                        url=re.compile(url_pattern),
-                        text=getattr(self._mock_vws_api, vws_route.route_name),
+                        url=compiled_url_pattern,
+                        callback=getattr(
+                            self._mock_vws_api, vws_route.route_name
+                        ),
                     )
 
             for vwq_route in self._mock_vwq_api.routes:
                 url_pattern = urljoin(
                     base=self._base_vwq_url,
                     url=f"{vwq_route.path_pattern}$",
                 )
+                compiled_url_pattern = re.compile(pattern=url_pattern)
+                compiled_url_patterns.add(compiled_url_pattern)
 
                 for vwq_http_method in vwq_route.http_methods:
-                    mock.register_uri(
+                    mock.add_callback(
                         method=vwq_http_method,
-                        url=re.compile(url_pattern),
-                        text=getattr(self._mock_vwq_api, vwq_route.route_name),
+                        url=compiled_url_pattern,
+                        callback=getattr(
+                            self._mock_vwq_api, vwq_route.route_name
+                        ),
                     )
 
-        self._mock = mock
-        self._mock.start()
+            if self._real_http:
+                mock.add_passthru(prefix=re.compile(".*"))
+            self._mock = mock
+            self._mock.start()
 
         return self
 

src/mock_vws/_requests_mock_server/mock_web_query_api.py

@@ -8,7 +8,6 @@
 import email.utils
 from collections.abc import Callable
 from http import HTTPMethod
-from typing import TYPE_CHECKING
 
 from mock_vws._mock_common import Route
 from mock_vws._query_tools import (
@@ -21,11 +20,6 @@
 from mock_vws.image_matchers import ImageMatcher
 from mock_vws.target_manager import TargetManager
 
-if TYPE_CHECKING:
-    from requests_mock.request import Request
-    from requests_mock.response import Context
-
-
 _ROUTES: set[Route] = set()
 
 
@@ -77,7 +71,7 @@ class MockVuforiaWebQueryAPI:
     """
     A fake implementation of the Vuforia Web Query API.
 
-    This implementation is tied to the implementation of `requests_mock`.
+    This implementation is tied to the implementation of ``responses``.
     """
 
     def __init__(

src/mock_vws/_requests_mock_server/mock_web_services_api.py

@@ -12,7 +12,7 @@
 import uuid
 from collections.abc import Callable
 from http import HTTPMethod, HTTPStatus
-from typing import TYPE_CHECKING, SupportsFloat
+from typing import SupportsFloat
 from zoneinfo import ZoneInfo
 
 from mock_vws._constants import ResultCodes, TargetStatuses
@@ -30,11 +30,6 @@
 from mock_vws.target_manager import TargetManager
 from mock_vws.target_raters import TargetTrackingRater
 
-if TYPE_CHECKING:
-    from requests_mock.request import Request
-    from requests_mock.response import Context
-
-
 _TARGET_ID_PATTERN = "[A-Za-z0-9]+"
 
 
@@ -78,7 +73,7 @@ def decorator(method: Callable[..., str]) -> Callable[..., str]:
     return decorator
 
 
-def _body_bytes(request: "Request") -> bytes:
+def _body_bytes(request: Request) -> bytes:
     """
     Return the body of a request as bytes.
     """
@@ -96,7 +91,7 @@ class MockVuforiaWebServicesAPI:
     """
     A fake implementation of the Vuforia Web Services API.
 
-    This implementation is tied to the implementation of `requests_mock`.
+    This implementation is tied to the implementation of ``responses``.
     """
 
     def __init__(

tests/mock_vws/fixtures/vuforia_backends.py

@@ -9,7 +9,7 @@
 
 import pytest
 import requests
-import requests_mock
+import responses
 from requests_mock_flask import add_flask_app_to_mock
 from vws import VWS
 from vws.exceptions.vws_exceptions import (
@@ -131,7 +131,7 @@ def _enable_use_docker_in_memory(
         value=target_manager_base_url,
     )
 
-    with requests_mock.Mocker(real_http=False) as mock:
+    with responses.RequestsMock() as mock:
         add_flask_app_to_mock(
             mock_obj=mock,
             flask_app=VWS_FLASK_APP,

tests/mock_vws/test_flask_app_usage.py

@@ -8,8 +8,8 @@
 
 import pytest
 import requests
+import responses
 from PIL import Image
-from requests_mock import Mocker
 from requests_mock_flask import add_flask_app_to_mock
 from vws import VWS, CloudRecoService
 
@@ -25,24 +25,25 @@
 
 
 @pytest.fixture(autouse=True)
-def _(monkeypatch: pytest.MonkeyPatch, requests_mock: Mocker) -> None:
+@responses.activate
+def _(monkeypatch: pytest.MonkeyPatch) -> None:
     """
     Enable a mock service backed by the Flask applications.
     """
     add_flask_app_to_mock(
-        mock_obj=requests_mock,
+        mock_obj=responses,
         flask_app=VWS_FLASK_APP,
         base_url="https://vws.vuforia.com",
     )
 
     add_flask_app_to_mock(
-        mock_obj=requests_mock,
+        mock_obj=responses,
         flask_app=CLOUDRECO_FLASK_APP,
         base_url="https://cloudreco.vuforia.com",
     )
 
     add_flask_app_to_mock(
-        mock_obj=requests_mock,
+        mock_obj=responses,
         flask_app=TARGET_MANAGER_FLASK_APP,
         base_url=_EXAMPLE_URL_FOR_TARGET_MANAGER,
     )

tests/mock_vws/test_requests_mock_usage.py

@@ -81,7 +81,9 @@ def test_default() -> None:
         non-Vuforia addresses, but not to mocked Vuforia endpoints.
         """
         with MockVWS():
-            with pytest.raises(expected_exception=NoMockAddress):
+            with pytest.raises(
+                expected_exception=requests.exceptions.ConnectionError
+            ):
                 request_unmocked_address()
 
             # No exception is raised when making a request to a mocked