Merge remote-tracking branch 'origin/main' into adamtheturtle/add-vumark-update-endpoint

# Conflicts:
#	src/mock_vws/_flask_server/target_manager.py
#	src/mock_vws/_flask_server/vws.py
#	tests/mock_vws/fixtures/vuforia_backends.py
#	tests/mock_vws/test_vumark_generation_api.py

Author: adamtheturtle

README.rst

@@ -26,10 +26,10 @@ This requires Python |minimum-python-version|\+.
     import requests
 
     from mock_vws import MockVWS
-    from mock_vws.database import VuforiaDatabase
+    from mock_vws.database import CloudDatabase
 
     with MockVWS() as mock:
-        database = VuforiaDatabase()
+        database = CloudDatabase()
         mock.add_database(database=database)
         # This will use the Vuforia mock.
         requests.get(url="https://vws.vuforia.com/summary", timeout=30)

docs/source/basic-example.rst

@@ -7,10 +7,10 @@ Using the mock redirects requests to Vuforia made with `requests`_ to an in-memo
     import requests
 
     from mock_vws import MockVWS
-    from mock_vws.database import VuforiaDatabase
+    from mock_vws.database import CloudDatabase
 
     with MockVWS() as mock:
-        database = VuforiaDatabase()
+        database = CloudDatabase()
         mock.add_database(database=database)
         # This will use the Vuforia mock.
         requests.get(url="https://vws.vuforia.com/summary", timeout=30)

docs/source/mock-api-reference.rst

@@ -11,11 +11,11 @@ API Reference
    :members:
    :undoc-members:
 
-.. Many parts of the VuforiaDatabase API are used for the Flask target
+.. Many parts of the CloudDatabase API are used for the Flask target
 .. database app, but Python users are not expected to use them.
 .. Therefore, they are not documented.
 
-.. autoclass:: mock_vws.database.VuforiaDatabase
+.. autoclass:: mock_vws.database.CloudDatabase
    :members:
    :undoc-members:
    :exclude-members: to_dict, get_target, from_dict, not_deleted_targets, active_targets, inactive_targets, failed_targets, processing_targets

pyproject.toml

@@ -450,7 +450,7 @@ ignore_names = [
     # pydantic-settings
     "model_config",
     # Used in TYPE_CHECKING for type hints
-    "DatabaseDict",
+    "CloudDatabaseDict",
     "VuMarkDatabaseDict",
     "VuMarkTargetDict",
 ]

src/mock_vws/_database_matchers.py

@@ -5,7 +5,7 @@
 from beartype import beartype
 from vws_auth_tools import authorization_header
 
-from mock_vws.database import VuforiaDatabase
+from mock_vws.database import CloudDatabase
 
 
 @beartype
@@ -15,8 +15,8 @@ def get_database_matching_client_keys(
     request_body: bytes | None,
     request_method: str,
     request_path: str,
-    databases: Iterable[VuforiaDatabase],
-) -> VuforiaDatabase:
+    databases: Iterable[CloudDatabase],
+) -> CloudDatabase:
     """Return the first of the given databases which is being accessed by
     the
     given client request.
@@ -64,8 +64,8 @@ def get_database_matching_server_keys(
     request_body: bytes | None,
     request_method: str,
     request_path: str,
-    databases: Iterable[VuforiaDatabase],
-) -> VuforiaDatabase:
+    databases: Iterable[CloudDatabase],
+) -> CloudDatabase:
     """Return the first of the given databases which is being accessed by
     the
     given server request.

src/mock_vws/_flask_server/target_manager.py

@@ -12,7 +12,7 @@
 from flask import Flask, Response, request
 from pydantic_settings import BaseSettings
 
-from mock_vws.database import VuforiaDatabase
+from mock_vws.database import CloudDatabase
 from mock_vws.database_type import DatabaseType
 from mock_vws.states import States
 from mock_vws.target import ImageTarget, VuMarkTarget
@@ -134,7 +134,7 @@ def create_database() -> Response:
 
     :status 201: The database has been successfully created.
     """
-    random_database = VuforiaDatabase()
+    random_database = CloudDatabase()
     request_json = json.loads(s=request.data)
     server_access_key = request_json.get(
         "server_access_key",
@@ -168,7 +168,7 @@ def create_database() -> Response:
     state = States[state_name]
     database_type = DatabaseType[database_type_name]
 
-    database = VuforiaDatabase(
+    database = CloudDatabase(
         server_access_key=server_access_key,
         server_secret_key=server_secret_key,
         client_access_key=client_access_key,

src/mock_vws/_flask_server/vwq.py

@@ -21,7 +21,7 @@
 from mock_vws._query_validators.exceptions import (
     ValidatorError,
 )
-from mock_vws.database import VuforiaDatabase
+from mock_vws.database import CloudDatabase
 from mock_vws.image_matchers import (
     ExactMatcher,
     ImageMatcher,
@@ -63,15 +63,15 @@ class VWQSettings(BaseSettings):
 
 
 @beartype
-def get_all_databases() -> set[VuforiaDatabase]:
+def get_all_databases() -> set[CloudDatabase]:
     """Get all database objects from the target manager back-end."""
     settings = VWQSettings.model_validate(obj={})
     response = requests.get(
         url=f"{settings.target_manager_base_url}/databases",
         timeout=30,
     )
     return {
-        VuforiaDatabase.from_dict(database_dict=database_dict)
+        CloudDatabase.from_dict(database_dict=database_dict)
         for database_dict in response.json()
     }
 

src/mock_vws/_flask_server/vws.py

@@ -37,7 +37,7 @@
     TargetStatusProcessingError,
     ValidatorError,
 )
-from mock_vws.database import VuforiaDatabase
+from mock_vws.database import CloudDatabase
 from mock_vws.database_type import DatabaseType
 from mock_vws.image_matchers import (
     ExactMatcher,
@@ -88,7 +88,7 @@ class VWSSettings(BaseSettings):
 
 
 @beartype
-def get_all_databases() -> set[VuforiaDatabase]:
+def get_all_databases() -> set[CloudDatabase]:
     """Get all database objects from the task manager back-end."""
     settings = VWSSettings.model_validate(obj={})
     timeout_seconds = 30
@@ -97,7 +97,7 @@ def get_all_databases() -> set[VuforiaDatabase]:
         timeout=timeout_seconds,
     )
     return {
-        VuforiaDatabase.from_dict(database_dict=database_dict)
+        CloudDatabase.from_dict(database_dict=database_dict)
         for database_dict in response.json()
     }
 

src/mock_vws/_query_tools.py

@@ -14,7 +14,7 @@
 from mock_vws._constants import ResultCodes, TargetStatuses
 from mock_vws._database_matchers import get_database_matching_client_keys
 from mock_vws._mock_common import json_dump
-from mock_vws.database import VuforiaDatabase
+from mock_vws.database import CloudDatabase
 from mock_vws.image_matchers import ImageMatcher
 from mock_vws.target import ImageTarget
 
@@ -26,7 +26,7 @@ def get_query_match_response_text(
     request_body: bytes,
     request_method: str,
     request_path: str,
-    databases: Iterable[VuforiaDatabase],
+    databases: Iterable[CloudDatabase],
     query_match_checker: ImageMatcher,
 ) -> str:
     """

src/mock_vws/_query_validators/__init__.py

@@ -4,7 +4,7 @@
 
 from beartype import beartype
 
-from mock_vws.database import VuforiaDatabase
+from mock_vws.database import CloudDatabase
 
 from .accept_header_validators import validate_accept_header
 from .auth_validators import (
@@ -45,7 +45,7 @@ def run_query_validators(
     request_headers: Mapping[str, str],
     request_body: bytes,
     request_method: str,
-    databases: Iterable[VuforiaDatabase],
+    databases: Iterable[CloudDatabase],
 ) -> None:
     """Run all validators.