README.md (1)

27-27: Fix title-case and trailing space in menu entry.

Use “Training Plans” (title case) and drop the trailing space.

-  [b] 📅 Training plans 
+  [b] 📅 Training Plans

garminconnect/__init__.py (1)

269-270: Align attribute naming with existing garmin_connect_* pattern.

All other URL attributes use garmin_connect_*. Rename for consistency.

-        self.garmin_training_plan_url = "/trainingplan-service/trainingplan"
+        self.garmin_connect_training_plan_url = "/trainingplan-service/trainingplan"

And update call sites:

-        url = f"{self.garmin_training_plan_url}/plans"
+        url = f"{self.garmin_connect_training_plan_url}/plans"

-        url = f"{self.garmin_training_plan_url}/plans/{plan_id}"
+        url = f"{self.garmin_connect_training_plan_url}/plans/{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}"

demo.py (1)

1773-1800: Fix misleading docstring and make “by ID” actually accept an ID (with safe fallback).

• Docstring says adaptive not supported, but code does support it; update.
• Menu option says “by ID” but code always uses the last plan. Prompt for an ID and fallback to latest when omitted.
• Avoid KeyError if trainingPlanList is absent.

-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"""
+def get_training_plan_by_id_data(api: Garmin) -> None:
+    """Get training plan details by ID (routes FBT_ADAPTIVE plans to the adaptive endpoint)."""
     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"]
-
-            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}",
-                )
-        else:
-            print("ℹ️ No training plans found")
+        resp = api.get_training_plans() or {}
+        training_plans = resp.get("trainingPlanList") or []
+        if not training_plans:
+            print("ℹ️ No training plans found")
+            return
+
+        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:
+                    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}",
+            )
     except Exception as e:
         print(f"❌ Error getting plan by ID: {e}")

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

demo.py (1)

1773-1828: Harden error handling and truly pick “most recent”; normalize adaptive check

• Wrap the initial fetch with safe_api_call to reuse uniform HTTP handling.
• When defaulting to “most recent,” sort by an available timestamp instead of taking the last element.
• Normalize the category comparison to be case-insensitive.

Suggested patch:

 def get_training_plan_by_id_data(api: Garmin) -> None:
     """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 []
+    ok, resp, _ = safe_api_call(api.get_training_plans, method_name="get_training_plans")
+    if not ok or not resp:
+        return
+    training_plans = (resp or {}).get("trainingPlanList") or []
     if not training_plans:
         print("ℹ️ No training plans found")
         return
@@
-    else:
-        selected = training_plans[-1]
-        plan_id = int(selected["trainingPlanId"])
-        plan_name = selected.get("name", str(plan_id))
-        plan_category = selected.get("trainingPlanCategory")
+    else:
+        # Choose the most recently updated/created plan when no ID is provided
+        candidates = ["lastUpdatedDate", "updatedDate", "createDate", "startDate"]
+        def _to_dt(p: dict) -> datetime.datetime:
+            for k in candidates:
+                v = p.get(k)
+                if isinstance(v, str):
+                    with suppress(Exception):
+                        return datetime.datetime.fromisoformat(v.replace("Z", "+00:00"))
+            return datetime.datetime.min
+        selected = max(training_plans, key=_to_dt, default=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":
+    category_norm = (str(plan_category).upper() if plan_category is not None else "")
+    if category_norm == "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}",
         )

Please confirm the training plan list objects expose one of these timestamp fields: lastUpdatedDate, updatedDate, createDate, or startDate. If they differ, adjust the candidates list accordingly.

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro