fix test

lm_eval/tasks/_config_loader.py

@@ -146,8 +146,8 @@ def _import_fun_from_str(path_str: str) -> Any:
 def load_yaml(
     path: str | Path,
     *,
-    resolve_functions: bool = True,
-    resolve_includes: bool = True,
+    resolve_func: bool = True,
+    recursive: bool = True,
     _seen: set[Path] | None = None,
 ) -> dict[str, Any]:
     """Pure data-loading helper.
@@ -161,11 +161,11 @@ def load_yaml(
         raise ValueError(f"Include cycle at {path}")
     _seen.add(path)
 
-    loader_cls = _make_loader(path.parent, resolve_funcs=resolve_functions)
+    loader_cls = _make_loader(path.parent, resolve_funcs=resolve_func)
     with path.open("rb") as fh:
         cfg = yaml.load(fh, Loader=loader_cls)
 
-    if not resolve_includes or "include" not in cfg:
+    if not recursive or "include" not in cfg:
         return cfg
     else:
         includes = cfg.pop("include")
@@ -176,8 +176,8 @@ def load_yaml(
         merged.update(
             load_yaml(
                 inc_path,
-                resolve_functions=resolve_functions,
-                resolve_includes=True,
+                resolve_func=resolve_func,
+                recursive=True,
                 _seen=_seen,
             ),
         )

lm_eval/tasks/factory.py

@@ -106,7 +106,7 @@ class TaskFactory:
         self, entry: Entry, overrides: dict[str, Any] | None
     ) -> dict[str, Any]:
         if entry.yaml_path:
-            cfg = deepcopy(load_cfg_cached(entry.yaml_path, resolve_functions=True))
+            cfg = deepcopy(load_cfg_cached(entry.yaml_path, resolve_func=True))
         else:
             cfg = {"metadata": {"config": "unknown"}}  # python task without YAML
 

lm_eval/tasks/index.py

@@ -56,8 +56,8 @@ class TaskIndex:
                 try:
                     cfg = load_cfg(
                         yaml_path,
-                        resolve_functions=False,
-                        resolve_includes=resolve_includes,
+                        resolve_func=False,
+                        recursive=resolve_includes,
                     )
                     self.process_cfg(cfg, yaml_path, index)
                 except Exception as err:

tests/test_config_loader.py

@@ -308,7 +308,7 @@ doc_to_text: !function utils.process_doc
 """
         file_path = yaml_file(content)
 
-        result = load_yaml(file_path, resolve_functions=True)
+        result = load_yaml(file_path, resolve_func=True)
 
         assert callable(result["doc_to_text"])
         assert result["doc_to_text"]("hello") == "HELLO"
@@ -320,7 +320,7 @@ doc_to_text: !function utils.process_doc
 """
         file_path = yaml_file(content)
 
-        result = load_yaml(file_path, resolve_functions=False)
+        result = load_yaml(file_path, resolve_func=False)
 
         assert isinstance(result["doc_to_text"], str)
         # When resolve_functions=False, it returns the full path + function spec
@@ -345,7 +345,7 @@ shared_value: 100
 """
         main_path = yaml_file(main_content, "main.yaml")
 
-        result = load_yaml(main_path, resolve_includes=True)
+        result = load_yaml(main_path, recursive=True)
 
         assert result["task"] == "main_task"
         assert result["shared_metric"] == "f1_score"
@@ -368,7 +368,7 @@ main_key: main_value
 """
         main_path = yaml_file(main_content)
 
-        result = load_yaml(main_path, resolve_includes=True)
+        result = load_yaml(main_path, recursive=True)
 
         assert result["main_key"] == "main_value"
         assert result["included_key"] == "included_value"
@@ -381,7 +381,7 @@ task: test_task
 """
         file_path = yaml_file(content)
 
-        result = load_yaml(file_path, resolve_includes=False)
+        result = load_yaml(file_path, recursive=False)
 
         assert result["include"] == ["other.yaml"]
         assert result["task"] == "test_task"

tests/utils.py

 import os
 from typing import List, Union
 
-from lm_eval.tasks import load_yaml_config
+from lm_eval.tasks._config_loader import load_yaml
 
 
 # {{{CI}}}
@@ -12,7 +12,7 @@ from lm_eval.tasks import load_yaml_config
 # reads a text file and returns a list of words
 # used to read the output of the changed txt from tj-actions/changed-files
 def load_changed_files(file_path: str) -> List[str]:
-    with open(file_path, "r", encoding="utf-8") as f:
+    with open(file_path, encoding="utf-8") as f:
         content = f.read()
         words_list = list(content.split())
     return words_list
@@ -26,7 +26,7 @@ def parser(full_path: List[str]) -> List[str]:
     _output = set()
     for x in full_path:
         if x.endswith(".yaml") and os.path.exists(x):
-            config = load_yaml_config(x, mode="simple")
+            config = load_yaml(x, recursive=True, resolve_func=True)
             if isinstance(config["task"], str):
                 _output.add(config["task"])
             elif isinstance(config["task"], list):