zpdatafetch 2.3.1__tar.gz → 2.4.0__tar.gz

{zpdatafetch-2.3.1/src/zpdatafetch.egg-info → zpdatafetch-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zpdatafetch
-Version: 2.3.1
+Version: 2.4.0
 Summary: A package for fetching data from Zwiftpower and Zwiftracing.app
 Author-email: Doug Morris <doug@mhost.com>
 License-Expression: MIT
@@ -77,7 +77,7 @@ required).
 - **Primes** - Prime results for Fastest Through Segment (FTS) and First Across the Line (FAL)
 - **Sprints** - Sprint data including sprint details and positions
 - **Team data** - Team rosters and member information
-- **League data** - League standings and Zwift Racing Score (ZRS) information
+- **League data** - League standings, events, team standings, and league metadata (name, categories, contact)
 
 ### For zrdata (Zwiftracing)
 
@@ -312,7 +312,25 @@ available classes are as follows:
 - Signup: fetch signups for a particular event by event id
 - Sprints: fetch sprints from one or more races using event id
 - Team: fetch team data by team id
-- League: fetch league standings by league id
+- League: fetch league standings, events, team standings, team-event results and metadata by league id
+
+**League data example:**
+
+```python
+from zpdatafetch import ZPLeagueFetch
+
+lf = ZPLeagueFetch()
+league = lf.fetch(3379)[3379]
+
+league.info()                 # ZPLeagueInfo: name, contact, categories, ...
+league.events()               # list[ZPLeagueEvent]: event_id, title, start_datetime
+league.team_standings()       # list[ZPLeagueTeamStanding]
+league.team_event_results()   # list[ZPLeagueTeamEventResult]
+print(league.json())          # all collections as JSON (keys omitted when empty)
+```
+
+Each source is fetched independently: a league without a standings file (e.g.
+3388) still returns its events and metadata, and vice versa.
 
 ## Zwiftracing Data (zrdata)
 
@@ -704,7 +722,8 @@ status = ZRRider().rate_limiter.get_status() if hasattr(ZRRider(), 'rate_limiter
 
 #### Async Rate Limiting
 
-Async operations also respect rate limits with automatic throttling:
+Async operations also respect rate limits with automatic throttling. As with
+the sync API, the tier can be set globally and per call:
 
 ```python
 import anyio
@@ -717,12 +736,23 @@ async def main():
         rider.set_session(zr)
         await rider.fetch(12345)  # Auto-throttled to standard limits
 
-    # Premium tier
-    async with AsyncZR_obj(premium=True) as zr:
+    # Premium tier - set globally (applies to existing and new instances)
+    AsyncZR_obj.set_premium_mode(True)
+    async with AsyncZR_obj() as zr:
         rider = AsyncZRRider()
         rider.set_session(zr)
         await rider.fetch(12345)  # Auto-throttled to premium limits
 
+    # Premium tier - per call
+    async with AsyncZR_obj() as zr:
+        await zr.fetch_json('/public/riders/12345', premium=True)
+
+    # Premium tier - per instance
+    async with AsyncZR_obj(premium=True) as zr:
+        rider = AsyncZRRider()
+        rider.set_session(zr)
+        await rider.fetch(12345)
+
 anyio.run(main)
 ```
 

{zpdatafetch-2.3.1 → zpdatafetch-2.4.0}/README.md

@@ -48,7 +48,7 @@ required).
 - **Primes** - Prime results for Fastest Through Segment (FTS) and First Across the Line (FAL)
 - **Sprints** - Sprint data including sprint details and positions
 - **Team data** - Team rosters and member information
-- **League data** - League standings and Zwift Racing Score (ZRS) information
+- **League data** - League standings, events, team standings, and league metadata (name, categories, contact)
 
 ### For zrdata (Zwiftracing)
 
@@ -283,7 +283,25 @@ available classes are as follows:
 - Signup: fetch signups for a particular event by event id
 - Sprints: fetch sprints from one or more races using event id
 - Team: fetch team data by team id
-- League: fetch league standings by league id
+- League: fetch league standings, events, team standings, team-event results and metadata by league id
+
+**League data example:**
+
+```python
+from zpdatafetch import ZPLeagueFetch
+
+lf = ZPLeagueFetch()
+league = lf.fetch(3379)[3379]
+
+league.info()                 # ZPLeagueInfo: name, contact, categories, ...
+league.events()               # list[ZPLeagueEvent]: event_id, title, start_datetime
+league.team_standings()       # list[ZPLeagueTeamStanding]
+league.team_event_results()   # list[ZPLeagueTeamEventResult]
+print(league.json())          # all collections as JSON (keys omitted when empty)
+```
+
+Each source is fetched independently: a league without a standings file (e.g.
+3388) still returns its events and metadata, and vice versa.
 
 ## Zwiftracing Data (zrdata)
 
@@ -675,7 +693,8 @@ status = ZRRider().rate_limiter.get_status() if hasattr(ZRRider(), 'rate_limiter
 
 #### Async Rate Limiting
 
-Async operations also respect rate limits with automatic throttling:
+Async operations also respect rate limits with automatic throttling. As with
+the sync API, the tier can be set globally and per call:
 
 ```python
 import anyio
@@ -688,12 +707,23 @@ async def main():
         rider.set_session(zr)
         await rider.fetch(12345)  # Auto-throttled to standard limits
 
-    # Premium tier
-    async with AsyncZR_obj(premium=True) as zr:
+    # Premium tier - set globally (applies to existing and new instances)
+    AsyncZR_obj.set_premium_mode(True)
+    async with AsyncZR_obj() as zr:
         rider = AsyncZRRider()
         rider.set_session(zr)
         await rider.fetch(12345)  # Auto-throttled to premium limits
 
+    # Premium tier - per call
+    async with AsyncZR_obj() as zr:
+        await zr.fetch_json('/public/riders/12345', premium=True)
+
+    # Premium tier - per instance
+    async with AsyncZR_obj(premium=True) as zr:
+        rider = AsyncZRRider()
+        rider.set_session(zr)
+        await rider.fetch(12345)
+
 anyio.run(main)
 ```
 

{zpdatafetch-2.3.1 → zpdatafetch-2.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "zpdatafetch"
-version = "2.3.1"
+version = "2.4.0"
 description = "A package for fetching data from Zwiftpower and Zwiftracing.app"
 readme = "README.md"
 requires-python = ">=3.10"

{zpdatafetch-2.3.1 → zpdatafetch-2.4.0}/src/zpdatafetch/cli.py

@@ -32,6 +32,35 @@ from zpdatafetch import (
 from zpdatafetch.logging_config import setup_logging
 
 
+# ==============================================================================
+def _league_raw_sources(obj: object) -> list[tuple[int, str, str]]:
+  """Return (league_id, source_label, raw_text) for a league fetch.
+
+  Empty for non-league fetches. Lets `--raw` print every fetched league
+  source instead of only the standings raw text.
+
+  Args:
+    obj: A fetched data object
+
+  Returns:
+    List of tuples, one per available source per league
+  """
+  if not hasattr(obj, '_events_raw'):
+    return []
+  sources = (
+    ('standings', getattr(obj, '_raw', {})),
+    ('team_standings', getattr(obj, '_team_standings_raw', {})),
+    ('team_event_results', getattr(obj, '_team_event_results_raw', {})),
+    ('events', getattr(obj, '_events_raw', {})),
+  )
+  out: list[tuple[int, str, str]] = []
+  for lid in getattr(obj, '_fetched', {}):
+    for label, raws in sources:
+      if isinstance(raws, dict) and lid in raws:
+        out.append((lid, label, raws[lid]))
+  return out
+
+
 # ==============================================================================
 def main() -> int | None:
   """Main entry point for the zpdatafetch CLI.
@@ -292,7 +321,12 @@ Module for fetching zwiftpower data using the Zwifpower API
 
   if args.raw:
     # Output raw response text
-    if len(x._raw) == 1:
+    league_raw_sources = _league_raw_sources(x)
+    if league_raw_sources:
+      # League: print the raw text of every source that was fetched
+      for lid, label, raw_text in league_raw_sources:
+        print(f'{lid} {label}: {raw_text}')
+    elif len(x._raw) == 1:
       # Single ID: print just the raw string
       print(list(x._raw.values())[0])
     else:
@@ -358,6 +392,30 @@ Module for fetching zwiftpower data using the Zwifpower API
           except (TypeError, AttributeError):
             pass
 
+      # Nested collections on structured objects (e.g. ZPLeague)
+      nested: list[Any] = []
+      if hasattr(value, 'info'):
+        nested_info = getattr(value, 'info')()
+        if nested_info is not None:
+          nested.append(nested_info)
+      for accessor in ('team_standings', 'team_event_results', 'events'):
+        if hasattr(value, accessor):
+          nested.extend(getattr(value, accessor)())
+
+      for nested_item in nested:
+        if args.excluded and hasattr(nested_item, 'excluded'):
+          nested_excluded = nested_item.excluded()
+          if nested_excluded:
+            print(f'  {nested_item!r}')
+            print(f'    excluded: {nested_excluded}')
+            has_excluded = True
+        if args.extras and hasattr(nested_item, 'extras'):
+          nested_extras = nested_item.extras()
+          if nested_extras:
+            print(f'  {nested_item!r}')
+            print(f'    extras: {nested_extras}')
+            has_extras = True
+
       # Show appropriate "no data" messages for each requested flag
       if args.excluded and not has_excluded:
         print('  No excluded')
@@ -407,6 +465,27 @@ Module for fetching zwiftpower data using the Zwifpower API
         # Not a collection, print on same line
         print(f' {value!r}')
 
+      # Structured objects (e.g. ZPLeague) with nested collections that are
+      # not part of their Sequence iteration.
+      league_info = (
+        getattr(value, 'info')() if hasattr(value, 'info') else None
+      )
+      if league_info is not None:
+        print(f'  league_info: {league_info!r}')
+      for label, accessor in (
+        ('team_standings', 'team_standings'),
+        ('team_event_results', 'team_event_results'),
+        ('events', 'events'),
+      ):
+        if not hasattr(value, accessor):
+          continue
+        nested_items = getattr(value, accessor)()
+        if not nested_items:
+          continue
+        print(f'  {label}:')
+        for nested_item in nested_items:
+          print_collection(nested_item, indent=2)
+
   return None