ref

core/models.py

@@ -348,7 +348,7 @@ class CreditTransaction(Base):
     
     # Additional details
     reason = Column(Text, nullable=True)  # Human-readable reason
-    metadata = Column(JSON, nullable=True)  # Additional context (endpoint_type, error_message, etc.)
+    extra_data = Column(JSON, nullable=True)  # Additional context (endpoint_type, error_message, etc.)
     
     # Timestamps
     created_at = Column(DateTime(timezone=True), server_default=func.now(), index=True)

services/audit_service/__init__.py

@@ -7,11 +7,7 @@ from services.audit_service.config import AuditServiceConfig
 from services.audit_service.middleware import AuditMiddleware
 
 # Import the existing AuditService from parent
-import sys
-import os
-# Add parent directory to path to import audit_service.py
-sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
-from audit_service import AuditService
+from .core import AuditService
 
 __all__ = [
     'AuditServiceConfig',

services/credit_service/middleware.py

@@ -44,14 +44,16 @@ class CreditMiddleware(BaseServiceMiddleware):
         path = request.url.path
         
 
+        
         config = CreditServiceConfig.get_config(path)
         credit_cost = config.get("cost", 0)
         endpoint_type = config.get("type", "free")
         
-
+        # Skip free endpoints
+        if credit_cost == 0:
             return await call_next(request)
         
-
+        # Require authentication for paid endpoints
         user = getattr(request.state, 'user', None)
         if not user:
             return JSONResponse(
@@ -59,9 +61,9 @@ class CreditMiddleware(BaseServiceMiddleware):
                 content={"detail": "Authentication required for this endpoint"}
             )
         
-
+        # Reserve credits
         async with async_session_maker() as db:
-
+            try:
                 transaction = await CreditTransactionManager.reserve_credits(
                     session=db,
                     user=user,
@@ -79,7 +81,7 @@ class CreditMiddleware(BaseServiceMiddleware):
                 
                 await db.commit()
                 
-
+                # Store transaction info in request state
                 request.state.credit_transaction_id = transaction.transaction_id
                 request.state.endpoint_type = endpoint_type
                 request.state.credit_cost = credit_cost
@@ -108,23 +110,24 @@ class CreditMiddleware(BaseServiceMiddleware):
                 )
         
 
+        # Process request
         response = await call_next(request)
         
-
+        # Check if credits were reserved
         transaction_id = getattr(request.state, 'credit_transaction_id', None)
-
+        if not transaction_id:
             return response
         
-
+        # Read response body for inspection
         response_body = b""
         async for chunk in response.body_iterator:
             response_body += chunk
         
-
+        # Inspect response to determine credit handling
         response_data = ResponseInspector.parse_response_body(response_body)
         inspector = ResponseInspector()
         
-
+        # Confirm or refund based on response
         async with async_session_maker() as db:
             try:
                 should_confirm = inspector.should_confirm(
@@ -134,7 +137,7 @@ class CreditMiddleware(BaseServiceMiddleware):
                     response, endpoint_type, response_data
                 )
                 
-
+                if should_confirm:
                     await CreditTransactionManager.confirm_credits(
                         session=db,
                         transaction_id=transaction_id,
@@ -150,7 +153,7 @@ class CreditMiddleware(BaseServiceMiddleware):
                         f"Credits confirmed for {transaction_id} (success)"
                     )
                 
-
+                elif should_refund:
                     reason = inspector.get_refund_reason(response, response_data)
                     await CreditTransactionManager.refund_credits(
                         session=db,
@@ -169,14 +172,14 @@ class CreditMiddleware(BaseServiceMiddleware):
                         f"Credits refunded for {transaction_id}: {reason}"
                     )
                 
-
+                else:
                     self.log_request(
                         request,
                         f"Credits kept reserved for {transaction_id} (async pending)"
                     )
                 
             except Exception as e:
-
+                logger.error(f"Error processing credit confirmation/refund: {e}", exc_info=True)
         
 
         return Response(

services/credit_service/transaction_manager.py

@@ -122,7 +122,7 @@ class CreditTransactionManager:
             request_path=request_path,
             request_method=request_method,
             reason=reason or f"Reserved for {request_path or 'operation'}",
-            metadata={**request_metadata, **(metadata or {})}
+            extra_data={**request_metadata, **(metadata or {})}
         )
         
         # Update user balance
@@ -187,7 +187,7 @@ class CreditTransactionManager:
             request_path=original.request_path,
             request_method=original.request_method,
             reason=f"Confirmed usage for {original.transaction_id}",
-            metadata={
+            extra_data={
                 "original_transaction_id": transaction_id,
                 **(metadata or {})
             }
@@ -262,7 +262,7 @@ class CreditTransactionManager:
             request_path=original.request_path,
             request_method=original.request_method,
             reason=reason,
-            metadata={
+            extra_data={
                 "original_transaction_id": transaction_id,
                 **(metadata or {})
             }
@@ -323,7 +323,7 @@ class CreditTransactionManager:
             reference_type=reference_type,
             reference_id=reference_id,
             reason=reason,
-            metadata=metadata
+            extra_data=metadata
         )
         
         user.credits += amount

services/gemini_service/__init__.py

@@ -16,7 +16,6 @@ from services.gemini_service.api_client import (
     get_gemini_api_key,
     MOCK_MODE,
     MOCK_VIDEO_URL,
-    GeminiAPIClient, # Added
 )
 
 # Job Processor exports
@@ -41,7 +40,6 @@ __all__ = [
     'get_gemini_api_key',
     'MOCK_MODE',
     'MOCK_VIDEO_URL',
-    'GeminiAPIClient',
     
     # Job Processor
     'GeminiJobProcessor',

services/gemini_service/api_key_middleware.py

@@ -68,7 +68,7 @@ class APIKeyMiddleware(BaseHTTPMiddleware):
         response = await call_next(request)
         
         # Handle quota errors
-        if response.status_code == 429 and API KeyServiceConfig._retry_on_quota_error:
+        if response.status_code == 429 and APIKeyServiceConfig._retry_on_quota_error:
             logger.warning(f"Quota error on key {key_index}, attempting retry")
             
             # Mark key in cooldown

services/payment_service/transaction_manager.py

@@ -73,7 +73,7 @@ class PaymentTransactionManager:
             amount_paise=amount_paise,
             currency=currency,
             status="created",
-            metadata=metadata or {},
+            extra_data=metadata or {},
             created_at=datetime.utcnow()
         )
         
@@ -128,7 +128,7 @@ class PaymentTransactionManager:
         transaction.paid_at = datetime.utcnow()
         
         if metadata:
-            transaction.metadata.update(metadata)
+            transaction.extra_data.update(metadata)
         
         logger.info(
             f"Verified payment: {transaction_id}, "
@@ -170,7 +170,7 @@ class PaymentTransactionManager:
         transaction.error_message = error_message[:1000]  # Truncate
         
         if metadata:
-            transaction.metadata.update(metadata)
+            transaction.extra_data.update(metadata)
         
         logger.warning(f"Payment failed: {transaction_id}, reason: {error_message}")