highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-07-12 22:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix model serer startup

Browse Source
This commit is contained in:
Weves
2024-07-14 23:31:06 -07:00
committed by Chris Weaver
parent 078d5defbb
commit 6fe3eeaa48
8 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/danswer/indexing/embedder.py
View File

@ -14,12 +14,12 @@ from danswer.indexing.chunker import split_chunk_text_into_mini_chunks
from danswer.indexing.models import ChunkEmbedding
from danswer.indexing.models import DocAwareChunk
from danswer.indexing.models import IndexChunk
from danswer.search.enums import EmbedTextType
from danswer.search.search_nlp_models import EmbeddingModel
from danswer.utils.batching import batch_list
from danswer.utils.logger import setup_logger
from shared_configs.configs import INDEXING_MODEL_SERVER_HOST
from shared_configs.configs import INDEXING_MODEL_SERVER_PORT
from shared_configs.enums import EmbedTextType
logger = setup_logger()

5
backend/danswer/search/enums.py
View File

@ -28,8 +28,3 @@ class SearchType(str, Enum):
class QueryFlow(str, Enum):
SEARCH = "search"
QUESTION_ANSWER = "question-answer"
class EmbedTextType(str, Enum):
QUERY = "query"
PASSAGE = "passage"

2
backend/danswer/search/retrieval/search_runner.py
View File

@ -11,7 +11,6 @@ from danswer.configs.chat_configs import HYBRID_ALPHA
from danswer.configs.chat_configs import MULTILINGUAL_QUERY_EXPANSION
from danswer.db.embedding_model import get_current_db_embedding_model
from danswer.document_index.interfaces import DocumentIndex
from danswer.search.enums import EmbedTextType
from danswer.search.models import ChunkMetric
from danswer.search.models import IndexFilters
from danswer.search.models import InferenceChunk
@ -29,6 +28,7 @@ from danswer.utils.threadpool_concurrency import run_functions_tuples_in_paralle
from danswer.utils.timing import log_function_time
from shared_configs.configs import MODEL_SERVER_HOST
from shared_configs.configs import MODEL_SERVER_PORT
from shared_configs.enums import EmbedTextType
logger = setup_logger()

2
backend/danswer/search/search_nlp_models.py
View File

@ -9,10 +9,10 @@ from transformers import logging as transformer_logging # type:ignore
from danswer.configs.model_configs import DOC_EMBEDDING_CONTEXT_SIZE
from danswer.configs.model_configs import DOCUMENT_ENCODER_MODEL
from danswer.search.enums import EmbedTextType
from danswer.utils.logger import setup_logger
from shared_configs.configs import MODEL_SERVER_HOST
from shared_configs.configs import MODEL_SERVER_PORT
from shared_configs.enums import EmbedTextType
from shared_configs.model_server_models import EmbedRequest
from shared_configs.model_server_models import EmbedResponse
from shared_configs.model_server_models import IntentRequest

2
backend/danswer/server/manage/embedding/api.py
View File

@ -10,7 +10,6 @@ from danswer.db.llm import fetch_existing_embedding_providers
from danswer.db.llm import remove_embedding_provider
from danswer.db.llm import upsert_cloud_embedding_provider
from danswer.db.models import User
from danswer.search.enums import EmbedTextType
from danswer.search.search_nlp_models import EmbeddingModel
from danswer.server.manage.embedding.models import CloudEmbeddingProvider
from danswer.server.manage.embedding.models import CloudEmbeddingProviderCreationRequest
@ -18,6 +17,7 @@ from danswer.server.manage.embedding.models import TestEmbeddingRequest
from danswer.utils.logger import setup_logger
from shared_configs.configs import MODEL_SERVER_HOST
from shared_configs.configs import MODEL_SERVER_PORT
from shared_configs.enums import EmbedTextType
logger = setup_logger()

2
backend/model_server/constants.py
View File

@ -1,6 +1,6 @@
from enum import Enum
from danswer.search.enums import EmbedTextType
from shared_configs.enums import EmbedTextType
MODEL_WARM_UP_STRING = "hi " * 512

2
backend/model_server/encoders.py
View File

@ -15,7 +15,6 @@ from sentence_transformers import SentenceTransformer # type: ignore
from vertexai.language_models import TextEmbeddingInput # type: ignore
from vertexai.language_models import TextEmbeddingModel # type: ignore
from danswer.search.enums import EmbedTextType
from danswer.utils.logger import setup_logger
from model_server.constants import DEFAULT_COHERE_MODEL
from model_server.constants import DEFAULT_OPENAI_MODEL
@ -28,6 +27,7 @@ from model_server.utils import simple_log_function_time
from shared_configs.configs import CROSS_EMBED_CONTEXT_SIZE
from shared_configs.configs import CROSS_ENCODER_MODEL_ENSEMBLE
from shared_configs.configs import INDEXING_ONLY
from shared_configs.enums import EmbedTextType
from shared_configs.model_server_models import EmbedRequest
from shared_configs.model_server_models import EmbedResponse
from shared_configs.model_server_models import RerankRequest

2
backend/shared_configs/model_server_models.py
View File

@ -1,6 +1,6 @@
from pydantic import BaseModel
from danswer.search.enums import EmbedTextType
from shared_configs.enums import EmbedTextType
class EmbedRequest(BaseModel):