experimaestro 2.0.0a3__py3-none-any.whl → 2.0.0a5__py3-none-any.whl

experimaestro/connectors/__init__.py

@@ -16,7 +16,7 @@ from experimaestro.utils import logger
 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 @@ class 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

experimaestro/core/objects/config.py

@@ -214,6 +214,31 @@ class ConfigInformation:
         # Not an argument, bypass
         return object.__getattribute__(self.pyobject, name)
 
+    @staticmethod
+    def is_generated_value(argument, value):
+        if argument.ignore_generated:
+            return False
+
+        if value is None:
+            return False
+
+        if isinstance(value, (int, str, float, bool, Enum, Path)):
+            return False
+
+        if isinstance(value, ConfigMixin):
+            return value.__xpm__._generated_values and value.__xpm__.task is None
+
+        if isinstance(value, list):
+            return any(ConfigInformation.is_generated_value(argument, x) for x in value)
+
+        if isinstance(value, dict):
+            return any(
+                ConfigInformation.is_generated_value(argument, x)
+                for x in value.values()
+            )
+
+        return False
+
     def set(self, k, v, bypass=False):
         from experimaestro.generators import Generator
 
@@ -233,12 +258,7 @@ class ConfigInformation:
         try:
             argument = self.xpmtype.arguments.get(k, None)
             if argument:
-                if (
-                    isinstance(v, ConfigMixin)
-                    and v.__xpm__._generated_values
-                    and v.__xpm__.task is None
-                    and not argument.ignore_generated
-                ):
+                if ConfigInformation.is_generated_value(argument, v):
                     raise AttributeError(
                         f"Cannot set {k} to a configuration with generated values. "
                         "Here is the list of paths to help you: "
@@ -373,9 +393,7 @@ class ConfigInformation:
         if generated_keys := [
             k
             for k, v in self.values.items()
-            if isinstance(v, Config)
-            and v.__xpm__.task is None
-            and v.__xpm__._generated_values
+            if ConfigInformation.is_generated_value(self.xpmtype.arguments[k], v)
         ]:
             raise AttributeError(
                 "Cannot seal a configuration with generated values:"
@@ -926,6 +944,7 @@ class ConfigInformation:
                 "workspace": str(context.workspace.path.absolute()),
                 "tags": {key: value for key, value in self.tags().items()},
                 "version": 2,
+                "experimaestro": experimaestro.__version__,
                 "objects": self.__get_objects__([], context),
             },
             out,

experimaestro/scheduler/__init__.py

@@ -1 +1,18 @@
-from .base import *
+from .base import Scheduler, Listener
+from .workspace import Workspace, RunMode
+from .experiment import experiment, FailedExperiment
+from .jobs import Job, JobState, JobFailureStatus, JobDependency, JobContext
+
+__all__ = [
+    "Scheduler",
+    "Listener",
+    "Workspace",
+    "RunMode",
+    "experiment",
+    "FailedExperiment",
+    "Job",
+    "JobState",
+    "JobFailureStatus",
+    "JobDependency",
+    "JobContext",
+]