fix log v1.5.3

src/auth/dependencies.py

@@ -21,43 +21,54 @@ from firebase_admin import auth as firebase_auth
 from src.db.firebase import verify_token
 
 
+import inspect
+import time
+
 async def get_current_user(
     token: str = Depends(oauth2_scheme)
 ) -> User:
     """
-    Get the currently authenticated user with improved error reporting.
+    Get the currently authenticated user with extreme diagnostic introspection (v5).
     """
     db = get_firebase_db()
     firebase_error = None
+    session_id = str(int(time.time()))[-4:] # Last 4 digits of timestamp
 
     # Log token prefix for debugging
     token_prefix = token[:10] if token else "None"
-    logger.info(f"Received token starting with: {token_prefix}...")
+    logger.info(f"[v5-{session_id}] Received token {token_prefix}...")
 
     # 1. Try Firebase Verification
     try:
+        # INTROSPECTION: Where does verify_token come from?
+        vt_file = "Unknown"
+        try:
+            vt_file = inspect.getfile(verify_token)
+        except:
+            pass
+        vt_module = getattr(verify_token, "__module__", "Unknown")
+        
+        logger.info(f"[v5-{session_id}] Calling verify_token from {vt_module} ({vt_file})")
+        
         firebase_result = verify_token(token)
-        # Log type for absolute certainty
-        logger.info(f"[v4] Firebase result type: {type(firebase_result)}")
+        logger.info(f"[v5-{session_id}] Firebase result type: {type(firebase_result)}")
         
         if not isinstance(firebase_result, dict):
-            firebase_error = f"[v4] Internal Error [CP0]: verify_token returned {type(firebase_result)}"
+            firebase_error = f"[v5] Internal Error [CP0]: verify_token returned {type(firebase_result)} (Expected dict)"
             firebase_payload = None
         else:
             firebase_payload = firebase_result.get("payload")
             firebase_error = firebase_result.get("error")
         
-        # CHANGED: Use explicit None check to handle empty dicts {} which are falsy
         if firebase_payload is not None:
             uid = firebase_payload.get("uid")
             email = firebase_payload.get("email")
             if not uid:
-                 logger.error("[v4] Firebase payload missing 'uid' [CP1]")
-                 # Adding full payload string to help debug if it's truly empty
-                 raise HTTPException(status_code=401, detail=f"Invalid Firebase token payload [CP1-v4]. Payload: {str(firebase_payload)}")
+                 logger.error(f"[v5-{session_id}] Firebase payload missing 'uid' [CP1]")
+                 raise HTTPException(status_code=401, detail=f"Invalid Firebase token payload [CP1-v5]. Payload keys: {list(firebase_payload.keys())}")
             
             if db is None:
-                 logger.warning(f"[v4] Firestore not available, returning transient user for {email} [CP2]")
+                 logger.warning(f"[v5-{session_id}] Firestore not available, returning transient user for {email} [CP2]")
                  return User(id=uid, email=email or "unknown@example.com", username=firebase_payload.get("name", uid), role="user")
 
             # Retrieve from Firestore
@@ -71,7 +82,7 @@ async def get_current_user(
                 user_data.setdefault("role", user_data.get("role", "user"))
                 return User(**user_data)
             else:
-                logger.info(f"[v4] New Firebase user detected: {email or uid} [CP3]")
+                logger.info(f"[v5-{session_id}] New Firebase user detected: {email or uid} [CP3]")
                 return User(
                     id=uid,
                     email=email or "unknown@example.com",
@@ -82,8 +93,8 @@ async def get_current_user(
     except HTTPException:
         raise
     except Exception as e:
-        logger.error(f"[v4] Unexpected error in Firebase auth path: {repr(e)} [CP4]")
-        firebase_error = f"Exception [CP4-v4]: {repr(e)}"
+        logger.error(f"[v5-{session_id}] Unexpected error in Firebase auth path: {repr(e)} [CP4]")
+        firebase_error = f"Exception [CP4-v5]: {repr(e)}"
 
     # 2. Fallback to Custom JWT Decoding
     try:
@@ -91,7 +102,7 @@ async def get_current_user(
         if payload:
             username: Optional[str] = payload.get("sub")
             if not username:
-                raise HTTPException(status_code=401, detail="Token missing subject claim [CP5-v4]")
+                raise HTTPException(status_code=401, detail="Token missing subject claim [CP5-v5]")
 
             if db is None:
                 return User(id="mock_id", email="mock@example.com", username=username, password_hash="mock", role="user")
@@ -105,18 +116,18 @@ async def get_current_user(
                 user_data["id"] = user_doc.id
                 return User(**user_data)
             else:
-                logger.error(f"[v4] User {username} not found in database [CP6]")
-                raise HTTPException(status_code=401, detail="User account not found [CP6-v4]")
+                logger.error(f"[v5-{session_id}] User {username} not found in database [CP6]")
+                raise HTTPException(status_code=401, detail="User account not found [CP6-v5]")
     except HTTPException:
         raise
     except Exception as e:
-        logger.error(f"[v4] Unexpected error in custom JWT auth path: {repr(e)} [CP7]")
+        logger.error(f"[v5-{session_id}] Unexpected error in custom JWT auth path: {repr(e)} [CP7]")
 
     # If both failed, then it's a 401
-    fb_diag = f"Firebase(v4): {firebase_error if firebase_error else f'Payload is {type(firebase_payload)}({str(firebase_payload)})'}"
-    error_detail = f"Auth Failure [CP8-v4] | Token: {token_prefix}... | {fb_diag}"
+    fb_diag = f"Firebase(v5-{session_id}): {firebase_error if firebase_error else f'Payload is {type(firebase_payload)}({str(firebase_payload)})'}"
+    error_detail = f"Auth Failure [CP8-v5] | Token: {token_prefix}... | {fb_diag}"
     
-    logger.error(f"Authentication failed (v4): {error_detail}")
+    logger.error(f"Authentication failed (v5): {error_detail}")
     raise HTTPException(
         status_code=status.HTTP_401_UNAUTHORIZED,
         detail=error_detail,

src/db/firebase.py

@@ -26,11 +26,16 @@ def get_firebase_db():
             import json
             service_account_info = json.loads(settings.firebase_service_account_json)
             cred = credentials.Certificate(service_account_info)
+            
+            # Explicitly extract project_id from JSON if possible
+            project_id = service_account_info.get('project_id') or settings.firebase_project_id
+            
             firebase_admin.initialize_app(cred, {
-                'storageBucket': settings.firebase_storage_bucket
+                'storageBucket': settings.firebase_storage_bucket,
+                'projectId': project_id
             })
             _db = firestore.client()
-            logger.info("Firebase initialized successfully using environment variable JSON.")
+            logger.info(f"Firebase initialized successfully for project: {project_id} (using JSON)")
             return _db
 
         # Priority 2: Check for service account file
@@ -42,11 +47,12 @@ def get_firebase_db():
 
         cred = credentials.Certificate(str(service_account_path))
         firebase_admin.initialize_app(cred, {
-            'storageBucket': settings.firebase_storage_bucket
+            'storageBucket': settings.firebase_storage_bucket,
+            'projectId': settings.firebase_project_id
         })
         
         _db = firestore.client()
-        logger.info("Firebase initialized successfully using service account file.")
+        logger.info(f"Firebase initialized successfully for project: {settings.firebase_project_id} (using file)")
         return _db
     except Exception as e:
         logger.error(f"Failed to initialize Firebase: {e}")
@@ -54,23 +60,28 @@ def get_firebase_db():
 
 def verify_token(id_token: str):
     """
-    Verify a Firebase ID token with detailed error logging.
+    Verify a Firebase ID token with v5 absolute diagnostic clarity.
+    Returns: {"payload": decoded_token, "error": error_message}
     """
     try:
         # Check if any app is initialized, if not try to initialize
         if not firebase_admin._apps:
-            logger.warning("Firebase app not initialized. Attempting default initialization...")
+            logger.warning("[v5] Firebase app not initialized. Attempting default initialization...")
             get_firebase_db()
             
         if not firebase_admin._apps:
-            logger.error("Firebase app could not be initialized. Cannot verify token.")
-            return None
+            return {"payload": None, "error": "[v5] Firebase app could not be initialized."}
 
+        # The core SDK call
         decoded_token = auth.verify_id_token(id_token)
-        return decoded_token
+        
+        if decoded_token is None:
+             logger.error("[v5] auth.verify_id_token returned None unexpectedly.")
+             return {"payload": None, "error": "[v5] Firebase SDK returned None for token verification."}
+             
+        logger.info(f"[v5] Firebase token successfully verified for UID: {decoded_token.get('uid')}")
+        return {"payload": decoded_token, "error": None}
     except Exception as e:
-        logger.error(f"Firebase token verification failed: {str(e)}")
-        # Log more info about the token context if possible (length, etc)
-        if id_token:
-            logger.debug(f"Token length: {len(id_token)}, starts with: {id_token[:10]}...")
-        return None
+        error_msg = f"[v5] Exception during verify_id_token: {repr(e)}"
+        logger.error(error_msg)
+        return {"payload": None, "error": error_msg}

test_gen.py

@@ -0,0 +1,25 @@
+import sys
+import os
+from pathlib import Path
+
+# Add project root to path
+sys.path.append(str(Path(__file__).parent))
+
+from src.summarization.note_generator import NoteGenerator
+from src.utils.config import settings
+
+def test_note_generator():
+    print("Testing NoteGenerator initialization after fix...")
+    try:
+        # We need an API key for initialization if it's not in env
+        api_key = os.getenv("GOOGLE_API_KEY", "dummy_key")
+        gen = NoteGenerator(api_key=api_key)
+        print("✅ Initialization successful")
+        print(f"Model ID: {gen.model_id}")
+    except Exception as e:
+        print(f"❌ Initialization failed: {e}")
+        import traceback
+        traceback.print_exc()
+
+if __name__ == "__main__":
+    test_note_generator()

test_verify.py

@@ -0,0 +1,29 @@
+import sys
+from pathlib import Path
+
+# Add src to path
+sys.path.append(str(Path(__file__).parent))
+
+from src.db.firebase import verify_token
+import firebase_admin
+
+def test_verify():
+    print("Testing verify_token with invalid token...")
+    # This should return a dict with error and no payload
+    result = verify_token("invalid_token")
+    print(f"Result type: {type(result)}")
+    print(f"Result content: {result}")
+    
+    if isinstance(result, dict):
+        payload = result.get("payload")
+        error = result.get("error")
+        print(f"Payload: {payload} (Type: {type(payload)})")
+        print(f"Error: {error} (Type: {type(error)})")
+        
+        if not payload:
+            print("Payload is falsy")
+        if not error:
+            print("Error is falsy")
+
+if __name__ == "__main__":
+    test_verify()