From b83c452ddd4b12a0b29d477cab2178deaef3885b Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Tue, 2 Apr 2024 15:52:54 -0700 Subject: [PATCH] support all-models-on-proxy --- litellm/proxy/proxy_server.py | 2 +- litellm/tests/test_key_generate_prisma.py | 8 ++++---- ui/litellm-dashboard/src/components/teams.tsx | 14 +++++++------- .../src/components/view_key_table.tsx | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index 97c6ceeb0..9e73c923f 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -639,7 +639,7 @@ async def user_api_key_auth( pass elif ( isinstance(valid_token.models, list) - and "all-models" in valid_token.models + and "all-models-on-proxy" in valid_token.models ): # Admin UI - Special alias to allow `all_models` pass diff --git a/litellm/tests/test_key_generate_prisma.py b/litellm/tests/test_key_generate_prisma.py index 6cf2599d3..8d017e625 100644 --- a/litellm/tests/test_key_generate_prisma.py +++ b/litellm/tests/test_key_generate_prisma.py @@ -247,14 +247,14 @@ def test_call_with_valid_model(prisma_client): def test_call_with_valid_model_using_all_models(prisma_client): - # Make a call to a key with model = `all-models` this is an Alias from LiteLLM Admin UI + # Make a call to a key with model = `all-models-on-proxy` this is an Alias from LiteLLM Admin UI setattr(litellm.proxy.proxy_server, "prisma_client", prisma_client) setattr(litellm.proxy.proxy_server, "master_key", "sk-1234") try: async def test(): await litellm.proxy.proxy_server.prisma_client.connect() - request = GenerateKeyRequest(models=["all-models"]) + request = GenerateKeyRequest(models=["all-models-on-proxy"]) key = await generate_key_fn(data=request) print(key) @@ -273,11 +273,11 @@ def test_call_with_valid_model_using_all_models(prisma_client): result = await user_api_key_auth(request=request, api_key=bearer_token) print("result from user auth with new key", result) - # call /key/info for key - models == "all-models" + # call /key/info for key - models == "all-models-on-proxy" key_info = await info_key_fn(key=generated_key) print("key_info", key_info) models = key_info["info"]["models"] - assert models == ["all-models"] + assert models == ["all-models-on-proxy"] asyncio.run(test()) except Exception as e: diff --git a/ui/litellm-dashboard/src/components/teams.tsx b/ui/litellm-dashboard/src/components/teams.tsx index 9d4ebe708..4c759a5a9 100644 --- a/ui/litellm-dashboard/src/components/teams.tsx +++ b/ui/litellm-dashboard/src/components/teams.tsx @@ -115,16 +115,16 @@ const Team: React.FC = ({ - - All Models + + All Models on Proxy - - All Models + + All Models on Proxy {userModels && userModels.map((model) => ( @@ -364,7 +364,7 @@ const handleEditSubmit = async (formValues: Record) => {
{team.models.length === 0 ? ( - all-models + all-models-on-proxy ) : ( team.models.map((model: string, index: number) => ( @@ -483,8 +483,8 @@ const handleEditSubmit = async (formValues: Record) => { placeholder="Select models" style={{ width: "100%" }} > - - All Models + + All Models on Proxy {userModels.map((model) => ( diff --git a/ui/litellm-dashboard/src/components/view_key_table.tsx b/ui/litellm-dashboard/src/components/view_key_table.tsx index 6784211c3..8bcd8e087 100644 --- a/ui/litellm-dashboard/src/components/view_key_table.tsx +++ b/ui/litellm-dashboard/src/components/view_key_table.tsx @@ -418,7 +418,7 @@ const handleEditSubmit = async (formValues: Record) => { ) : ( // If selected team is None or selected team's models are empty, show all models - all-models + all-models-on-proxy )}