Merge branch 'main' into litellm_bedrock_anthropic_fix

This commit is contained in:
Krish Dholakia 2024-05-17 17:47:32 -07:00 committed by GitHub
commit 3a06fe2818
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 155 additions and 14 deletions

View file

@ -5122,7 +5122,7 @@ def get_optional_params(
or "tools" in non_default_params
):
if (
custom_llm_provider != "openai"
custom_llm_provider == "ollama"
and custom_llm_provider != "text-completion-openai"
and custom_llm_provider != "azure"
and custom_llm_provider != "vertex_ai"
@ -5136,6 +5136,8 @@ def get_optional_params(
and custom_llm_provider != "cohere"
and custom_llm_provider != "bedrock"
and custom_llm_provider != "ollama_chat"
and custom_llm_provider != "openrouter"
and custom_llm_provider not in litellm.openai_compatible_providers
):
if custom_llm_provider == "ollama":
# ollama actually supports json output