Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(sdk): Calls to Infernece API (#1113)

Morgan Dean896ed3f8d3b3
diff --git a/libs/python/agent/agent/adapters/cua_adapter.py b/libs/python/agent/agent/adapters/cua_adapter.py
index 0301903064..45f7e32731 100644
--- a/libs/python/agent/agent/adapters/cua_adapter.py
+++ b/libs/python/agent/agent/adapters/cua_adapter.py
@@ -16,8 +16,22 @@ class CUAAdapter(CustomLLM):
)
def _normalize_model(self, model: str) -> str:
- # Accept either "cua/<model>" or raw "<model>"
- return model.split("/", 1)[1] if model and model.startswith("cua/") else model
+ """Strip known prefixes to get the base model name."""
+ known_prefixes = ("cua/", "anthropic/", "gemini/", "google/", "openai/")
+ result = model
+ for prefix in known_prefixes:
+ if result.startswith(prefix):
+ result = result[len(prefix) :]
+ return result
+
+ def _resolve_route(self, model: str, api_base: str) -> tuple[str, str]:
+ """Return (prefixed_model, api_base) for the CUA inference API."""
+ if "anthropic/" in model:
+ return f"anthropic/{self._normalize_model(model)}", api_base.removesuffix("/v1")
+ elif "gemini/" in model or "google/" in model:
+ return f"gemini/{self._normalize_model(model)}", api_base + "/gemini"
+ else:
+ return f"openai/{self._normalize_model(model)}", api_base
def _resolve_api_key(self, kwargs: dict | None = None) -> str:
"""Resolve the CUA API key, raising a clear error if missing.
@@ -40,25 +54,25 @@ class CUAAdapter(CustomLLM):
return resolved
def completion(self, *args, **kwargs) -> ModelResponse:
- model = kwargs.get("model", "")
- api_base = kwargs.get("api_base") or self.base_url
- if "anthropic/" in model:
- model = f"anthropic/{self._normalize_model(model)}"
- api_base = api_base.removesuffix("/v1")
- elif "gemini/" in model or "google/" in model:
- # Route to Gemini pass-through endpoint
- model = f"gemini/{self._normalize_model(model)}"
- api_base = api_base + "/gemini"
- else:
- model = f"openai/{self._normalize_model(model)}"
+ model, api_base = self._resolve_route(
+ kwargs.get("model", ""), kwargs.get("api_base") or self.base_url
+ )
api_key = self._resolve_api_key(kwargs)
+ # Ensure the CUA inference API always receives Bearer auth;
+ # merge caller headers first, then force Authorization so it cannot be overridden.
+ extra_headers = {}
+ if "extra_headers" in kwargs:
+ extra_headers.update(kwargs.pop("extra_headers"))
+ extra_headers["Authorization"] = f"Bearer {api_key}"
+
params = {
"model": model,
"messages": kwargs.get("messages", []),
"api_base": api_base,
"api_key": api_key,
+ "extra_headers": extra_headers,
"stream": False,
}
@@ -67,7 +81,11 @@ class CUAAdapter(CustomLLM):
params["tools"] = kwargs["tools"]
if "optional_params" in kwargs:
- params.update(kwargs["optional_params"])
+ protected_keys = {"api_key", "extra_headers", "model", "api_base", "stream"}
+ filtered = {
+ k: v for k, v in kwargs["optional_params"].items() if k not in protected_keys
+ }
+ params.update(filtered)
del kwargs["optional_params"]
if "headers" in kwargs:
@@ -102,25 +120,25 @@ class CUAAdapter(CustomLLM):
return completion(**params) # type: ignore
async def acompletion(self, *args, **kwargs) -> ModelResponse:
- model = kwargs.get("model", "")
- api_base = kwargs.get("api_base") or self.base_url
- if "anthropic/" in model:
- model = f"anthropic/{self._normalize_model(model)}"
- api_base = api_base.removesuffix("/v1")
- elif "gemini/" in model or "google/" in model:
- # Route to Gemini pass-through endpoint
- model = f"gemini/{self._normalize_model(model)}"
- api_base = api_base + "/gemini"
- else:
- model = f"openai/{self._normalize_model(model)}"
+ model, api_base = self._resolve_route(
+ kwargs.get("model", ""), kwargs.get("api_base") or self.base_url
+ )
api_key = self._resolve_api_key(kwargs)
+ # Ensure the CUA inference API always receives Bearer auth;
+ # merge caller headers first, then force Authorization so it cannot be overridden.
+ extra_headers = {}
+ if "extra_headers" in kwargs:
+ extra_headers.update(kwargs.pop("extra_headers"))
+ extra_headers["Authorization"] = f"Bearer {api_key}"
+
params = {
"model": model,
"messages": kwargs.get("messages", []),
"api_base": api_base,
"api_key": api_key,
+ "extra_headers": extra_headers,
"stream": False,
}
@@ -129,7 +147,11 @@ class CUAAdapter(CustomLLM):
params["tools"] = kwargs["tools"]
if "optional_params" in kwargs:
- params.update(kwargs["optional_params"])
+ protected_keys = {"api_key", "extra_headers", "model", "api_base", "stream"}
+ filtered = {
+ k: v for k, v in kwargs["optional_params"].items() if k not in protected_keys
+ }
+ params.update(filtered)
del kwargs["optional_params"]
if "headers" in kwargs:
@@ -167,13 +189,24 @@ class CUAAdapter(CustomLLM):
def streaming(self, *args, **kwargs) -> Iterator[GenericStreamingChunk]:
params = dict(kwargs)
- inner_model = self._normalize_model(params.get("model", ""))
+ model, api_base = self._resolve_route(
+ params.get("model", ""), params.get("api_base") or self.base_url
+ )
api_key = self._resolve_api_key(kwargs)
+
+ # Ensure the CUA inference API always receives Bearer auth;
+ # merge caller headers first, then force Authorization so it cannot be overridden.
+ extra_headers = {}
+ if "extra_headers" in params:
+ extra_headers.update(params.pop("extra_headers"))
+ extra_headers["Authorization"] = f"Bearer {api_key}"
+
params.update(
{
- "model": f"openai/{inner_model}",
- "api_base": self.base_url,
+ "model": model,
+ "api_base": api_base,
"api_key": api_key,
+ "extra_headers": extra_headers,
"stream": True,
}
)
@@ -187,13 +220,24 @@ class CUAAdapter(CustomLLM):
async def astreaming(self, *args, **kwargs) -> AsyncIterator[GenericStreamingChunk]:
params = dict(kwargs)
- inner_model = self._normalize_model(params.get("model", ""))
+ model, api_base = self._resolve_route(
+ params.get("model", ""), params.get("api_base") or self.base_url
+ )
api_key = self._resolve_api_key(kwargs)
+
+ # Ensure the CUA inference API always receives Bearer auth;
+ # merge caller headers first, then force Authorization so it cannot be overridden.
+ extra_headers = {}
+ if "extra_headers" in params:
+ extra_headers.update(params.pop("extra_headers"))
+ extra_headers["Authorization"] = f"Bearer {api_key}"
+
params.update(
{
- "model": f"openai/{inner_model}",
- "api_base": self.base_url,
+ "model": model,
+ "api_base": api_base,
"api_key": api_key,
+ "extra_headers": extra_headers,
"stream": True,
}
)