merge main to wangcx

Author: Naplessss

Diff for: evals/completion_fns/uni_finder.py

@@ -93,7 +93,6 @@ def __call__(self, prompt: Union[str, list[dict]], **kwargs: Any) -> UniFinderCo
             "pdf_token": pdf_token,
             "query": prompt,
             'api_key': self.api_key,
-            'model_engine': 'gpt',
         }
         response = requests.post(url, json=payload, timeout=300)
         try:

Diff for: evals/elsuite/utils.py

@@ -359,7 +359,7 @@ def match_indices(ind0, ind1, threshold=0.9) -> dict:
         """
         renames = {}
 <<<<<<< HEAD
-        name2query = lambda name: name if type(name) != tuple else name[0] if len(name)==1 or name[1] == "" else name[1]
+        name2query = lambda name: name if type(name) != tuple else name[0] if len(name) == 1 or name[1] == "" else name[1]
 =======
         name2query = lambda name: name if type(name) != tuple else name[0] if len(name) == 1 or name[1] == "" else name[1]
 >>>>>>> 60025939908ad308a6bbf6e8c1ade42b69ae7596