mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-09 03:18:44 +00:00
fix req changes by greptile
This commit is contained in:
parent
4dec34b752
commit
69928449f7
2 changed files with 14 additions and 1 deletions
|
|
@ -620,7 +620,7 @@ class Logging(LiteLLMLoggingBaseClass):
|
|||
if "litellm_metadata" in kwargs and isinstance(
|
||||
kwargs["litellm_metadata"], dict
|
||||
):
|
||||
if "metadata" not in base_litellm_params:
|
||||
if not base_litellm_params.get("metadata"):
|
||||
base_litellm_params["metadata"] = dict(kwargs["litellm_metadata"])
|
||||
else:
|
||||
base_litellm_params["metadata"] = dict(base_litellm_params["metadata"])
|
||||
|
|
|
|||
|
|
@ -467,6 +467,19 @@ class TestUpdateFromKwargs:
|
|||
assert result_meta["from_caller"] is True
|
||||
assert result_meta["user_api_key_hash"] == "hashed-xyz"
|
||||
|
||||
def test_merge_handles_metadata_none(self, logging_obj):
|
||||
"""When metadata=None is explicitly in kwargs alongside litellm_metadata,
|
||||
the merge should not crash (dict(None) would TypeError)."""
|
||||
kwargs = {
|
||||
"metadata": None,
|
||||
"litellm_metadata": {"user_api_key_hash": "hashed-abc"},
|
||||
}
|
||||
|
||||
logging_obj.update_from_kwargs(kwargs=kwargs)
|
||||
|
||||
result_meta = logging_obj.litellm_params["metadata"]
|
||||
assert result_meta["user_api_key_hash"] == "hashed-abc"
|
||||
|
||||
def test_caller_litellm_params_win_over_kwargs(self, logging_obj):
|
||||
"""Explicit litellm_params from the caller should override auto-extracted values."""
|
||||
kwargs = {"metadata": {"from_kwargs": True}}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue