Progress towards using all new annotations

Author: adamtheturtle

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.9]
         platform: [ubuntu-latest]
 
     runs-on: ${{ matrix.platform }}

src/vws/query.py

@@ -6,7 +6,6 @@
 
 import datetime
 import io
-from typing import Optional
 from urllib.parse import urljoin
 
 import requests
@@ -158,7 +157,7 @@ def query(
         result = []
         result_list = list(response.json()['results'])
         for item in result_list:
-            target_data: Optional[TargetData] = None
+            target_data: TargetData | None = None
             if 'target_data' in item:
                 target_data_dict = item['target_data']
                 metadata = target_data_dict['application_metadata']

src/vws/reports.py

@@ -87,7 +87,7 @@ class TargetData:
     """
 
     name: str
-    application_metadata: Optional[str]
+    application_metadata: str | None
     target_timestamp: datetime.datetime
 
 
@@ -101,7 +101,7 @@ class QueryResult:
     """
 
     target_id: str
-    target_data: Optional[TargetData]
+    target_data: TargetData | None
 
 
 @dataclass

src/vws/vws.py

@@ -199,10 +199,10 @@ def _make_request(
     def add_target(
         self,
         name: str,
-        width: Union[int, float],
+        width: int | float,
         image: io.BytesIO,
         active_flag: bool,
-        application_metadata: Optional[str],
+        application_metadata: str | None,
     ) -> str:
         """
         Add a target to a Vuforia Web Services database.
@@ -357,7 +357,7 @@ def wait_for_target_processed(
         self,
         target_id: str,
         seconds_between_requests: float = 0.2,
-        timeout_seconds: Optional[float] = 60 * 5,
+        timeout_seconds: float | None = 60 * 5,
     ) -> None:
         """
         Wait up to five minutes (arbitrary) for a target to get past the
@@ -584,11 +584,11 @@ def get_duplicate_targets(self, target_id: str) -> list[str]:
     def update_target(
         self,
         target_id: str,
-        name: Optional[str] = None,
-        width: Optional[Union[int, float]] = None,
-        image: Optional[io.BytesIO] = None,
-        active_flag: Optional[bool] = None,
-        application_metadata: Optional[str] = None,
+        name: str | None = None,
+        width: int | float | None = None,
+        image: io.BytesIO | None = None,
+        active_flag: bool | None = None,
+        application_metadata: str | None = None,
     ) -> None:
         """
         Add a target to a Vuforia Web Services database.
@@ -631,7 +631,7 @@ def update_target(
             ~vws.exceptions.vws_exceptions.RequestTimeTooSkewed: There is an
                 error with the time sent to Vuforia.
         """
-        data: Dict[str, Union[str, bool, float, int]] = {}
+        data: Dict[str, str | bool | float| int] = {}
 
         if name is not None:
             data['name'] = name

tests/test_vws.py

@@ -36,7 +36,7 @@ def test_add_target(
         vws_client: VWS,
         high_quality_image: io.BytesIO,
         active_flag: bool,
-        application_metadata: Optional[bytes],
+        application_metadata: bytes | None,
         cloud_reco_client: CloudRecoService,
     ) -> None:
         """