experimaestro 1.10.0__py3-none-any.whl → 1.16.0__py3-none-any.whl

experimaestro/launcherfinder/registry.py

@@ -6,10 +6,10 @@ from typing import ClassVar, Dict, Optional, Set, Type, Union
 from pathlib import Path
 import typing
 from omegaconf import DictConfig, OmegaConf, SCMode
-import pkg_resources
 from experimaestro.utils import logger
 from .base import ConnectorConfiguration, TokenConfiguration
 from .specs import HostRequirement, RequirementUnion
+from importlib.metadata import entry_points
 
 if typing.TYPE_CHECKING:
     from experimaestro.launchers import Launcher
@@ -59,9 +59,9 @@ class LauncherRegistry:
             ).expanduser()
 
         if LauncherRegistry.CURRENT_CONFIG_DIR not in LauncherRegistry.INSTANCES:
-            LauncherRegistry.INSTANCES[
-                LauncherRegistry.CURRENT_CONFIG_DIR
-            ] = LauncherRegistry(LauncherRegistry.CURRENT_CONFIG_DIR)
+            LauncherRegistry.INSTANCES[LauncherRegistry.CURRENT_CONFIG_DIR] = (
+                LauncherRegistry(LauncherRegistry.CURRENT_CONFIG_DIR)
+            )
 
         return LauncherRegistry.INSTANCES[LauncherRegistry.CURRENT_CONFIG_DIR]
 
@@ -75,10 +75,10 @@ class LauncherRegistry:
         self.find_launcher_fn = None
 
         # Use entry points for connectors and launchers
-        for entry_point in pkg_resources.iter_entry_points("experimaestro.connectors"):
+        for entry_point in entry_points(group="experimaestro.connectors"):
             entry_point.load().init_registry(self)
 
-        for entry_point in pkg_resources.iter_entry_points("experimaestro.tokens"):
+        for entry_point in entry_points(group="experimaestro.tokens"):
             entry_point.load().init_registry(self)
 
         # Register the find launcher function if it exists

experimaestro/launcherfinder/specs.py

@@ -29,7 +29,7 @@ class CudaSpecification:
     def __repr__(self):
         return (
             f"CUDA({self.model} "
-            f"max={format_size(self.memory)}/min={format_size(self.min_memory)})"
+            f"max={format_size(self.memory, binary=True)}/min={format_size(self.min_memory, binary=True)})"
         )
 
 
@@ -47,6 +47,13 @@ class CPUSpecification:
     cpu_per_gpu: int = 0
     """Number of CPU per GPU (0 if not defined)"""
 
+    def __repr__(self):
+        return (
+            f"CPU("
+            f"mem={format_size(self.memory, binary=True)}, cores={self.cores}"
+            ")"
+        )
+
     def match(self, other: "CPUSpecification"):
         return (self.memory >= other.memory) and (self.cores >= other.cores)
 

experimaestro/launchers/slurm/base.py

@@ -20,7 +20,7 @@ from experimaestro.launcherfinder.registry import (
 from experimaestro.utils import ThreadingCondition
 from experimaestro.tests.connectors.utils import OutputCaptureHandler
 from experimaestro.utils.asyncio import asyncThreadcheck
-from experimaestro.compat import cached_property
+from functools import cached_property
 from experimaestro.launchers import Launcher
 from experimaestro.scriptbuilder import PythonScriptBuilder
 from experimaestro.connectors import (

experimaestro/run.py

@@ -8,6 +8,7 @@ import json
 from typing import List
 import fasteners
 from experimaestro.notifications import progress, report_eoj
+from experimaestro.utils.multiprocessing import delayed_shutdown
 from .core.types import ObjectType
 from experimaestro.utils import logger
 from experimaestro.core.objects import ConfigInformation
@@ -96,6 +97,7 @@ class TaskRunner:
         self.failedpath.write_text(str(code))
         self.cleanup()
         logger.info("Exiting")
+        delayed_shutdown(60, exit_code=code)
         sys.exit(1)
 
     def run(self):

experimaestro/scheduler/base.py

@@ -992,9 +992,7 @@ class experiment:
             self.server.start()
 
         self.workspace.__enter__()
-        (self.workspace.path / ".__experimaestro__").touch()
 
-        global SIGNAL_HANDLER
         # Number of unfinished jobs
         self.unfinishedJobs = 0
         self.taskOutputQueueSize = 0

experimaestro/scheduler/workspace.py

@@ -2,10 +2,14 @@ from collections import ChainMap
 from enum import Enum
 from functools import cached_property
 from pathlib import Path
-from typing import Iterator, Optional
+from typing import Optional
 from experimaestro.settings import WorkspaceSettings, Settings
 
 
+# Current workspace version
+WORKSPACE_VERSION = 0
+
+
 class RunMode(str, Enum):
     NORMAL = "normal"
     """Normal run"""
@@ -54,6 +58,45 @@ class Workspace:
         self.env = ChainMap({}, workspace_settings.env, settings.env)
 
     def __enter__(self):
+        # Check and update workspace version
+        version_file = self.path / ".__experimaestro__"
+
+        if version_file.exists():
+            # Read existing version
+            content = version_file.read_text().strip()
+            if content == "":
+                # Empty file = v0
+                workspace_version = 0
+            else:
+                try:
+                    workspace_version = int(content)
+                except ValueError:
+                    raise RuntimeError(
+                        f"Invalid workspace version file at {version_file}: "
+                        f"expected integer, got '{content}'"
+                    )
+
+            # Check if workspace version is supported
+            if workspace_version > WORKSPACE_VERSION:
+                raise RuntimeError(
+                    f"Workspace version {workspace_version} is not supported by "
+                    f"this version of experimaestro (supports up to version "
+                    f"{WORKSPACE_VERSION}). Please upgrade experimaestro."
+                )
+            if workspace_version < WORKSPACE_VERSION:
+                raise RuntimeError(
+                    f"Workspace version {workspace_version} is not supported by "
+                    "this version of experimaestro (please upgrade the experimaestro "
+                    "workspace)"
+                )
+        else:
+            # New workspace - create the file
+            workspace_version = WORKSPACE_VERSION
+
+        # Write current version to file (update empty v0 workspaces)
+        if not version_file.exists() or version_file.read_text().strip() == "":
+            version_file.write_text(str(WORKSPACE_VERSION))
+
         self.old_workspace = Workspace.CURRENT
         Workspace.CURRENT = self
 

experimaestro/server/__init__.py

@@ -5,7 +5,7 @@ import platform
 import socket
 import uuid
 from experimaestro.scheduler.base import Job
-import pkg_resources
+from importlib.metadata import files
 import http
 import threading
 from typing import Optional, Tuple
@@ -143,7 +143,7 @@ def proxy_response(base_url: str, request: Request, path: str):
     return flask_response
 
 
-def start_app(server: "Server"):
+def start_app(server: "Server"):  # noqa: C901
     logging.debug("Starting Flask server...")
     app = Flask("experimaestro")
 
@@ -256,10 +256,16 @@ def start_app(server: "Server"):
 
         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)
+        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
+
         return Response("Page not found", status=404)
 
     # Start the app