chore: | for union types since >=py310

Author: ceholden

src/stac_auth_proxy/middleware/AuthenticationExtensionMiddleware.py

@@ -3,7 +3,7 @@
 import logging
 import re
 from dataclasses import dataclass, field
-from typing import Any, Sequence, Union
+from typing import Any, Sequence
 from urllib.parse import urlparse
 
 from starlette.datastructures import Headers
@@ -35,8 +35,8 @@ class AuthenticationExtensionMiddleware(JsonResponseMiddleware):
         "https://stac-extensions.github.io/authentication/v1.1.0/schema.json"
     )
 
-    items_filter_path: Union[str, Sequence[str], None] = None
-    collections_filter_path: Union[str, Sequence[str], None] = None
+    items_filter_path: str | Sequence[str] | None = None
+    collections_filter_path: str | Sequence[str] | None = None
     root_path: str = ""
 
     json_content_type_expr: str = r"application/(geo\+)?json"

src/stac_auth_proxy/middleware/Cql2BuildFilterMiddleware.py

@@ -3,7 +3,7 @@
 import logging
 import re
 from dataclasses import dataclass
-from typing import Any, Awaitable, Callable, Optional, Sequence, Union
+from typing import Any, Awaitable, Callable, Optional, Sequence
 
 from cql2 import Expr, ValidationError
 from fastapi import HTTPException
@@ -32,11 +32,11 @@ class Cql2BuildFilterMiddleware:
 
     # Filters
     collections_filter: Optional[Callable] = None
-    collections_filter_path: Union[str, Sequence[str]] = (
+    collections_filter_path: str | Sequence[str] = (
         r"^/collections(?:/(?P<collection_id>[^/]+))?$",
     )
     items_filter: Optional[Callable] = None
-    items_filter_path: Union[str, Sequence[str]] = (
+    items_filter_path: str | Sequence[str] = (
         r"^(?:/collections/(?P<collection_id>[^/]+)/items(?:/(?P<item_id>[^/]+))?|/search)$",
     )
 

src/stac_auth_proxy/middleware/UpdateOpenApiMiddleware.py

@@ -2,7 +2,7 @@
 
 import re
 from dataclasses import dataclass
-from typing import Any, Optional, Sequence, Union
+from typing import Any, Optional, Sequence
 
 from starlette.datastructures import Headers
 from starlette.requests import Request
@@ -28,8 +28,8 @@ class OpenApiMiddleware(JsonResponseMiddleware):
     auth_scheme_name: str = "oidcAuth"
     auth_scheme_override: Optional[dict] = None
 
-    items_filter_path: Union[str, Sequence[str], None] = None
-    collections_filter_path: Union[str, Sequence[str], None] = None
+    items_filter_path: str | Sequence[str] | None = None
+    collections_filter_path: str | Sequence[str] | None = None
 
     json_content_type_expr: str = r"application/(vnd\.oai\.openapi\+json?|json)"
 

src/stac_auth_proxy/utils/requests.py

@@ -4,7 +4,7 @@
 import logging
 import re
 from dataclasses import dataclass, field
-from typing import Dict, Optional, Sequence, Union
+from typing import Dict, Optional, Sequence
 from urllib.parse import urlparse
 
 from starlette.requests import Request
@@ -26,7 +26,7 @@ def extract_variables(url: str) -> dict:
     return {k: v for k, v in match.groupdict().items() if v} if match else {}
 
 
-def as_patterns(value: Union[str, Sequence[str], None]) -> Sequence[str]:
+def as_patterns(value: str | Sequence[str] | None) -> Sequence[str]:
     """Normalize a filter path setting to a list of regex patterns."""
     if value is None:
         return []
@@ -63,8 +63,8 @@ def find_match(
     private_endpoints: EndpointMethods,
     public_endpoints: EndpointMethods,
     default_public: bool,
-    items_filter_path: Union[str, Sequence[str], None] = None,
-    collections_filter_path: Union[str, Sequence[str], None] = None,
+    items_filter_path: str | Sequence[str] | None = None,
+    collections_filter_path: str | Sequence[str] | None = None,
 ) -> "MatchResult":
     """Check if the given path and method match any of the regex patterns and methods in the endpoints."""
     primary_endpoints = private_endpoints if default_public else public_endpoints