fix(models): ignore a non-string account_id in the Codex auth file (#5601)

load_codex_cli_credential copied tokens.account_id straight into CodexCliCredential.account_id with no type check. A Codex auth file whose account_id is JSON null therefore propagated None into CodexChatModel._account_id, and model_post_init raised TypeError: 'NoneType' object is not subscriptable on the account prefix in its log line. A numeric or boolean account_id slipped through the same way, reaching the ChatGPT-Account-ID header as a non-string.

Treat any non-string account_id as absent and fall back to the credential's empty-string default, matching how a missing account_id already behaves.
This commit is contained in:
哈基米 2026-09-20 16:08:27 +08:00 committed by GitHub
parent 3fdf04597e
commit 4e8e2ce691
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 62 additions and 0 deletions

View File

@ -241,6 +241,9 @@ def load_codex_cli_credential() -> CodexCliCredential | None:
access_token = data.get("access_token") or data.get("token") or tokens.get("access_token", "") access_token = data.get("access_token") or data.get("token") or tokens.get("access_token", "")
account_id = data.get("account_id") or tokens.get("account_id", "") account_id = data.get("account_id") or tokens.get("account_id", "")
if not isinstance(account_id, str):
logger.debug("Codex CLI credentials file has a non-string account_id; using no account")
account_id = ""
if not access_token: if not access_token:
logger.debug("Codex CLI credentials file exists but no token found") logger.debug("Codex CLI credentials file exists but no token found")
return None return None

View File

@ -361,3 +361,20 @@ def test_parse_tool_call_arguments_non_dict_json():
parsed, err = model._parse_tool_call_arguments({"arguments": '["list", "not", "dict"]', "name": "t", "call_id": "c"}) parsed, err = model._parse_tool_call_arguments({"arguments": '["list", "not", "dict"]', "name": "t", "call_id": "c"})
assert parsed is None assert parsed is None
assert err is not None assert err is not None
# ---------------------------------------------------------------------------
# Credential loading
# ---------------------------------------------------------------------------
def test_model_post_init_accepts_null_account_id(tmp_path, monkeypatch):
auth_path = tmp_path / "auth.json"
auth_path.write_text(json.dumps({"tokens": {"access_token": "tok-test", "account_id": None}}))
monkeypatch.setenv("CODEX_AUTH_PATH", str(auth_path))
from deerflow.models.openai_codex_provider import CodexChatModel
model = CodexChatModel(model="gpt-5.4", reasoning_effort="medium")
assert model._account_id == ""

View File

@ -406,3 +406,45 @@ def test_codex_chat_model_reports_missing_credential_for_non_object_auth_file(tm
with pytest.raises(ValueError, match="Codex CLI credential not found"): with pytest.raises(ValueError, match="Codex CLI credential not found"):
CodexChatModel(model="gpt-5.4") CodexChatModel(model="gpt-5.4")
def test_load_codex_cli_credential_defaults_null_account_id(tmp_path, monkeypatch):
auth_path = tmp_path / "auth.json"
auth_path.write_text(
json.dumps(
{
"tokens": {
"access_token": "codex-access-token",
"account_id": None,
}
}
)
)
monkeypatch.setenv("CODEX_AUTH_PATH", str(auth_path))
cred = load_codex_cli_credential()
assert cred is not None
assert cred.access_token == "codex-access-token"
assert cred.account_id == ""
def test_load_codex_cli_credential_ignores_non_string_account_id(tmp_path, monkeypatch):
auth_path = tmp_path / "auth.json"
auth_path.write_text(
json.dumps(
{
"tokens": {
"access_token": "codex-access-token",
"account_id": 12345,
}
}
)
)
monkeypatch.setenv("CODEX_AUTH_PATH", str(auth_path))
cred = load_codex_cli_credential()
assert cred is not None
assert cred.access_token == "codex-access-token"
assert cred.account_id == ""