Merge pull request #2183 from VWS-Python/neaten

Neaten some of the codebase

Author: adamtheturtle

src/mock_vws/_database_matchers.py

@@ -15,6 +15,7 @@
 
 
 def get_database_matching_client_keys(
+    *,
     request_headers: dict[str, str],
     request_body: bytes | None,
     request_method: str,
@@ -59,6 +60,7 @@ def get_database_matching_client_keys(
 
 
 def get_database_matching_server_keys(
+    *,
     request_headers: dict[str, str],
     request_body: bytes | None,
     request_method: str,

src/mock_vws/_flask_server/vws.py

@@ -42,7 +42,7 @@
 VWS_FLASK_APP.config["PROPAGATE_EXCEPTIONS"] = True
 
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(name=__name__)
 
 
 class _ImageMatcherChoice(StrEnum):

src/mock_vws/_query_validators/accept_header_validators.py

@@ -6,7 +6,7 @@
 
 from mock_vws._query_validators.exceptions import InvalidAcceptHeaderError
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(name=__name__)
 
 
 def validate_accept_header(request_headers: dict[str, str]) -> None:

src/mock_vws/_query_validators/auth_validators.py

@@ -14,13 +14,13 @@
     MalformedAuthHeaderError,
 )
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(name=__name__)
 
 if TYPE_CHECKING:
     from mock_vws.database import VuforiaDatabase
 
 
-def validate_auth_header_exists(request_headers: dict[str, str]) -> None:
+def validate_auth_header_exists(*, request_headers: dict[str, str]) -> None:
     """
     Validate that there is an authorization header given to the query endpoint.
 
@@ -38,6 +38,7 @@ def validate_auth_header_exists(request_headers: dict[str, str]) -> None:
 
 
 def validate_auth_header_number_of_parts(
+    *,
     request_headers: dict[str, str],
 ) -> None:
     """
@@ -61,6 +62,7 @@ def validate_auth_header_number_of_parts(
 
 
 def validate_client_key_exists(
+    *,
     request_headers: dict[str, str],
     databases: set[VuforiaDatabase],
 ) -> None:
@@ -106,6 +108,7 @@ def validate_auth_header_has_signature(
 
 
 def validate_authorization(
+    *,
     request_path: str,
     request_headers: dict[str, str],
     request_body: bytes,
@@ -134,8 +137,8 @@ def validate_authorization(
             request_path=request_path,
             databases=databases,
         )
-    except ValueError:
+    except ValueError as exc:
         _LOGGER.warning(
             msg="The authorization header does not match any databases.",
         )
-        raise AuthenticationFailureError from ValueError
+        raise AuthenticationFailureError from exc

src/mock_vws/_query_validators/content_length_validators.py

@@ -10,10 +10,11 @@
     ContentLengthHeaderTooLargeError,
 )
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(name=__name__)
 
 
 def validate_content_length_header_is_int(
+    *,
     request_headers: dict[str, str],
 ) -> None:
     """
@@ -36,6 +37,7 @@ def validate_content_length_header_is_int(
 
 
 def validate_content_length_header_not_too_large(
+    *,
     request_headers: dict[str, str],
     request_body: bytes,
 ) -> None:
@@ -61,6 +63,7 @@ def validate_content_length_header_not_too_large(
 
 
 def validate_content_length_header_not_too_small(
+    *,
     request_headers: dict[str, str],
     request_body: bytes,
 ) -> None:

src/mock_vws/_query_validators/content_type_validators.py

@@ -12,7 +12,7 @@
     UnsupportedMediaTypeError,
 )
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(name=__name__)
 
 
 def validate_content_type_header(

src/mock_vws/_query_validators/date_validators.py

@@ -13,7 +13,7 @@
     RequestTimeTooSkewedError,
 )
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(name=__name__)
 
 
 def validate_date_header_given(*, request_headers: dict[str, str]) -> None:

src/mock_vws/_query_validators/fields_validators.py

@@ -10,10 +10,11 @@
 
 from mock_vws._query_validators.exceptions import UnknownParametersError
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(name=__name__)
 
 
 def validate_extra_fields(
+    *,
     request_headers: dict[str, str],
     request_body: bytes,
 ) -> None:

src/mock_vws/_query_validators/image_validators.py

@@ -15,10 +15,11 @@
     RequestEntityTooLargeError,
 )
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(name=__name__)
 
 
 def validate_image_field_given(
+    *,
     request_headers: dict[str, str],
     request_body: bytes,
 ) -> None:
@@ -49,6 +50,7 @@ def validate_image_field_given(
 
 
 def validate_image_file_size(
+    *,
     request_headers: dict[str, str],
     request_body: bytes,
 ) -> None:
@@ -88,6 +90,7 @@ def validate_image_file_size(
 
 
 def validate_image_dimensions(
+    *,
     request_headers: dict[str, str],
     request_body: bytes,
 ) -> None:
@@ -125,6 +128,7 @@ def validate_image_dimensions(
 
 
 def validate_image_format(
+    *,
     request_headers: dict[str, str],
     request_body: bytes,
 ) -> None:

src/mock_vws/_query_validators/include_target_data_validators.py

@@ -10,7 +10,7 @@
 
 from mock_vws._query_validators.exceptions import InvalidIncludeTargetDataError
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(name=__name__)
 
 
 def validate_include_target_data(