Upload github_tools.py

agent/tools/github_tools.py

@@ -1,5 +1,5 @@
 """
-NeuraPrompt Agent — GitHub MCP Connector (v1.0)
+NeuraPrompt Agent — GitHub MCP Connector (v1.1 - Fixed Auth & Error Handling)
 OAuth + Per-User Token Storage + GitHub API Tools
 """
 
@@ -116,6 +116,7 @@ async def github_callback(code: str = Query(...), state: str = Query(...)):
     access_token = token_data.get("access_token")
     token_type = token_data.get("token_type", "bearer")
     scope = token_data.get("scope", "")
+    refresh_token = token_data.get("refresh_token")  # FIX: Store refresh token for future use
     
     # Get user info from GitHub
     user_info = _github_api_get("/user", access_token)
@@ -128,6 +129,7 @@ async def github_callback(code: str = Query(...), state: str = Query(...)):
             "access_token": access_token,
             "token_type": token_type,
             "scope": scope,
+            "refresh_token": refresh_token,  # FIX: Store refresh token
             "github_login": user_info.get("login"),
             "github_id": user_info.get("id"),
             "github_avatar": user_info.get("avatar_url"),
@@ -183,7 +185,7 @@ def _github_api_get(endpoint: str, token: str, params: dict = None) -> dict:
     """Make authenticated GET request to GitHub API."""
     url = f"https://api.github.com{endpoint}"
     headers = {
-        "Authorization": f"token {token}",
+        "Authorization": f"Bearer {token}",  # FIX: Changed from "token" to "Bearer" for modern GitHub API
         "Accept": "application/vnd.github.v3+json",
         "User-Agent": "NeuraPrompt-Agent"
     }
@@ -198,7 +200,7 @@ def _github_api_post(endpoint: str, token: str, data: dict = None) -> dict:
     """Make authenticated POST request to GitHub API."""
     url = f"https://api.github.com{endpoint}"
     headers = {
-        "Authorization": f"token {token}",
+        "Authorization": f"Bearer {token}",  # FIX: Changed from "token" to "Bearer"
         "Accept": "application/vnd.github.v3+json",
         "User-Agent": "NeuraPrompt-Agent"
     }
@@ -213,7 +215,7 @@ def _github_api_patch(endpoint: str, token: str, data: dict = None) -> dict:
     """Make authenticated PATCH request to GitHub API."""
     url = f"https://api.github.com{endpoint}"
     headers = {
-        "Authorization": f"token {token}",
+        "Authorization": f"Bearer {token}",  # FIX: Changed from "token" to "Bearer"
         "Accept": "application/vnd.github.v3+json",
         "User-Agent": "NeuraPrompt-Agent"
     }
@@ -228,7 +230,7 @@ def _github_api_delete(endpoint: str, token: str) -> bool:
     """Make authenticated DELETE request to GitHub API."""
     url = f"https://api.github.com{endpoint}"
     headers = {
-        "Authorization": f"token {token}",
+        "Authorization": f"Bearer {token}",  # FIX: Changed from "token" to "Bearer"
         "Accept": "application/vnd.github.v3+json",
         "User-Agent": "NeuraPrompt-Agent"
     }
@@ -238,6 +240,22 @@ def _github_api_delete(endpoint: str, token: str) -> bool:
     return r.status_code in (204, 200)
 
 
+def _github_api_put(endpoint: str, token: str, data: dict = None) -> dict:
+    """PUT request helper."""
+    url = f"https://api.github.com{endpoint}"
+    headers = {
+        "Authorization": f"Bearer {token}",  # FIX: Changed from "token" to "Bearer"
+        "Accept": "application/vnd.github.v3+json",
+        "User-Agent": "NeuraPrompt-Agent"
+    }
+    r = requests.put(url, headers=headers, json=data, timeout=30)
+    # FIX: Added 401 handling that was missing
+    if r.status_code == 401:
+        raise HTTPException(401, "GitHub token expired or invalid. Please reconnect.")
+    r.raise_for_status()
+    return r.json()
+
+
 # ==================== GITHUB TOOLS (AI Agent Uses These) ====================
 
 # These tools accept user_id and automatically use that user's token
@@ -371,10 +389,15 @@ def github_write_file(user_id: str, owner: str, repo: str, path: str, content: s
         token = _get_user_token(user_id)
         
         # Check if file exists to get SHA
+        sha = None
         try:
             existing = _github_api_get(f"/repos/{owner}/{repo}/contents/{path}", token, {"ref": branch})
             sha = existing.get("sha")
-        except:
+        except HTTPException:
+            # FIX: Don't swallow auth errors — re-raise them
+            raise
+        except Exception:
+            # File doesn't exist, that's fine — we'll create it
             sha = None
         
         import base64
@@ -396,19 +419,6 @@ def github_write_file(user_id: str, owner: str, repo: str, path: str, content: s
         return f"Error: {str(e)}"
 
 
-def _github_api_put(endpoint: str, token: str, data: dict = None) -> dict:
-    """PUT request helper."""
-    url = f"https://api.github.com{endpoint}"
-    headers = {
-        "Authorization": f"token {token}",
-        "Accept": "application/vnd.github.v3+json",
-        "User-Agent": "NeuraPrompt-Agent"
-    }
-    r = requests.put(url, headers=headers, json=data, timeout=30)
-    r.raise_for_status()
-    return r.json()
-
-
 def github_create_branch(user_id: str, owner: str, repo: str, branch: str, from_branch: str = "main") -> str:
     """Create a new branch from an existing branch."""
     try:
@@ -508,4 +518,4 @@ def register_github_tools():
 
 
 # Call this in your main app startup
-# register_github_tools()
+# register_github_tools()