From 8bcc4b26a1b6987ad5ff28812e08cff84652d485 Mon Sep 17 00:00:00 2001 From: Tanay Soni Date: Wed, 17 Jun 2020 16:26:21 +0200 Subject: [PATCH] Remove Literal type hint (#156) --- haystack/api/controller/search.py | 2 +- haystack/retriever/elasticsearch.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/haystack/api/controller/search.py b/haystack/api/controller/search.py index 4c8a4bb27..95bf50cb4 100644 --- a/haystack/api/controller/search.py +++ b/haystack/api/controller/search.py @@ -45,7 +45,7 @@ if EMBEDDING_MODEL_PATH: retriever = EmbeddingRetriever( document_store=document_store, embedding_model=EMBEDDING_MODEL_PATH, - model_format=EMBEDDING_MODEL_FORMAT, # type: ignore + model_format=EMBEDDING_MODEL_FORMAT, gpu=USE_GPU ) # type: BaseRetriever else: diff --git a/haystack/retriever/elasticsearch.py b/haystack/retriever/elasticsearch.py index 1c73c6ba2..4ea3d4f0c 100644 --- a/haystack/retriever/elasticsearch.py +++ b/haystack/retriever/elasticsearch.py @@ -2,7 +2,6 @@ import logging from typing import List, Union from farm.infer import Inferencer -from typing_extensions import Literal from haystack.database.base import Document from haystack.database.elasticsearch import ElasticsearchDocumentStore @@ -108,8 +107,8 @@ class EmbeddingRetriever(BaseRetriever): document_store: ElasticsearchDocumentStore, embedding_model: str, gpu: bool = True, - model_format: Literal["farm", "transformers", "sentence_transformers"] = "farm", - pooling_strategy: Literal["cls_token", "reduce_mean", "reduce_max", "per_token", "s3e"] = "reduce_mean", + model_format: str = "farm", + pooling_strategy: str = "reduce_mean", emb_extraction_layer: int = -1, ): """