scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-28 01:32:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 43

refactor(vertex): log the credential source decision where it is made

Browse source
This commit is contained in:
Kolade Fajimi 2026-09-08 07:20:45 +01:00
parent 7da9cc7edf
commit 596cc4c0c2
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
litellm/llms/vertex_ai/credentials_source.py
View file

@ -6,6 +6,7 @@ it is decides what a failure means, so the two are told apart by the shape of th
each failure is returned as its own case instead of collapsing into one parse error.
"""
import os
from collections.abc import Mapping
from dataclasses import dataclass
from typing import Final, NoReturn, TypeAlias
@ -80,7 +81,7 @@ def _read_json_file(path: str) -> _VertexCredentialsFile:
return VertexCredentialsJson(parsed)
def is_inline_credentials_json(credentials: str) -> bool:
def _is_inline_credentials_json(credentials: str) -> bool:
"""Whether *credentials* carries the JSON itself rather than a path to a file holding it."""
return credentials.lstrip().startswith("{")
@ -92,7 +93,11 @@ def load_vertex_credentials_source(credentials: str) -> VertexCredentialsSource:
failure recognisable: `os.path.exists()` answers False for an unreadable path as well as
an absent one, so both used to reach the inline branch and be reported as malformed JSON.
"""
if not is_inline_credentials_json(credentials):
inline_first: Final = _is_inline_credentials_json(credentials)
verbose_logger.debug(
"Vertex: Loading vertex credentials, is_file_path=%s, current dir %s", not inline_first, os.getcwd()
)
if not inline_first:
return _read_json_file(credentials)
inline: Final = _parse_json_object(credentials)

7
litellm/llms/vertex_ai/vertex_llm_base.py
View file

@ -6,7 +6,6 @@ Handles Authentication and generating request urls for Vertex AI and Google AI S
import asyncio
import json
import os
import threading
from collections.abc import Mapping
from typing import TYPE_CHECKING, Any, Final, Literal, Protocol
@ -28,7 +27,6 @@ from .common_utils import (
)
from .credentials_source import (
VertexCredentialsJson,
is_inline_credentials_json,
load_vertex_credentials_source,
raise_vertex_credentials_failure,
)
@ -134,11 +132,6 @@ class VertexBase:
if credentials is not None:
if isinstance(credentials, str):
source: Final = load_vertex_credentials_source(credentials)
verbose_logger.debug(
"Vertex: Loading vertex credentials, is_file_path=%s, current dir %s",
not is_inline_credentials_json(credentials),
os.getcwd(),
)
if not isinstance(source, VertexCredentialsJson):
raise_vertex_credentials_failure(source)
json_obj: Mapping[str, object] = source.value