highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-06-19 04:20:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bedrock w/ access keys (#3538)

Browse Source 
* Fix bedrock w/ access keys

* cleanup

* Remove extra #
This commit is contained in:
Chris Weaver 2024-12-20 18:24:11 -08:00 committed by GitHub
parent 457a4c73f0
commit b9567eabd7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backend/onyx/llm/chat_llm.py
View File

@ -266,26 +266,27 @@ class DefaultMultiLLM(LLM):
# ) # )
self._custom_config = custom_config self._custom_config = custom_config
# Create a dictionary for model-specific arguments if it's None
model_kwargs = model_kwargs or {}
# NOTE: have to set these as environment variables for Litellm since # NOTE: have to set these as environment variables for Litellm since
# not all are able to passed in but they always support them set as env # not all are able to passed in but they always support them set as env
# variables. We'll also try passing them in, since litellm just ignores # variables. We'll also try passing them in, since litellm just ignores
# addtional kwargs (and some kwargs MUST be passed in rather than set as # addtional kwargs (and some kwargs MUST be passed in rather than set as
# env variables) # env variables)
# Create a dictionary for model-specific arguments if it's None
model_kwargs = model_kwargs or {}
# Filter out empty or None values from custom_config before use
if custom_config: if custom_config:
filtered_config = {k: v for k, v in custom_config.items() if v} # Specifically pass in "vertex_credentials" as a model_kwarg to the
# completion call for vertex AI. More details here:
# Set non-empty config entries as environment variables for litellm # https://docs.litellm.ai/docs/providers/vertex
for k, v in filtered_config.items(): vertex_credentials_key = "vertex_credentials"
vertex_credentials = custom_config.get(vertex_credentials_key)
if vertex_credentials and model_provider == "vertex_ai":
model_kwargs[vertex_credentials_key] = vertex_credentials
else:
# standard case
for k, v in custom_config.items():
os.environ[k] = v os.environ[k] = v
# Update model_kwargs with remaining non-empty config
model_kwargs.update(filtered_config)
if extra_headers: if extra_headers:
model_kwargs.update({"extra_headers": extra_headers}) model_kwargs.update({"extra_headers": extra_headers})
if extra_body: if extra_body: