fix(litellm_pre_call_utils.py): fix dynamic key logging when team id …

…is set

Fixes issue where key logging would not be set if team metadata was not none

litellm/proxy/_new_secret_config.yaml

@@ -3,11 +3,4 @@ model_list:
     litellm_params:
       model: azure/chatgpt-v-2
       api_key: os.environ/AZURE_API_KEY
-      api_base: os.environ/AZURE_API_BASE
-
-router_settings:
-  model_group_alias: {"gpt-4": "gpt-turbo"} 
-  retry_policy: {
-    "BadRequestErrorRetries": 3,
-    "ContentPolicyViolationErrorRetries": 4
-  }
+      api_base: os.environ/AZURE_API_BASE

litellm/proxy/litellm_pre_call_utils.py

@@ -107,7 +107,16 @@ def _get_dynamic_logging_metadata(
     user_api_key_dict: UserAPIKeyAuth,
 ) -> Optional[TeamCallbackMetadata]:
     callback_settings_obj: Optional[TeamCallbackMetadata] = None
-    if user_api_key_dict.team_metadata is not None:
+    if (
+        user_api_key_dict.metadata is not None
+        and "logging" in user_api_key_dict.metadata
+    ):
+        for item in user_api_key_dict.metadata["logging"]:
+            callback_settings_obj = convert_key_logging_metadata_to_callback(
+                data=AddTeamCallback(**item),
+                team_callback_settings_obj=callback_settings_obj,
+            )
+    elif user_api_key_dict.team_metadata is not None:
         team_metadata = user_api_key_dict.team_metadata
         if "callback_settings" in team_metadata:
             callback_settings = team_metadata.get("callback_settings", None) or {}
@@ -124,15 +133,7 @@ def _get_dynamic_logging_metadata(
             }
             }
             """
-    elif (
-        user_api_key_dict.metadata is not None
-        and "logging" in user_api_key_dict.metadata
-    ):
-        for item in user_api_key_dict.metadata["logging"]:
-            callback_settings_obj = convert_key_logging_metadata_to_callback(
-                data=AddTeamCallback(**item),
-                team_callback_settings_obj=callback_settings_obj,
-            )
+
     return callback_settings_obj
 
 

litellm/tests/test_proxy_utils.py

@@ -11,8 +11,11 @@
 sys.path.insert(
     0, os.path.abspath("../..")
 )  # Adds the parent directory to the system path
-from litellm.proxy._types import UserAPIKeyAuth
-from litellm.proxy.litellm_pre_call_utils import add_litellm_data_to_request
+from litellm.proxy._types import LitellmUserRoles, UserAPIKeyAuth
+from litellm.proxy.litellm_pre_call_utils import (
+    _get_dynamic_logging_metadata,
+    add_litellm_data_to_request,
+)
 from litellm.types.utils import SupportedCacheControls
 
 
@@ -204,3 +207,70 @@ async def test_add_key_or_team_level_spend_logs_metadata_to_request(
     # assert (
     #     new_data["metadata"]["spend_logs_metadata"] == metadata["spend_logs_metadata"]
     # )
+
+
+def test_dynamic_logging_metadata_key_and_team_metadata():
+    user_api_key_dict = UserAPIKeyAuth(
+        token="6f8688eaff1d37555bb9e9a6390b6d7032b3ab2526ba0152da87128eab956432",
+        key_name="sk-...63Fg",
+        key_alias=None,
+        spend=0.000111,
+        max_budget=None,
+        expires=None,
+        models=[],
+        aliases={},
+        config={},
+        user_id=None,
+        team_id="ishaan-special-team_e02dd54f-f790-4755-9f93-73734f415898",
+        max_parallel_requests=None,
+        metadata={
+            "logging": [
+                {
+                    "callback_name": "langfuse",
+                    "callback_type": "success",
+                    "callback_vars": {
+                        "langfuse_host": "https://us.cloud.langfuse.com",
+                        "langfuse_public_key": "pk-lf-9636b7a6-c066",
+                        "langfuse_secret_key": "sk-lf-7cc8b620",
+                    },
+                }
+            ]
+        },
+        tpm_limit=None,
+        rpm_limit=None,
+        budget_duration=None,
+        budget_reset_at=None,
+        allowed_cache_controls=[],
+        permissions={},
+        model_spend={},
+        model_max_budget={},
+        soft_budget_cooldown=False,
+        litellm_budget_table=None,
+        org_id=None,
+        team_spend=0.000132,
+        team_alias=None,
+        team_tpm_limit=None,
+        team_rpm_limit=None,
+        team_max_budget=None,
+        team_models=[],
+        team_blocked=False,
+        soft_budget=None,
+        team_model_aliases=None,
+        team_member_spend=None,
+        team_member=None,
+        team_metadata={},
+        end_user_id=None,
+        end_user_tpm_limit=None,
+        end_user_rpm_limit=None,
+        end_user_max_budget=None,
+        last_refreshed_at=1726101560.967527,
+        api_key="7c305cc48fe72272700dc0d67dc691c2d1f2807490ef5eb2ee1d3a3ca86e12b1",
+        user_role=LitellmUserRoles.INTERNAL_USER,
+        allowed_model_region=None,
+        parent_otel_span=None,
+        rpm_limit_per_model=None,
+        tpm_limit_per_model=None,
+    )
+    callbacks = _get_dynamic_logging_metadata(user_api_key_dict=user_api_key_dict)
+
+    assert callbacks is not None