Merge branch 'master' into fix-doccache-backwards

jina-ai · Feb 24, 2021 · 231bd82 · 231bd82
2 parents cb60e93 + 810d71a
commit 231bd82
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 223 deletions.
diff --git a/jina/executors/clients.py b/jina/executors/clients.py
diff --git a/jina/executors/encoders/tfserving.py b/jina/executors/encoders/tfserving.py
diff --git a/jina/executors/indexers/cache.py b/jina/executors/indexers/cache.py
@@ -2,7 +2,7 @@
 
 import pickle
 import tempfile
-from typing import Optional, Iterable, List, Tuple
+from typing import Optional, Iterable, List, Tuple, Union
 
 from jina.executors.indexers import BaseKVIndexer
 from jina.helper import deprecated_alias
@@ -73,7 +73,10 @@ def close(self):
     default_fields = (ID_KEY,)
 
     @deprecated_alias(field=('fields', 0))
-    def __init__(self, index_filename: Optional[str] = None, fields: Optional[Tuple[str]] = None, *args, **kwargs):
+    def __init__(self,
+                 index_filename: Optional[str] = None,
+                 fields: Optional[Union[str, Tuple[str]]] = None, # str for backwards compatibility
+                 *args, **kwargs):
         if not index_filename:
             # create a new temp file if not exist
             index_filename = tempfile.NamedTemporaryFile(delete=False).name