Merge pull request #2258 from VWS-Python/rm-future-annotations

Remove from __future__ import annotations

Author: adamtheturtle

src/mock_vws/_database_matchers.py

@@ -2,16 +2,11 @@
 Helpers for getting databases which match keys given in requests.
 """
 
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
+from collections.abc import Iterable
 
 from vws_auth_tools import authorization_header
 
-if TYPE_CHECKING:
-    from collections.abc import Iterable
-
-    from mock_vws.database import VuforiaDatabase
+from mock_vws.database import VuforiaDatabase
 
 
 def get_database_matching_client_keys(

src/mock_vws/_query_tools.py

@@ -2,24 +2,20 @@
 Tools for making Vuforia queries.
 """
 
-from __future__ import annotations
-
 import base64
 import io
 import uuid
 from email.message import EmailMessage
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from werkzeug.formparser import MultiPartParser
 
 from mock_vws._base64_decoding import decode_base64
 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
-
-if TYPE_CHECKING:
-    from mock_vws.database import VuforiaDatabase
-    from mock_vws.image_matchers import ImageMatcher
+from mock_vws.database import VuforiaDatabase
+from mock_vws.image_matchers import ImageMatcher
 
 
 def get_query_match_response_text(

src/mock_vws/_query_validators/__init__.py

@@ -2,9 +2,7 @@
 Input validators to use in the mock query API.
 """
 
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
+from mock_vws.database import VuforiaDatabase
 
 from .accept_header_validators import validate_accept_header
 from .auth_validators import (
@@ -37,9 +35,6 @@
 from .num_results_validators import validate_max_num_results
 from .project_state_validators import validate_project_state
 
-if TYPE_CHECKING:
-    from mock_vws.database import VuforiaDatabase
-
 
 def run_query_validators(
     *,

src/mock_vws/_query_validators/auth_validators.py

@@ -2,23 +2,18 @@
 Authorization validators to use in the mock query API.
 """
 
-from __future__ import annotations
-
 import logging
-from typing import TYPE_CHECKING
 
 from mock_vws._database_matchers import get_database_matching_client_keys
 from mock_vws._query_validators.exceptions import (
     AuthenticationFailureError,
     AuthHeaderMissingError,
     MalformedAuthHeaderError,
 )
+from mock_vws.database import VuforiaDatabase
 
 _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:
     """

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
+from typing import Literal, Self
 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_query_api.py

@@ -5,9 +5,8 @@
 https://developer.vuforia.com/library/web-api/vuforia-query-web-api
 """
 
-from __future__ import annotations
-
 import email.utils
+from collections.abc import Callable
 from http import HTTPMethod
 from typing import TYPE_CHECKING
 
@@ -19,15 +18,13 @@
 from mock_vws._query_validators.exceptions import (
     ValidatorError,
 )
+from mock_vws.image_matchers import ImageMatcher
+from mock_vws.target_manager import TargetManager
 
 if TYPE_CHECKING:
-    from collections.abc import Callable
-
     from requests_mock.request import Request
     from requests_mock.response import Context
 
-    from mock_vws.image_matchers import ImageMatcher
-    from mock_vws.target_manager import TargetManager
 
 _ROUTES: set[Route] = set()
 
@@ -69,7 +66,7 @@ def decorator(method: Callable[..., str]) -> Callable[..., str]:
     return decorator
 
 
-def _body_bytes(request: Request) -> bytes:
+def _body_bytes(request: "Request") -> bytes:
     """
     Return the body of a request as bytes.
     """
@@ -102,7 +99,7 @@ def __init__(
         self._query_match_checker = query_match_checker
 
     @route(path_pattern="/v1/query", http_methods={HTTPMethod.POST})
-    def query(self, request: Request, context: Context) -> str:
+    def query(self, request: "Request", context: "Context") -> str:
         """
         Perform an image recognition query.
         """

src/mock_vws/_requests_mock_server/mock_web_services_api.py

@@ -5,13 +5,12 @@
 https://developer.vuforia.com/library/web-api/cloud-targets-web-services-api
 """
 
-from __future__ import annotations
-
 import base64
 import dataclasses
 import datetime
 import email.utils
 import uuid
+from collections.abc import Callable
 from http import HTTPMethod, HTTPStatus
 from typing import TYPE_CHECKING
 from zoneinfo import ZoneInfo
@@ -26,17 +25,15 @@
     TargetStatusProcessingError,
     ValidatorError,
 )
+from mock_vws.image_matchers import ImageMatcher
 from mock_vws.target import Target
+from mock_vws.target_manager import TargetManager
+from mock_vws.target_raters import TargetTrackingRater
 
 if TYPE_CHECKING:
-    from collections.abc import Callable
-
     from requests_mock.request import Request
     from requests_mock.response import Context
 
-    from mock_vws.image_matchers import ImageMatcher
-    from mock_vws.target_manager import TargetManager
-    from mock_vws.target_raters import TargetTrackingRater
 
 _TARGET_ID_PATTERN = "[A-Za-z0-9]+"
 
@@ -81,7 +78,7 @@ def decorator(method: Callable[..., str]) -> Callable[..., str]:
     return decorator
 
 
-def _body_bytes(request: Request) -> bytes:
+def _body_bytes(request: "Request") -> bytes:
     """
     Return the body of a request as bytes.
     """
@@ -133,7 +130,7 @@ def __init__(
         path_pattern="/targets",
         http_methods={HTTPMethod.POST},
     )
-    def add_target(self, request: Request, context: Context) -> str:
+    def add_target(self, request: "Request", context: "Context") -> str:
         """
         Add a target.
 
@@ -210,7 +207,7 @@ def add_target(self, request: Request, context: Context) -> str:
         path_pattern=f"/targets/{_TARGET_ID_PATTERN}",
         http_methods={HTTPMethod.DELETE},
     )
-    def delete_target(self, request: Request, context: Context) -> str:
+    def delete_target(self, request: "Request", context: "Context") -> str:
         """
         Delete a target.
 
@@ -277,7 +274,7 @@ def delete_target(self, request: Request, context: Context) -> str:
         return body_json
 
     @route(path_pattern="/summary", http_methods={HTTPMethod.GET})
-    def database_summary(self, request: Request, context: Context) -> str:
+    def database_summary(self, request: "Request", context: "Context") -> str:
         """
         Get a database summary report.
 
@@ -343,7 +340,7 @@ def database_summary(self, request: Request, context: Context) -> str:
         return body_json
 
     @route(path_pattern="/targets", http_methods={HTTPMethod.GET})
-    def target_list(self, request: Request, context: Context) -> str:
+    def target_list(self, request: "Request", context: "Context") -> str:
         """
         Get a list of all targets.
 
@@ -403,7 +400,7 @@ def target_list(self, request: Request, context: Context) -> str:
         path_pattern=f"/targets/{_TARGET_ID_PATTERN}",
         http_methods={HTTPMethod.GET},
     )
-    def get_target(self, request: Request, context: Context) -> str:
+    def get_target(self, request: "Request", context: "Context") -> str:
         """
         Get details of a target.
 
@@ -471,7 +468,7 @@ def get_target(self, request: Request, context: Context) -> str:
         path_pattern=f"/duplicates/{_TARGET_ID_PATTERN}",
         http_methods={HTTPMethod.GET},
     )
-    def get_duplicates(self, request: Request, context: Context) -> str:
+    def get_duplicates(self, request: "Request", context: "Context") -> str:
         """
         Get targets which may be considered duplicates of a given target.
 
@@ -545,7 +542,7 @@ def get_duplicates(self, request: Request, context: Context) -> str:
         path_pattern=f"/targets/{_TARGET_ID_PATTERN}",
         http_methods={HTTPMethod.PUT},
     )
-    def update_target(self, request: Request, context: Context) -> str:
+    def update_target(self, request: "Request", context: "Context") -> str:
         """
         Update a target.
 
@@ -654,7 +651,7 @@ def update_target(self, request: Request, context: Context) -> str:
         path_pattern=f"/summary/{_TARGET_ID_PATTERN}",
         http_methods={HTTPMethod.GET},
     )
-    def target_summary(self, request: Request, context: Context) -> str:
+    def target_summary(self, request: "Request", context: "Context") -> str:
         """
         Get a summary report for a target.
 

src/mock_vws/_services_validators/__init__.py

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

src/mock_vws/_services_validators/auth_validators.py

@@ -2,21 +2,15 @@
 Authorization header validators to use in the mock.
 """
 
-from __future__ import annotations
-
 import logging
 from http import HTTPStatus
-from typing import TYPE_CHECKING
 
 from mock_vws._database_matchers import get_database_matching_server_keys
 from mock_vws._services_validators.exceptions import (
     AuthenticationFailureError,
     FailError,
 )
-
-if TYPE_CHECKING:
-    from mock_vws.database import VuforiaDatabase
-
+from mock_vws.database import VuforiaDatabase
 
 _LOGGER = logging.getLogger(name=__name__)
 

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