feat: first working version of payments for nilAI

Author: jcabrero

docker-compose.dev.yml

@@ -106,11 +106,16 @@ services:
     depends_on:
       nilauth-postgres:
         condition: service_healthy
+<<<<<<< HEAD
     healthcheck:
       test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:3000/health"]
       interval: 30s
       retries: 3
       start_period: 15s
       timeout: 10s
+=======
+
+
+>>>>>>> a4d2f92 (feat: first working version of payments for nilAI)
 volumes:
   postgres_data:

nilai-api/pyproject.toml

@@ -36,7 +36,10 @@ dependencies = [
     "pyyaml>=6.0.1",
     "trafilatura>=1.7.0",
     "secretvaults",
+<<<<<<< HEAD
     "e2b-code-interpreter>=1.0.3",
+=======
+>>>>>>> a4d2f92 (feat: first working version of payments for nilAI)
     "nilauth-credit-middleware>=0.1.0",
 ]
 

nilai-api/src/nilai_api/credit.py

@@ -12,8 +12,11 @@
 
 from nilai_api.config import CONFIG
 
+<<<<<<< HEAD
 from nuc.envelope import NucTokenEnvelope
 
+=======
+>>>>>>> a4d2f92 (feat: first working version of payments for nilAI)
 logger = logging.getLogger(__name__)
 
 
@@ -94,7 +97,11 @@ class LLMResponse(BaseModel):
 
 def user_id_extractor() -> Callable[[Request], Awaitable[str]]:
     if CONFIG.auth.auth_strategy == "nuc":
+<<<<<<< HEAD
         return from_nuc_bearer_root_token()
+=======
+        return UserIdExtractors.from_nuc_bearer_token()
+>>>>>>> a4d2f92 (feat: first working version of payments for nilAI)
     else:
         extractor = UserIdExtractors.from_header("Authorization")
 
@@ -109,6 +116,7 @@ async def wrapper(request: Request) -> str:
         return wrapper
 
 
+<<<<<<< HEAD
 def from_nuc_bearer_root_token() -> Callable[[Request], Awaitable[str]]:
     """Extract user ID from a NUC root token"""
 
@@ -127,6 +135,8 @@ async def extractor(request: Request) -> str:
     return extractor
 
 
+=======
+>>>>>>> a4d2f92 (feat: first working version of payments for nilAI)
 def llm_cost_calculator(llm_cost_dict: LLMCostDict):
     async def calculator(request: Request, response_data: dict) -> float:
         model_name = getattr(request, "model", "default")