experimaestro 1.4.3__py3-none-any.whl → 1.5.0__py3-none-any.whl

experimaestro/connectors/ssh.py

@@ -1,7 +1,8 @@
 from dataclasses import dataclass
-from pathlib import Path, PurePosixPath
+from pathlib import Path, _posix_flavour
 import io
 import os
+import re
 from experimaestro.launcherfinder import LauncherRegistry, YAMLDataClass
 from fabric import Connection
 from invoke import Promise
@@ -21,7 +22,7 @@ from experimaestro.tokens import Token
 # Might be wise to switch to https://github.com/marian-code/ssh-utilities
 
 
-class SshPath(Path, PurePosixPath):
+class SshPath(Path):
     """SSH path
 
     Absolute:
@@ -31,16 +32,31 @@ class SshPath(Path, PurePosixPath):
     ssh://[user@]host[:port]/relative/path
     """
 
+    _flavour = _posix_flavour
+
+    def __new__(cls, *args, **kwargs):
+        return object.__new__(cls)
+
+    def __init__(self, url: str):
+        parsed = urlparse(url)
+        assert parsed.scheme == "ssh"
+        self._host = parsed.hostname
+
+        self._parts = re.split(r"/+", parsed.path)
+        if parsed.path.startswith("//"):
+            self._parts[0] = "/"
+        else:
+            self._parts = self._parts[1:]
+
     @property
     def hostpath(self):
-        # path = "/" if self._parts[:0]  + "/".join(self._parts[1:])
         if self.is_absolute():
-            return "/" + self._flavour.join(self._parts[1:])
-        return self._flavour.join(self._parts)
+            return "/" + "/".join(self._parts[1:])
+        return "/".join(self._parts)
 
     @property
     def host(self):
-        return self._drv
+        return self._host
 
     def is_absolute(self):
         return self._parts and self._parts[0] == "/"
@@ -66,11 +82,15 @@ class SshPath(Path, PurePosixPath):
 
     def _make_child(self, args):
         drv, root, parts = self._parse_args(args)
-        assert self._drv == drv or drv == "", f"{self._drv} and {drv}"
+        assert self._host == drv or drv == "", f"{self._host} and {drv}"
         drv, root, parts = self._flavour.join_parsed_parts(
-            "", self._root, self._parts, "", root, parts
+            "", "", self._parts, "", root, parts
         )
-        return self._from_parsed_parts(self._drv, root, parts)
+
+        child = object.__new__(SshPath)
+        child._parts = parts
+        child._host = self._host
+        return child
 
     def open(self, mode="r", buffering=-1, encoding=None, errors=None, newline=None):
         # FIXME: should probably be wiser
@@ -105,10 +125,10 @@ class SshPath(Path, PurePosixPath):
         return obj
 
     def __repr__(self):
-        return "SshPath(%s,%s)" % (self._drv, self._flavour.join(self._parts[1:]))
+        return "SshPath(%s,%s)" % (self._host, self._flavour.join(self._parts[1:]))
 
     def __str__(self):
-        return "ssh://%s/%s" % (self._drv, self._flavour.join(self._parts[1:]))
+        return "ssh://%s/%s" % (self._host, self._flavour.join(self._parts[1:]))
 
 
 @dataclass

experimaestro/core/objects.py

@@ -646,7 +646,7 @@ class ConfigInformation:
                     "Cannot set non existing attribute %s in %s" % (k, self.xpmtype)
                 )
         except Exception:
-            logger.exception("Error while setting value %s" % k)
+            logger.error("Error while setting value %s in %s", k, self.xpmtype)
             raise
 
     def addtag(self, name, value):
@@ -1093,7 +1093,7 @@ class ConfigInformation:
         state_dict = {
             "id": id(self.pyobject),
             "module": self.xpmtype._module,
-            "type": self.xpmtype.objecttype.__qualname__,
+            "type": self.xpmtype.basetype.__qualname__,
             "typename": self.xpmtype.name(),
             "identifier": self.identifier.state_dict(),
         }
@@ -1340,7 +1340,10 @@ class ConfigInformation:
             cls = getqualattr(mod, definition["type"])
 
             # Creates an object (or a config)
-            o = cls.__new__(cls, __xpmobject__=as_instance)
+            if as_instance:
+                o = cls.XPMValue.__new__(cls.XPMValue)
+            else:
+                o = cls.XPMConfig.__new__(cls.XPMConfig)
             assert definition["id"] not in objects, "Duplicate id %s" % definition["id"]
             objects[definition["id"]] = o
 
@@ -1377,6 +1380,7 @@ class ConfigInformation:
                         o.__xpm_stdout__ = basepath / f"{name.lower()}.out"
                         o.__xpm_stderr__ = basepath / f"{name.lower()}.err"
             else:
+                o.__init__()
                 xpminfo = o.__xpm__  # type: ConfigInformation
 
                 meta = definition.get("meta", None)
@@ -1497,12 +1501,7 @@ class ConfigInformation:
 
             if o is None:
                 # Creates an object (and not a config)
-                o = config.__xpmtype__.objecttype.__new__(
-                    config.__xpmtype__.objecttype, __xpmobject__=True
-                )
-
-                # And calls the parameter-less initialization
-                o.__init__()
+                o = config.XPMValue()
 
                 # Store in cache
                 self.objects.add_stub(id(config), o)
@@ -1650,8 +1649,8 @@ class TypeConfig:
             [f"{key}={value}" for key, value in self.__xpm__.values.items()]
         )
         return (
-            f"{self.__xpmtype__.objecttype.__module__}."
-            f"{self.__xpmtype__.objecttype.__qualname__}({params})"
+            f"{self.__xpmtype__.basetype.__module__}."
+            f"{self.__xpmtype__.basetype.__qualname__}({params})"
         )
 
     def tag(self, name, value):
@@ -1770,6 +1769,11 @@ class TypeConfig:
         self.__xpm__.add_dependencies(*other.__xpm__.dependencies)
 
 
+class classproperty(property):
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class Config:
     """Base type for all objects in python interface"""
 
@@ -1781,6 +1785,42 @@ class Config:
     """The __xpm__ object contains all instance specific information about a
     configuration/task"""
 
+    @classproperty
+    def XPMConfig(cls):
+        if issubclass(cls, TypeConfig):
+            return cls
+        return cls.__getxpmtype__().configtype
+
+    @classproperty
+    def C(cls):
+        return cls.XPMConfig
+
+    @classproperty
+    def XPMValue(cls):
+        """Returns the value object for this configuration"""
+        if issubclass(cls, TypeConfig):
+            return cls.__xpmtype__.objecttype
+
+        if value_cls := cls.__dict__.get("__XPMValue__", None):
+            pass
+        else:
+            from .types import XPMValue
+
+            __objectbases__ = tuple(
+                s.XPMValue
+                for s in cls.__bases__
+                if issubclass(s, Config) and (s is not Config)
+            ) or (XPMValue,)
+
+            *tp_qual, tp_name = cls.__qualname__.split(".")
+            value_cls = type(f"{tp_name}.XPMValue", (cls,) + __objectbases__, {})
+            value_cls.__qualname__ = ".".join(tp_qual + [value_cls.__name__])
+            value_cls.__module__ = cls.__module__
+
+            setattr(cls, "__XPMValue__", value_cls)
+
+        return value_cls
+
     @classmethod
     def __getxpmtype__(cls) -> "ObjectType":
         """Get (and create if necessary) the Object type of this"""
@@ -1796,27 +1836,32 @@ class Config:
                 raise
         return xpmtype
 
-    def __getnewargs_ex__(self):
-        # __new__ will be called with those arguments when unserializing
-        return ((), {"__xpmobject__": True})
+    def __new__(cls: Type[T], *args, **kwargs) -> T:
+        """Returns an instance of a TypeConfig (for compatibility, use XPMConfig
+        or C if possible)"""
 
-    @classmethod
-    def c(cls: Type[T], **kwargs) -> T:
-        """Allows typing to process easily"""
-        return cls.__new__(cls, **kwargs)
+        # If this is an XPMValue, just return a new instance
+        from experimaestro.core.types import XPMValue
 
-    def __new__(cls: Type[T], *args, __xpmobject__=False, **kwargs) -> T:
-        """Returns an instance of a TypeConfig when called __xpmobject__ is False,
-        and otherwise the real object
-        """
+        if issubclass(cls, XPMValue):
+            return object.__new__(cls)
 
-        if __xpmobject__:
-            # __init__ is  called directly
+        # If this is the XPMConfig, just return a new instance
+        # __init__ will be called
+        if issubclass(cls, TypeConfig):
             return object.__new__(cls)
 
-        # We use the configuration type
-        o = object.__new__(cls.__getxpmtype__().configtype)
-        o.__init__(*args, **kwargs)
+        # otherwise, we use the configuration type
+        o: TypeConfig = object.__new__(cls.__getxpmtype__().configtype)
+        try:
+            o.__init__(*args, **kwargs)
+        except Exception:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            logger.error(
+                "Init error in %s:%s"
+                % (str(Path(caller.filename).absolute()), caller.lineno)
+            )
+            raise
         return o
 
     def __validate__(self):

experimaestro/core/objects.pyi

@@ -27,13 +27,16 @@ from typing import (
     Callable,
     ClassVar,
     Dict,
+    Generic,
     List,
     Optional,
     Set,
+    Type,
     TypeVar,
     Union,
     overload,
 )
+from typing_extensions import Self
 
 TConfig = TypeVar("TConfig", bound="Config")
 
@@ -205,12 +208,15 @@ class TypeConfig:
 class Config:
     __xpmtype__: ClassVar[ObjectType]
     __xpm__: ConfigInformation
+    __use_xpmobject__: ClassVar[bool]
+
+    XPMValue: Type[Self]
+    XPMConfig: Union[Type[Self], Type[TypeConfig[Self]]]
+    C: Union[Type[Self], Type[TypeConfig[Self]]]
+
     @classmethod
     def __getxpmtype__(cls) -> ObjectType: ...
-    def __getnewargs_ex__(self): ...
-    @classmethod
-    def c(cls, **kwargs) -> T: ...
-    def __new__(cls, *args, __xpmobject__: bool = ..., **kwargs) -> T: ...
+    def __new__(cls, *args, **kwargs) -> Self: ...
     def __validate__(self) -> None: ...
     def __post_init__(self) -> None: ...
     def __json__(self): ...
@@ -240,6 +246,6 @@ class Task(LightweightTask):
 def copyconfig(config_or_output: TConfig, **kwargs) -> TConfig: ...
 def setmeta(config: TConfig, flag: bool) -> TConfig: ...
 
-class TypeConfig:
+class TypeConfig(Generic[T]):
     def __validate__(self):
         pass

experimaestro/core/types.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 import inspect
 import sys
-from typing import Set, Union, Dict, Iterator, List
+from typing import Set, Union, Dict, Iterator, List, get_args, get_origin
 from collections import ChainMap
 from pathlib import Path
 import typing
@@ -126,6 +126,10 @@ class Type:
         if t:
             return DictType(Type.fromType(t[0]), Type.fromType(t[1]))
 
+        # Takes care of generics
+        if get_origin(key):
+            return GenericType(key)
+
         raise Exception("No type found for %s", key)
 
 
@@ -179,6 +183,12 @@ class SubmitHook(ABC):
         return hash((self.__class__, self.spec()))
 
 
+class XPMValue:
+    """Jut marks a XPMValue"""
+
+    pass
+
+
 class ObjectType(Type):
     submit_hooks: Set[SubmitHook]
     """Hooks associated with this configuration"""
@@ -211,6 +221,8 @@ class ObjectType(Type):
         # Get the identifier
         if identifier is None and hasattr(tp, "__xpmid__"):
             __xpmid__ = getattr(tp, "__xpmid__")
+            if isinstance(__xpmid__, Identifier):
+                identifier = __xpmid__
             if inspect.ismethod(__xpmid__):
                 identifier = Identifier(__xpmid__())
             elif "__xpmid__" in tp.__dict__:
@@ -247,7 +259,7 @@ class ObjectType(Type):
         else:
             self.basetype = tp
 
-        # Create the type-specific configuration class
+        # --- Create the type-specific configuration class (XPMConfig)
         __configbases__ = tuple(
             s.__getxpmtype__().configtype
             for s in tp.__bases__
@@ -256,23 +268,18 @@ class ObjectType(Type):
 
         *tp_qual, tp_name = self.basetype.__qualname__.split(".")
         self.configtype = type(
-            f"{tp_name}_XPMConfig", __configbases__ + (self.basetype,), {}
+            f"{tp_name}.XPMConfig", __configbases__ + (self.basetype,), {}
         )
         self.configtype.__qualname__ = ".".join(tp_qual + [self.configtype.__name__])
         self.configtype.__module__ = tp.__module__
 
-        # Create the type-specific object class
-        # (now, the same as basetype - but in the future, remove references)
-        self.objecttype = self.basetype  # type: type
-        self.basetype._ = self.configtype
-
         # Return type is used by tasks to change the output
         if hasattr(self.basetype, "task_outputs") or False:
             self.returntype = get_type_hints(
                 getattr(self.basetype, "task_outputs")
             ).get("return", typing.Any)
         else:
-            self.returntype = self.objecttype
+            self.returntype = self.basetype
 
         # Registers ourselves
         self.basetype.__xpmtype__ = self
@@ -284,6 +291,11 @@ class ObjectType(Type):
         self.annotations = []
         self._deprecated = False
 
+    @property
+    def objecttype(self):
+        """Returns the object type"""
+        return self.basetype.XPMValue
+
     def addAnnotation(self, annotation):
         assert not self.__initialized__
         self.annotations.append(annotation)
@@ -636,3 +648,31 @@ class DictType(Type):
 
     def __repr__(self):
         return str(self)
+
+
+class GenericType(Type):
+    def __init__(self, type: typing.Type):
+        self.type = type
+        self.origin = get_origin(type)
+
+        self.args = get_args(type)
+
+    def name(self):
+        return str(self.type)
+
+    def __repr__(self):
+        return repr(self.type)
+
+    def validate(self, value):
+        # Now, let's check generics...
+        mros = typingutils.generic_mro(type(value))
+        matching = next(
+            (mro for mro in mros if (get_origin(mro) or mro) is self.origin), None
+        )
+        target = get_origin(self.type) or self.type
+        if matching is None:
+            raise ValueError(
+                f"{type(value)} is not of type {target} ({type(value).__mro__})"
+            )
+
+        return value

experimaestro/exceptions.py

@@ -0,0 +1,2 @@
+class HandledException(Exception):
+    pass

experimaestro/experiments/cli.py

@@ -10,6 +10,7 @@ import omegaconf
 import yaml
 from experimaestro import LauncherRegistry, RunMode, experiment
 from experimaestro.experiments.configuration import ConfigurationBase
+from experimaestro.exceptions import HandledException
 from experimaestro.settings import get_workspace
 from omegaconf import OmegaConf, SCMode
 from termcolor import cprint
@@ -63,7 +64,7 @@ def load(yaml_file: Path):
     if parent := _data.get("parent", None):
         data.extend(load(yaml_file.parent / parent))
 
-    return data
+    return data[::-1]
 
 
 @click.option("--debug", is_flag=True, help="Print debug information")
@@ -110,10 +111,16 @@ def load(yaml_file: Path):
     help="Working directory - if None, uses the default XPM " "working directory",
 )
 @click.option("--conf", "-c", "extra_conf", type=str, multiple=True)
+@click.option(
+    "--pre-yaml", type=str, multiple=True, help="Add YAML file after the main one"
+)
+@click.option(
+    "--post-yaml", type=str, multiple=True, help="Add YAML file before the main one"
+)
 @click.argument("args", nargs=-1, type=click.UNPROCESSED)
 @click.argument("yaml_file", metavar="YAML file", type=str)
 @click.command()
-def experiments_cli(
+def experiments_cli(  # noqa: C901
     yaml_file: str,
     xp_file: str,
     host: str,
@@ -123,6 +130,8 @@ def experiments_cli(
     env: List[Tuple[str, str]],
     run_mode: RunMode,
     extra_conf: List[str],
+    pre_yaml: List[str],
+    post_yaml: List[str],
     args: List[str],
     show: bool,
     debug: bool,
@@ -133,13 +142,17 @@ def experiments_cli(
     logging.getLogger("xpm.hash").setLevel(logging.INFO)
 
     # --- Loads the YAML
-    yamls = load(Path(yaml_file))
+    yamls = []
+    for y in pre_yaml:
+        yamls.extend(load(Path(y)))
+    yamls.extend(load(Path(yaml_file)))
+    for y in post_yaml:
+        yamls.extend(load(Path(y)))
 
     # --- Get the XP file
     if xp_file is None:
-        for data in yamls:
-            if xp_file := data.get("file"):
-                del data["file"]
+        for data in yamls[::-1]:
+            if xp_file := data.get("file", None):
                 break
 
         if xp_file is None:
@@ -201,15 +214,15 @@ def experiments_cli(
             cprint(f"Error in configuration:\n\n{e}", "red", file=sys.stderr)
             sys.exit(1)
 
+    if show:
+        print(json.dumps(OmegaConf.to_container(configuration)))  # noqa: T201
+        sys.exit(0)
+
     # Move to an object container
     configuration: schema = OmegaConf.to_container(
         configuration, structured_config_mode=SCMode.INSTANTIATE
     )
 
-    if show:
-        print(json.dumps(OmegaConf.to_container(configuration)))  # noqa: T201
-        sys.exit(0)
-
     # Get the working directory
     if workdir is None or not Path(workdir).is_dir():
         workdir = get_workspace(workdir).path.expanduser().resolve()
@@ -223,9 +236,13 @@ def experiments_cli(
         for key, value in env:
             xp.setenv(key, value)
 
-        # Run the experiment
-        helper.xp = xp
-        helper.run(list(args), configuration)
+        try:
+            # Run the experiment
+            helper.xp = xp
+            helper.run(list(args), configuration)
+
+            # ... and wait
+            xp.wait()
 
-        # ... and wait
-        xp.wait()
+        except HandledException:
+            sys.exit(1)

experimaestro/experiments/configuration.py

@@ -20,14 +20,28 @@ def configuration(*args, **kwargs):
 
 @configuration()
 class ConfigurationBase:
+    """Base configuration for any experiment"""
+
     id: str = MISSING
-    """ID of the experiment"""
+    """ID of the experiment
 
-    description: str = ""
-    """Description of the experiment"""
+    This ID is used by experimaestro when running as the experiment.
+    """
 
     file: str = "experiment"
-    """qualified name (relative to the module) for the file containing a run function"""
+    """Relative path of the file containing a run function"""
 
     parent: Optional[str] = None
     """Relative path of a YAML file that should be merged"""
+
+    title: str = ""
+    """Short description of the experiment"""
+
+    subtitle: str = ""
+    """Allows to give some more details about the experiment"""
+
+    paper: str = ""
+    """Source paper for this experiment"""
+
+    description: str = ""
+    """Description of the experiment"""

experimaestro/launcherfinder/registry.py

@@ -85,6 +85,10 @@ def load_yaml(loader_cls: Type[Loader], path: Path):
     if not path.is_file():
         return None
 
+    logger.warning(
+        "Using YAML file to configure launchers is deprecated. Please remove %s using launchers.py",
+        path,
+    )
     logger.debug("Loading %s", path)
     with path.open("rt") as fp:
         loader = loader_cls(fp)

experimaestro/launcherfinder/specs.py

@@ -51,6 +51,13 @@ class CPUSpecification:
     def __lt__(self, other: "CPUSpecification"):
         return self.memory < other.memory and self.cores < other.cores
 
+    def total_memory(self, gpus: int = 0):
+        return max(
+            self.memory,
+            self.mem_per_cpu * self.cores,
+            self.cpu_per_gpu * self.mem_per_cpu * gpus,
+        )
+
 
 @define(kw_only=True)
 class HostSpecification:

experimaestro/scheduler/base.py

@@ -9,6 +9,7 @@ from typing import Any, List, Optional, Set, TypeVar, Union, TYPE_CHECKING
 import enum
 import signal
 import asyncio
+from experimaestro.exceptions import HandledException
 from experimaestro.notifications import LevelInformation, Reporter
 from typing import Dict
 from experimaestro.scheduler.services import Service
@@ -29,7 +30,7 @@ if TYPE_CHECKING:
     from experimaestro.launchers import Launcher
 
 
-class FailedExperiment(RuntimeError):
+class FailedExperiment(HandledException):
     """Raised when an experiment failed"""
 
     pass
@@ -70,6 +71,17 @@ class JobState(enum.Enum):
         return self.value >= JobState.DONE.value
 
 
+class JobFailureStatus(enum.Enum):
+    #: Job failed
+    DEPENDENCY = 0
+
+    #: Job dependency failed
+    FAILED = 1
+
+    #: Memory
+    MEMORY = 2
+
+
 class JobLock(Lock):
     def __init__(self, job):
         super().__init__()
@@ -130,6 +142,9 @@ class Job(Resource):
         self.config = config
         self.state: JobState = JobState.UNSCHEDULED
 
+        #: If a job has failed, indicates the failure status
+        self.failure_status: JobFailureStatus = None
+
         # Dependencies
         self.dependencies: Set[Dependency] = set()  # as target
 
@@ -294,6 +309,7 @@ class Job(Resource):
             # Job completed
             if not self.state.finished():
                 self.state = JobState.ERROR
+                self.failure_status = JobFailureStatus.DEPENDENCY
                 self._readyEvent.set()
 
         if self.unsatisfied == 0:
@@ -846,13 +862,16 @@ class experiment:
 
                 if self.failedJobs:
                     # Show some more information
+                    count = 0
                     for job in self.failedJobs.values():
-                        logger.error(
-                            "Job %s failed, check the log file %s",
-                            job.relpath,
-                            job.stderr,
-                        )
-                    raise FailedExperiment(f"{len(self.failedJobs)} failed jobs")
+                        if job.failure_status != JobFailureStatus.DEPENDENCY:
+                            count += 1
+                            logger.error(
+                                "Job %s failed, check the log file %s",
+                                job.relpath,
+                                job.stderr,
+                            )
+                    raise FailedExperiment(f"{count} failed jobs")
 
         future = asyncio.run_coroutine_threadsafe(awaitcompletion(), self.loop)
         return future.result()
@@ -922,7 +941,7 @@ class experiment:
             if exc_type:
                 # import faulthandler
                 # faulthandler.dump_traceback()
-                logger.exception(
+                logger.error(
                     "Not waiting since an exception was thrown"
                     " (some jobs may be running)"
                 )

experimaestro/tests/test_objects.py

@@ -4,6 +4,7 @@ import pytest
 from experimaestro import Config, Task, Annotated, copyconfig, default
 from experimaestro.core.arguments import Param
 from experimaestro.core.objects import TypeConfig
+from experimaestro.core.types import XPMValue
 from experimaestro.generators import pathgenerator
 from experimaestro.scheduler.workspace import RunMode
 from experimaestro.tests.utils import TemporaryExperiment
@@ -33,6 +34,10 @@ class C(B):
     pass
 
 
+class D(B, A):
+    pass
+
+
 class DefaultAnnotationConfig(Config):
     a: Annotated[A, default(A(x=3))]
 
@@ -51,9 +56,10 @@ def test_object_config_default():
 
 def test_hierarchy():
     """Test if the object hierarchy is OK"""
-    OA = A.__xpmtype__.objecttype
-    OB = B.__xpmtype__.objecttype
-    OC = C.__xpmtype__.objecttype
+    OA = A.__getxpmtype__().objecttype
+    OB = B.__getxpmtype__().objecttype
+    OC = C.__getxpmtype__().objecttype
+    OD = D.__getxpmtype__().objecttype
 
     assert issubclass(A, Config)
     assert issubclass(B, Config)
@@ -65,9 +71,10 @@ def test_hierarchy():
 
     assert issubclass(C, B)
 
-    assert OA.__bases__ == (Config,)
-    assert OB.__bases__ == (Config,)
-    assert OC.__bases__ == (B,)
+    assert OA.__bases__ == (A, XPMValue)
+    assert OB.__bases__ == (B, XPMValue)
+    assert OC.__bases__ == (C, B.XPMValue)
+    assert OD.__bases__ == (D, B.XPMValue, A.XPMValue)
 
 
 class CopyConfig(Task):

experimaestro/tests/test_param.py

@@ -232,8 +232,8 @@ def test_redefined_param():
     class B:
         x: Param[int] = 3
 
-    atx = A._.__xpmtype__.getArgument("x")
-    btx = B._.__xpmtype__.getArgument("x")
+    atx = A.C.__xpmtype__.getArgument("x")
+    btx = B.C.__xpmtype__.getArgument("x")
 
     assert atx.required
 

experimaestro/typingutils.py

@@ -1,10 +1,21 @@
 import sys
 import typing
-
-if sys.version_info.major == 3 and sys.version_info.minor < 9:
-    from typing_extensions import _AnnotatedAlias as AnnotatedAlias, get_args
-else:
-    from typing import _AnnotatedAlias as AnnotatedAlias, get_args
+from typing import Generic, Protocol
+
+if sys.version_info.major == 3:
+    if sys.version_info.minor < 11:
+        from typing import _collect_type_vars as _collect_parameters
+    else:
+        from typing import _collect_parameters
+
+    if sys.version_info.minor < 9:
+        from typing_extensions import (
+            _AnnotatedAlias as AnnotatedAlias,
+            get_args,
+            get_origin,
+        )
+    else:
+        from typing import _AnnotatedAlias as AnnotatedAlias, get_args, get_origin
 
 GenericAlias = typing._GenericAlias
 
@@ -19,7 +30,9 @@ def get_optional(typehint):
     if isgenericalias(typehint) and typehint.__origin__ == typing.Union:
         if len(typehint.__args__) == 2:
             for ix in (0, 1):
-                if typehint.__args__[ix] == type(None):
+                argtype = typehint.__args__[ix]
+                origin = get_origin(argtype) or argtype
+                if issubclass(origin, type(None)):
                     return typehint.__args__[1 - ix]
     return None
 
@@ -63,3 +76,35 @@ def get_dict(typehint):
             assert len(typehint.__args__) == 2
             return typehint.__args__
     return None
+
+
+# From https://github.com/python/typing/issues/777
+
+
+def _generic_mro(result, tp):
+    origin = typing.get_origin(tp) or tp
+
+    result[origin] = tp
+    if hasattr(origin, "__orig_bases__"):
+        parameters = _collect_parameters(origin.__orig_bases__)
+        substitution = dict(zip(parameters, get_args(tp)))
+        for base in origin.__orig_bases__:
+            if get_origin(base) in result:
+                continue
+            base_parameters = getattr(base, "__parameters__", ())
+            if base_parameters:
+                base = base[tuple(substitution.get(p, p) for p in base_parameters)]
+            _generic_mro(result, base)
+
+
+def generic_mro(tp):
+    origin = get_origin(tp)
+    if origin is None and not hasattr(tp, "__orig_bases__"):
+        if not isinstance(tp, type):
+            raise TypeError(f"{tp!r} is not a type or a generic alias")
+        return tp.__mro__
+    # sentinel value to avoid to subscript Generic and Protocol
+    result = {Generic: Generic, Protocol: Protocol}
+    _generic_mro(result, tp)
+    cls = origin if origin is not None else tp
+    return tuple(result.get(sub_cls, sub_cls) for sub_cls in cls.__mro__)

{experimaestro-1.4.3.dist-info → experimaestro-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: experimaestro
-Version: 1.4.3
+Version: 1.5.0
 Summary: "Experimaestro is a computer science experiment manager"
 Home-page: https://github.com/experimaestro/experimaestro-python
 License: GPL-3
@@ -23,7 +23,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: arpeggio (>=2,<3)
 Requires-Dist: attrs (>=23.1.0,<24.0.0)
-Requires-Dist: cached-property (>=1.5.2,<2.0.0) ; python_version < "3.9"
 Requires-Dist: click (>=8)
 Requires-Dist: decorator (>=5,<6)
 Requires-Dist: docstring-parser (>=0.15,<0.16)
@@ -46,7 +45,7 @@ Requires-Dist: rpyc (>=5,<6)
 Requires-Dist: sortedcontainers (>=2.4,<3.0)
 Requires-Dist: termcolor (>=2.3)
 Requires-Dist: tqdm (>=4.66.1,<5.0.0)
-Requires-Dist: typing-extensions (>=4.2) ; python_version < "3.11"
+Requires-Dist: typing-extensions (>=4.2) ; python_version < "3.12"
 Requires-Dist: watchdog (>=2,<3)
 Project-URL: Documentation, https://experimaestro-python.readthedocs.io/
 Project-URL: Repository, https://github.com/experimaestro/experimaestro-python

{experimaestro-1.4.3.dist-info → experimaestro-1.5.0.dist-info}/RECORD

@@ -7,19 +7,20 @@ experimaestro/commandline.py,sha256=NS1ubme8DTJtDS2uWwdHLQiZsl6TSK1LkNxu39c3-cw,
 experimaestro/compat.py,sha256=dQqE2ZNHLM2wtdfp7fBRYMfC33qNehVf9J6FGRBUQhs,171
 experimaestro/connectors/__init__.py,sha256=hxcBSeVLk_7oyiIlS3l-9dGg1NGtShwvRD1tS7f8D2M,5461
 experimaestro/connectors/local.py,sha256=6tlaZb0tvNS2mjsapiVbfY7kIfLICJad137VXBMz-xo,5816
-experimaestro/connectors/ssh.py,sha256=A6qObY_phynZVQFdAsyymP9c0fiUHwn04nShROzMrec,7896
+experimaestro/connectors/ssh.py,sha256=hmvU6bCq6ZsB1Zjz273mzb9pdZdTinUhUqZFJTZl8Fg,8290
 experimaestro/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 experimaestro/core/arguments.py,sha256=dW32opqNEsULYr6nR7Zk8PqHsSCbLPclfXofw27GTpI,5620
 experimaestro/core/context.py,sha256=Q8_ngiHRBZ0laavXRJNiDvdCprrnROVTWaHfrwMdlG4,2638
-experimaestro/core/objects.py,sha256=UeQJmJ4597T89mjxNauGbnnfeiPkG4ifmoZuKDoi2Ds,62627
-experimaestro/core/objects.pyi,sha256=D8-kd-NU-pRl9-_ktXUne_k1YH6TG3VGqRaKV8mrZwk,7003
+experimaestro/core/objects.py,sha256=s9dt7U8LDT9XNVY7mowdt1DvuBH19EO4obips1ZBSHg,63989
+experimaestro/core/objects.pyi,sha256=Adi2OKCW0-B9GROlEUgxxBDK6SHUqccTBHTofRRJE9M,7131
 experimaestro/core/serialization.py,sha256=9tg5ebLF3YeZ_zG9DiTHPLthppvo7io710ohD_dcLTo,3836
 experimaestro/core/serializers.py,sha256=R_CAMyjjfU1oi-eHU6VlEUixJpFayGqEPaYu7VsD9xA,1197
-experimaestro/core/types.py,sha256=jQGlyC1xnsZ5NKct3FELIcXcXQMvNQvauCEuumyfBz8,19253
+experimaestro/core/types.py,sha256=oTXD4UjMVoYn_Usxn2C4h6IGhYDTtekKB3O3hfeOynQ,20176
 experimaestro/core/utils.py,sha256=JfC3qGUS9b6FUHc2VxIYUI9ysNpXSQ1LjOBkjfZ8n7o,495
+experimaestro/exceptions.py,sha256=cUy83WHM3GeynxmMk6QRr5xsnpqUAdAoc-m3KQVrE2o,44
 experimaestro/experiments/__init__.py,sha256=GcpDUIbCvhnv6rxFdAp4wTffCVNTv-InY6fbQAlTy-o,159
-experimaestro/experiments/cli.py,sha256=ftAo8Km0WM_CuooBvFMZXhNgTtisGkLajEPDWlTF3cg,6543
-experimaestro/experiments/configuration.py,sha256=tGaI7VJdXlD4VcBIpuJxnL1uXjrDaz7M4yUXyxwZlP0,834
+experimaestro/experiments/cli.py,sha256=vne6skjbNmMIIgmlEJY0b_xoJIxgIjis07xL4byr-0o,7080
+experimaestro/experiments/configuration.py,sha256=8GRqyLG1leF_NbvbFzqpm0yM24O0WjSNmQzvnuLnxxw,1150
 experimaestro/filter.py,sha256=DN1PrmS9yXoOa5Xnv001zbxzpdzvcVZFI9xZFKZ1-6g,5794
 experimaestro/generators.py,sha256=9NQ_TfDfASkArLnO4PF7s5Yoo9KWjlna2DCPzk5gJOI,1230
 experimaestro/huggingface.py,sha256=gnVlr6SZnbutYz4PLH0Q77n1TRF-uk-dR-3UFzFqAY0,2956
@@ -27,8 +28,8 @@ experimaestro/ipc.py,sha256=ltYqybPm_XfcQC3yiskMfhfI_1dREs-XRu0F83YsNws,1490
 experimaestro/launcherfinder/__init__.py,sha256=jIeT9uRKsIjUv-oyKt0MhFzXJJrSdpJKwM2vL9Sk5YY,294
 experimaestro/launcherfinder/base.py,sha256=NptPJ0e8CktdhOPejocSfI_B4mloeH_EmJrbXruUCSA,1020
 experimaestro/launcherfinder/parser.py,sha256=0qDXgdPce_PsWDy-hKTfxxjXjTAu4FA8moKtyllB2-Q,2129
-experimaestro/launcherfinder/registry.py,sha256=KdxQgUn56Iui3vGNXt8D-LiWz0CrxhiY09LYTxYj8PA,8751
-experimaestro/launcherfinder/specs.py,sha256=DHX7-07ffe_nrv-HSU8oCl_nd3519zhXkh3ymKBukIA,6250
+experimaestro/launcherfinder/registry.py,sha256=KxlKZDl0PbBIh-JUnn0U8JYSHVt14L3Qox0DKJefwoc,8892
+experimaestro/launcherfinder/specs.py,sha256=G8za6mEmkVxuZY_ab3OhWJIpONpcBMO_iXeB30sUbhI,6448
 experimaestro/launchers/__init__.py,sha256=lXn544sgJExr6uirILWzAXu_IfmfyqFZOt4OzRnjHXg,2525
 experimaestro/launchers/direct.py,sha256=VJzQNrUGnh-1Ovt6uw4yYIjXNu45QpR-_6V45lcZAfQ,1967
 experimaestro/launchers/oar.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -48,7 +49,7 @@ experimaestro/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 experimaestro/rpyc.py,sha256=ZRKol-3tVoeoUITLNFenLF4dhWBLW_FvSV_GvsypmeI,3605
 experimaestro/run.py,sha256=tH9oG7o8_c7cp0cyBLIzWN7CVYjtz72SChz2X-FjYhs,4455
 experimaestro/scheduler/__init__.py,sha256=ERmmOxz_9mUkIuccNbzUa5Y6gVLLVDdyc4cCxbCCUbY,20
-experimaestro/scheduler/base.py,sha256=l-DPZJQMNHr-pbUwfLJbGS7Wp9jX1m9I9cLwdS5xbZ8,30914
+experimaestro/scheduler/base.py,sha256=1SkwjSbOKTHs_pAB44z63xmcsgYrXsxxluO2MhJW5uU,31450
 experimaestro/scheduler/dependencies.py,sha256=n9XegwrmjayOIxt3xhuTEBVEBGSq4oeVdzz-FviDGXo,1994
 experimaestro/scheduler/environment.py,sha256=ZaSHSgAcZBmIj7b_eS1OvNQOuVLFvuw-qvqtYrc3Vms,2393
 experimaestro/scheduler/services.py,sha256=aCKkNZMULlceabqf-kOs_-C7KPINnjU3Q-I00o5x6iY,2189
@@ -112,9 +113,9 @@ experimaestro/tests/test_findlauncher.py,sha256=twliDFFI75KPuUJE6EgJwDMf8u3ic1LA
 experimaestro/tests/test_forward.py,sha256=XkZ2iOPETVj-kbTyniOQU9gyHXdfvn89GTwpMq9J6qc,780
 experimaestro/tests/test_identifier.py,sha256=fnl7jCUAg86npRrS3yeXtb9JysSKhs5czgFzW9yJ9Q8,13397
 experimaestro/tests/test_instance.py,sha256=awIIMnhiec_qDO6jZBqWDR13ReTzh3arK_60QDY6TLQ,1540
-experimaestro/tests/test_objects.py,sha256=wDUW7FXQ9rmB8EXJriJrO--E90Xq2CDIksPdEp8fEoM,1837
+experimaestro/tests/test_objects.py,sha256=6PSG5FtqkiLg2OK26ZzvBYbJYPbFpyDYZtKS-DbiXIs,2037
 experimaestro/tests/test_outputs.py,sha256=DYzPk5TT_yLumy8SsQbl-S66ivVxJ-ERFrZ68KQZ4KU,781
-experimaestro/tests/test_param.py,sha256=YoJI2hhtyrTPEUHgEGZyu1C1pabW0oBTHcaFLKkr-qs,6405
+experimaestro/tests/test_param.py,sha256=FcRF8HbjoW96SR6cTW3fqracLM4BivAsTq0iZvl14Ow,6405
 experimaestro/tests/test_progress.py,sha256=wtIGQzlV3ldd_wMng11LinVESchW-1J954mCJNlG28E,7580
 experimaestro/tests/test_serializers.py,sha256=xSCezAM9yH_Ix1wr7j0au9SyBv9DtZ7b0zs2-Ynt-VM,2338
 experimaestro/tests/test_snippets.py,sha256=rojnyDjtmAMnSuDUj6Bv9XEgdP8oQf2nVc132JF8vsM,3081
@@ -131,7 +132,7 @@ experimaestro/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 experimaestro/tools/diff.py,sha256=FBCwupPrSwkEOcqYu0NWe7LTkuOW6r-_btoCel2_k_I,3436
 experimaestro/tools/documentation.py,sha256=O2UzjzodPqGot3YSe6NYlK7S42XpplakUdqxFpvjqHQ,9184
 experimaestro/tools/jobs.py,sha256=63bXhJ7RGdczLU_nxu2skGn-9dwgr4r5pD23qH4WeBA,3516
-experimaestro/typingutils.py,sha256=gkEhJ9Fir05xh5v45pYKmrGYiLCykGtlU8sL-ydFXS8,1785
+experimaestro/typingutils.py,sha256=Gtsz_nU-t2CBVZP-EeUn-uAlxcbcS9Hp03Xy-TLDY-Q,3334
 experimaestro/utils/__init__.py,sha256=BdYguxAbR1jOQPV36OgGA31itaMvBJ6WVPV6b4Jn4xw,2434
 experimaestro/utils/asyncio.py,sha256=zEQQqZW6uHGnFknp_udt9WjjtqLNNMWun9TPL6FOF64,601
 experimaestro/utils/jobs.py,sha256=42FAdKcn_v_-M6hcQZPUBr9kbDt1eVsk3a4E8Gc4eu8,2394
@@ -140,8 +141,8 @@ experimaestro/utils/resources.py,sha256=gDjkrRjo7GULWyXmNXm_u1uqzEIAoAvJydICk56n
 experimaestro/utils/settings.py,sha256=jpFMqF0DLL4_P1xGal0zVR5cOrdD8O0Y2IOYvnRgN3k,793
 experimaestro/utils/yaml.py,sha256=jEjqXqUtJ333wNUdIc0o3LGvdsTQ9AKW9a9CCd-bmGU,6766
 experimaestro/xpmutils.py,sha256=S21eMbDYsHfvmZ1HmKpq5Pz5O-1HnCLYxKbyTBbASyQ,638
-experimaestro-1.4.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-experimaestro-1.4.3.dist-info/METADATA,sha256=jFUznTSnjqfDBRU98s8mFP3sNBRzX5W9rJPOu3p8nMc,6338
-experimaestro-1.4.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-experimaestro-1.4.3.dist-info/entry_points.txt,sha256=PhaEili_fDgn5q7rBJGip_uhGkRBq5l3Yuhg91zkcbk,574
-experimaestro-1.4.3.dist-info/RECORD,,
+experimaestro-1.5.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+experimaestro-1.5.0.dist-info/METADATA,sha256=Mf0BErVRpCxCp2hnBnbH42ZE1cuK56TUSCO-WG4xMBQ,6265
+experimaestro-1.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+experimaestro-1.5.0.dist-info/entry_points.txt,sha256=PhaEili_fDgn5q7rBJGip_uhGkRBq5l3Yuhg91zkcbk,574
+experimaestro-1.5.0.dist-info/RECORD,,

{experimaestro-1.4.3.dist-info → experimaestro-1.5.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.8.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any