flashrag-dev 0.1.4.dev20250806__tar.gz → 0.3.0.dev20250912__tar.gz

{flashrag_dev-0.1.4.dev20250806 → flashrag_dev-0.3.0.dev20250912}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flashrag_dev
-Version: 0.1.4.dev20250806
+Version: 0.3.0.dev20250912
 Summary: A library for efficient Retrieval-Augmented Generation research
 Home-page: https://github.com/RUC-NLPIR/FlashRAG
 Author: Jiajie Jin, Yutao Zhu, Chenghao Zhang, Xinyu Yang, Zhicheng Dou

{flashrag_dev-0.1.4.dev20250806 → flashrag_dev-0.3.0.dev20250912}/flashrag/generator/generator.py

@@ -261,13 +261,25 @@ class VLLMGenerator(BaseGenerator):
         if return_raw_output:
             base_output = outputs
         else:
-            generated_texts = [output.outputs[0].text for output in outputs]
+            generated_texts = [
+                [c.text for c in output.outputs] if len(output.outputs) > 1 else output.outputs[0].text
+                for output in outputs
+            ]
             base_output = generated_texts
         if return_scores:
             scores = []
             for output in outputs:
-                logprobs = output.outputs[0].logprobs
-                scores.append([np.exp(list(score_dict.values())[0].logprob) for score_dict in logprobs])
+                for single_output in output.outputs:
+                    if single_output.logprobs:
+                        token_probs = [np.exp(list(score_dict.values())[0].logprob) 
+                                      for score_dict in single_output.logprobs]
+                        output_scores.append(token_probs)
+                    else:
+                        output_scores.append([])
+                if len(output_scores) == 1:
+                    scores.append(output_scores[0])
+                else:
+                    scores.append(output_scores)
             return base_output, scores
         else:
             return base_output

{flashrag_dev-0.1.4.dev20250806 → flashrag_dev-0.3.0.dev20250912}/flashrag/utils/utils.py

@@ -184,5 +184,12 @@ def extract_between(text: str, start_tag: str, end_tag: str):
         return matches[-1].strip()
     return None
 
+def extract_between_all(text:str, start_tag:str, end_tag:str):
+    pattern = re.escape(start_tag) + r"(.*?)" + re.escape(end_tag)
+    matches = re.findall(pattern, text, flags=re.DOTALL)
+    if matches:
+        return matches
+    return None
+
 def get_device() -> str:
-    return "cuda" if torch.cuda.is_available() else "cpu"
+    return "cuda" if torch.cuda.is_available() else "cpu"

flashrag_dev-0.3.0.dev20250912/flashrag/version.py

@@ -0,0 +1 @@
+__version__ = "0.3.0dev20250912"

{flashrag_dev-0.1.4.dev20250806 → flashrag_dev-0.3.0.dev20250912}/flashrag_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flashrag-dev
-Version: 0.1.4.dev20250806
+Version: 0.3.0.dev20250912
 Summary: A library for efficient Retrieval-Augmented Generation research
 Home-page: https://github.com/RUC-NLPIR/FlashRAG
 Author: Jiajie Jin, Yutao Zhu, Chenghao Zhang, Xinyu Yang, Zhicheng Dou

flashrag_dev-0.1.4.dev20250806/flashrag/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.4dev20250806"