Merge remote-tracking branch 'origin/main' into more-beartype

Author: adamtheturtle

src/mock_vws/_query_validators/__init__.py

@@ -2,12 +2,12 @@
 Input validators to use in the mock query API.
 """
 
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
+from collections.abc import Mapping
 
 from beartype import beartype
 
+from mock_vws.database import VuforiaDatabase
+
 from .accept_header_validators import validate_accept_header
 from .auth_validators import (
     validate_auth_header_exists,
@@ -39,11 +39,6 @@
 from .num_results_validators import validate_max_num_results
 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(

src/mock_vws/_requests_mock_server/decorators.py

@@ -2,31 +2,28 @@
 Decorators for using the mock.
 """
 
-from __future__ import annotations
-
 import re
 from contextlib import ContextDecorator
-from typing import TYPE_CHECKING, Literal, Self, SupportsFloat
+from typing import Literal, Self, SupportsFloat
 from urllib.parse import urljoin, urlparse
 
 import requests
 from requests_mock.mocker import Mocker
 
+from mock_vws.database import VuforiaDatabase
 from mock_vws.image_matchers import (
     ImageMatcher,
     StructuralSimilarityMatcher,
 )
 from mock_vws.target_manager import TargetManager
-from mock_vws.target_raters import BrisqueTargetTrackingRater
+from mock_vws.target_raters import (
+    BrisqueTargetTrackingRater,
+    TargetTrackingRater,
+)
 
 from .mock_web_query_api import MockVuforiaWebQueryAPI
 from .mock_web_services_api import MockVuforiaWebServicesAPI
 
-if TYPE_CHECKING:
-    from mock_vws.database import VuforiaDatabase
-    from mock_vws.target_raters import TargetTrackingRater
-
-
 _STRUCTURAL_SIMILARITY_MATCHER = StructuralSimilarityMatcher()
 _BRISQUE_TRACKING_RATER = BrisqueTargetTrackingRater()
 

src/mock_vws/_requests_mock_server/mock_web_services_api.py

@@ -36,6 +36,7 @@
     from requests_mock.request import Request
     from requests_mock.response import Context
 
+
 _TARGET_ID_PATTERN = "[A-Za-z0-9]+"
 
 

src/mock_vws/_services_validators/__init__.py

@@ -2,9 +2,9 @@
 Input validators to use in the mock.
 """
 
-from __future__ import annotations
+from collections.abc import Mapping
 
-from typing import TYPE_CHECKING
+from mock_vws.database import VuforiaDatabase
 
 from .active_flag_validators import validate_active_flag
 from .auth_validators import (
@@ -50,11 +50,6 @@
 from .target_validators import validate_target_id_exists
 from .width_validators import validate_width
 
-if TYPE_CHECKING:
-    from collections.abc import Mapping
-
-    from mock_vws.database import VuforiaDatabase
-
 
 def run_services_validators(
     request_path: str,

src/mock_vws/database.py

@@ -2,8 +2,6 @@
 Utilities for managing mock Vuforia databases.
 """
 
-from __future__ import annotations
-
 import uuid
 from dataclasses import dataclass, field
 from typing import Self, TypedDict

src/mock_vws/target.py

@@ -2,24 +2,22 @@
 A fake implementation of a target for the Vuforia Web Services API.
 """
 
-from __future__ import annotations
-
 import base64
 import datetime
 import io
 import statistics
 import uuid
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Self, SupportsFloat, TypedDict
+from typing import Self, SupportsFloat, TypedDict
 from zoneinfo import ZoneInfo
 
 from PIL import Image, ImageStat
 
 from mock_vws._constants import TargetStatuses
-from mock_vws.target_raters import HardcodedTargetTrackingRater
-
-if TYPE_CHECKING:
-    from mock_vws.target_raters import TargetTrackingRater
+from mock_vws.target_raters import (
+    HardcodedTargetTrackingRater,
+    TargetTrackingRater,
+)
 
 
 class TargetDict(TypedDict):