Remove dependency on importlib_metadata

Author: kageurufu

klippy/printer.py

@@ -6,7 +6,6 @@
 
 import sys, os, gc, optparse, logging, time, collections
 import importlib, importlib.util
-import importlib_metadata
 
 from . import compat
 from . import util, reactor, queuelogger, msgproto
@@ -147,18 +146,17 @@ def load_object(self, config, section, default=configfile.sentinel):
         plugins_spec = importlib.util.find_spec(
             f".{module_name}", "klippy.plugins"
         )
-        entrypoints = importlib_metadata.entry_points(
-            group="kalico.plugins", name=module_name
-        )
-        if entrypoints:
+        entrypoints = util.find_entrypoints()
+        if module_name in entrypoints:
             entrypoint = entrypoints[module_name]
+            metadata = util.entrypoint_metadata(entrypoint)
             if extras_spec and not get_danger_options().allow_plugin_override:
                 raise self.config_error(
                     f"Module '{section}' found in both extras and "
-                    f"installed plugin {entrypoint.dist.name} (v{entrypoint.dist.version})"
+                    f"installed plugin {metadata['name']} (v{metadata['version']})"
                 )
             logging.info(
-                f"Loading '{module_name}' from plugin {entrypoint.dist.name} ({entrypoint.dist.version})"
+                f"Loading '{module_name}' from plugin {metadata['name']} (v{metadata['version']})"
             )
             mod = entrypoint.load()
         elif plugins_spec:
@@ -558,10 +556,10 @@ def main():
     extra_git_desc += "\nRemote: %s" % (git_info["remote"])
     extra_git_desc += "\nTracked URL: %s" % (git_info["url"])
 
-    plugins = importlib_metadata.entry_points(group="kalico.plugins")
-    for plugin in plugins:
-        extra_git_desc += f"\nPlugin {plugin.dist.name}=={plugin.dist.version}"
-        start_args["plugins"][plugin.dist.name] = plugin.dist.metadata.json
+    for entrypoint in util.find_entrypoints().values():
+        metadata = util.entrypoint_metadata(entrypoint)
+        extra_git_desc += f"\nPlugin {metadata['name']}=={metadata['version']}"
+        start_args["plugins"][metadata["name"]] = metadata
 
     start_args["software_version"] = git_vers
     start_args["git_branch"] = git_info["branch"]

klippy/util.py

@@ -4,6 +4,8 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import os, pty, fcntl, termios, signal, logging, json, time
+import functools
+import importlib.metadata
 import subprocess
 import traceback
 
@@ -103,6 +105,33 @@ def dump_mcu_build():
     dump_file_stats(build_dir, "out/klipper.elf")
 
 
+######################################################################
+# Plugin loading and metadata
+######################################################################
+
+
+@functools.cache
+def find_entrypoints() -> dict[str, importlib.metadata.EntryPoint]:
+    entrypoints = importlib.metadata.entry_points()
+    if hasattr(entrypoints, "select"):
+        return {e.name: e for e in entrypoints.select(group="kalico.plugins")}
+    else:
+        return {e.name: e for e in entrypoints["kalico.plugins"]}
+
+
+@functools.cache
+def entrypoint_metadata(
+    entrypoint: importlib.metadata.EntryPoint,
+) -> dict[str, str]:
+    metadata = importlib.metadata.metadata(entrypoint.value)
+    return {
+        "name": metadata.get("name", entrypoint.name),
+        "version": metadata.get("version", None),
+        "summary": metadata.get("summary", None),
+        "description": metadata.get_payload(),
+    }
+
+
 ######################################################################
 # General system and software information
 ######################################################################

pyproject.toml

@@ -15,7 +15,6 @@ dependencies = [
   "pyserial==3.4",
   "python-can~=4.5",
   "setuptools==75.8.2 ; python_version >= '3.12'", # required by python-can < 4.3
-  "importlib-metadata>=8.7.0",
 ]
 
 [tool.uv]