diff --git a/litellm/proxy/_new_secret_config.yaml b/litellm/proxy/_new_secret_config.yaml index 806b55994..911f15b86 100644 --- a/litellm/proxy/_new_secret_config.yaml +++ b/litellm/proxy/_new_secret_config.yaml @@ -68,7 +68,7 @@ model_list: litellm_settings: fallbacks: [{ "claude-3-5-sonnet-20240620": ["claude-3-5-sonnet-aihubmix"] }] - callbacks: ["otel", "prometheus"] + # callbacks: ["otel", "prometheus"] default_redis_batch_cache_expiry: 10 # default_team_settings: # - team_id: "dbe2f686-a686-4896-864a-4c3924458709" diff --git a/litellm/proxy/management_endpoints/key_management_endpoints.py b/litellm/proxy/management_endpoints/key_management_endpoints.py index c50aa0f9f..01baa5a43 100644 --- a/litellm/proxy/management_endpoints/key_management_endpoints.py +++ b/litellm/proxy/management_endpoints/key_management_endpoints.py @@ -303,21 +303,17 @@ async def generate_key_fn( # noqa: PLR0915 ) -async def prepare_key_update_data( +def prepare_key_update_data( data: Union[UpdateKeyRequest, RegenerateKeyRequest], existing_key_row ): - data_json: dict = data.dict(exclude_unset=True) + data_json: dict = data.model_dump(exclude_unset=True) data_json.pop("key", None) _metadata_fields = ["model_rpm_limit", "model_tpm_limit", "guardrails"] non_default_values = {} for k, v in data_json.items(): if k in _metadata_fields: continue - if v is not None: - if not isinstance(v, bool) and v in ([], {}, 0): - pass - else: - non_default_values[k] = v + non_default_values[k] = v if "duration" in non_default_values: duration = non_default_values.pop("duration") @@ -379,7 +375,7 @@ async def update_key_fn( ) try: - data_json: dict = data.json() + data_json: dict = data.model_dump(exclude_unset=True) key = data_json.pop("key") # get the row from db if prisma_client is None: @@ -395,7 +391,7 @@ async def update_key_fn( detail={"error": f"Team not found, passed team_id={data.team_id}"}, ) - non_default_values = await prepare_key_update_data( + non_default_values = prepare_key_update_data( data=data, existing_key_row=existing_key_row ) @@ -1144,7 +1140,7 @@ async def regenerate_key_fn( non_default_values = {} if data is not None: # Update with any provided parameters from GenerateKeyRequest - non_default_values = await prepare_key_update_data( + non_default_values = prepare_key_update_data( data=data, existing_key_row=_key_in_db ) diff --git a/tests/proxy_unit_tests/test_proxy_utils.py b/tests/proxy_unit_tests/test_proxy_utils.py index f3f33bad6..2e857808d 100644 --- a/tests/proxy_unit_tests/test_proxy_utils.py +++ b/tests/proxy_unit_tests/test_proxy_utils.py @@ -510,3 +510,23 @@ async def test_proxy_config_update_from_db(): "success_callback": "langfuse", } } + + +def test_prepare_key_update_data(): + from litellm.proxy.management_endpoints.key_management_endpoints import ( + prepare_key_update_data, + ) + from litellm.proxy._types import UpdateKeyRequest + + existing_key_row = MagicMock() + data = UpdateKeyRequest(key="test_key", models=["gpt-4"], duration="120s") + updated_data = prepare_key_update_data(data, existing_key_row) + assert "expires" in updated_data + + data = UpdateKeyRequest(key="test_key", metadata={}) + updated_data = prepare_key_update_data(data, existing_key_row) + assert updated_data["metadata"] == {} + + data = UpdateKeyRequest(key="test_key", metadata=None) + updated_data = prepare_key_update_data(data, existing_key_row) + assert updated_data["metadata"] == None diff --git a/tests/test_keys.py b/tests/test_keys.py index 437afc336..a569634bc 100644 --- a/tests/test_keys.py +++ b/tests/test_keys.py @@ -66,6 +66,7 @@ async def generate_key( max_parallel_requests: Optional[int] = None, user_id: Optional[str] = None, team_id: Optional[str] = None, + metadata: Optional[dict] = None, calling_key="sk-1234", ): url = "http://0.0.0.0:4000/key/generate" @@ -82,6 +83,7 @@ async def generate_key( "max_parallel_requests": max_parallel_requests, "user_id": user_id, "team_id": team_id, + "metadata": metadata, } print(f"data: {data}") @@ -136,16 +138,21 @@ async def test_key_gen_bad_key(): pass -async def update_key(session, get_key): +async def update_key(session, get_key, metadata: Optional[dict] = None): """ Make sure only models user has access to are returned """ url = "http://0.0.0.0:4000/key/update" headers = { - "Authorization": f"Bearer sk-1234", + "Authorization": "Bearer sk-1234", "Content-Type": "application/json", } - data = {"key": get_key, "models": ["gpt-4"], "duration": "120s"} + data = {"key": get_key} + + if metadata is not None: + data["metadata"] = metadata + else: + data.update({"models": ["gpt-4"], "duration": "120s"}) async with session.post(url, headers=headers, json=data) as response: status = response.status @@ -276,20 +283,24 @@ async def chat_completion_streaming(session, key, model="gpt-4"): return prompt_tokens, completion_tokens +@pytest.mark.parametrize("metadata", [{"test": "new"}, {}]) @pytest.mark.asyncio -async def test_key_update(): +async def test_key_update(metadata): """ Create key Update key with new model Test key w/ model """ async with aiohttp.ClientSession() as session: - key_gen = await generate_key(session=session, i=0) + key_gen = await generate_key(session=session, i=0, metadata={"test": "test"}) key = key_gen["key"] - await update_key( + assert key_gen["metadata"]["test"] == "test" + updated_key = await update_key( session=session, get_key=key, + metadata=metadata, ) + assert updated_key["metadata"] == metadata await update_proxy_budget(session=session) # resets proxy spend await chat_completion(session=session, key=key) diff --git a/tests/test_team_logging.py b/tests/test_team_logging.py index 97f18b42e..cf0fa6354 100644 --- a/tests/test_team_logging.py +++ b/tests/test_team_logging.py @@ -62,8 +62,8 @@ async def chat_completion(session, key, model="azure-gpt-3.5", request_metadata= @pytest.mark.asyncio -@pytest.mark.flaky(retries=6, delay=1) -async def test_team_logging(): +@pytest.mark.flaky(retries=12, delay=2) +async def test_aaateam_logging(): """ -> Team 1 logs to project 1 -> Create Key