experimaestro 1.6.0__tar.gz → 1.6.2__tar.gz

{experimaestro-1.6.0 → experimaestro-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: experimaestro
-Version: 1.6.0
+Version: 1.6.2
 Summary: "Experimaestro is a computer science experiment manager"
 License: GPL-3
 Keywords: experiment manager

{experimaestro-1.6.0 → experimaestro-1.6.2}/pyproject.toml

@@ -19,7 +19,7 @@ include = [
     "src/experimaestro/sphinx/static/experimaestro.css",
     "src/experimaestro/mkdocs/style.css"
 ]
-version = "1.6.0"
+version = "1.6.2"
 repository = "https://github.com/experimaestro/experimaestro-python"
 documentation = "https://experimaestro-python.readthedocs.io/"
 
@@ -119,7 +119,7 @@ warn_unused_ignores = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.6.0"
+version = "1.6.2"
 changelog_start_rev = "0.15.0"
 tag_format = "v$version"
 update_changelog_on_bump = true

{experimaestro-1.6.0 → experimaestro-1.6.2}/src/experimaestro/core/objects.py

@@ -1340,8 +1340,14 @@ class ConfigInformation:
                     sys.modules[module_name] = mod
                     spec.loader.exec_module(mod)
             else:
-                logger.debug("Importing module %s", definition["module"])
-                mod = importlib.import_module(module_name)
+                try:
+                    logger.debug("Importing module %s", definition["module"])
+                    mod = importlib.import_module(module_name)
+                except ModuleNotFoundError:
+                    # More hints on the nature of the error
+                    logging.warning("(1) Either the python path is wrong – %s", ":".join(sys.path))
+                    logging.warning("(2) There is not __init__.py in your module")
+                    raise
 
             cls = getqualattr(mod, definition["type"])
 

{experimaestro-1.6.0 → experimaestro-1.6.2}/src/experimaestro/experiments/cli.py

@@ -59,7 +59,7 @@ class ExperimentCallable(Protocol):
 class ConfigurationLoader:
     def __init__(self):
         self.yamls = []
-        self.pythonpath = set()
+        self.python_path = set()
 
     def load(self, yaml_file: Path):
         """Loads a YAML file, and parents one if they exist"""
@@ -76,9 +76,9 @@ class ConfigurationLoader:
         for path in _data.get("pythonpath", []):
             path = Path(path)
             if path.is_absolute():
-                self.pythonpath.add(path.resolve())
+                self.python_path.add(path.resolve())
             else:
-                self.pythonpath.add((yaml_file.parent / path).resolve())
+                self.python_path.add((yaml_file.parent / path).resolve())
 
 
 @click.option("--debug", is_flag=True, help="Print debug information")
@@ -181,7 +181,7 @@ def experiments_cli(  # noqa: C901
         configuration.merge_with(OmegaConf.from_dotlist(extra_conf))
 
     # --- Get the XP file
-    pythonpath = list(conf_loader.pythonpath)
+    python_path = list(conf_loader.python_path)
     if module_name is None:
         module_name = configuration.get("module", None)
 
@@ -192,9 +192,9 @@ def experiments_cli(  # noqa: C901
                 not module_name
             ), "Module name and experiment file are mutually exclusive options"
             xp_file = Path(xp_file)
-            if not pythonpath:
-                pythonpath.append(xp_file.parent)
-            logging.info("Using python path: %s", ", ".join(str(s) for s in pythonpath))
+            if not python_path:
+                python_path.append(xp_file.parent)
+            logging.info("Using python path: %s", ", ".join(str(s) for s in python_path))
 
     assert (
         module_name or xp_file
@@ -208,29 +208,31 @@ def experiments_cli(  # noqa: C901
 
     # --- Finds the "run" function
 
-    try:
-        for path in pythonpath:
-            sys.path.append(str(path))
-
-        if xp_file:
-            if not xp_file.exists() and xp_file.suffix != ".py":
-                xp_file = xp_file.with_suffix(".py")
-            xp_file: Path = Path(yaml_file).parent / xp_file
-            with open(xp_file) as src:
-                module_name = xp_file.with_suffix("").name
-                mod = imp.load_module(
-                    module_name,
-                    src,
-                    str(xp_file.absolute()),
-                    (".py", "r", imp.PY_SOURCE),
-                )
-        else:
-            # Module
+    # Modifies the Python path
+    for path in python_path:
+        sys.path.append(str(path))
+
+    if xp_file:
+        if not xp_file.exists() and xp_file.suffix != ".py":
+            xp_file = xp_file.with_suffix(".py")
+        xp_file: Path = Path(yaml_file).parent / xp_file
+        with open(xp_file) as src:
+            module_name = xp_file.with_suffix("").name
+            mod = imp.load_module(
+                module_name,
+                src,
+                str(xp_file.absolute()),
+                (".py", "r", imp.PY_SOURCE),
+            )
+    else:
+        # Module
+        try:
             mod = importlib.import_module(module_name)
+        except ModuleNotFoundError as e:
+            logging.error("Module not found: %s with python path %s", e, sys.path)
+            raise
 
-        helper = getattr(mod, "run", None)
-    finally:
-        pass
+    helper = getattr(mod, "run", None)
 
     # --- ... and runs it
     if helper is None:
@@ -267,10 +269,11 @@ def experiments_cli(  # noqa: C901
 
     # Define the workspace
     ws_env = find_workspace(workdir=workdir, workspace=workspace)
+    
     workdir = ws_env.path
 
     logging.info("Using working directory %s", str(workdir.resolve()))
-
+    
     # --- Runs the experiment
     with experiment(
         ws_env, configuration.id, host=host, port=port, run_mode=run_mode
@@ -280,6 +283,9 @@ def experiments_cli(  # noqa: C901
         for key, value in env:
             xp.setenv(key, value)
 
+        # Sets the python path
+        xp.workspace.python_path.extend(python_path)
+
         try:
             # Run the experiment
             helper.xp = xp

{experimaestro-1.6.0 → experimaestro-1.6.2}/src/experimaestro/scheduler/base.py

@@ -1,12 +1,13 @@
 from collections import ChainMap
 from functools import cached_property
+import itertools
 import logging
 import os
 from pathlib import Path
 from shutil import rmtree
 import threading
 import time
-from typing import Any, List, Optional, Set, TypeVar, Union, TYPE_CHECKING
+from typing import Any, Iterator, List, Optional, Set, TypeVar, Union, TYPE_CHECKING
 import enum
 import signal
 import asyncio
@@ -166,6 +167,13 @@ class Job(Resource):
         assert self._future, "Cannot wait a not submitted job"
         return self._future.result()
 
+    @cached_property
+    def python_path(self) -> Iterator[str]:
+        """Returns an iterator over python path"""
+        return itertools.chain(
+            self.workspace.python_path
+        )
+        
     @cached_property
     def environ(self):
         """Returns the job environment

{experimaestro-1.6.0 → experimaestro-1.6.2}/src/experimaestro/scheduler/workspace.py

@@ -2,7 +2,7 @@ from collections import ChainMap
 from enum import Enum
 from functools import cached_property
 from pathlib import Path
-from typing import Optional
+from typing import Iterator, Optional
 from experimaestro.settings import WorkspaceSettings, Settings
 
 
@@ -46,6 +46,7 @@ class Workspace:
             path = path.absolute()
         self.path = path
         self.run_mode = run_mode
+        self.python_path = []
         from ..launchers import Launcher
 
         self.launcher = launcher or Launcher.get(path)

{experimaestro-1.6.0 → experimaestro-1.6.2}/src/experimaestro/scriptbuilder.py

@@ -94,6 +94,7 @@ class PythonScriptBuilder:
             out.write("# Experimaestro generated task\n\n")
             out.write(
                 """import logging\n"""
+                """import sys\n"""
                 """logging.basicConfig(level=logging.INFO, """
                 """format='%(levelname)s:%(process)d:%(asctime)s [%(name)s] %(message)s', datefmt='%y-%m-%d %H:%M:%S')\n\n"""
             )
@@ -112,9 +113,17 @@ class PythonScriptBuilder:
             out.write("    ]\n")
 
             for name, value in job.environ.items():
-                out.write(f"""    os.environ["{name}"] = "{shquote(value)}"\n""")
+                if name == "PYTHONPATH":
+                    # Handles properly python path
+                    for path in value.split(":"):
+                        out.write(f"""    sys.path.insert(0, "{shquote(path)}")\n""")
+                else:
+                    out.write(f"""    os.environ["{name}"] = "{shquote(value)}"\n""")
             out.write("\n")
 
+            for path in job.python_path:
+                out.write(f"""    sys.path.insert(0, "{shquote(str(path))}")\n""")
+
             out.write(
                 f"""    TaskRunner("{shquote(connector.resolve(scriptpath))}","""
                 """ lockfiles).run()\n"""

{experimaestro-1.6.0 → experimaestro-1.6.2}/src/experimaestro/settings.py

@@ -37,7 +37,7 @@ class WorkspaceSettings:
 
     alt_workspaces: List[str] = field(default_factory=list)
     """Alternative workspaces to find jobs or experiments"""
-
+    
     def __post_init__(self):
         self.path = self.path.expanduser().resolve()
 
@@ -83,7 +83,7 @@ def get_workspace(id: Optional[str] = None) -> Optional[WorkspaceSettings]:
     return None
 
 
-def find_workspace(*, workspace: Optional[str] = None, workdir: Optional[Path] = None):
+def find_workspace(*, workspace: Optional[str] = None, workdir: Optional[Path] = None) -> WorkspaceSettings:
     """Find workspace"""
     workdir = Path(workdir) if workdir else None