diff --git a/rest_api/controller/feedback.py b/rest_api/controller/feedback.py index b9a086689..80f0c4a48 100644 --- a/rest_api/controller/feedback.py +++ b/rest_api/controller/feedback.py @@ -10,6 +10,7 @@ from rest_api.config import ( DB_USER, DB_PW, DB_INDEX, + DB_INDEX_FEEDBACK, ES_CONN_SCHEME, TEXT_FIELD_NAME, SEARCH_FIELD_NAME, @@ -20,7 +21,6 @@ from rest_api.config import ( CREATE_INDEX, VECTOR_SIMILARITY_METRIC ) -from rest_api.config import DB_INDEX_FEEDBACK router = APIRouter() @@ -30,6 +30,7 @@ document_store = ElasticsearchDocumentStore( username=DB_USER, password=DB_PW, index=DB_INDEX, + label_index=DB_INDEX_FEEDBACK, scheme=ES_CONN_SCHEME, ca_certs=False, verify_certs=False, diff --git a/rest_api/controller/file_upload.py b/rest_api/controller/file_upload.py index 0dc98e12e..df4c55311 100644 --- a/rest_api/controller/file_upload.py +++ b/rest_api/controller/file_upload.py @@ -9,7 +9,7 @@ from fastapi import APIRouter from fastapi import HTTPException from fastapi import UploadFile, File, Form -from rest_api.config import DB_HOST, DB_PORT, DB_USER, DB_PW, DB_INDEX, ES_CONN_SCHEME, TEXT_FIELD_NAME, \ +from rest_api.config import DB_HOST, DB_PORT, DB_USER, DB_PW, DB_INDEX, DB_INDEX_FEEDBACK, ES_CONN_SCHEME, TEXT_FIELD_NAME, \ SEARCH_FIELD_NAME, FILE_UPLOAD_PATH, EMBEDDING_DIM, EMBEDDING_FIELD_NAME, EXCLUDE_META_DATA_FIELDS, VALID_LANGUAGES, \ FAQ_QUESTION_FIELD_NAME, REMOVE_NUMERIC_TABLES, REMOVE_WHITESPACE, REMOVE_EMPTY_LINES, REMOVE_HEADER_FOOTER, \ CREATE_INDEX, VECTOR_SIMILARITY_METRIC @@ -28,6 +28,7 @@ document_store = ElasticsearchDocumentStore( username=DB_USER, password=DB_PW, index=DB_INDEX, + label_index=DB_INDEX_FEEDBACK, scheme=ES_CONN_SCHEME, ca_certs=False, verify_certs=False, diff --git a/rest_api/controller/search.py b/rest_api/controller/search.py index ab46e4409..544db8df1 100644 --- a/rest_api/controller/search.py +++ b/rest_api/controller/search.py @@ -9,12 +9,12 @@ from fastapi import APIRouter from fastapi import HTTPException from haystack import Finder -from rest_api.config import DB_HOST, DB_PORT, DB_USER, DB_PW, DB_INDEX, DEFAULT_TOP_K_READER, ES_CONN_SCHEME, \ - TEXT_FIELD_NAME, SEARCH_FIELD_NAME, EMBEDDING_DIM, EMBEDDING_FIELD_NAME, EXCLUDE_META_DATA_FIELDS, \ +from rest_api.config import DB_HOST, DB_PORT, DB_USER, DB_PW, DB_INDEX, DB_INDEX_FEEDBACK, DEFAULT_TOP_K_READER, \ + ES_CONN_SCHEME, TEXT_FIELD_NAME, SEARCH_FIELD_NAME, EMBEDDING_DIM, EMBEDDING_FIELD_NAME, EXCLUDE_META_DATA_FIELDS, \ RETRIEVER_TYPE, EMBEDDING_MODEL_PATH, USE_GPU, READER_MODEL_PATH, BATCHSIZE, CONTEXT_WINDOW_SIZE, \ - TOP_K_PER_CANDIDATE, NO_ANS_BOOST, READER_CAN_HAVE_NO_ANSWER, MAX_PROCESSES, MAX_SEQ_LEN, DOC_STRIDE, CONCURRENT_REQUEST_PER_WORKER, \ - FAQ_QUESTION_FIELD_NAME, EMBEDDING_MODEL_FORMAT, READER_TYPE, READER_TOKENIZER, GPU_NUMBER, NAME_FIELD_NAME, \ - VECTOR_SIMILARITY_METRIC, CREATE_INDEX, LOG_LEVEL + TOP_K_PER_CANDIDATE, NO_ANS_BOOST, READER_CAN_HAVE_NO_ANSWER, MAX_PROCESSES, MAX_SEQ_LEN, DOC_STRIDE, \ + CONCURRENT_REQUEST_PER_WORKER, FAQ_QUESTION_FIELD_NAME, EMBEDDING_MODEL_FORMAT, READER_TYPE, READER_TOKENIZER, \ + GPU_NUMBER, NAME_FIELD_NAME, VECTOR_SIMILARITY_METRIC, CREATE_INDEX, LOG_LEVEL from rest_api.controller.request import Question from rest_api.controller.response import Answers, AnswersToIndividualQuestion @@ -40,6 +40,7 @@ document_store = ElasticsearchDocumentStore( username=DB_USER, password=DB_PW, index=DB_INDEX, + label_index=DB_INDEX_FEEDBACK, scheme=ES_CONN_SCHEME, ca_certs=False, verify_certs=False,