Merge pull request #2260 from VWS-Python/supports-float

Use SupportsFloat to allow ints for some fields

Author: adamtheturtle

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 flask import Flask, Response, request
@@ -66,7 +67,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/_requests_mock_server/decorators.py

@@ -4,7 +4,7 @@
 
 import re
 from contextlib import ContextDecorator
-from typing import Literal, Self
+from typing import Literal, Self, SupportsFloat
 from urllib.parse import urljoin, urlparse
 
 import requests
@@ -39,7 +39,7 @@ def __init__(
         base_vwq_url: str = "https://cloudreco.vuforia.com",
         duplicate_match_checker: ImageMatcher = _STRUCTURAL_SIMILARITY_MATCHER,
         query_match_checker: ImageMatcher = _STRUCTURAL_SIMILARITY_MATCHER,
-        processing_time_seconds: float = 2,
+        processing_time_seconds: SupportsFloat = 2,
         target_tracking_rater: TargetTrackingRater = _BRISQUE_TRACKING_RATER,
         *,
         real_http: bool = False,

src/mock_vws/_requests_mock_server/mock_web_services_api.py

@@ -12,7 +12,7 @@
 import uuid
 from collections.abc import Callable
 from http import HTTPMethod, HTTPStatus
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, SupportsFloat
 from zoneinfo import ZoneInfo
 
 from mock_vws._constants import ResultCodes, TargetStatuses
@@ -103,7 +103,7 @@ def __init__(
         self,
         *,
         target_manager: TargetManager,
-        processing_time_seconds: float,
+        processing_time_seconds: SupportsFloat,
         duplicate_match_checker: ImageMatcher,
         target_tracking_rater: TargetTrackingRater,
     ) -> None:

src/mock_vws/target.py

@@ -8,7 +8,7 @@
 import statistics
 import uuid
 from dataclasses import dataclass, field
-from typing import Self, TypedDict
+from typing import Self, SupportsFloat, TypedDict
 from zoneinfo import ZoneInfo
 
 from PIL import Image, ImageStat
@@ -29,7 +29,7 @@ class TargetDict(TypedDict):
     width: float
     image_base64: str
     active_flag: bool
-    processing_time_seconds: int | float
+    processing_time_seconds: SupportsFloat
     application_metadata: str | None
     target_id: str
     last_modified_date: str
@@ -64,7 +64,7 @@ class Target:
     application_metadata: str | None
     image_value: bytes
     name: str
-    processing_time_seconds: float
+    processing_time_seconds: SupportsFloat
     width: float
     target_tracking_rater: TargetTrackingRater = field(compare=False)
     current_month_recos: int = 0
@@ -112,7 +112,7 @@ def status(self) -> str:
         target is for detection.
         """
         processing_time = datetime.timedelta(
-            seconds=self.processing_time_seconds,
+            seconds=float(self.processing_time_seconds),
         )
 
         timezone = self.upload_date.tzinfo
@@ -137,7 +137,7 @@ def tracking_rating(self) -> int:
         pre_rating_time = datetime.timedelta(
             # That this is half of the total processing time is unrealistic.
             # In VWS it is not a constant percentage.
-            seconds=self.processing_time_seconds / 2,
+            seconds=float(self.processing_time_seconds) / 2,
         )
 
         timezone = self.upload_date.tzinfo