yujunjun/haystack
1
0
Fork 0
mirror of https://github.com/deepset-ai/haystack.git synced 2025-09-01 20:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Literal type hint (#156)

Browse Source
This commit is contained in:
Tanay Soni 2020-06-17 16:26:21 +02:00 committed by GitHub
parent af5fc79dce
commit 8bcc4b26a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
haystack/api/controller/search.py
View File

@ -45,7 +45,7 @@ if EMBEDDING_MODEL_PATH:
retriever = EmbeddingRetriever( retriever = EmbeddingRetriever(
document_store=document_store, document_store=document_store,
embedding_model=EMBEDDING_MODEL_PATH, embedding_model=EMBEDDING_MODEL_PATH,
model_format=EMBEDDING_MODEL_FORMAT, # type: ignore model_format=EMBEDDING_MODEL_FORMAT,
gpu=USE_GPU gpu=USE_GPU
) # type: BaseRetriever ) # type: BaseRetriever
else: else:

5
haystack/retriever/elasticsearch.py
View File

@ -2,7 +2,6 @@ import logging
from typing import List, Union from typing import List, Union
from farm.infer import Inferencer from farm.infer import Inferencer
from typing_extensions import Literal
from haystack.database.base import Document from haystack.database.base import Document
from haystack.database.elasticsearch import ElasticsearchDocumentStore from haystack.database.elasticsearch import ElasticsearchDocumentStore
@ -108,8 +107,8 @@ class EmbeddingRetriever(BaseRetriever):
document_store: ElasticsearchDocumentStore, document_store: ElasticsearchDocumentStore,
embedding_model: str, embedding_model: str,
gpu: bool = True, gpu: bool = True,
model_format: Literal["farm", "transformers", "sentence_transformers"] = "farm", model_format: str = "farm",
pooling_strategy: Literal["cls_token", "reduce_mean", "reduce_max", "per_token", "s3e"] = "reduce_mean", pooling_strategy: str = "reduce_mean",
emb_extraction_layer: int = -1, emb_extraction_layer: int = -1,
): ):
""" """