Addressing review comments and bug.

Author: shenoyvvarun

.github/workflows/publish-to-pypi.yml

@@ -33,7 +33,7 @@ jobs:
         run: |
           WHEEL=$(ls dist/*.whl | head -n 1)
           python -m pip install "${WHEEL}[openai,google,anthropic]"
-          python -c "from oci_genai_auth.openai import OciOpenAI; from oci_genai_auth.google import OciGoogleGenAI; from oci_genai_auth.anthropic import OciAnthropic; import oci_genai_auth;"
+          python -c "from oci_genai_auth import OciSessionAuth; from oci_genai_auth import OciUserPrincipalAuth; import oci_genai_auth;"
       # - name: Publish to Test PyPI
       #   run: |
       #     python -m pip install twine

examples/common.py

@@ -18,44 +18,33 @@
 COMPARTMENT_ID = ""
 CONVERSATION_STORE_ID = ""
 OPENAI_PROJECT = ""
-OVERRIDE_URL = ""
 PROFILE_NAME = "DEFAULT"
-REGION = "us-chicago-1"
 GEMINI_API_KEY = ""
-GEMINI_BASE_URL = ""
+
+# OpenAI-compatible base URLs.
+OPENAI_BASE_URL_PT = "https://inference.generativeai.us-chicago-1.oci.oraclecloud.com/v1"
+OPENAI_BASE_URL_NP = "https://inference.generativeai.us-chicago-1.oci.oraclecloud.com/openai/v1"
+# Switch to "NP" for examples that store data on the server.
+RESPONSE_API_MODE = "PT"  # "PT" (pass-through) or "NP" (non-pass-through)
+
+# Other provider base URLs.
+ANTHROPIC_BASE_URL = "https://inference.generativeai.us-chicago-1.oci.oraclecloud.com/anthropic"
+GOOGLE_BASE_URL = "https://inference.generativeai.us-chicago-1.oci.oraclecloud.com/google"
 
 
 def _build_headers(include_conversation_store_id: bool = False) -> dict[str, str]:
-    headers: dict[str, str] = {}
-    if COMPARTMENT_ID:
-        headers["CompartmentId"] = COMPARTMENT_ID
-        headers["opc-compartment-id"] = COMPARTMENT_ID
-    if OPENAI_PROJECT:
-        headers["OpenAI-Project"] = OPENAI_PROJECT
-    if include_conversation_store_id and CONVERSATION_STORE_ID:
+    headers: dict[str, str] = {
+        "CompartmentId": COMPARTMENT_ID,
+        "opc-compartment-id": COMPARTMENT_ID,
+        "OpenAI-Project": OPENAI_PROJECT,
+    }
+    if include_conversation_store_id:
         headers["opc-conversation-store-id"] = CONVERSATION_STORE_ID
-    return headers
+    return {key: value for key, value in headers.items() if value}
 
 
 def _resolve_openai_base_url() -> str:
-    service_endpoint = OVERRIDE_URL or (
-        f"https://inference.generativeai.{REGION}.oci.oraclecloud.com" if REGION else ""
-    )
-    if not service_endpoint:
-        raise ValueError("REGION or OVERRIDE_URL must be set.")
-    return f"{service_endpoint.rstrip(' /')}/openai/v1"
-
-
-def _resolve_anthropic_base_url() -> str:
-    if not REGION:
-        raise ValueError("REGION or ANTHROPIC_BASE_URL must be set.")
-    return f"https://inference.generativeai.{REGION}.oci.oraclecloud.com/anthropic"
-
-
-def _resolve_google_base_url() -> str:
-    if not REGION:
-        raise ValueError("REGION or GOOGLE_BASE_URL must be set.")
-    return f"https://inference.generativeai.{REGION}.oci.oraclecloud.com/google"
+    return OPENAI_BASE_URL_NP if RESPONSE_API_MODE == "NP" else OPENAI_BASE_URL_PT
 
 
 def build_openai_client() -> "OpenAI":
@@ -95,7 +84,7 @@ def build_anthropic_client() -> "Anthropic":
 
     return Anthropic(
         api_key="not-used",
-        base_url=_resolve_anthropic_base_url(),
+        base_url=ANTHROPIC_BASE_URL,
         http_client=httpx.Client(
             auth=OciSessionAuth(profile_name=PROFILE_NAME),
             headers=_build_headers(),
@@ -108,7 +97,7 @@ def build_anthropic_async_client() -> "AsyncAnthropic":
 
     return AsyncAnthropic(
         api_key="not-used",
-        base_url=_resolve_anthropic_base_url(),
+        base_url=ANTHROPIC_BASE_URL,
         http_client=httpx.AsyncClient(
             auth=OciSessionAuth(profile_name=PROFILE_NAME),
             headers=_build_headers(),
@@ -127,7 +116,7 @@ def build_google_client() -> "genai.Client":
     return genai.Client(
         api_key="not-used",
         http_options={
-            "base_url": _resolve_google_base_url(),
+            "base_url": GOOGLE_BASE_URL,
             "headers": headers,
             "httpx_client": http_client,
         },
@@ -145,7 +134,7 @@ def build_google_async_client() -> tuple["genai.Client", httpx.AsyncClient]:
     client = genai.Client(
         api_key="not-used",
         http_options={
-            "base_url": _resolve_google_base_url(),
+            "base_url": GOOGLE_BASE_URL,
             "headers": headers,
             "httpx_async_client": http_client,
         },

…ion/create_response_fc_ parallel_tool.py …tion/create_response_fc_parallel_tool.pyexamples/openai/function/create_response_fc_ parallel_tool.py renamed to examples/openai/function/create_response_fc_parallel_tool.py examples/openai/function/create_response_fc_ parallel_tool.py renamed to examples/openai/function/create_response_fc_parallel_tool.py

@@ -47,7 +47,7 @@ dev = [
       "pytest-cov>=5.0.0,<6.0.0",
       "respx",
       "typing-extensions>=4.11, <5",
-      "openai>=v1.108.1",
+      "openai>=1.108.1",
       "google-genai>=1.0.0",
       "anthropic>=0.79.0",
       "openai-agents>=0.5.1",
@@ -94,7 +94,7 @@ exclude_lines = [
 ]
 
 [tool.ruff]
-target-version = "py38"
+target-version = "py39"
 line-length = 100
 extend-exclude = [
 ]
@@ -114,5 +114,5 @@ select = [
 
 [tool.black]
 line-length = 100
-target-version = ['py38']
+target-version = ['py39']
 exclude = '\.venv|build|dist'

pyproject.toml

@@ -58,8 +58,6 @@ def _should_refresh_token(self) -> bool:
         Returns:
             bool: True if token should be refreshed, False otherwise
         """
-        if not self._last_refresh:
-            return True
         current_time = time.time()
         return (current_time - self._last_refresh) >= self.refresh_interval
 
@@ -84,7 +82,7 @@ def _refresh_if_needed(self) -> None:
                     self._last_refresh = time.time()
                     logger.info("%s token refresh completed successfully", self.__class__.__name__)
                 except Exception as e:
-                    logger.exception("Warning: Token refresh failed:", e)
+                    logger.exception("Warning: Token refresh failed")
 
     def _sign_request(self, request: httpx.Request, content: bytes) -> None:
         """
@@ -150,7 +148,7 @@ def auth_flow(self, request: httpx.Request) -> Generator[httpx.Request, httpx.Re
                     self._sign_request(request, content)
                     yield request
                 except Exception as e:
-                    logger.exception("Token refresh on 401 failed:", e)
+                    logger.exception("Token refresh on 401 failed")
 
 
 class OciSessionAuth(HttpxOciAuth):
@@ -169,7 +167,7 @@ def __init__(
         config_file: str = DEFAULT_LOCATION,
         profile_name: str = DEFAULT_PROFILE,
         refresh_interval: int = 3600,
-        **kwargs: Mapping[str, Any],
+        **kwargs: Any,
     ):
         """
         Initialize a Security Token-based OCI signer.

src/oci_genai_auth/auth.py

@@ -34,6 +34,11 @@ def _refresh_signer(self) -> None:
         self.signer = _DummySigner(f"signed-{self.refresh_calls}")
 
 
+class _BrokenRefreshAuth(HttpxOciAuth):
+    def _refresh_signer(self) -> None:
+        raise ConnectionError("metadata service unreachable")
+
+
 def test_auth_flow_signs_request():
     auth = _DummyAuth(_DummySigner("signed-0"))
     request = httpx.Request(
@@ -71,6 +76,20 @@ def test_refresh_if_needed_calls_refresh_signer():
     assert auth.refresh_calls == 1
 
 
+def test_refresh_failure_does_not_break_auth_flow(caplog):
+    auth = _BrokenRefreshAuth(_DummySigner("signed-0"), refresh_interval=0)
+    request = httpx.Request("GET", "https://example.com")
+
+    with caplog.at_level("ERROR"):
+        flow = auth.auth_flow(request)
+        signed_request = next(flow)
+
+    assert signed_request.headers["authorization"] == "signed-0"
+    assert any(
+        "Token refresh failed" in record.message for record in caplog.records
+    )
+
+
 def test_session_auth_initializes_signer_from_config():
     config = {
         "key_file": "dummy.key",