zpdatafetch 2.2.2__tar.gz → 2.2.4__tar.gz

{zpdatafetch-2.2.2/src/zpdatafetch.egg-info → zpdatafetch-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zpdatafetch
-Version: 2.2.2
+Version: 2.2.4
 Summary: A package for fetching data from Zwiftpower and Zwiftracing.app
 Author-email: Doug Morris <doug@mhost.com>
 License-Expression: MIT
@@ -18,6 +18,7 @@ Requires-Dist: httpx>=0.28.0
 Requires-Dist: keyring>=25.2.0
 Requires-Dist: keyrings-alt
 Requires-Dist: lxml>=5.4.0
+Requires-Dist: protobuf>=7.34.1
 Provides-Extra: async-full
 Requires-Dist: trio>=0.26.0; extra == "async-full"
 Provides-Extra: trio

{zpdatafetch-2.2.2 → zpdatafetch-2.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "zpdatafetch"
-version = "2.2.2"
+version = "2.2.4"
 description = "A package for fetching data from Zwiftpower and Zwiftracing.app"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -28,6 +28,7 @@ dependencies = [
   "keyring>=25.2.0",
   "keyrings-alt",
   "lxml>=5.4.0",
+  "protobuf>=7.34.1",
 ]
 
 [project.urls]
@@ -175,6 +176,7 @@ deps =
 """
 
 [tool.ty]
+
 # Python environment configuration
 [tool.ty.environment]
 python-version = "3.10"  # Minimum supported version

{zpdatafetch-2.2.2 → zpdatafetch-2.2.4}/src/zpdatafetch/zp_utils.py

@@ -214,6 +214,11 @@ def extract_value(value: Any, default: Any = None) -> Any:
 def extract_numeric(value: Any, type_func: type, default: Any) -> Any:
   """Extract and convert numeric value, handling array format.
 
+  String inputs have US-locale thousands separators (commas) stripped before
+  conversion, so values like ``'7,200.0'`` parse correctly. Decimal-comma
+  inputs (e.g. European ``'7,2'`` meaning 7.2) are not supported and will
+  fall back to ``default``.
+
   Args:
       value: Value that may be a list or scalar
       type_func: Type conversion function (int, float)
@@ -225,6 +230,8 @@ def extract_numeric(value: Any, type_func: type, default: Any) -> Any:
   extracted = extract_value(value, default)
   if extracted == default:
     return default
+  if isinstance(extracted, str):
+    extracted = extracted.replace(',', '')
   try:
     return type_func(extracted)
   except (ValueError, TypeError):

{zpdatafetch-2.2.2 → zpdatafetch-2.2.4}/src/zpdatafetch/zpcyclist.py

@@ -9,6 +9,7 @@ import json
 from dataclasses import dataclass, field
 from typing import Any
 
+from zpdatafetch.zp_utils import extract_numeric
 from zpdatafetch.zpracelog import ZPRacelog
 
 
@@ -206,11 +207,7 @@ class ZPCyclist:
         height = 0
 
       # Extract weight
-      weight_value = extract_value(last_race.get('weight', 0.0))
-      try:
-        weight = float(weight_value) if weight_value else 0.0
-      except (ValueError, TypeError):
-        weight = 0.0
+      weight = extract_numeric(last_race.get('weight'), float, 0.0)
 
       # Extract skill
       skill_value = extract_value(last_race.get('skill', 0.0))

{zpdatafetch-2.2.2 → zpdatafetch-2.2.4}/src/zpdatafetch/zpprime.py

@@ -16,6 +16,7 @@ from typing import Any, overload
 from zpdatafetch.zp_utils import (
   convert_gender,
   convert_msec_to_iso8601,
+  extract_numeric,
   set_rider_category,
 )
 
@@ -117,7 +118,7 @@ class ZPPrimeResult:
       elapsed=float(data.get('elapsed', 0.0)),
       elapsed_diff=float(data.get('elapsed_diff', 0.0)),
       zftp=int(data.get('ftp', 0)) if data.get('ftp') else 0,
-      weight=float(data.get('w', 0.0)) if data.get('w') else 0.0,
+      weight=extract_numeric(data.get('w'), float, 0.0),
       age=str(data.get('age', '')),
       gender=convert_gender(data.get('gender', '')),
       flag=str(data.get('flag', '')),

{zpdatafetch-2.2.2 → zpdatafetch-2.2.4}/src/zpdatafetch/zpracefinish.py

@@ -294,6 +294,9 @@ class ZPRaceFinish:
         return default
       # Extract from array if needed
       value = extract_array_value(value)
+      # Strip US thousands separators from string inputs (e.g. '7,200.0').
+      if isinstance(value, str) and field_type in (int, float):
+        value = value.replace(',', '')
       try:
         return field_type(value) if value is not None else default
       except (ValueError, TypeError):

{zpdatafetch-2.2.2 → zpdatafetch-2.2.4}/src/zpdatafetch/zpracesignup.py

@@ -7,6 +7,7 @@ from typing import Any
 from zpdatafetch.zp_utils import (
   convert_gender,
   convert_label_to_pen,
+  extract_numeric,
   extract_value,
   set_rider_category,
 )
@@ -284,8 +285,7 @@ class ZPRiderSignup:
       int(extract_value(height_raw, 0)) if extract_value(height_raw, 0) else 0
     )
 
-    weight_raw = data.get('weight', 0)
-    weight = float(extract_value(weight_raw, 0))
+    weight = extract_numeric(data.get('weight'), float, 0.0)
 
     # Category with division mapping (div: 0/5/10/20/30/40 -> empty/A+/A/B/C/D)
     category = ''

{zpdatafetch-2.2.2 → zpdatafetch-2.2.4}/src/zpdatafetch/zpracesprint.py

@@ -12,6 +12,7 @@ from typing import Any
 from zpdatafetch.zp_utils import (
   convert_gender,
   convert_label_to_pen,
+  extract_numeric,
   extract_value,
 )
 
@@ -170,8 +171,7 @@ class ZPRiderSprint:
     height_val = extract_value(data.get('height', 0), 0)
     height = int(height_val) if height_val else 0
 
-    weight_val = extract_value(data.get('weight', 0), 0)
-    weight = float(weight_val) if weight_val else 0.0
+    weight = extract_numeric(data.get('weight'), float, 0.0)
 
     # Category
     category = str(data.get('category', ''))

{zpdatafetch-2.2.2 → zpdatafetch-2.2.4}/src/zpdatafetch/zpteam.py

@@ -11,6 +11,7 @@ from typing import Any
 
 from zpdatafetch.zp_utils import (
   convert_gender,
+  extract_numeric,
   extract_value,
   format_time_hms,
   set_rider_category,
@@ -164,9 +165,8 @@ class ZPTeamMember:
     gender = convert_gender(data.get('gender', ''))
     flag = str(data.get('flag', ''))
 
-    # Weight from array format or direct value (using extract_value utility)
-    weight_val = extract_value(data.get('w', 0), 0)
-    weight = float(weight_val) if weight_val else 0.0
+    # Weight from array format or direct value
+    weight = extract_numeric(data.get('w'), float, 0.0)
 
     # FTP from array format or direct value (using extract_value utility)
     ftp_val = extract_value(data.get('ftp', 0), 0)

{zpdatafetch-2.2.2 → zpdatafetch-2.2.4/src/zpdatafetch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zpdatafetch
-Version: 2.2.2
+Version: 2.2.4
 Summary: A package for fetching data from Zwiftpower and Zwiftracing.app
 Author-email: Doug Morris <doug@mhost.com>
 License-Expression: MIT
@@ -18,6 +18,7 @@ Requires-Dist: httpx>=0.28.0
 Requires-Dist: keyring>=25.2.0
 Requires-Dist: keyrings-alt
 Requires-Dist: lxml>=5.4.0
+Requires-Dist: protobuf>=7.34.1
 Provides-Extra: async-full
 Requires-Dist: trio>=0.26.0; extra == "async-full"
 Provides-Extra: trio

{zpdatafetch-2.2.2 → zpdatafetch-2.2.4}/src/zpdatafetch.egg-info/requires.txt

@@ -5,6 +5,7 @@ httpx>=0.28.0
 keyring>=25.2.0
 keyrings-alt
 lxml>=5.4.0
+protobuf>=7.34.1
 
 [async-full]
 trio>=0.26.0

{zpdatafetch-2.2.2 → zpdatafetch-2.2.4}/src/zrdatafetch/zr_utils.py

@@ -11,6 +11,9 @@ from typing import Any
 def safe_int(value: Any, default: int = 0) -> int:  # noqa: ANN401
   """Safely convert value to integer.
 
+  String inputs have US-locale thousands separators (commas) stripped before
+  conversion, so values like ``'7,200'`` parse correctly.
+
   Args:
     value: Value to convert
     default: Default value if conversion fails (default: 0)
@@ -20,6 +23,8 @@ def safe_int(value: Any, default: int = 0) -> int:  # noqa: ANN401
   """
   if value is None:
     return default
+  if isinstance(value, str):
+    value = value.replace(',', '')
   try:
     return int(value)
   except (ValueError, TypeError):
@@ -29,6 +34,11 @@ def safe_int(value: Any, default: int = 0) -> int:  # noqa: ANN401
 def safe_float(value: Any, default: float = 0.0) -> float:  # noqa: ANN401
   """Safely convert value to float.
 
+  String inputs have US-locale thousands separators (commas) stripped before
+  conversion, so values like ``'7,200.0'`` parse correctly. Decimal-comma
+  inputs (e.g. European ``'7,2'`` meaning 7.2) are not supported and will
+  fall back to ``default``.
+
   Args:
     value: Value to convert
     default: Default value if conversion fails (default: 0.0)
@@ -38,6 +48,8 @@ def safe_float(value: Any, default: float = 0.0) -> float:  # noqa: ANN401
   """
   if value is None:
     return default
+  if isinstance(value, str):
+    value = value.replace(',', '')
   try:
     return float(value)
   except (ValueError, TypeError):