Merge pull request #141 from experimaestro/120-pkg_resources-deprecation

upd: updates imports of deprecated functions

Author: bpiwowar

src/experimaestro/connectors/__init__.py

@@ -16,7 +16,7 @@
 from experimaestro.locking import Lock
 from experimaestro.tokens import Token
 from experimaestro.utils.asyncio import asyncThreadcheck
-import pkg_resources
+from importlib.metadata import entry_points
 
 
 class RedirectType(enum.Enum):
@@ -101,7 +101,7 @@ def handler(key: str) -> Type["Process"]:
         """Get a handler"""
         if Process.HANDLERS is None:
             Process.HANDLERS = {}
-            for ep in pkg_resources.iter_entry_points(group="experimaestro.process"):
+            for ep in entry_points(group="experimaestro.process"):
                 logging.debug("Adding process handler for type %s", ep.name)
                 handler = ep.load()
                 Process.HANDLERS[ep.name] = handler

src/experimaestro/server/__init__.py

@@ -5,10 +5,25 @@
 import socket
 import uuid
 from experimaestro.scheduler.base import Job
-import pkg_resources
+import sys
 import http
 import threading
 from typing import Optional, Tuple
+
+if sys.version_info >= (3, 9):
+    from importlib.resources import files
+
+    pkg_resources = None
+else:
+    try:
+        from importlib_resources import files
+
+        pkg_resources = None
+    except ImportError:
+        # Fallback to pkg_resources if importlib_resources not available
+        import pkg_resources
+
+        files = None
 from experimaestro.scheduler import Scheduler, Listener as BaseListener
 from experimaestro.scheduler.services import Service, ServiceListener
 from experimaestro.settings import ServerSettings
@@ -143,6 +158,7 @@ def proxy_response(base_url: str, request: Request, path: str):
     return flask_response
 
 
+# flake8: noqa: C901
 def start_app(server: "Server"):
     logging.debug("Starting Flask server...")
     app = Flask("experimaestro")
@@ -256,10 +272,25 @@ def static_route(path):
 
         datapath = "data/%s" % path
         logging.debug("Looking for %s", datapath)
-        if pkg_resources.resource_exists("experimaestro.server", datapath):
-            mimetype = MIMETYPES[datapath.rsplit(".", 1)[1]]
-            content = pkg_resources.resource_string("experimaestro.server", datapath)
-            return Response(content, mimetype=mimetype)
+
+        if files is not None:
+            try:
+                package_files = files("experimaestro.server")
+                resource_file = package_files / datapath
+                if resource_file.is_file():
+                    mimetype = MIMETYPES[datapath.rsplit(".", 1)[1]]
+                    content = resource_file.read_bytes()
+                    return Response(content, mimetype=mimetype)
+            except (FileNotFoundError, KeyError):
+                pass
+        elif pkg_resources is not None:
+            # Fallback to pkg_resources
+            if pkg_resources.resource_exists("experimaestro.server", datapath):
+                mimetype = MIMETYPES[datapath.rsplit(".", 1)[1]]
+                content = pkg_resources.resource_string(
+                    "experimaestro.server", datapath
+                )
+                return Response(content, mimetype=mimetype)
         return Response("Page not found", status=404)
 
     # Start the app

src/experimaestro/typingutils.py

@@ -6,7 +6,16 @@
     if sys.version_info.minor < 11:
         from typing import _collect_type_vars as _collect_parameters
     else:
-        from typing import _collect_parameters
+
+        def _collect_parameters(bases):
+            """Collect type parameters from generic bases"""
+            parameters = []
+            for base in bases:
+                if hasattr(base, "__parameters__"):
+                    parameters.extend(base.__parameters__)
+            return tuple(parameters)
+
+        # from typing import _collect_parameters
 
     from typing import _AnnotatedAlias as AnnotatedAlias, get_args, get_origin
 
@@ -62,7 +71,7 @@ def get_type(typehint):
     while True:
         if t := get_optional(typehint):
             typehint = t
-        if isinstance(typehint, AnnotatedAlias):
+        if is_annotated(typehint):
             typehint = get_args(typehint)[0]
         else:
             break