Merge pull request #1359 from hanhainebula/master

Fix a bug in beir evaluation and release v1.3.4

Author: hanhainebula

FlagEmbedding/evaluation/beir/evaluator.py

@@ -87,7 +87,8 @@ def __call__(
         if sub_dataset_names is None:
             if dataset_name is not None:
                 save_name = f"{dataset_name}-" + "{split}.json"
-                corpus_embd_save_dir = os.path.join(corpus_embd_save_dir, str(retriever), dataset_name)
+                if corpus_embd_save_dir is not None:
+                    corpus_embd_save_dir = os.path.join(corpus_embd_save_dir, str(retriever), dataset_name)
             else:
                 save_name = "{split}.json"
 
@@ -213,7 +214,8 @@ def __call__(
             for sub_dataset_name in sub_dataset_names:
                 if dataset_name is not None:
                     save_name = f"{dataset_name}-{sub_dataset_name}-" + "{split}.json"
-                    corpus_embd_save_dir = os.path.join(corpus_embd_save_dir, str(retriever), dataset_name, sub_dataset_name)
+                    if corpus_embd_save_dir is not None:
+                        corpus_embd_save_dir = os.path.join(corpus_embd_save_dir, str(retriever), dataset_name, sub_dataset_name)
                 else:
                     save_name = f"{sub_dataset_name}-" + "{split}.json"
 

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='FlagEmbedding',
-    version='1.3.3',
+    version='1.3.4',
     description='FlagEmbedding',
     long_description=readme,
     long_description_content_type="text/markdown",
@@ -16,7 +16,7 @@
     install_requires=[
         'torch>=1.6.0',
         'transformers>=4.44.2',
-        'datasets==2.19.0',
+        'datasets>=2.19.0',
         'accelerate>=0.20.1',
         'sentence_transformers',
         'peft',