Merge pull request #146 from smokeyScraper/bug_fixes

fix: deprecation warnings and bug fixes

Author: smokeyScraper

backend/app/api/v1/integrations.py

@@ -7,7 +7,7 @@
     IntegrationListResponse,
     IntegrationStatusResponse
 )
-from app.services.integration_service import integration_service, NotFoundError
+from app.services.integration_service import integration_service, IntegrationNotFoundError
 from app.core.dependencies import get_current_user
 
 router = APIRouter()
@@ -76,8 +76,10 @@ async def update_integration(
     """Update an existing integration."""
     try:
         return await integration_service.update_integration(user_id, integration_id, request)
-    except NotFoundError as e:
+    except IntegrationNotFoundError as e:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(e)) from e
+    except ValueError as e:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e)) from e
     except HTTPException:
         raise
     except Exception as e:
@@ -94,8 +96,10 @@ async def delete_integration(
     """Delete an integration."""
     try:
         await integration_service.delete_integration(user_id, integration_id)
-    except NotFoundError as e:
+    except IntegrationNotFoundError as e:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(e)) from e
+    except ValueError as e:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e)) from e
     except HTTPException:
         raise
     except Exception as e:

backend/app/database/falkor/code-graph-backend/poetry.lock

@@ -7,8 +7,8 @@ readme = "README.md"
 package-mode = false
 
 [tool.poetry.dependencies]
-python = "^3.10"
-graphrag-sdk = { version = "^0.5.0", extras = ["litellm"] }
+python = ">=3.10,<3.14"
+graphrag-sdk = "^0.8.1"
 tree-sitter = "^0.24.0"
 validators = "^0.34.0"
 falkordb = "^1.0.10"

backend/app/database/falkor/code-graph-backend/pyproject.toml

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, ConfigDict
 from uuid import UUID
 from typing import Optional, List
 from datetime import datetime
@@ -225,5 +225,4 @@ class IndexedRepository(BaseModel):
     edge_count: int = 0
     last_error: Optional[str] = None
 
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)

backend/app/models/database/supabase.py

@@ -7,13 +7,17 @@
     IntegrationCreateRequest,
     IntegrationUpdateRequest,
     IntegrationResponse,
-    IntegrationStatusResponse,
-    NotFoundError
+    IntegrationStatusResponse
 )
 
 logger = logging.getLogger(__name__)
 
 
+class IntegrationNotFoundError(Exception):
+    """Raised when an integration is not found."""
+    pass
+
+
 class IntegrationService:
     """Service for registering organizations (stores org info only)."""
 
@@ -143,7 +147,7 @@ async def update_integration(
 
             existing = await self.get_integration(user_id, integration_id)
             if not existing:
-                raise NotFoundError("Integration not found")
+                raise IntegrationNotFoundError("Integration not found")
 
             if request.organization_link is not None:
                 base_config = (update_data.get("config") or existing.config or {}).copy()
@@ -170,6 +174,11 @@ async def update_integration(
     async def delete_integration(self, user_id: UUID, integration_id: UUID) -> bool:
         """Delete an integration."""
         try:
+            # Check if integration exists before deleting
+            existing = await self.get_integration(user_id, integration_id)
+            if not existing:
+                raise IntegrationNotFoundError("Integration not found")
+
             await self.supabase.table("organization_integrations")\
                 .delete()\
                 .eq("id", str(integration_id))\

backend/app/services/integration_service.py

@@ -20,6 +20,7 @@ def __init__(self, queue_manager: AsyncQueueManager, **kwargs):
         super().__init__(
             command_prefix=None,
             intents=intents,
+            heartbeat_timeout=60.0,
             **kwargs
         )
 

backend/integrations/discord/bot.py

@@ -141,5 +141,7 @@ async def favicon():
         "__main__:api",
         host="0.0.0.0",
         port=8000,
-        reload=True
+        reload=True,
+        ws_ping_interval=20,
+        ws_ping_timeout=20
     )

backend/main.py

@@ -153,7 +153,7 @@ proto-plus==1.26.1
 protobuf>=3.20.2,<4.0
 ptyprocess==0.7.0
 pure_eval==0.2.3
-py-cord==2.6.1
+py-cord==2.6.2  # Latest version to minimize deprecation warnings
 pyasn1==0.6.1
 pyasn1_modules==0.4.2
 pycodestyle==2.13.0
@@ -224,7 +224,7 @@ watchfiles==1.0.5
 wcwidth==0.2.13
 weaviate-client==4.15.4
 websocket-client==1.8.0
-websockets==14.2
+websockets>=15.0.1,<16.0.0
 wrapt==1.17.2
 xxhash==3.5.0
 yarl==1.20.1

backend/requirements.txt

@@ -11,14 +11,14 @@
     try:
         from app.agents.devrel.github.services.github_mcp_server import app
         import uvicorn
-        
+
         print("Starting GitHub MCP Server...")
         print("Server will be available at: http://localhost:8001")
         print("Health check: http://localhost:8001/health")
         print("Press Ctrl+C to stop the server")
-        
-        uvicorn.run(app, host="0.0.0.0", port=8001)
-        
+
+        uvicorn.run(app, host="0.0.0.0", port=8001, ws_ping_interval=20, ws_ping_timeout=20)
+
     except ImportError as e:
         print(f"Import error: {e}")
         print("Make sure you're running this from the backend directory")