Add comprehensive Garmin Connect tools (#5)

* Fix pre-commit hook formatting issues

* Remove async from all tools to fix coroutine object issue

- All tools now return actual data instead of coroutine objects
- Fixes the '<coroutine object at 0x...>' responses when using tools
- Tools remain fully functional but execute synchronously

* Address CodeRabbit feedback

- Add .claude/settings.local.json to .gitignore
- Bump version to 0.0.7 (micro bump for new tools)
- Use urllib.parse.urlencode for proper URL parameter encoding
- Fix sleep_movement attribute handling with hasattr() check
- Remove async-related changes (already addressed by removing async)

Note: Intentionally not adding date validation as it adds unnecessary
complexity for this use case. Users can handle invalid dates through
the natural API error responses.

Author: matin

.claude/settings.local.json

@@ -0,0 +1,15 @@
+{
+  "permissions": {
+    "allow": [
+      "WebFetch(domain:raw.githubusercontent.com)",
+      "WebFetch(domain:modelcontextprotocol.io)",
+      "Bash(git checkout:*)",
+      "Bash(git add:*)",
+      "Bash(make format)",
+      "Bash(make lint)",
+      "Bash(uv sync:*)",
+      "Bash(gh pr view:*)"
+    ],
+    "deny": []
+  }
+}

.gitignore

@@ -51,3 +51,6 @@ tmp/
 
 # exclude saved oauth tokens
 oauth*_token.json
+
+# Claude local settings
+.claude/settings.local.json

README.md

@@ -34,8 +34,43 @@ use the same PATH your shell does. On macOS, it's typically
 
 ## Tools
 
-- sleep
-- stress (weekly and daily)
-- daily intensity minutes
-- monthly activity summary
-- snapshot
+### Health & Wellness (using Garth data classes)
+
+- `user_profile` - Get user profile information
+- `user_settings` - Get user settings and preferences
+- `nightly_sleep` - Get detailed sleep data with optional movement data
+- `daily_sleep` - Get daily sleep summary data
+- `daily_stress` / `weekly_stress` - Get stress data
+- `daily_intensity_minutes` / `weekly_intensity_minutes` - Get intensity minutes
+- `daily_body_battery` - Get body battery data
+- `daily_hydration` - Get hydration data
+- `daily_steps` / `weekly_steps` - Get steps data
+- `daily_hrv` / `hrv_data` - Get heart rate variability data
+
+### Activities (using Garmin Connect API)
+
+- `get_activities` - Get list of activities with optional filters
+- `get_activities_by_date` - Get activities for a specific date
+- `get_activity_details` - Get detailed activity information
+- `get_activity_splits` - Get activity lap/split data
+- `get_activity_weather` - Get weather data for activities
+
+### Additional Health Data (using Garmin Connect API)
+
+- `get_body_composition` - Get body composition data
+- `get_respiration_data` - Get respiration data
+- `get_spo2_data` - Get SpO2 (blood oxygen) data
+- `get_blood_pressure` - Get blood pressure readings
+
+### Device & Gear (using Garmin Connect API)
+
+- `get_devices` - Get connected devices
+- `get_device_settings` - Get device settings
+- `get_gear` - Get gear information
+- `get_gear_stats` - Get gear usage statistics
+
+### Utility Tools
+
+- `monthly_activity_summary` - Get monthly activity overview
+- `snapshot` - Get snapshot data for date ranges
+- `get_connectapi_endpoint` - Direct access to any Garmin Connect API endpoint

pyproject.toml

@@ -8,7 +8,7 @@ authors = [
     {name = "Matin Tamizi", email = "[email protected]"},
 ]
 dependencies = [
-    "garth>=0.5.9,<0.6.0",
+    "garth>=0.5.14,<0.6.0",
     "mcp>=1.9.0,<2.0.0",
 ]
 license = {text = "MIT"}

src/garth_mcp_server/__init__.py

@@ -1,12 +1,13 @@
 import os
 from datetime import date
 from functools import wraps
+from urllib.parse import urlencode
 
 import garth
 from mcp.server.fastmcp import FastMCP
 
 
-__version__ = "0.0.6"
+__version__ = "0.0.7"
 
 server = FastMCP("Garth - Garmin Connect", dependencies=["garth"], version=__version__)
 
@@ -23,6 +24,278 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
+# Tools using Garth data classes
+
+
+@server.tool()
+@requires_garth_session
+def user_profile() -> str | garth.UserProfile:
+    """
+    Get user profile information using Garth's UserProfile data class.
+    """
+    return garth.UserProfile.get()
+
+
+@server.tool()
+@requires_garth_session
+def user_settings() -> str | garth.UserSettings:
+    """
+    Get user settings using Garth's UserSettings data class.
+    """
+    return garth.UserSettings.get()
+
+
+@server.tool()
+@requires_garth_session
+def weekly_intensity_minutes(
+    end_date: date | None = None, weeks: int = 1
+) -> str | list[garth.WeeklyIntensityMinutes]:
+    """
+    Get weekly intensity minutes data for a given date and number of weeks.
+    If no date is provided, the current date will be used.
+    If no weeks are provided, 1 week will be used.
+    """
+    return garth.WeeklyIntensityMinutes.list(end_date, weeks)
+
+
+@server.tool()
+@requires_garth_session
+def daily_body_battery(
+    end_date: date | None = None, days: int = 1
+) -> str | list[garth.DailyBodyBatteryStress]:
+    """
+    Get daily body battery data for a given date and number of days.
+    If no date is provided, the current date will be used.
+    If no days are provided, 1 day will be used.
+    """
+    return garth.DailyBodyBatteryStress.list(end_date, days)
+
+
+@server.tool()
+@requires_garth_session
+def daily_hydration(
+    end_date: date | None = None, days: int = 1
+) -> str | list[garth.DailyHydration]:
+    """
+    Get daily hydration data for a given date and number of days.
+    If no date is provided, the current date will be used.
+    If no days are provided, 1 day will be used.
+    """
+    return garth.DailyHydration.list(end_date, days)
+
+
+@server.tool()
+@requires_garth_session
+def daily_steps(
+    end_date: date | None = None, days: int = 1
+) -> str | list[garth.DailySteps]:
+    """
+    Get daily steps data for a given date and number of days.
+    If no date is provided, the current date will be used.
+    If no days are provided, 1 day will be used.
+    """
+    return garth.DailySteps.list(end_date, days)
+
+
+@server.tool()
+@requires_garth_session
+def weekly_steps(
+    end_date: date | None = None, weeks: int = 1
+) -> str | list[garth.WeeklySteps]:
+    """
+    Get weekly steps data for a given date and number of weeks.
+    If no date is provided, the current date will be used.
+    If no weeks are provided, 1 week will be used.
+    """
+    return garth.WeeklySteps.list(end_date, weeks)
+
+
+@server.tool()
+@requires_garth_session
+def daily_hrv(
+    end_date: date | None = None, days: int = 1
+) -> str | list[garth.DailyHRV]:
+    """
+    Get daily heart rate variability data for a given date and number of days.
+    If no date is provided, the current date will be used.
+    If no days are provided, 1 day will be used.
+    """
+    return garth.DailyHRV.list(end_date, days)
+
+
+@server.tool()
+@requires_garth_session
+def hrv_data(end_date: date | None = None, days: int = 1) -> str | list[garth.HRVData]:
+    """
+    Get detailed HRV data for a given date and number of days.
+    If no date is provided, the current date will be used.
+    If no days are provided, 1 day will be used.
+    """
+    return garth.HRVData.list(end_date, days)
+
+
+@server.tool()
+@requires_garth_session
+def daily_sleep(
+    end_date: date | None = None, days: int = 1
+) -> str | list[garth.DailySleep]:
+    """
+    Get daily sleep summary data for a given date and number of days.
+    If no date is provided, the current date will be used.
+    If no days are provided, 1 day will be used.
+    """
+    return garth.DailySleep.list(end_date, days)
+
+
+# Tools using direct API calls
+
+
+@server.tool()
+@requires_garth_session
+def get_activities(
+    start_date: str | None = None, limit: int | None = None
+) -> str | dict | None:
+    """
+    Get list of activities from Garmin Connect.
+    start_date: Start date for activities (YYYY-MM-DD format)
+    limit: Maximum number of activities to return
+    """
+    params = {}
+    if start_date:
+        params["startDate"] = start_date
+    if limit:
+        params["limit"] = str(limit)
+
+    endpoint = "activitylist-service/activities/search/activities"
+    if params:
+        endpoint += "?" + urlencode(params)
+    return garth.connectapi(endpoint)
+
+
+@server.tool()
+@requires_garth_session
+def get_activities_by_date(date: str) -> str | dict | None:
+    """
+    Get activities for a specific date from Garmin Connect.
+    date: Date for activities (YYYY-MM-DD format)
+    """
+    return garth.connectapi(f"wellness-service/wellness/dailySummaryChart/{date}")
+
+
+@server.tool()
+@requires_garth_session
+def get_activity_details(activity_id: str) -> str | dict | None:
+    """
+    Get detailed information for a specific activity.
+    activity_id: Garmin Connect activity ID
+    """
+    return garth.connectapi(f"activity-service/activity/{activity_id}")
+
+
+@server.tool()
+@requires_garth_session
+def get_activity_splits(activity_id: str) -> str | dict | None:
+    """
+    Get lap/split data for a specific activity.
+    activity_id: Garmin Connect activity ID
+    """
+    return garth.connectapi(f"activity-service/activity/{activity_id}/splits")
+
+
+@server.tool()
+@requires_garth_session
+def get_activity_weather(activity_id: str) -> str | dict | None:
+    """
+    Get weather data for a specific activity.
+    activity_id: Garmin Connect activity ID
+    """
+    return garth.connectapi(f"activity-service/activity/{activity_id}/weather")
+
+
+@server.tool()
+@requires_garth_session
+def get_body_composition(date: str | None = None) -> str | dict | None:
+    """
+    Get body composition data from Garmin Connect.
+    date: Date for body composition data (YYYY-MM-DD format), if not provided returns latest
+    """
+    if date:
+        endpoint = f"wellness-service/wellness/bodyComposition/{date}"
+    else:
+        endpoint = "wellness-service/wellness/bodyComposition"
+    return garth.connectapi(endpoint)
+
+
+@server.tool()
+@requires_garth_session
+def get_respiration_data(date: str) -> str | dict | None:
+    """
+    Get respiration data from Garmin Connect.
+    date: Date for respiration data (YYYY-MM-DD format)
+    """
+    return garth.connectapi(f"wellness-service/wellness/dailyRespiration/{date}")
+
+
+@server.tool()
+@requires_garth_session
+def get_spo2_data(date: str) -> str | dict | None:
+    """
+    Get SpO2 (blood oxygen) data from Garmin Connect.
+    date: Date for SpO2 data (YYYY-MM-DD format)
+    """
+    return garth.connectapi(f"wellness-service/wellness/dailyPulseOx/{date}")
+
+
+@server.tool()
+@requires_garth_session
+def get_blood_pressure(date: str) -> str | dict | None:
+    """
+    Get blood pressure readings from Garmin Connect.
+    date: Date for blood pressure data (YYYY-MM-DD format)
+    """
+    return garth.connectapi(f"wellness-service/wellness/dailyBloodPressure/{date}")
+
+
+@server.tool()
+@requires_garth_session
+def get_devices() -> str | dict | None:
+    """
+    Get connected devices from Garmin Connect.
+    """
+    return garth.connectapi("device-service/deviceregistration/devices")
+
+
+@server.tool()
+@requires_garth_session
+def get_device_settings(device_id: str) -> str | dict | None:
+    """
+    Get settings for a specific device.
+    device_id: Device ID from Garmin Connect
+    """
+    return garth.connectapi(
+        f"device-service/deviceservice/device-info/settings/{device_id}"
+    )
+
+
+@server.tool()
+@requires_garth_session
+def get_gear() -> str | dict | None:
+    """
+    Get gear information from Garmin Connect.
+    """
+    return garth.connectapi("gear-service/gear")
+
+
+@server.tool()
+@requires_garth_session
+def get_gear_stats(gear_uuid: str) -> str | dict | None:
+    """
+    Get usage statistics for specific gear.
+    gear_uuid: UUID of the gear item
+    """
+    return garth.connectapi(f"gear-service/gear/stats/{gear_uuid}")
+
+
 @server.tool()
 @requires_garth_session
 def get_connectapi_endpoint(endpoint: str) -> str | dict | None:
@@ -36,16 +309,20 @@ def get_connectapi_endpoint(endpoint: str) -> str | dict | None:
 @server.tool()
 @requires_garth_session
 def nightly_sleep(
-    end_date: date | None = None, nights: int = 1
+    end_date: date | None = None, nights: int = 1, sleep_movement: bool = False
 ) -> str | list[garth.SleepData]:
     """
     Get sleep stats for a given date and number of nights.
     If no date is provided, the current date will be used.
     If no nights are provided, 1 night will be used.
+    sleep_movement provides detailed sleep movement data. If looking at
+    multiple nights, it'll be a lot of data.
     """
     sleep_data = garth.SleepData.list(end_date, nights)
-    for night in sleep_data:
-        del night.sleep_movement
+    if not sleep_movement:
+        for night in sleep_data:
+            if hasattr(night, "sleep_movement"):
+                del night.sleep_movement
     return sleep_data