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

Allow separate vespa config server host

Browse Source
This commit is contained in:
Weves 2024-04-22 21:29:17 -07:00 committed by Chris Weaver
parent df216eafa5
commit 832d40e490
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/danswer/configs/app_configs.py
View File

@ -95,6 +95,9 @@ DOCUMENT_INDEX_TYPE = os.environ.get(
"DOCUMENT_INDEX_TYPE", DocumentIndexType.COMBINED.value "DOCUMENT_INDEX_TYPE", DocumentIndexType.COMBINED.value
) )
VESPA_HOST = os.environ.get("VESPA_HOST") or "localhost" VESPA_HOST = os.environ.get("VESPA_HOST") or "localhost"
# NOTE: this is used if and only if the vespa config server is accessible via a
# different host than the main vespa application
VESPA_CONFIG_SERVER_HOST = os.environ.get("VESPA_CONFIG_SERVER_HOST") or VESPA_HOST
VESPA_PORT = os.environ.get("VESPA_PORT") or "8081" VESPA_PORT = os.environ.get("VESPA_PORT") or "8081"
VESPA_TENANT_PORT = os.environ.get("VESPA_TENANT_PORT") or "19071" VESPA_TENANT_PORT = os.environ.get("VESPA_TENANT_PORT") or "19071"
# The default below is for dockerized deployment # The default below is for dockerized deployment

10
backend/danswer/document_index/vespa/index.py
View File

@ -20,6 +20,7 @@ import requests
from retry import retry from retry import retry
from danswer.configs.app_configs import LOG_VESPA_TIMING_INFORMATION from danswer.configs.app_configs import LOG_VESPA_TIMING_INFORMATION
from danswer.configs.app_configs import VESPA_CONFIG_SERVER_HOST
from danswer.configs.app_configs import VESPA_HOST from danswer.configs.app_configs import VESPA_HOST
from danswer.configs.app_configs import VESPA_PORT from danswer.configs.app_configs import VESPA_PORT
from danswer.configs.app_configs import VESPA_TENANT_PORT from danswer.configs.app_configs import VESPA_TENANT_PORT
@ -76,14 +77,19 @@ VESPA_DIM_REPLACEMENT_PAT = "VARIABLE_DIM"
DANSWER_CHUNK_REPLACEMENT_PAT = "DANSWER_CHUNK_NAME" DANSWER_CHUNK_REPLACEMENT_PAT = "DANSWER_CHUNK_NAME"
DOCUMENT_REPLACEMENT_PAT = "DOCUMENT_REPLACEMENT" DOCUMENT_REPLACEMENT_PAT = "DOCUMENT_REPLACEMENT"
DATE_REPLACEMENT = "DATE_REPLACEMENT" DATE_REPLACEMENT = "DATE_REPLACEMENT"
VESPA_CONFIG_SERVER_URL = f"http://{VESPA_HOST}:{VESPA_TENANT_PORT}"
VESPA_APP_CONTAINER_URL = f"http://{VESPA_HOST}:{VESPA_PORT}" # config server
VESPA_CONFIG_SERVER_URL = f"http://{VESPA_CONFIG_SERVER_HOST}:{VESPA_TENANT_PORT}"
VESPA_APPLICATION_ENDPOINT = f"{VESPA_CONFIG_SERVER_URL}/application/v2" VESPA_APPLICATION_ENDPOINT = f"{VESPA_CONFIG_SERVER_URL}/application/v2"
# main search application
VESPA_APP_CONTAINER_URL = f"http://{VESPA_HOST}:{VESPA_PORT}"
# danswer_chunk below is defined in vespa/app_configs/schemas/danswer_chunk.sd # danswer_chunk below is defined in vespa/app_configs/schemas/danswer_chunk.sd
DOCUMENT_ID_ENDPOINT = ( DOCUMENT_ID_ENDPOINT = (
f"{VESPA_APP_CONTAINER_URL}/document/v1/default/{{index_name}}/docid" f"{VESPA_APP_CONTAINER_URL}/document/v1/default/{{index_name}}/docid"
) )
SEARCH_ENDPOINT = f"{VESPA_APP_CONTAINER_URL}/search/" SEARCH_ENDPOINT = f"{VESPA_APP_CONTAINER_URL}/search/"
_BATCH_SIZE = 100 # Specific to Vespa _BATCH_SIZE = 100 # Specific to Vespa
_NUM_THREADS = ( _NUM_THREADS = (
16 # since Vespa doesn't allow batching of inserts / updates, we use threads 16 # since Vespa doesn't allow batching of inserts / updates, we use threads