Fix ruff lint errors for Python 3.11+ target

Replace Optional[X] with X | None (UP045) and add strict=True
to zip() call (B905), as required by ruff with target-version py311.

Author: lukekim

spicepy/_client.py

@@ -3,7 +3,7 @@
 import platform
 import threading
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 import certifi
 import pyarrow as pa
@@ -54,8 +54,8 @@ class _ADBCClient:
     def __init__(
         self,
         uri: str,
-        api_key: Optional[str] = None,
-        user_agent: Optional[str] = None,
+        api_key: str | None = None,
+        user_agent: str | None = None,
     ):
         if not ADBC_AVAILABLE:
             raise ImportError(
@@ -120,7 +120,7 @@ def _create_param_batch(
 
         # Create parameter arrays (each with a single row)
         param_arrays = []
-        for value, arrow_type in zip(param_values, param_types):
+        for value, arrow_type in zip(param_values, param_types, strict=True):
             param_arrays.append(pa.array([value], type=arrow_type))
 
         # Create parameter schema with positional field names ($1, $2, etc.)
@@ -268,19 +268,19 @@ class Client:
     # pylint: disable=R0917
     def __init__(
         self,
-        api_key: Optional[str] = None,
+        api_key: str | None = None,
         flight_url: str = config.DEFAULT_LOCAL_FLIGHT_URL,
         http_url: str = config.DEFAULT_HTTP_URL,
-        tls_root_cert: Union[str, Path, None] = None,
-        user_agent: Optional[str] = None,
+        tls_root_cert: str | Path | None = None,
+        user_agent: str | None = None,
     ):  # pylint: disable=R0913
         tls_root_certs = _Cert(tls_root_cert).tls_root_certs
         self._flight = _SpiceFlight(flight_url, api_key or "", tls_root_certs, user_agent)
 
         self.api_key = api_key
         self._flight_url = flight_url
         self._user_agent = user_agent
-        self._adbc_client: Optional[_ADBCClient] = None
+        self._adbc_client: _ADBCClient | None = None
         self.http = HttpRequests(http_url, self._headers(user_agent))
 
     def _headers(self, user_agent=None) -> dict[str, str]:
@@ -373,7 +373,7 @@ def query_with_params(
         adbc = self._ensure_adbc_client()
         return adbc.query_with_params(sql, params)
 
-    def refresh_dataset(self, dataset: str, refresh_opts: Optional[RefreshOpts] = None) -> Any:
+    def refresh_dataset(self, dataset: str, refresh_opts: RefreshOpts | None = None) -> Any:
         response = self.http.send_request(
             "POST",
             f"/v1/datasets/{dataset}/acceleration/refresh",

spicepy/_http.py

@@ -1,6 +1,7 @@
 import datetime
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any, Callable, Literal, Optional
+from typing import Any, Literal
 
 from requests import Response, Session
 from requests.adapters import HTTPAdapter, Retry
@@ -11,9 +12,9 @@
 
 @dataclass
 class RefreshOpts:
-    refresh_sql: Optional[str] = None
-    refresh_mode: Optional[str] = None
-    refresh_jitter_max: Optional[str] = None
+    refresh_sql: str | None = None
+    refresh_mode: str | None = None
+    refresh_jitter_max: str | None = None
 
     def to_dict(self) -> dict[str, Any]:
         return {
@@ -42,9 +43,9 @@ def send_request(
         self,
         method: HttpMethod,
         path: str,
-        param: Optional[dict[str, Any]] = None,
-        headers: Optional[dict[str, Any]] = None,
-        body: Optional[str] = None,
+        param: dict[str, Any] | None = None,
+        headers: dict[str, Any] | None = None,
+        body: str | None = None,
     ) -> Any:
         if headers is None:
             headers = {}

spicepy/config.py

@@ -1,7 +1,6 @@
 import os
 import platform
 from importlib.metadata import version
-from typing import Optional
 
 
 DEFAULT_FLIGHT_URL = os.environ.get("SPICE_FLIGHT_URL", "grpc+tls://flight.spiceai.io")
@@ -20,7 +19,7 @@
 #   Default is the system information of the current system, e.g. `Linux/5.4.0-1043-aws x86_64`.
 ###
 def get_user_agent(
-    client_name: Optional[str] = None, client_version: Optional[str] = None, client_system: Optional[str] = None
+    client_name: str | None = None, client_version: str | None = None, client_system: str | None = None
 ) -> str:
     package_version = version("spicepy") if client_version is None else client_version
     system = platform.system()