added coderabbit changes

Author: DhruvK278

backend/app/agents/devrel/github/github_toolkit.py

@@ -57,19 +57,24 @@ async def classify_intent(self, user_query: str) -> Dict[str, Any]:
 
             import json
             import re
-            
+
             content = response.content.strip()
-            
-            # Try to extract JSON from markdown code blocks if present
-            json_match = re.search(r'```(?:json)?\s*(\{.*?\})\s*```', content, re.DOTALL)
-            if json_match:
-                content = json_match.group(1)
-            
-            json_match = re.search(r'\{.*\}', content, re.DOTALL)
-            if json_match:
-                content = json_match.group(0)
-            
-            result = json.loads(content)
+
+            candidates = []
+            cb = re.search(r'```(?:json)?\s*({[\s\S]*?})\s*```', content, flags=re.IGNORECASE)
+            if cb:
+                candidates.append(cb.group(1))
+            candidates.extend(m.group(0) for m in re.finditer(r'\{[\s\S]*?\}', content))
+
+            result = None
+            for payload in candidates:
+                try:
+                    result = json.loads(payload)
+                    break
+                except json.JSONDecodeError:
+                    continue
+            if result is None:
+                raise json.JSONDecodeError("No valid JSON object found in LLM response", content, 0)
 
             classification = result.get("classification")
             if classification not in self.tools:

backend/app/agents/devrel/github/services/github_mcp_client.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Dict, Any, Optional
 import aiohttp
+import asyncio
 
 logger = logging.getLogger(__name__)
 
@@ -15,7 +16,7 @@ def __init__(self, mcp_server_url: str = "http://localhost:8001"):
 
     async def __aenter__(self):
         # Async context manager entry
-        self.session = aiohttp.ClientSession()
+        self.session = aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=15))
         return self
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
@@ -29,7 +30,6 @@ async def get_repo_info(self, owner: str, repo: str) -> Dict[str, Any]:
             raise RuntimeError("Client not initialized. Use async context manager.")
 
         try:
-            # Try the direct repo_info endpoint first (simpler)
             payload = {
                 "owner": owner,
                 "repo": repo
@@ -65,5 +65,7 @@ async def is_server_available(self) -> bool:
         try:
             async with self.session.get(f"{self.mcp_server_url}/health", timeout=5) as response:
                 return response.status == 200
-        except:
+            
+        except (aiohttp.ClientError, asyncio.TimeoutError) as e:
+            logger.debug(f"Health check failed: {e}")
             return False

backend/app/agents/devrel/github/services/github_mcp_server.py

@@ -1,19 +1,28 @@
 import os
 import logging
-from dotenv import load_dotenv
+from dotenv import load_dotenv, find_dotenv
 from fastapi import FastAPI, HTTPException
 from pydantic import BaseModel
 from .github_mcp_service import GitHubMCPService
+from typing import Optional
 
-load_dotenv(dotenv_path=os.path.join(os.path.dirname(__file__), "../../../../.env"))
+dotenv_path = find_dotenv(usecwd=True)
+if dotenv_path:
+    load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 app = FastAPI(title="GitHub MCP Server", version="1.0.0")
 
+github_service: Optional[GitHubMCPService] = None
 try:
-    github_service = GitHubMCPService(token=os.getenv("GITHUB_TOKEN"))
+    token = os.getenv("GITHUB_TOKEN") or os.getenv("GH_TOKEN")
+    if not token:
+        logger.warning("GITHUB_TOKEN/GH_TOKEN not set; GitHub API calls may be rate-limited or fail.")
+    github_service = GitHubMCPService(token=token)
     logger.info("GitHub service initialized successfully")
 except Exception as e:
     logger.error(f"Failed to initialize GitHub service: {e}")
@@ -51,6 +60,8 @@ async def mcp_endpoint(request: dict):
                 if not owner or not repo:
                     return {"error": "Missing owner or repo parameter"}
 
+                if not github_service:
+                    return {"error": "GitHub service not available"}
                 result = github_service.repo_query(owner, repo)
                 return {"result": result}
             else:
@@ -59,7 +70,7 @@ async def mcp_endpoint(request: dict):
             return {"error": f"Unknown method: {method}"}
 
     except Exception as e:
-        logger.error(f"Error in MCP endpoint: {e}")
+        logger.exception("Error in MCP endpoint")
         return {"error": str(e)}
 
 @app.post("/repo_info")

backend/app/agents/devrel/github/services/github_mcp_service.py

@@ -20,10 +20,15 @@ def __init__(self, token: str = None):
     def repo_query(self, owner: str, repo: str) -> dict:
 
         url = f"{self.base_url}/repos/{owner}/{repo}"
-        headers = {"Authorization": f"token {self.token}"}
+        headers = {
+            "Authorization": f"Bearer {self.token}",
+            "Accept": "application/vnd.github+json",
+            "X-GitHub-Api-Version": "2022-11-28",
+            "User-Agent": "DevrAI-GitHubMCPService/0.1"
+        }
 
         try:
-            resp = requests.get(url, headers=headers)
+            resp = requests.get(url, headers=headers, timeout=15)
             resp.raise_for_status()
         except requests.exceptions.RequestException as e:
             return {"error": "Request failed", "message": str(e)}

backend/app/agents/devrel/github/test_repo_query.py

@@ -1,12 +1,22 @@
 from ..services.github_mcp_client import GitHubMCPClient
 import re
 
-OWNER_REPO_RE = re.compile(r"([A-Za-z0-9_.-]+)/([A-Za-z0-9_.-]+)")
+#GitHub URL forms: https(s)://github.com/owner/repo[.git][...], git@github.com:owner/repo[.git]
+GH_URL_RE = re.compile(
+    r'(?:https?://|git@)github\.com[/:]'
+    r'([A-Za-z0-9](?:-?[A-Za-z0-9]){0,38})/'
+    r'([A-Za-z0-9._-]+?)(?:\.git)?(?:/|$)',
+    re.IGNORECASE,
+)
+
+OWNER_REPO_RE = re.compile(
+    r'\b([A-Za-z0-9](?:-?[A-Za-z0-9]){0,38})/([A-Za-z0-9._-]{1,100})\b'
+)
 
 async def handle_repo_query(user_query: str) -> dict:
-    m = OWNER_REPO_RE.search(user_query)
+    m = GH_URL_RE.search(user_query) or OWNER_REPO_RE.search(user_query)
     if not m:
-        return {"status": "error", "message": "Usage: include owner/repo in query."}
+        return {"status": "error", "message": "Usage: include a GitHub owner/repo (e.g., AOSSIE-Org/Devr.AI) or a GitHub URL."}
 
     owner, repo = m.group(1), m.group(2)
 

backend/app/agents/devrel/github/tools/repository_query.py

@@ -26,7 +26,6 @@ dependencies = [
     "uvicorn (>=0.35.0,<0.36.0)",
     "ddgs (>=9.0.2,<10.0.0)",
     "fastmcp>=2.11.3,<3.0.0",
-    "PyGithub>=2.5.0,<3.0.0",
     "discord-py (>=2.5.2,<3.0.0)",
 ]