Fix bug

Author: XKTZ

src/rank_llm/rerank/listwise/listwise_rankllm.py

@@ -9,6 +9,7 @@
 from typing import Any, Dict, List, Tuple, Union
 
 from ftfy import fix_text
+from gguf import Optional
 from tqdm import tqdm
 
 from rank_llm.data import RankingExecInfo, Request, Result
@@ -58,7 +59,7 @@ class ListwiseRankLLM(RankLLM, ABC):
 
     def __init__(
         self,
-        reorder_policy: ReorderPolicy,
+        reorder_policy: Optional[ReorderPolicy],
         model: str,
         context_size: int,
         window_size: int,
@@ -74,7 +75,6 @@ def __init__(
         )
         self._window_size = window_size
         self._use_alpha = use_alpha
-    
 
     def rerank_batch(
         self,
@@ -88,16 +88,16 @@ def rerank_batch(
     ) -> List[Result]:
         populate_exec_summary: bool = kwargs.get("populate_exec_summary", False)
 
-        batch_size = kwargs.get("batch_size", 1)
+        batch_size = kwargs.get("batch_size") or len(requests)
 
         if not batched:
             batch_size = 1
 
         reorder_policy = self.reorder_policy
         model_functions, consumption = self._get_model_function(batched, **kwargs)
 
-        # reranking using vllm
-        if len(set([len(req.candidates) for req in requests])) != 1:
+        # reranking using batched mode
+        if batched and len(set([len(req.candidates) for req in requests])) != 1:
             raise ValueError("Batched requests must have the same number of candidates")
 
         result: list[Result] = []
@@ -462,12 +462,11 @@ def _clean_response(self, response: str) -> str:
         else:
             for c in response:
                 if not c.isdigit():
-                    if len(new_response) == 0 or new_response[-1] != " ":
                     new_response += " "
                 else:
                     new_response += c
             new_response = new_response.strip()
-
+        new_response = re.sub(r"\s+", " ", new_response)
         return new_response
 
     def _remove_duplicate(self, response: List[int]) -> List[int]:

src/rank_llm/rerank/listwise/rank_gpt.py

@@ -62,6 +62,7 @@ def __init__(
             window_size=window_size,
             prompt_mode=prompt_mode,
             num_few_shot_examples=num_few_shot_examples,
+            use_alpha=False,  # Alphabet is not supported in OpenAI for now
         )
         if isinstance(keys, str):
             keys = [keys]
@@ -103,6 +104,7 @@ def rerank_batch(
         rank_end: int = 100,
         shuffle_candidates: bool = False,
         logging: bool = False,
+        batched: bool = False,
         **kwargs: Any,
     ) -> List[Result]:
         return super().rerank_batch(
@@ -130,7 +132,7 @@ def _call_completion(
                         *args, **kwargs, timeout=30
                     )
                 elif completion_mode == self.CompletionMode.TEXT:
-                    completion = openai.Completion.create(*args, **kwargs)
+                    completion = openaiCompletion.create(*args, **kwargs)
                 else:
                     raise ValueError(
                         "Unsupported completion mode: %V" % completion_mode