From c9e5e07a9608d8b4271ec50d0837d2b2b766827e Mon Sep 17 00:00:00 2001 From: ishaan-jaff Date: Mon, 22 Jan 2024 15:53:12 -0800 Subject: [PATCH] (chore) fix merge conflicts --- litellm/tests/test_key_generate_prisma.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/litellm/tests/test_key_generate_prisma.py b/litellm/tests/test_key_generate_prisma.py index 2447448ff5e..4734e103022 100644 --- a/litellm/tests/test_key_generate_prisma.py +++ b/litellm/tests/test_key_generate_prisma.py @@ -599,7 +599,8 @@ def test_generate_and_update_key(prisma_client): print("Got Exception", e) print(e.detail) pytest.fail(f"An exception occurred - {str(e)}") - + + def test_key_generate_with_custom_auth(prisma_client): # custom - generate key function async def custom_generate_key_fn(data: GenerateKeyRequest) -> dict: @@ -651,7 +652,10 @@ def test_key_generate_with_custom_auth(prisma_client): setattr( litellm.proxy.proxy_server, "user_custom_key_generate", custom_generate_key_fn ) - try: + try: + + async def test(): + try: request = GenerateKeyRequest() key = await generate_key_fn(request) pytest.fail(f"Expected an exception. Got {key}") @@ -817,7 +821,6 @@ def test_call_with_key_over_budget_stream(prisma_client): print("result from user auth with new key", result) pytest.fail(f"This should have failed!. They key crossed it's budget") - asyncio.run(test()) except Exception as e: error_detail = e.detail assert "Authentication Error, ExceededTokenBudget:" in error_detail