credit issue fix

routers/gemini.py

@@ -72,7 +72,7 @@ async def create_job(
     credits_reserved: int = 0
 ) -> GeminiJob:
     """Create a new job in the queue."""
-    from services.gemini_job_worker import get_priority_for_job_type, get_pool
+    from services.gemini_service.job_processor import get_priority_for_job_type, get_pool
     
     job_id = f"job_{uuid.uuid4().hex[:16]}"
     priority = get_priority_for_job_type(job_type)
@@ -339,7 +339,7 @@ async def get_job_status(
     
 
     if job.status == "processing" and job.job_type == "video" and job.third_party_id:
-        from services.gemini_job_worker import GeminiJobProcessor
+        from services.gemini_service.job_processor import GeminiJobProcessor
         processor = GeminiJobProcessor()
         job = await processor.check_status(job, db)
         await db.commit()

services/credit_service/middleware.py

@@ -89,6 +89,7 @@ class CreditMiddleware(BaseServiceMiddleware):
                 request.state.credit_transaction_id = transaction.transaction_id
                 request.state.endpoint_type = endpoint_type
                 request.state.credit_cost = credit_cost
+                request.state.credits_reserved = credit_cost  # For gemini router compatibility
                 
                 self.log_request(
                     request,

services/credit_service/transaction_manager.py

@@ -70,7 +70,7 @@ class CreditTransactionManager:
         
         Args:
             session: Database session
-            user: User model instance
+            user: User model instance (used for user.id reference)
             amount: Number of credits to reserve
             source: Source of transaction (e.g., "middleware")
             reference_type: Type of reference (e.g., "request", "job")
@@ -84,10 +84,17 @@ class CreditTransactionManager:
             
         Raises:
             InsufficientCreditsError: If user doesn't have enough credits
+            UserNotFoundError: If user not found in database
         """
-        if user.credits < amount:
+        # Fetch fresh user from DB to ensure we have current state
+        # (user parameter may be detached from AuthMiddleware's closed session)
+        db_user = await session.get(User, user.id)
+        if not db_user:
+            raise UserNotFoundError(f"User {user.id} not found")
+        
+        if db_user.credits < amount:
             raise InsufficientCreditsError(
-                f"User has {user.credits} credits, needs {amount}"
+                f"User has {db_user.credits} credits, needs {amount}"
             )
         
         # Generate transaction ID
@@ -111,11 +118,11 @@ class CreditTransactionManager:
         # Create transaction record
         transaction = CreditTransaction(
             transaction_id=transaction_id,
-            user_id=user.id,
+            user_id=db_user.id,
             transaction_type="reserve",
             amount=-amount,  # Negative for deduction
-            balance_before=user.credits,
-            balance_after=user.credits - amount,
+            balance_before=db_user.credits,
+            balance_after=db_user.credits - amount,
             source=source,
             reference_type=reference_type,
             reference_id=reference_id,
@@ -126,15 +133,15 @@ class CreditTransactionManager:
         )
         
         # Update user balance
-        user.credits -= amount
-        user.last_used_at = datetime.utcnow()
+        db_user.credits -= amount
+        db_user.last_used_at = datetime.utcnow()
         
         session.add(transaction)
         await session.flush()  # Don't commit yet - let caller handle
         
         logger.info(
-            f"Reserved {amount} credits for user {user.user_id}, "
-            f"transaction: {transaction_id}, new balance: {user.credits}"
+            f"Reserved {amount} credits for user {db_user.user_id}, "
+            f"transaction: {transaction_id}, new balance: {db_user.credits}"
         )
         
         return transaction
@@ -299,7 +306,7 @@ class CreditTransactionManager:
         
         Args:
             session: Database session
-            user: User model instance
+            user: User model instance (used for user.id reference)
             amount: Number of credits to add
             source: Source of transaction (e.g., "payment")
             reference_type: Type of reference (e.g., "payment")
@@ -309,16 +316,25 @@ class CreditTransactionManager:
             
         Returns:
             CreditTransaction record
+            
+        Raises:
+            UserNotFoundError: If user not found in database
         """
+        # Fetch fresh user from DB to ensure we have current state
+        # (user parameter may be detached from AuthMiddleware's closed session)
+        db_user = await session.get(User, user.id)
+        if not db_user:
+            raise UserNotFoundError(f"User {user.id} not found")
+        
         transaction_id = f"add_{uuid.uuid4().hex[:16]}"
         
         transaction = CreditTransaction(
             transaction_id=transaction_id,
-            user_id=user.id,
+            user_id=db_user.id,
             transaction_type="purchase",
             amount=amount,
-            balance_before=user.credits,
-            balance_after=user.credits + amount,
+            balance_before=db_user.credits,
+            balance_after=db_user.credits + amount,
             source=source,
             reference_type=reference_type,
             reference_id=reference_id,
@@ -326,14 +342,14 @@ class CreditTransactionManager:
             extra_data=metadata
         )
         
-        user.credits += amount
+        db_user.credits += amount
         
         session.add(transaction)
         await session.flush()
         
         logger.info(
-            f"Added {amount} credits to user {user.user_id}, "
-            f"source: {source}, new balance: {user.credits}"
+            f"Added {amount} credits to user {db_user.user_id}, "
+            f"source: {source}, new balance: {db_user.credits}"
         )
         
         return transaction

tests/test_worker_pool.py

@@ -30,7 +30,7 @@ from services.priority_worker_pool import (
 )
 
 # Test the Gemini-specific implementation
-from services.gemini_job_worker import (
+from services.gemini_service.job_processor import (
     get_priority_for_job_type as gemini_get_priority,
     JOB_PRIORITY_MAP,
     GeminiJobProcessor