From ffa036566b89b13de979a1778d7014d7c3075984 Mon Sep 17 00:00:00 2001 From: Krrish Dholakia Date: Thu, 26 Oct 2023 16:54:06 -0700 Subject: [PATCH] build(litellm_server/main.py): fix keys in environment --- litellm/utils.py | 12 ++++++------ litellm_server/config | 0 litellm_server/main.py | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 litellm_server/config diff --git a/litellm/utils.py b/litellm/utils.py index 4f6c9c3aa..d7c71bf22 100644 --- a/litellm/utils.py +++ b/litellm/utils.py @@ -1921,12 +1921,12 @@ def validate_environment(model: Optional[str]=None) -> dict: if model is None: return {"keys_in_environment": keys_in_environment, "missing_keys": missing_keys} ## EXTRACT LLM PROVIDER - if model name provided - custom_llm_provider = None - # check if llm provider part of model name - if model.split("/",1)[0] in litellm.provider_list: - custom_llm_provider = model.split("/", 1)[0] - model = model.split("/", 1)[1] - custom_llm_provider_passed_in = True + custom_llm_provider = get_llm_provider(model=model) + # # check if llm provider part of model name + # if model.split("/",1)[0] in litellm.provider_list: + # custom_llm_provider = model.split("/", 1)[0] + # model = model.split("/", 1)[1] + # custom_llm_provider_passed_in = True if custom_llm_provider: if custom_llm_provider == "openai": diff --git a/litellm_server/config b/litellm_server/config deleted file mode 100644 index e69de29bb..000000000 diff --git a/litellm_server/main.py b/litellm_server/main.py index 4f2586b7a..116e78dfa 100644 --- a/litellm_server/main.py +++ b/litellm_server/main.py @@ -91,7 +91,8 @@ async def chat_completion(request: Request): try: data = await request.json() # default to always using the "ENV" variables, only if AUTH_STRATEGY==DYNAMIC then reads headers - if os.getenv("AUTH_STRATEGY", None) == "DYNAMIC" and "authorization" in request.headers: # if users pass LLM api keys as part of header + keys_in_environment, _ = litellm.validate_environment(model=data["model"]) + if (keys_in_environment is False or os.getenv("AUTH_STRATEGY", None) == "DYNAMIC") and "authorization" in request.headers: # if users pass LLM api keys as part of header api_key = request.headers.get("authorization") api_key = api_key.replace("Bearer", "").strip() if len(api_key.strip()) > 0: