zpdatafetch 2.2.6__tar.gz → 2.3.0__tar.gz

{zpdatafetch-2.2.6/src/zpdatafetch.egg-info → zpdatafetch-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zpdatafetch
-Version: 2.2.6
+Version: 2.3.0
 Summary: A package for fetching data from Zwiftpower and Zwiftracing.app
 Author-email: Doug Morris <doug@mhost.com>
 License-Expression: MIT
@@ -14,7 +14,7 @@ License-File: LICENSE
 Requires-Dist: anyio>=4.4.0
 Requires-Dist: beautifulsoup4>=4.12.3
 Requires-Dist: cryptography>=46.0.7
-Requires-Dist: httpx>=0.28.0
+Requires-Dist: httpx2>=2.9.1
 Requires-Dist: idna>=3.16
 Requires-Dist: keyring>=25.2.0
 Requires-Dist: keyrings-alt

{zpdatafetch-2.2.6 → zpdatafetch-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "zpdatafetch"
-version = "2.2.6"
+version = "2.3.0"
 description = "A package for fetching data from Zwiftpower and Zwiftracing.app"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -20,11 +20,9 @@ dependencies = [
   "anyio>=4.4.0",
   "beautifulsoup4>=4.12.3",
   "cryptography>=46.0.7",
-  # Note: httpx 0.28.0 depends on httpcore 1.1.x which has a compatibility
-  # issue with Python 3.14's typing.Union. This causes test failures on 3.14.
-  # Workaround: test_shared_client_connection_pooling is marked as xfail on 3.14.
-  # This will be resolved when httpx 0.29.0+ is released (depends on httpcore 1.2.0+).
-  "httpx>=0.28.0",
+  # httpx2: Pydantic's maintained continuation of httpx, built on httpcore2,
+  # which resolves the httpcore 1.1.x / Python 3.14 typing.Union issue.
+  "httpx2>=2.9.1",
   "idna>=3.16",
   "keyring>=25.2.0",
   "keyrings-alt",

{zpdatafetch-2.2.6 → zpdatafetch-2.3.0}/src/shared/http_client.py

@@ -15,7 +15,7 @@ from abc import ABC, abstractmethod
 from typing import Any
 
 import anyio
-import httpx
+import httpx2
 
 from shared.exceptions import NetworkError
 
@@ -25,21 +25,21 @@ from shared.exceptions import NetworkError
 
 
 def fetch_with_retry_sync(
-  client: httpx.Client,
+  client: httpx2.Client,
   url: str,
   method: str = 'GET',
   max_retries: int = 3,
   backoff_factor: float = 1.0,
   logger: logging.Logger | None = None,
   **kwargs: Any,
-) -> httpx.Response:
+) -> httpx2.Response:
   """Fetch URL with exponential backoff retry logic (sync variant).
 
   Retries on transient errors (connection errors, timeouts, 5xx errors)
   but not on client errors (4xx).
 
   Args:
-    client: httpx.Client instance
+    client: httpx2.Client instance
     url: URL to fetch
     method: HTTP method (default: 'GET')
     max_retries: Maximum number of retry attempts (default: 3)
@@ -48,7 +48,7 @@ def fetch_with_retry_sync(
     **kwargs: Additional arguments to pass to client.request()
 
   Returns:
-    httpx.Response: The successful response
+    httpx2.Response: The successful response
 
   Raises:
     NetworkError: If all retries are exhausted
@@ -64,7 +64,7 @@ def fetch_with_retry_sync(
       response = client.request(method, url, **kwargs)
       response.raise_for_status()
       return response
-    except (httpx.ConnectError, httpx.TimeoutException) as e:
+    except (httpx2.ConnectError, httpx2.TimeoutException) as e:
       last_exception = e
       if attempt == max_retries - 1:
         break
@@ -74,7 +74,7 @@ def fetch_with_retry_sync(
         f'Retrying in {wait_time:.1f}s...',
       )
       time.sleep(wait_time)
-    except httpx.HTTPStatusError as e:
+    except httpx2.HTTPStatusError as e:
       if 500 <= e.response.status_code < 600:
         last_exception = e
         if attempt == max_retries - 1:
@@ -88,7 +88,7 @@ def fetch_with_retry_sync(
       else:
         # Client errors (4xx) - don't retry, re-raise for caller to handle
         raise
-    except httpx.RequestError as e:
+    except httpx2.RequestError as e:
       last_exception = e
       if attempt == max_retries - 1:
         break
@@ -109,21 +109,21 @@ def fetch_with_retry_sync(
 
 
 async def fetch_with_retry_async(
-  client: httpx.AsyncClient,
+  client: httpx2.AsyncClient,
   url: str,
   method: str = 'GET',
   max_retries: int = 3,
   backoff_factor: float = 1.0,
   logger: logging.Logger | None = None,
   **kwargs: Any,
-) -> httpx.Response:
+) -> httpx2.Response:
   """Fetch URL with exponential backoff retry logic (async variant).
 
   Async version using anyio.sleep() for compatibility with both asyncio
   and trio.
 
   Args:
-    client: httpx.AsyncClient instance
+    client: httpx2.AsyncClient instance
     url: URL to fetch
     method: HTTP method (default: 'GET')
     max_retries: Maximum number of retry attempts (default: 3)
@@ -132,7 +132,7 @@ async def fetch_with_retry_async(
     **kwargs: Additional arguments to pass to client.request()
 
   Returns:
-    httpx.Response: The successful response
+    httpx2.Response: The successful response
 
   Raises:
     NetworkError: If all retries are exhausted
@@ -148,7 +148,7 @@ async def fetch_with_retry_async(
       response = await client.request(method, url, **kwargs)
       response.raise_for_status()
       return response
-    except (httpx.ConnectError, httpx.TimeoutException) as e:
+    except (httpx2.ConnectError, httpx2.TimeoutException) as e:
       last_exception = e
       if attempt == max_retries - 1:
         break
@@ -158,7 +158,7 @@ async def fetch_with_retry_async(
         f'Retrying in {wait_time:.1f}s...',
       )
       await anyio.sleep(wait_time)
-    except httpx.HTTPStatusError as e:
+    except httpx2.HTTPStatusError as e:
       if 500 <= e.response.status_code < 600:
         last_exception = e
         if attempt == max_retries - 1:
@@ -172,7 +172,7 @@ async def fetch_with_retry_async(
       else:
         # Client errors (4xx) - don't retry, re-raise for caller to handle
         raise
-    except httpx.RequestError as e:
+    except httpx2.RequestError as e:
       last_exception = e
       if attempt == max_retries - 1:
         break
@@ -204,8 +204,8 @@ class BaseHTTPClient(ABC):
   Subclasses implement hooks for package-specific behavior.
   """
 
-  _client: httpx.Client | None = None
-  _shared_client: httpx.Client | None = None
+  _client: httpx2.Client | None = None
+  _shared_client: httpx2.Client | None = None
   _owns_client: bool = False
 
   # ----------------------------------------------------------------------------
@@ -213,13 +213,13 @@ class BaseHTTPClient(ABC):
   # ----------------------------------------------------------------------------
 
   @abstractmethod
-  def _create_client(self) -> httpx.Client:
+  def _create_client(self) -> httpx2.Client:
     """Create and configure an HTTP client.
 
     Subclasses implement this to provide package-specific client configuration.
 
     Returns:
-      Configured httpx.Client instance
+      Configured httpx2.Client instance
     """
 
   def _before_request(
@@ -241,7 +241,7 @@ class BaseHTTPClient(ABC):
       **kwargs: Additional request parameters
     """
 
-  def _after_request(self, response: httpx.Response) -> None:
+  def _after_request(self, response: httpx2.Response) -> None:
     """Hook called after receiving a response.
 
     Default: no-op. Override in subclasses for post-response operations like:
@@ -266,7 +266,7 @@ class BaseHTTPClient(ABC):
   # SHARED IMPLEMENTATIONS
   # ----------------------------------------------------------------------------
 
-  def init_client(self, client: httpx.Client | None = None) -> None:
+  def init_client(self, client: httpx2.Client | None = None) -> None:
     """Initialize or replace the HTTP client.
 
     Three-way logic:
@@ -275,7 +275,7 @@ class BaseHTTPClient(ABC):
     3. Else create new client via _create_client()
 
     Args:
-      client: Optional httpx.Client instance to use
+      client: Optional httpx2.Client instance to use
     """
     if client:
       self._client = client
@@ -327,8 +327,8 @@ class AsyncBaseHTTPClient(ABC):
   Async version of BaseHTTPClient with same pattern but async methods.
   """
 
-  _client: httpx.AsyncClient | None = None
-  _shared_client: httpx.AsyncClient | None = None
+  _client: httpx2.AsyncClient | None = None
+  _shared_client: httpx2.AsyncClient | None = None
   _owns_client: bool = False
 
   # ----------------------------------------------------------------------------
@@ -336,11 +336,11 @@ class AsyncBaseHTTPClient(ABC):
   # ----------------------------------------------------------------------------
 
   @abstractmethod
-  async def _create_client(self) -> httpx.AsyncClient:
+  async def _create_client(self) -> httpx2.AsyncClient:
     """Create and configure an async HTTP client.
 
     Args:
-      Returns: Configured httpx.AsyncClient instance
+      Returns: Configured httpx2.AsyncClient instance
     """
 
   async def _before_request(
@@ -354,7 +354,7 @@ class AsyncBaseHTTPClient(ABC):
     Default: no-op. Override for pre-request operations.
     """
 
-  async def _after_request(self, response: httpx.Response) -> None:
+  async def _after_request(self, response: httpx2.Response) -> None:
     """Hook called after receiving a response.
 
     Default: no-op. Override for post-response operations.
@@ -370,7 +370,7 @@ class AsyncBaseHTTPClient(ABC):
   # SHARED IMPLEMENTATIONS
   # ----------------------------------------------------------------------------
 
-  async def init_client(self, client: httpx.AsyncClient | None = None) -> None:
+  async def init_client(self, client: httpx2.AsyncClient | None = None) -> None:
     """Initialize or replace the async HTTP client.
 
     Three-way logic:
@@ -379,7 +379,7 @@ class AsyncBaseHTTPClient(ABC):
     3. Else create new client via _create_client()
 
     Args:
-      client: Optional httpx.AsyncClient instance to use
+      client: Optional httpx2.AsyncClient instance to use
     """
     if client:
       self._client = client

{zpdatafetch-2.2.6 → zpdatafetch-2.3.0}/src/zdatafetch/activity.py

@@ -6,7 +6,7 @@ Provides access to activity history from Zwift's unofficial API.
 import json
 from typing import Any
 
-import httpx
+import httpx2
 
 from shared.exceptions import ConfigError, NetworkError
 from shared.json_helpers import parse_json_safe
@@ -110,7 +110,7 @@ class ZwiftActivity:
     params = {'start': start, 'limit': limit}
 
     try:
-      with httpx.Client() as client:
+      with httpx2.Client() as client:
         response = client.get(url, headers=headers, params=params, timeout=30.0)
 
         if response.status_code == 404:
@@ -130,11 +130,11 @@ class ZwiftActivity:
           f'Successfully fetched {len(self.activities)} activities for rider {rider_id}',
         )
 
-    except httpx.TimeoutException as e:
+    except httpx2.TimeoutException as e:
       raise NetworkError(
         f'Request timed out fetching activities for rider {rider_id}: {e}',
       ) from e
-    except httpx.HTTPError as e:
+    except httpx2.HTTPError as e:
       raise NetworkError(
         f'Network error fetching activities for rider {rider_id}: {e}',
       ) from e
@@ -188,7 +188,7 @@ class ZwiftActivity:
 
     # Fetch all activities
     results = {}
-    with httpx.Client() as client:
+    with httpx2.Client() as client:
       for rider_id in rider_ids:
         try:
           url = f'{cls.BASE_URL}/api/profiles/{rider_id}/activities/'

{zpdatafetch-2.2.6 → zpdatafetch-2.3.0}/src/zdatafetch/auth.py

@@ -7,7 +7,7 @@ token acquisition, storage, and automatic refresh.
 import time
 from typing import Any
 
-import httpx
+import httpx2
 
 from shared.exceptions import AuthenticationError, NetworkError
 from zdatafetch.logging_config import get_logger
@@ -75,7 +75,7 @@ class ZwiftAuth:
     }
 
     try:
-      with httpx.Client() as client:
+      with httpx2.Client() as client:
         response = client.post(self.AUTH_URL, data=data, timeout=30.0)
 
         if response.status_code == 401:
@@ -91,9 +91,9 @@ class ZwiftAuth:
         f'Authentication successful (token expires in {self.expires_in}s)',
       )
 
-    except httpx.TimeoutException as e:
+    except httpx2.TimeoutException as e:
       raise NetworkError(f'Authentication request timed out: {e}') from e
-    except httpx.HTTPError as e:
+    except httpx2.HTTPError as e:
       raise NetworkError(f'Authentication request failed: {e}') from e
 
   def _parse_token_response(self, token_data: dict[str, Any]) -> None:
@@ -162,7 +162,7 @@ class ZwiftAuth:
     }
 
     try:
-      with httpx.Client() as client:
+      with httpx2.Client() as client:
         response = client.post(self.AUTH_URL, data=data, timeout=30.0)
 
         if response.status_code == 401:
@@ -178,9 +178,9 @@ class ZwiftAuth:
 
       logger.debug('Token refreshed successfully')
 
-    except httpx.TimeoutException as e:
+    except httpx2.TimeoutException as e:
       raise NetworkError(f'Token refresh request timed out: {e}') from e
-    except httpx.HTTPError as e:
+    except httpx2.HTTPError as e:
       raise NetworkError(f'Token refresh request failed: {e}') from e
 
   def is_authenticated(self) -> bool:

{zpdatafetch-2.2.6 → zpdatafetch-2.3.0}/src/zdatafetch/followers.py

@@ -6,7 +6,7 @@ Provides access to follower/followee relationship data from Zwift's unofficial A
 import json
 from typing import Any
 
-import httpx
+import httpx2
 
 from shared.exceptions import ConfigError, NetworkError
 from shared.json_helpers import parse_json_safe
@@ -112,7 +112,7 @@ class ZwiftFollowers:
     raw_data = {}
 
     try:
-      with httpx.Client() as client:
+      with httpx2.Client() as client:
         # Fetch followers
         if include_followers:
           url = f'{self.BASE_URL}/api/profiles/{rider_id}/followers'
@@ -154,11 +154,11 @@ class ZwiftFollowers:
         self._raw = json.dumps(self._fetched, indent=2)
         logger.info(f'Successfully fetched follower data for rider {rider_id}')
 
-    except httpx.TimeoutException as e:
+    except httpx2.TimeoutException as e:
       raise NetworkError(
         f'Request timed out fetching follower data for rider {rider_id}: {e}',
       ) from e
-    except httpx.HTTPError as e:
+    except httpx2.HTTPError as e:
       raise NetworkError(
         f'Network error fetching follower data for rider {rider_id}: {e}',
       ) from e
@@ -218,7 +218,7 @@ class ZwiftFollowers:
 
     # Fetch all follower data
     results = {}
-    with httpx.Client() as client:
+    with httpx2.Client() as client:
       for rider_id in rider_ids:
         try:
           raw_data = {}

{zpdatafetch-2.2.6 → zpdatafetch-2.3.0}/src/zdatafetch/profile.py

@@ -7,7 +7,7 @@ including demographics, statistics, and connected services.
 import json
 from typing import Any
 
-import httpx
+import httpx2
 
 from shared.exceptions import ConfigError, NetworkError
 from shared.json_helpers import parse_json_safe
@@ -199,7 +199,7 @@ class ZwiftProfile:
     headers = {'Authorization': f'Bearer {token}', 'Accept': 'application/json'}
 
     try:
-      with httpx.Client() as client:
+      with httpx2.Client() as client:
         response = client.get(url, headers=headers, timeout=30.0)
 
         if response.status_code == 404:
@@ -217,11 +217,11 @@ class ZwiftProfile:
         self._parse_response()
         logger.info(f'Successfully fetched profile for rider {rider_id}')
 
-    except httpx.TimeoutException as e:
+    except httpx2.TimeoutException as e:
       raise NetworkError(
         f'Request timed out fetching profile for rider {rider_id}: {e}',
       ) from e
-    except httpx.HTTPError as e:
+    except httpx2.HTTPError as e:
       raise NetworkError(
         f'Network error fetching profile for rider {rider_id}: {e}',
       ) from e
@@ -268,7 +268,7 @@ class ZwiftProfile:
 
     # Fetch all profiles
     results = {}
-    with httpx.Client() as client:
+    with httpx2.Client() as client:
       for rider_id in rider_ids:
         try:
           url = f'{cls.BASE_URL}/api/profiles/{rider_id}'

{zpdatafetch-2.2.6 → zpdatafetch-2.3.0}/src/zdatafetch/rideons.py

@@ -7,7 +7,7 @@ fetching RideOns received on activities and giving RideOns.
 import json
 from typing import Any
 
-import httpx
+import httpx2
 
 from shared.exceptions import ConfigError, NetworkError
 from shared.json_helpers import parse_json_safe
@@ -109,7 +109,7 @@ class ZwiftRideOns:
     url = f'{self.BASE_URL}/api/profiles/{rider_id}/activities/{activity_id}/rideons'
 
     try:
-      with httpx.Client() as client:
+      with httpx2.Client() as client:
         response = client.get(url, headers=headers, timeout=30.0)
 
         if response.status_code == 404:
@@ -131,11 +131,11 @@ class ZwiftRideOns:
           f'Successfully fetched RideOns for activity {activity_id} (rider {rider_id})',
         )
 
-    except httpx.TimeoutException as e:
+    except httpx2.TimeoutException as e:
       raise NetworkError(
         f'Request timed out fetching RideOns for activity {activity_id}: {e}',
       ) from e
-    except httpx.HTTPError as e:
+    except httpx2.HTTPError as e:
       raise NetworkError(
         f'Network error fetching RideOns for activity {activity_id}: {e}',
       ) from e
@@ -187,7 +187,7 @@ class ZwiftRideOns:
 
     # Fetch all RideOns
     results = {}
-    with httpx.Client() as client:
+    with httpx2.Client() as client:
       for rider_id, activity_id in activity_tuples:
         try:
           url = f'{cls.BASE_URL}/api/profiles/{rider_id}/activities/{activity_id}/rideons'
@@ -261,7 +261,7 @@ class ZwiftRideOns:
     url = f'{ZwiftRideOns.BASE_URL}/api/profiles/{rider_id}/activities/{activity_id}/rideon'
 
     try:
-      with httpx.Client() as client:
+      with httpx2.Client() as client:
         response = client.post(url, headers=headers, timeout=30.0)
 
         if response.status_code in (200, 201, 204):
@@ -280,12 +280,12 @@ class ZwiftRideOns:
         )
         return False
 
-    except httpx.TimeoutException as e:
+    except httpx2.TimeoutException as e:
       logger.error(
         f'Request timed out giving RideOn to activity {activity_id}: {e}',
       )
       return False
-    except httpx.HTTPError as e:
+    except httpx2.HTTPError as e:
       logger.error(
         f'Network error giving RideOn to activity {activity_id}: {e}',
       )

{zpdatafetch-2.2.6 → zpdatafetch-2.3.0}/src/zdatafetch/ridersinworld.py

@@ -6,7 +6,7 @@ Provides access to riders currently in a specific world from Zwift's unofficial
 import json
 from typing import Any
 
-import httpx
+import httpx2
 
 from shared.exceptions import ConfigError, NetworkError
 from shared.json_helpers import parse_json_safe
@@ -99,7 +99,7 @@ class ZwiftRidersInWorld:
     url = f'{self.BASE_URL}/relay/worlds/{world_id}'
 
     try:
-      with httpx.Client() as client:
+      with httpx2.Client() as client:
         response = client.get(url, headers=headers, timeout=30.0)
 
         if response.status_code == 404:
@@ -119,11 +119,11 @@ class ZwiftRidersInWorld:
           f'Successfully fetched {len(self.riders)} riders in world {world_id}',
         )
 
-    except httpx.TimeoutException as e:
+    except httpx2.TimeoutException as e:
       raise NetworkError(
         f'Request timed out fetching riders for world {world_id}: {e}',
       ) from e
-    except httpx.HTTPError as e:
+    except httpx2.HTTPError as e:
       raise NetworkError(
         f'Network error fetching riders for world {world_id}: {e}',
       ) from e
@@ -195,7 +195,7 @@ class ZwiftRidersInWorld:
 
     # Fetch all riders
     results = {}
-    with httpx.Client() as client:
+    with httpx2.Client() as client:
       for world_id in world_ids:
         try:
           url = f'{cls.BASE_URL}/relay/worlds/{world_id}'

{zpdatafetch-2.2.6 → zpdatafetch-2.3.0}/src/zdatafetch/worlds.py

@@ -6,7 +6,7 @@ Provides access to active worlds from Zwift's unofficial API.
 import json
 from typing import Any
 
-import httpx
+import httpx2
 
 from shared.exceptions import ConfigError, NetworkError
 from shared.json_helpers import parse_json_safe
@@ -129,7 +129,7 @@ class ZwiftWorlds:
     url = f'{self.BASE_URL}/relay/worlds'
 
     try:
-      with httpx.Client() as client:
+      with httpx2.Client() as client:
         response = client.get(url, headers=headers, timeout=30.0)
 
         if response.status_code != 200:
@@ -144,9 +144,9 @@ class ZwiftWorlds:
         self._raw = json.dumps(self._fetched, indent=2)
         logger.info(f'Successfully fetched {len(self.worlds)} active worlds')
 
-    except httpx.TimeoutException as e:
+    except httpx2.TimeoutException as e:
       raise NetworkError(f'Request timed out fetching worlds: {e}') from e
-    except httpx.HTTPError as e:
+    except httpx2.HTTPError as e:
       raise NetworkError(f'Network error fetching worlds: {e}') from e
 
   def _parse_response(self, raw_json: str) -> None: