mirror of
https://github.com/danswer-ai/danswer.git
synced 2025-06-12 17:10:54 +02:00
AWS extraneous error fix (#3529)
* remove left over vim command * aws fix * k * remove double
This commit is contained in:
parent
35022f5f09
commit
64b6f15e95
@ -271,13 +271,21 @@ class DefaultMultiLLM(LLM):
|
|||||||
# 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:
|
||||||
for k, v in custom_config.items():
|
filtered_config = {k: v for k, v in custom_config.items() if v}
|
||||||
|
|
||||||
|
# Set non-empty config entries as environment variables for litellm
|
||||||
|
for k, v in filtered_config.items():
|
||||||
os.environ[k] = v
|
os.environ[k] = v
|
||||||
|
|
||||||
model_kwargs = model_kwargs or {}
|
# Update model_kwargs with remaining non-empty config
|
||||||
if custom_config:
|
model_kwargs.update(filtered_config)
|
||||||
model_kwargs.update(custom_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:
|
||||||
|
@ -57,7 +57,6 @@ def test_llm_configuration(
|
|||||||
)
|
)
|
||||||
|
|
||||||
functions_with_args: list[tuple[Callable, tuple]] = [(test_llm, (llm,))]
|
functions_with_args: list[tuple[Callable, tuple]] = [(test_llm, (llm,))]
|
||||||
|
|
||||||
if (
|
if (
|
||||||
test_llm_request.fast_default_model_name
|
test_llm_request.fast_default_model_name
|
||||||
and test_llm_request.fast_default_model_name
|
and test_llm_request.fast_default_model_name
|
||||||
|
@ -238,7 +238,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ../data/certbot/conf:/etc/letsencrypt
|
- ../data/certbot/conf:/etc/letsencrypt
|
||||||
- ../data/certbot/www:/var/www/certbot
|
- ../data/certbot/www:/var/www/certbot
|
||||||
logging::wq
|
logging:
|
||||||
driver: json-file
|
driver: json-file
|
||||||
options:
|
options:
|
||||||
max-size: "50m"
|
max-size: "50m"
|
||||||
@ -260,6 +260,3 @@ volumes:
|
|||||||
# Created by the container itself
|
# Created by the container itself
|
||||||
model_cache_huggingface:
|
model_cache_huggingface:
|
||||||
indexing_huggingface_model_cache:
|
indexing_huggingface_model_cache:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user