experimaestro 0.22.0__py2.py3-none-any.whl → 0.24.0__py2.py3-none-any.whl

experimaestro/__init__.py

@@ -44,22 +44,24 @@ from .core.objects import (
     Config,
     copyconfig,
     setmeta,
-    TaskOutput,
+    ConfigWrapper,
+    ConfigWrapper as TaskOutput,  # maintains compatibility
     Task,
-    SerializedConfig,
-    Serialized,
 )
+from .core.serializers import SerializedConfig, PathBasedSerializedConfig
+from .core.types import Any, SubmitHook, submit_hook_decorator
+from .launchers import Launcher
 from .scheduler.environment import Environment
 from .scheduler.workspace import Workspace, RunMode
 from .scheduler import Scheduler, experiment, FailedExperiment
 from .notifications import progress, tqdm
-from .core.types import Any
 from .checkers import Choices
 from .xpmutils import DirectoryContext
 from .mkdocs.annotations import documentation
+from .scheduler.base import Job
 
 
-def set_launcher(launcher):
+def set_launcher(launcher: Launcher):
     Workspace.CURRENT.launcher = launcher
 
 

experimaestro/__main__.py

@@ -12,7 +12,7 @@ import subprocess
 from termcolor import colored, cprint
 
 import experimaestro
-from experimaestro.core.objects import TaskOutput
+from experimaestro.core.objects import ConfigWrapper
 
 # --- Command line main options
 logging.basicConfig(level=logging.INFO)
@@ -125,7 +125,7 @@ def diff(path: Path):
     """Show the reason of the identifier change for a job"""
     from experimaestro.tools.jobs import load_job
     from experimaestro import Config
-    from experimaestro.core.objects import GenerationContext
+    from experimaestro.core.objects import ConfigWalkContext
 
     _, job = load_job(path / "params.json", discard_id=False)
     _, new_job = load_job(path / "params.json")
@@ -142,7 +142,7 @@ def diff(path: Path):
             if new_id != old_id:
                 print(f"{path} differ: {new_id} vs {old_id}")
 
-                if isinstance(value, TaskOutput):
+                if isinstance(value, ConfigWrapper):
                     check(f"{path}.<task>", value.__xpm__.task, new_value.__xpm__.task)
                 else:
                     for arg in value.__xpmtype__.arguments.values():

experimaestro/commandline.py

@@ -1,6 +1,5 @@
 """Command line jobs"""
 
-from collections import ChainMap
 import json
 import io
 from pathlib import Path
@@ -260,13 +259,6 @@ class CommandLineJob(Job):
 
         return None
 
-    @property
-    def environ(self):
-        return ChainMap(
-            self.workspace.environment.environ,
-            self.launcher.environ if self.launcher else {},
-        )
-
     @property
     def notificationURL(self):
         if self.launcher and self.launcher.notificationURL: