Staging

api/agents/relevancy_agent.py

@@ -68,7 +68,7 @@ def __init__(self, queries_history: list, result_history: list):
                 self.messages.append({"role": "user", "content": query})
                 self.messages.append({"role": "assistant", "content": result})
 
-    def get_answer(self, user_question: str, database_desc: dict) -> dict:
+    async def get_answer(self, user_question: str, database_desc: dict) -> dict:
         """Get relevancy assessment for user question against database description."""
         self.messages.append(
             {

api/app_factory.py

@@ -11,6 +11,7 @@
 from starlette.middleware.sessions import SessionMiddleware
 from starlette.middleware.base import BaseHTTPMiddleware
 
+from api.auth.oauth_handlers import setup_oauth_handlers
 from api.routes.auth import auth_router, init_auth
 from api.routes.graphs import graphs_router
 from api.routes.database import database_router
@@ -83,6 +84,8 @@ def create_app():
     app.include_router(graphs_router, prefix="/graphs")
     app.include_router(database_router)
 
+    setup_oauth_handlers(app, app.state.oauth)
+
     @app.exception_handler(Exception)
     async def handle_oauth_error(request: Request, exc: Exception):
         """Handle OAuth-related errors gracefully"""
@@ -99,11 +102,4 @@ async def handle_oauth_error(request: Request, exc: Exception):
         # For other errors, let them bubble up
         raise exc
 
-    # Add template globals
-    @app.middleware("http")
-    async def add_template_globals(request: Request, call_next):
-        request.state.google_tag_manager_id = os.getenv("GOOGLE_TAG_MANAGER_ID")
-        response = await call_next(request)
-        return response
-
     return app

api/auth/oauth_handlers.py

@@ -34,7 +34,7 @@ async def handle_google_callback(_request: Request,
                 return False
 
             # Check if identity exists in Organizations graph, create if new
-            _, _ = ensure_user_in_organizations(
+            _, _ = await ensure_user_in_organizations(
                 user_id,
                 email,
                 name,
@@ -62,7 +62,7 @@ async def handle_github_callback(_request: Request,
                 return False
 
             # Check if identity exists in Organizations graph, create if new
-            _, _ = ensure_user_in_organizations(
+            _, _ = await ensure_user_in_organizations(
                 user_id,
                 email,
                 name,

api/auth/user_management.py

@@ -13,7 +13,7 @@
 from api.extensions import db
 
 
-def ensure_user_in_organizations(provider_user_id, email, name, provider, picture=None):
+async def ensure_user_in_organizations(provider_user_id, email, name, provider, picture=None):
     """
     Check if identity exists in Organizations graph, create if not.
     Creates separate Identity and User nodes with proper relationships.
@@ -80,7 +80,7 @@ def ensure_user_in_organizations(provider_user_id, email, name, provider, pictur
             EXISTS((user)<-[:AUTHENTICATES]-(:Identity)) AS had_other_identities
         """
 
-        result = organizations_graph.query(merge_query, {
+        result = await organizations_graph.query(merge_query, {
             "provider": provider,
             "provider_user_id": provider_user_id,
             "email": email,
@@ -124,7 +124,7 @@ def ensure_user_in_organizations(provider_user_id, email, name, provider, pictur
         return False, None
 
 
-def update_identity_last_login(provider, provider_user_id):
+async def update_identity_last_login(provider, provider_user_id):
     """Update the last login timestamp for an existing identity"""
     # Input validation
     if not provider or not provider_user_id:
@@ -145,7 +145,7 @@ def update_identity_last_login(provider, provider_user_id):
         SET identity.last_login = timestamp()
         RETURN identity
         """
-        organizations_graph.query(update_query, {
+        await organizations_graph.query(update_query, {
             "provider": provider,
             "provider_user_id": provider_user_id
         })

api/extensions.py

@@ -2,7 +2,8 @@
 
 import os
 
-from falkordb import FalkorDB
+from falkordb.asyncio import FalkorDB
+from redis.asyncio import ConnectionPool
 
 # Connect to FalkorDB
 url = os.getenv("FALKORDB_URL", None)
@@ -12,4 +13,13 @@
     except Exception as e:
         raise ConnectionError(f"Failed to connect to FalkorDB: {e}") from e
 else:
-    db = FalkorDB.from_url(os.getenv("FALKORDB_URL"))
+    # Ensure the URL is properly encoded as string and handle potential encoding issues
+    try:
+        # Create connection pool with explicit encoding settings
+        pool = ConnectionPool.from_url(
+            url, 
+            decode_responses=True
+        )
+        db = FalkorDB(connection_pool=pool)
+    except Exception as e:
+        raise ConnectionError(f"Failed to connect to FalkorDB with URL: {e}") from e