Use new Python typing style

Author: adamtheturtle

setup.py

@@ -2,13 +2,14 @@
 Setup script for VWS Python Mock, a mock of Vuforia's Web Services APIs.
 """
 
+from __future__ import annotations
+
 from pathlib import Path
-from typing import List
 
 from setuptools import setup
 
 
-def _get_dependencies(requirements_file: Path) -> List[str]:
+def _get_dependencies(requirements_file: Path) -> list[str]:
     """
     Return requirements from a requirements file.
 

src/mock_vws/_database_matchers.py

@@ -2,7 +2,9 @@
 Helpers for getting databases which match keys given in requests.
 """
 
-from typing import Dict, Iterable, Optional
+from __future__ import annotations
+
+from typing import Dict, Iterable
 
 from vws_auth_tools import authorization_header
 
@@ -11,11 +13,11 @@
 
 def get_database_matching_client_keys(
     request_headers: Dict[str, str],
-    request_body: Optional[bytes],
+    request_body: bytes | None,
     request_method: str,
     request_path: str,
     databases: Iterable[VuforiaDatabase],
-) -> Optional[VuforiaDatabase]:
+) -> VuforiaDatabase | None:
     """
     Return which, if any, of the given databases is being accessed by the given
     client request.
@@ -53,11 +55,11 @@ def get_database_matching_client_keys(
 
 def get_database_matching_server_keys(
     request_headers: Dict[str, str],
-    request_body: Optional[bytes],
+    request_body: bytes | None,
     request_method: str,
     request_path: str,
     databases: Iterable[VuforiaDatabase],
-) -> Optional[VuforiaDatabase]:
+) -> VuforiaDatabase | None:
     """
     Return which, if any, of the given databases is being accessed by the given
     server request.

src/mock_vws/_flask_server/vwq.py

@@ -69,6 +69,7 @@ class ResponseNoContentTypeAdded(Response):
     Without this, a content type is added to all responses.
     Some of our responses need to not have a "Content-Type" header.
     """
+
     default_mimetype = None
 
 

src/mock_vws/_flask_server/vws.py

@@ -11,7 +11,7 @@
 import os
 import uuid
 from http import HTTPStatus
-from typing import List, Set
+from typing import Set
 
 import requests
 from flask import Flask, Response, request
@@ -52,6 +52,7 @@ class ResponseNoContentTypeAdded(Response):
     Without this, a content type is added to all responses.
     Some of our responses need to not have a "Content-Type" header.
     """
+
     default_mimetype = None
 
 
@@ -394,7 +395,7 @@ def get_duplicates(target_id: str) -> Response:
     ]
     other_targets = set(database.targets) - {target}
 
-    similar_targets: List[str] = [
+    similar_targets: list[str] = [
         other.target_id
         for other in other_targets
         if other.image_value == target.image_value

src/mock_vws/_query_tools.py

@@ -7,7 +7,7 @@
 import datetime
 import io
 import uuid
-from typing import Any, Dict, List, Set, Union
+from typing import Any, Dict, Set
 
 from backports.zoneinfo import ZoneInfo
 
@@ -30,8 +30,8 @@ def get_query_match_response_text(
     request_method: str,
     request_path: str,
     databases: Set[VuforiaDatabase],
-    query_processes_deletion_seconds: Union[int, float],
-    query_recognizes_deletion_seconds: Union[int, float],
+    query_processes_deletion_seconds: int | float,
+    query_recognizes_deletion_seconds: int | float,
 ) -> str:
     """
     Args:
@@ -129,7 +129,7 @@ def get_query_match_response_text(
 
     matches = not_deleted_matches + deletion_not_recognized_matches
 
-    results: List[Dict[str, Any]] = []
+    results: list[Dict[str, Any]] = []
     for target in matches:
         target_timestamp = target.last_modified_date.timestamp()
         if target.application_metadata is None:

src/mock_vws/_requests_mock_server/decorators.py

@@ -2,9 +2,11 @@
 Decorators for using the mock.
 """
 
+from __future__ import annotations
+
 import re
 from contextlib import ContextDecorator
-from typing import Literal, Tuple, Union
+from typing import Literal, Tuple
 from urllib.parse import urljoin, urlparse
 
 import requests
@@ -27,9 +29,9 @@ def __init__(
         base_vws_url: str = 'https://vws.vuforia.com',
         base_vwq_url: str = 'https://cloudreco.vuforia.com',
         real_http: bool = False,
-        processing_time_seconds: Union[int, float] = 0.5,
-        query_recognizes_deletion_seconds: Union[int, float] = 0.2,
-        query_processes_deletion_seconds: Union[int, float] = 3,
+        processing_time_seconds: int | float = 0.5,
+        query_recognizes_deletion_seconds: int | float = 0.2,
+        query_processes_deletion_seconds: int | float = 3,
     ) -> None:
         """
         Route requests to Vuforia's Web Service APIs to fakes of those APIs.

src/mock_vws/_requests_mock_server/mock_web_query_api.py

@@ -6,7 +6,7 @@
 """
 
 import email.utils
-from typing import Callable, Set, Union
+from typing import Callable, Set
 
 from requests_mock import POST
 from requests_mock.request import _RequestObjectProxy
@@ -74,8 +74,8 @@ class MockVuforiaWebQueryAPI:
     def __init__(
         self,
         target_manager: TargetManager,
-        query_recognizes_deletion_seconds: Union[int, float],
-        query_processes_deletion_seconds: Union[int, float],
+        query_recognizes_deletion_seconds: int | float,
+        query_processes_deletion_seconds: int | float,
     ) -> None:
         """
         Args:

src/mock_vws/_requests_mock_server/mock_web_services_api.py

@@ -5,14 +5,16 @@
 https://library.vuforia.com/articles/Solution/How-To-Use-the-Vuforia-Web-Services-API
 """
 
+from __future__ import annotations
+
 import base64
 import dataclasses
 import datetime
 import email.utils
 import random
 import uuid
 from http import HTTPStatus
-from typing import Callable, Dict, List, Set, Union
+from typing import Callable, Dict, Set
 
 from backports.zoneinfo import ZoneInfo
 from requests_mock import DELETE, GET, POST, PUT
@@ -86,7 +88,7 @@ class MockVuforiaWebServicesAPI:
     def __init__(
         self,
         target_manager: TargetManager,
-        processing_time_seconds: Union[int, float],
+        processing_time_seconds: int | float,
     ) -> None:
         """
         Args:
@@ -268,7 +270,7 @@ def database_summary(
             context.status_code = exc.status_code
             return exc.response_text
 
-        body: Dict[str, Union[str, int]] = {}
+        body: Dict[str, str | int] = {}
 
         database = get_database_matching_server_keys(
             request_headers=request.headers,
@@ -343,7 +345,7 @@ def target_list(
         date = email.utils.formatdate(None, localtime=False, usegmt=True)
 
         results = [target.target_id for target in database.not_deleted_targets]
-        body: Dict[str, Union[str, List[str]]] = {
+        body: Dict[str, str | list[str]] = {
             'transaction_id': uuid.uuid4().hex,
             'result_code': ResultCodes.SUCCESS.value,
             'results': results,
@@ -461,7 +463,7 @@ def get_duplicates(
 
         other_targets = set(database.targets) - {target}
 
-        similar_targets: List[str] = [
+        similar_targets: list[str] = [
             other.target_id
             for other in other_targets
             if other.image_value == target.image_value

src/mock_vws/database.py

@@ -6,7 +6,7 @@
 
 import uuid
 from dataclasses import dataclass, field
-from typing import List, Set, TypedDict
+from typing import Set, TypedDict
 
 from mock_vws._constants import TargetStatuses
 from mock_vws.states import States
@@ -24,7 +24,7 @@ class DatabaseDict(TypedDict):
     client_access_key: str
     client_secret_key: str
     state_name: str
-    targets: List[TargetDict]
+    targets: list[TargetDict]
 
 
 def _random_hex() -> str:

src/mock_vws/target.py

@@ -10,7 +10,7 @@
 import statistics
 import uuid
 from dataclasses import dataclass, field
-from typing import Optional, TypedDict, Union
+from typing import TypedDict
 
 from backports.zoneinfo import ZoneInfo
 from PIL import Image, ImageStat
@@ -27,12 +27,12 @@ class TargetDict(TypedDict):
     width: float
     image_base64: str
     active_flag: bool
-    processing_time_seconds: Union[int, float]
+    processing_time_seconds: int | float
     processed_tracking_rating: int
-    application_metadata: Optional[str]
+    application_metadata: str | None
     target_id: str
     last_modified_date: str
-    delete_date_optional: Optional[str]
+    delete_date_optional: str | None
     upload_date: str
 
 
@@ -66,13 +66,13 @@ class Target:
     """
 
     active_flag: bool
-    application_metadata: Optional[str]
+    application_metadata: str | None
     image_value: bytes
     name: str
     processing_time_seconds: float
     width: float
     current_month_recos: int = 0
-    delete_date: Optional[datetime.datetime] = None
+    delete_date: datetime.datetime | None = None
     last_modified_date: datetime.datetime = field(default_factory=_time_now)
     previous_month_recos: int = 0
     processed_tracking_rating: int = field(
@@ -208,7 +208,7 @@ def to_dict(self) -> TargetDict:
         """
         Dump a target to a dictionary which can be loaded as JSON.
         """
-        delete_date: Optional[str] = None
+        delete_date: str | None = None
         if self.delete_date:
             delete_date = datetime.datetime.isoformat(self.delete_date)