replace importlib_resources with importlib.resources

aider/help.py

@@ -6,7 +6,7 @@
 import warnings
 from pathlib import Path
 
-import importlib_resources
+import importlib.resources
 
 from aider import __version__, utils
 from aider.dump import dump  # noqa: F401
@@ -31,7 +31,7 @@ def install_help_extra(io):
 
 
 def get_package_files():
-    for path in importlib_resources.files("aider.website").iterdir():
+    for path in importlib.resources.files("aider.website").iterdir():
         if path.is_file():
             yield path
         elif path.is_dir():
@@ -112,7 +112,7 @@ def get_index():
                 continue
 
             doc = Document(
-                text=importlib_resources.files("aider.website")
+                text=importlib.resources.files("aider.website")
                 .joinpath(fname)
                 .read_text(encoding="utf-8"),
                 metadata=dict(

aider/main.py

@@ -13,7 +13,7 @@
 except ImportError:
     git = None
 
-import importlib_resources
+import importlib.resources
 import shtab
 from dotenv import load_dotenv
 from prompt_toolkit.enums import EditingMode
@@ -391,7 +391,7 @@ def register_litellm_models(git_root, model_metadata_fname, io, verbose=False):
     model_metadata_files = []
 
     # Add the resource file path
-    resource_metadata = importlib_resources.files("aider.resources").joinpath("model-metadata.json")
+    resource_metadata = importlib.resources.files("aider.resources").joinpath("model-metadata.json")
     model_metadata_files.append(str(resource_metadata))
 
     model_metadata_files += generate_search_path_list(

aider/resources/__init__.py

@@ -1,3 +1,3 @@
-# This ensures that importlib_resources.files("aider.resources")
+# This ensures that importlib.resources.files("aider.resources")
 # doesn't raise ImportError, even if there are no other files in this
 # dir.

benchmark/benchmark.py

@@ -16,7 +16,7 @@
 from typing import List, Optional
 
 import git
-import importlib_resources
+import importlib.resources
 import lox
 import pandas as pd
 import prompts
@@ -320,7 +320,7 @@ def get_exercise_dirs(base_dir, languages=None):
 
     test_dnames = sorted(str(d.relative_to(original_dname)) for d in exercise_dirs)
 
-    resource_metadata = importlib_resources.files("aider.resources").joinpath("model-metadata.json")
+    resource_metadata = importlib.resources.files("aider.resources").joinpath("model-metadata.json")
     model_metadata_files_loaded = models.register_litellm_models([resource_metadata])
     dump(model_metadata_files_loaded)
 

requirements.txt

@@ -198,10 +198,6 @@ importlib-metadata==7.2.1
     #   -c requirements/common-constraints.txt
     #   -r requirements/requirements.in
     #   litellm
-importlib-resources==6.5.2
-    # via
-    #   -c requirements/common-constraints.txt
-    #   -r requirements/requirements.in
 jinja2==3.1.6
     # via
     #   -c requirements/common-constraints.txt

requirements/common-constraints.txt

@@ -210,8 +210,6 @@ importlib-metadata==7.2.1
     # via
     #   -r requirements/requirements.in
     #   litellm
-importlib-resources==6.5.2
-    # via -r requirements/requirements.in
 iniconfig==2.3.0
     # via pytest
 jinja2==3.1.6

requirements/requirements.in

@@ -17,7 +17,6 @@ diff-match-patch
 pypandoc
 litellm
 flake8
-importlib_resources
 pyperclip
 posthog
 mixpanel

tests/basic/test_main.py

@@ -1303,7 +1303,7 @@ def test_list_models_with_direct_resource_patch(self):
             mock_files = MagicMock()
             mock_files.joinpath.return_value = mock_resource_path
 
-            with patch("aider.main.importlib_resources.files", return_value=mock_files):
+            with patch("aider.main.importlib.resources.files", return_value=mock_files):
                 # Capture stdout to check the output
                 with patch("sys.stdout", new_callable=StringIO) as mock_stdout:
                     main(