Move to importlib.resources.files()

Author: cg123

mergekit/architecture/json_definitions.py

@@ -136,9 +136,7 @@ def _template_substitution(
     return TemplateWithArithmetic(template).substitute(substitutions)
 
 
-def _load_architecture_json(name: str) -> ModelArchitecture:
-    with importlib.resources.open_text(mergekit._data.architectures, name) as f:
-        text = f.read()
+def _load_architecture_json(text: str) -> ModelArchitecture:
     data = json.loads(text)
     kind = data.get("kind", "module")
     if kind == "modular":
@@ -174,9 +172,10 @@ def _load_all_architectures() -> (
     Tuple[List[ModelArchitecture], Dict[str, List[ModelArchitecture]]]
 ):
     architectures: List[ModelArchitecture] = []
-    for f in importlib.resources.contents(mergekit._data.architectures):
-        if f.lower().endswith(".json"):
-            architectures.append(_load_architecture_json(f))
+    for f in importlib.resources.files(mergekit._data.architectures).iterdir():
+        if f.is_file() and f.name.lower().endswith(".json"):
+            text = f.read_text()
+            architectures.append(_load_architecture_json(text))
 
     name_to_arch: Dict[str, List[JsonModuleArchitecture]] = {}
     for arch_info in architectures:

mergekit/merge.py

@@ -187,11 +187,12 @@ def _set_chat_template(
         chat_template = Counter(model_templates).most_common(1)[0][0]
         LOG.info(f"Auto-selected chat template: {chat_template}")
 
-    elif importlib.resources.is_resource(chat_templates, chat_template + ".jinja"):
-        with importlib.resources.open_text(
-            chat_templates, chat_template + ".jinja"
-        ) as fp:
-            chat_template = fp.read()
+    elif (
+        t := importlib.resources.files(chat_templates).joinpath(
+            chat_template + ".jinja"
+        )
+    ).is_file():
+        chat_template = t.read_text()
 
     elif len(chat_template) < 20 or "{" not in chat_template:
         raise RuntimeError(f"Invalid chat template: {chat_template}")

pyproject.toml

@@ -85,18 +85,11 @@ minversion = "6.0"
 filterwarnings = [
     "ignore::pydantic.PydanticDeprecatedSince20:huggingface_hub.*:",
     "ignore::FutureWarning:huggingface_hub.*:",
-    "ignore:(read_text|open_text|contents|is_resource) is deprecated:DeprecationWarning", # yes i know, but files() doesn't exist in 3.8
     "ignore:Attempting Automatic Merge:UserWarning",
     "ignore:No architecture config available:UserWarning",
 ]
 testpaths = ["tests"]
 
 [dependency-groups]
-test = [
-    "pytest~=8.3.5",
-]
-dev = [
-    "black~=24.10.0",
-    "isort~=5.13.2",
-    "pre-commit~=4.1.0",
-]
+test = ["pytest~=8.3.5"]
+dev = ["black~=24.10.0", "isort~=5.13.2", "pre-commit~=4.1.0"]