Populate OBO token ONLY dynamically.

Author: mgiannakopoulos

singlestoredb/ai/debugv3.py

@@ -173,23 +173,23 @@ def _inject_headers(request: Any, **_ignored: Any) -> None:
         )
 
     if t is not None:
-        http_client = httpx.Client(
+        http_client_internal = httpx.Client(
             timeout=t,
             auth=SingleStoreOpenAIAuth(api_key_getter_fn, obo_token_getter_fn),
         )
     else:
-        http_client = httpx.Client(
+        http_client_internal = httpx.Client(
             timeout=httpx.Timeout(timeout=600, connect=5.0),  # default OpenAI timeout
             auth=SingleStoreOpenAIAuth(api_key_getter_fn, obo_token_getter_fn),
         )
 
     # OpenAI / Azure OpenAI path
     openai_kwargs = dict(
         base_url=info.connection_url,
-        api_key='placeholder',
+        api_key=api_key_getter_fn(),
         model=model_name,
         streaming=streaming,
-        http_client=http_client,
+        http_client=http_client_internal,
     )
     return ChatOpenAI(
         **openai_kwargs,

singlestoredb/ai/utils.py

@@ -13,15 +13,19 @@ def __init__(self, api_key_getter, obo_token_getter):  # type: ignore
 
     def auth_flow(self, request):  # type: ignore[no-untyped-def]
         print(f'[DEBUG] auth_flow called for {request.method} {request.url}')
-        if self.api_key_getter is not None:
-            token_val = self.api_key_getter()
-            print(f"[DEBUG] api_key_getter: {token_val if token_val else 'None'}...")
-            if token_val:
-                request.headers['Authorization'] = f'Bearer {token_val}'
+        # if self.api_key_getter is not None:
+        #     token_val = self.api_key_getter()
+        #     print(f"[DEBUG] api_key_getter: {token_val if token_val else 'None'}...")
+        #     if token_val:
+        #         request.headers['Authorization'] = f'Bearer {token_val}'
+        # else:
+        #     print('[DEBUG] api_key_getter is None')
         if self.obo_token_getter is not None:
             obo_val = self.obo_token_getter()
             print(f"[DEBUG] obo_token_getter: {obo_val if obo_val else 'None'}...")
             if obo_val:
                 request.headers['X-S2-OBO'] = obo_val
+        else:
+            print('[DEBUG] obo_token_getter is None')
         print(f'[DEBUG] Final headers: {dict(request.headers)}')
         yield request