Adjustment based on CodeRabbit

Author: nickknissen

README.md

@@ -3,7 +3,7 @@
 The Garmin Connect API library comes with two examples:
 
 - **`example.py`** - Simple getting-started example showing authentication, token storage, and basic API calls
-- **`demo.py`** - Comprehensive demo providing access to **100+ API methods** organized into **11 categories** for easy navigation
+- **`demo.py`** - Comprehensive demo providing access to **100+ API methods** organized into **12 categories** for easy navigation
 
 Note: The demo menu is generated dynamically; exact options may change between releases.
 
@@ -24,7 +24,7 @@ Select a category:
   [9] 🎽 Gear & Equipment
   [0] 💧 Hydration & Wellness
   [a] 🔧 System & Export
-  [b] 📅 Training plans 
+  [b] 📅 Training plans
 
   [q] Exit program
 

demo.py

@@ -1771,32 +1771,60 @@ def get_activity_exercise_sets_data(api: Garmin) -> None:
 
 
 def get_training_plan_by_id_data(api: Garmin) -> None:
-    """Get training plan by ID. adaptive plans are not supported. use get_adaptive_training_plan_by_id instead"""
-    try:
-        training_plans = api.get_training_plans()["trainingPlanList"]
-        if training_plans:
-            plan_id = training_plans[-1]["trainingPlanId"]
-            plan_name = training_plans[-1]["name"]
-            plan_category = training_plans[-1]["trainingPlanCategory"]
+    """Get training plan details by ID (routes FBT_ADAPTIVE plans to the adaptive endpoint)."""
+    resp = api.get_training_plans() or {}
+    training_plans = resp.get("trainingPlanList") or []
+    if not training_plans:
+        print("ℹ️ No training plans found")
+        return
 
-            if plan_category == "FBT_ADAPTIVE":
-                call_and_display(
-                    api.get_adaptive_training_plan_by_id,
-                    plan_id,
-                    method_name="get_adaptive_training_plan_by_id",
-                    api_call_desc=f"api.get_adaptive_training_plan_by_id({plan_id}) - {plan_name}",
+    user_input = input("Enter training plan ID (press Enter for most recent): ").strip()
+    selected = None
+    if user_input:
+        try:
+            wanted_id = int(user_input)
+            selected = next(
+                (
+                    p
+                    for p in training_plans
+                    if int(p.get("trainingPlanId", 0)) == wanted_id
+                ),
+                None,
+            )
+            if not selected:
+                print(
+                    f"ℹ️ Plan ID {wanted_id} not found in your plans; attempting fetch anyway"
                 )
+                plan_id = wanted_id
+                plan_name = f"Plan {wanted_id}"
+                plan_category = None
             else:
-                call_and_display(
-                    api.get_training_plan_by_id,
-                    plan_id,
-                    method_name="get_training_plan_by_id",
-                    api_call_desc=f"api.get_training_plan_by_id({plan_id}) - {plan_name}",
-                )
-        else:
-            print("ℹ️ No training plans found")
-    except Exception as e:
-        print(f"❌ Error getting plan by ID: {e}")
+                plan_id = int(selected["trainingPlanId"])
+                plan_name = selected.get("name", str(plan_id))
+                plan_category = selected.get("trainingPlanCategory")
+        except ValueError:
+            print("❌ Invalid plan ID")
+            return
+    else:
+        selected = training_plans[-1]
+        plan_id = int(selected["trainingPlanId"])
+        plan_name = selected.get("name", str(plan_id))
+        plan_category = selected.get("trainingPlanCategory")
+
+    if plan_category == "FBT_ADAPTIVE":
+        call_and_display(
+            api.get_adaptive_training_plan_by_id,
+            plan_id,
+            method_name="get_adaptive_training_plan_by_id",
+            api_call_desc=f"api.get_adaptive_training_plan_by_id({plan_id}) - {plan_name}",
+        )
+    else:
+        call_and_display(
+            api.get_training_plan_by_id,
+            plan_id,
+            method_name="get_training_plan_by_id",
+            api_call_desc=f"api.get_training_plan_by_id({plan_id}) - {plan_name}",
+        )
 
 
 def get_workout_by_id_data(api: Garmin) -> None:

garminconnect/__init__.py

@@ -266,7 +266,7 @@ def __init__(
 
         self.garmin_graphql_endpoint = "graphql-gateway/graphql"
 
-        self.garmin_training_plan_url = "/trainingplan-service/trainingplan"
+        self.garmin_connect_training_plan_url = "/trainingplan-service/trainingplan"
 
         self.garth = garth.Client(
             domain="garmin.cn" if is_cn else "garmin.com",
@@ -2168,7 +2168,7 @@ def logout(self) -> None:
     def get_training_plans(self) -> dict[str, Any]:
         """Return all available training plans."""
 
-        url = f"{self.garmin_training_plan_url}/plans"
+        url = f"{self.garmin_connect_training_plan_url}/plans"
         logger.debug("Requesting training plans.")
         return self.connectapi(url)
 
@@ -2177,15 +2177,15 @@ def get_training_plan_by_id(self, plan_id: int | str) -> dict[str, Any]:
 
         plan_id = _validate_positive_integer(int(plan_id), "plan_id")
 
-        url = f"{self.garmin_training_plan_url}/plans/{plan_id}"
+        url = f"{self.garmin_connect_training_plan_url}/plans/{plan_id}"
         logger.debug("Requesting training plan details for %s", plan_id)
         return self.connectapi(url)
 
     def get_adaptive_training_plan_by_id(self, plan_id: int | str) -> dict[str, Any]:
         """Return details for a specific adaptive training plan."""
 
         plan_id = _validate_positive_integer(int(plan_id), "plan_id")
-        url = f"{self.garmin_training_plan_url}/fbt-adaptive/{plan_id}"
+        url = f"{self.garmin_connect_training_plan_url}/fbt-adaptive/{plan_id}"
 
         logger.debug("Requesting adaptive training plan details for %s", plan_id)
         return self.connectapi(url)