strava-activity-mcp-server 0.1.7__py3-none-any.whl → 0.1.8__py3-none-any.whl

strava_activity_mcp_server/strava_activity_mcp_server.py

@@ -31,192 +31,70 @@ def get_auth_url(client_id: int | None = None):
 
 
 
-@mcp.tool("strava://auth/token")
-def exchange_code_for_token(
+@mcp.tool("strava://athlete/stats")
+def get_athlete_stats(
     code: str,
     client_id: int | None = None,
-    client_secret: str | None = None,
-) -> dict:
-    """Exchange an authorization code for access + refresh tokens."""
-    if not code:
-        return {"error": "authorization code is required"}
+    client_secret: str | None = None,) -> dict:
+        
+    #'''Exchange an authorization code for access + refresh tokens.'''
+        if not code:
+            return {"error": "authorization code is required"}
     
-    if client_id is None:
-        client_id_env = os.getenv("STRAVA_CLIENT_ID")
-        if not client_id_env:
-            return {"error": "STRAVA_CLIENT_ID environment variable is not set"}
-        try:
-            client_id = int(client_id_env)
-        except ValueError:
-            return {"error": "STRAVA_CLIENT_ID must be an integer"}
+        if client_id is None:
+            client_id_env = os.getenv("STRAVA_CLIENT_ID")
+            if not client_id_env:
+                return {"error": "STRAVA_CLIENT_ID environment variable is not set"}
+            try:
+                client_id = int(client_id_env)
+            except ValueError:
+                return {"error": "STRAVA_CLIENT_ID must be an integer"}
     
-    if client_secret is None:
-        client_secret_env = os.getenv("STRAVA_CLIENT_SECRET")
-        if not client_secret_env:
-            return {"error": "STRAVA_CLIENT_SECRET environment variable is not set"}
-        try:
-            client_secret = str(client_secret_env)
-        except ValueError:
-            return {"error": "STRAVA_CLIENT_SECRET must be a string"}
+        if client_secret is None:
+            client_secret_env = os.getenv("STRAVA_CLIENT_SECRET")
+            if not client_secret_env:
+                return {"error": "STRAVA_CLIENT_SECRET environment variable is not set"}
+            try:
+                client_secret = str(client_secret_env)
+            except ValueError:
+                return {"error": "STRAVA_CLIENT_SECRET must be a string"}
 
-    resp = requests.post(
-        "https://www.strava.com/oauth/token",
-        data={
+
+        resp = requests.post(
+            "https://www.strava.com/oauth/token",
+            data={
             "client_id": client_id,
             "client_secret": client_secret,
             "code": code,
             "grant_type": "authorization_code",
         },
     )
-    try:
-        resp.raise_for_status()
-    except requests.HTTPError:
-        return {"error": "token request failed", "status_code": resp.status_code, "response": resp.text}
+        try:
+            resp.raise_for_status()
+        except requests.HTTPError:
+            return {"error": "token request failed", "status_code": resp.status_code, "response": resp.text}
+        except Exception as e:
+            return {"error": "token request failed", "status_code": resp.status_code, "response": resp.text, "error": str(e)}
 
-    tokens = resp.json()
+        tokens = resp.json()
     # Print tokens for debugging (optional)
-    print(tokens)
+        print(tokens)
 
-    access_token = tokens.get("access_token")
-    refresh_token = tokens.get("refresh_token")
+        access_token = tokens.get("access_token")
+        refresh_token = tokens.get("refresh_token")
 
-    return {"tokens": tokens, "access_token": access_token, "refresh_token": refresh_token}
 
+    #return {"tokens": tokens, "access_token": access_token, "refresh_token": refresh_token}
 
-def refresh_access_token(
-    refresh_token: str,
-    client_id: int,
-    client_secret: str,
-) -> dict:
-    """Refresh an access token using a refresh token."""
-    if not refresh_token:
-        return {"error": "refresh_token is required"}
+        url = "https://www.strava.com/api/v3/athlete/activities?per_page=60"
+        headers = {
+            "accept": "application/json",
+            "authorization": f"Bearer {access_token}"
+            }
 
-    resp = requests.post(
-        "https://www.strava.com/oauth/token",
-        data={
-            "client_id": client_id,
-            "client_secret": client_secret,
-            "grant_type": "refresh_token",
-            "refresh_token": refresh_token,
-        },
-    )
-    try:
-        resp.raise_for_status()
-    except requests.HTTPError:
-        return {"error": "refresh request failed", "status_code": resp.status_code, "response": resp.text}
-
-    new_tokens = resp.json()
-    # Print new tokens for debugging (optional)
-    print(new_tokens)
-    return new_tokens
-
-
-@mcp.tool("strava://athlete/stats")
-def _get_env_client_credentials() -> tuple[int | None, str | None]:
-    """Read client id and secret from environment and return (client_id, client_secret).
-
-    client_id will be returned as int if present and valid, otherwise None.
-    """
-    client_id = None
-    client_secret = os.getenv("STRAVA_CLIENT_SECRET")
-    client_id_env = os.getenv("STRAVA_CLIENT_ID")
-    if client_id_env:
-        try:
-            client_id = int(client_id_env)
-        except ValueError:
-            client_id = None
-    return client_id, client_secret
-
-
-def _ensure_access_token(token_or_tokens: object) -> tuple[str | None, dict | None]:
-    """Given either an access token string or the token dict returned by the token endpoints,
-    return a tuple (access_token, tokens_dict).
-
-    If a dict is provided and contains no valid access_token but has a refresh_token,
-    attempt to refresh using env client credentials. Returns (access_token, tokens_dict) or (None, None)
-    on failure.
-    """
-    # If token_or_tokens is a string, assume it's an access token.
-    if isinstance(token_or_tokens, str):
-        return token_or_tokens, None
-
-    # If it's a dict-like object, try to find access_token
-    if isinstance(token_or_tokens, dict):
-        access_token = token_or_tokens.get("access_token")
-        if access_token:
-            return access_token, token_or_tokens
-
-        # try refresh flow
-        refresh_token = token_or_tokens.get("refresh_token")
-        client_id = token_or_tokens.get("client_id")
-        client_secret = token_or_tokens.get("client_secret")
-
-        # fallback to env vars if client id/secret not in the dict
-        if not client_id or not client_secret:
-            env_client_id, env_client_secret = _get_env_client_credentials()
-            if not client_id:
-                client_id = env_client_id
-            if not client_secret:
-                client_secret = env_client_secret
-
-        if refresh_token and client_id and client_secret:
-            try:
-                new_tokens = refresh_access_token(refresh_token, int(client_id), client_secret)
-            except Exception as e:
-                print(f"refresh failed: {e}")
-                return None, None
-
-            access_token = new_tokens.get("access_token")
-            return access_token, new_tokens
-
-    return None, None
-
-
-@mcp.tool("strava://athlete/stats")
-def get_athlete_stats(token: object) -> object:
-    """Retrieve athlete activities using either an access token string or a token dict.
-
-    If a token dict is provided and the access token is missing/expired, the function will
-    attempt to refresh it (one attempt) using provided refresh token and client credentials
-    (falling back to STRAVA_CLIENT_ID/STRAVA_CLIENT_SECRET environment variables).
-    """
-    access_token, tokens_dict = _ensure_access_token(token)
-    if not access_token:
-        return {"error": "Could not obtain an access token"}
-
-    url = "https://www.strava.com/api/v3/athlete/activities?per_page=60"
-    headers = {
-        "accept": "application/json",
-        "authorization": f"Bearer {access_token}"
-    }
+        response = requests.get(url, headers=headers)
 
-    response = requests.get(url, headers=headers)
-
-    # If unauthorized, try one refresh if we have a refresh token available
-    if response.status_code == 401 and isinstance(token, dict):
-        refresh_token = token.get("refresh_token") or (tokens_dict or {}).get("refresh_token")
-        if refresh_token:
-            client_id = token.get("client_id") or (tokens_dict or {}).get("client_id")
-            client_secret = token.get("client_secret") or (tokens_dict or {}).get("client_secret")
-            if not client_id or not client_secret:
-                env_client_id, env_client_secret = _get_env_client_credentials()
-                client_id = client_id or env_client_id
-                client_secret = client_secret or env_client_secret
-
-            if client_id and client_secret:
-                new_tokens = refresh_access_token(refresh_token, int(client_id), client_secret)
-                new_access = new_tokens.get("access_token")
-                if new_access:
-                    headers["authorization"] = f"Bearer {new_access}"
-                    response = requests.get(url, headers=headers)
-
-    try:
-        response.raise_for_status()
-    except requests.HTTPError:
-        return {"error": "request failed", "status_code": response.status_code, "response": response.text}
-
-    return response.json()
+        return response.json()
 
 if __name__ == "__main__":
     mcp.run(transport="stdio")  # Run the server, using standard input/output for communication

{strava_activity_mcp_server-0.1.7.dist-info → strava_activity_mcp_server-0.1.8.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: strava-activity-mcp-server
-Version: 0.1.7
-Summary: Trying to implement environment variables for client_id
+Version: 0.1.8
+Summary: STRAVA ACTIVITY MCP SERVER
 License-File: LICENSE
 Requires-Python: >=3.10
 Requires-Dist: build>=1.3.0

strava_activity_mcp_server-0.1.8.dist-info/RECORD

@@ -0,0 +1,8 @@
+strava_activity_mcp_server/__init__.py,sha256=jaa1ZVuEJMwuVGzj67oqC_ESUUiwblVVH-NEtTiQQdQ,110
+strava_activity_mcp_server/__main__.py,sha256=SAdVoObdjb5UP4MY-Y2_uCXpnthB6hgxlb1KNVNgOrc,58
+strava_activity_mcp_server/strava_activity_mcp_server.py,sha256=lfgnxF8w_NBl_NRwYcL2stGedwvKkMkKbwZy7TK0L74,3729
+strava_activity_mcp_server-0.1.8.dist-info/METADATA,sha256=IYzmmg30BrbrlZT0WBFxbuDA8cq_lAeTQv9yQxXDXsQ,5553
+strava_activity_mcp_server-0.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+strava_activity_mcp_server-0.1.8.dist-info/entry_points.txt,sha256=F6PO_DBSThhtmX2AC-tu2MIiCJkGi31LCaQJxfUzZ5g,79
+strava_activity_mcp_server-0.1.8.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+strava_activity_mcp_server-0.1.8.dist-info/RECORD,,

strava_activity_mcp_server-0.1.7.dist-info/RECORD

@@ -1,8 +0,0 @@
-strava_activity_mcp_server/__init__.py,sha256=jaa1ZVuEJMwuVGzj67oqC_ESUUiwblVVH-NEtTiQQdQ,110
-strava_activity_mcp_server/__main__.py,sha256=SAdVoObdjb5UP4MY-Y2_uCXpnthB6hgxlb1KNVNgOrc,58
-strava_activity_mcp_server/strava_activity_mcp_server.py,sha256=FenliPAzC8OyFVReM2iOofrbiar8eD6YW5Il4Ee851M,8567
-strava_activity_mcp_server-0.1.7.dist-info/METADATA,sha256=mZ0TKn5ODR2CdNwg_VJDrndBGd_LBgRJpprR0Rh-i1A,5582
-strava_activity_mcp_server-0.1.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-strava_activity_mcp_server-0.1.7.dist-info/entry_points.txt,sha256=F6PO_DBSThhtmX2AC-tu2MIiCJkGi31LCaQJxfUzZ5g,79
-strava_activity_mcp_server-0.1.7.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-strava_activity_mcp_server-0.1.7.dist-info/RECORD,,