Progress towards using beartype everywhere

Author: adamtheturtle

src/mock_vws/_database_matchers.py

@@ -59,7 +59,7 @@ def get_database_matching_client_keys(
 @beartype
 def get_database_matching_server_keys(
     *,
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes | None,
     request_method: str,
     request_path: str,

src/mock_vws/_flask_server/vws.py

@@ -12,6 +12,7 @@
 import uuid
 from enum import StrEnum, auto
 from http import HTTPMethod, HTTPStatus
+from typing import SupportsFloat
 
 import requests
 from beartype import beartype
@@ -67,7 +68,7 @@ class VWSSettings(BaseSettings):
     """Settings for the VWS Flask app."""
 
     target_manager_base_url: str
-    processing_time_seconds: float = 2
+    processing_time_seconds: SupportsFloat = 2
     vws_host: str = ""
     duplicates_image_matcher: _ImageMatcherChoice = (
         _ImageMatcherChoice.STRUCTURAL_SIMILARITY

src/mock_vws/_query_validators/__init__.py

@@ -6,6 +6,8 @@
 
 from typing import TYPE_CHECKING
 
+from beartype import beartype
+
 from .accept_header_validators import validate_accept_header
 from .auth_validators import (
     validate_auth_header_exists,
@@ -38,13 +40,16 @@
 from .project_state_validators import validate_project_state
 
 if TYPE_CHECKING:
+    from collections.abc import Mapping
+
     from mock_vws.database import VuforiaDatabase
 
 
+@beartype
 def run_query_validators(
     *,
     request_path: str,
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes,
     request_method: str,
     databases: set[VuforiaDatabase],

src/mock_vws/_query_validators/accept_header_validators.py

@@ -3,6 +3,7 @@
 """
 
 import logging
+from collections.abc import Mapping
 
 from beartype import beartype
 
@@ -12,7 +13,7 @@
 
 
 @beartype
-def validate_accept_header(request_headers: dict[str, str]) -> None:
+def validate_accept_header(request_headers: Mapping[str, str]) -> None:
     """
     Validate the accept header.
 

src/mock_vws/_query_validators/content_length_validators.py

@@ -3,6 +3,7 @@
 """
 
 import logging
+from collections.abc import Mapping
 
 from beartype import beartype
 
@@ -18,7 +19,7 @@
 @beartype
 def validate_content_length_header_is_int(
     *,
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
 ) -> None:
     """
     Validate the ``Content-Length`` header is an integer.
@@ -42,7 +43,7 @@ def validate_content_length_header_is_int(
 @beartype
 def validate_content_length_header_not_too_large(
     *,
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes,
 ) -> None:
     """
@@ -69,7 +70,7 @@ def validate_content_length_header_not_too_large(
 @beartype
 def validate_content_length_header_not_too_small(
     *,
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes,
 ) -> None:
     """

src/mock_vws/_query_validators/content_type_validators.py

@@ -3,6 +3,7 @@
 """
 
 import logging
+from collections.abc import Mapping
 from email.message import EmailMessage
 
 from beartype import beartype
@@ -19,7 +20,7 @@
 
 @beartype
 def validate_content_type_header(
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes,
 ) -> None:
     """

src/mock_vws/_query_validators/date_validators.py

@@ -5,6 +5,7 @@
 import contextlib
 import datetime
 import logging
+from collections.abc import Mapping
 from zoneinfo import ZoneInfo
 
 from beartype import beartype
@@ -19,7 +20,7 @@
 
 
 @beartype
-def validate_date_header_given(*, request_headers: dict[str, str]) -> None:
+def validate_date_header_given(*, request_headers: Mapping[str, str]) -> None:
     """
     Validate the date header is given to the query endpoint.
 
@@ -56,7 +57,7 @@ def _accepted_date_formats() -> set[str]:
 
 
 @beartype
-def validate_date_format(*, request_headers: dict[str, str]) -> None:
+def validate_date_format(*, request_headers: Mapping[str, str]) -> None:
     """
     Validate the format of the date header given to the query endpoint.
 
@@ -78,7 +79,7 @@ def validate_date_format(*, request_headers: dict[str, str]) -> None:
 
 
 @beartype
-def validate_date_in_range(*, request_headers: dict[str, str]) -> None:
+def validate_date_in_range(*, request_headers: Mapping[str, str]) -> None:
     """
     Validate date in the date header given to the query endpoint.
 

src/mock_vws/_query_validators/fields_validators.py

@@ -4,6 +4,7 @@
 
 import io
 import logging
+from collections.abc import Mapping
 from email.message import EmailMessage
 
 from beartype import beartype
@@ -17,7 +18,7 @@
 @beartype
 def validate_extra_fields(
     *,
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes,
 ) -> None:
     """

src/mock_vws/_query_validators/image_validators.py

@@ -4,6 +4,7 @@
 
 import io
 import logging
+from collections.abc import Mapping
 from email.message import EmailMessage
 
 from beartype import beartype
@@ -22,7 +23,7 @@
 @beartype
 def validate_image_field_given(
     *,
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes,
 ) -> None:
     """
@@ -54,7 +55,7 @@ def validate_image_field_given(
 @beartype
 def validate_image_file_size(
     *,
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes,
 ) -> None:
     """
@@ -95,7 +96,7 @@ def validate_image_file_size(
 @beartype
 def validate_image_dimensions(
     *,
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes,
 ) -> None:
     """
@@ -134,7 +135,7 @@ def validate_image_dimensions(
 @beartype
 def validate_image_format(
     *,
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes,
 ) -> None:
     """
@@ -168,7 +169,7 @@ def validate_image_format(
 
 @beartype
 def validate_image_is_image(
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes,
 ) -> None:
     """

src/mock_vws/_query_validators/include_target_data_validators.py

@@ -4,6 +4,7 @@
 
 import io
 import logging
+from collections.abc import Mapping
 from email.message import EmailMessage
 
 from beartype import beartype
@@ -16,7 +17,7 @@
 
 @beartype
 def validate_include_target_data(
-    request_headers: dict[str, str],
+    request_headers: Mapping[str, str],
     request_body: bytes,
 ) -> None:
     """