experimaestro 1.8.0rc0__tar.gz → 1.8.0rc2__tar.gz

{experimaestro-1.8.0rc0 → experimaestro-1.8.0rc2}/PKG-INFO

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

{experimaestro-1.8.0rc0 → experimaestro-1.8.0rc2}/pyproject.toml

@@ -20,7 +20,7 @@ include = [
     "src/experimaestro/mkdocs/style.css",
     { path="src/experimaestro/server/data/*", format=['sdist', 'wheel']}
 ]
-version = "1.8.0-rc0"
+version = "1.8.0-rc2"
 repository = "https://github.com/experimaestro/experimaestro-python"
 documentation = "https://experimaestro-python.readthedocs.io/"
 
@@ -122,7 +122,7 @@ warn_unused_ignores = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.8.0rc0"
+version = "1.8.0rc2"
 changelog_start_rev = "v1.0.0"
 tag_format = "v$major.$minor.$patch$prerelease"
 # update_changelog_on_bump = true

{experimaestro-1.8.0rc0 → experimaestro-1.8.0rc2}/src/experimaestro/core/context.py

@@ -1,5 +1,10 @@
 from contextlib import contextmanager
-from pathlib import Path, UnsupportedOperation
+from pathlib import Path
+
+try:
+    from pathlib import UnsupportedOperation
+except ImportError:
+    UnsupportedOperation = OSError
 import shutil
 from typing import List, Optional, Protocol, Set, Union
 import os

{experimaestro-1.8.0rc0 → experimaestro-1.8.0rc2}/src/experimaestro/experiments/cli.py

@@ -1,3 +1,4 @@
+import datetime
 import importlib
 import inspect
 import json
@@ -292,7 +293,7 @@ def experiments_cli(  # noqa: C901
         sys.exit(0)
 
     # Move to an object container
-    configuration = OmegaConf.to_container(
+    xp_configuration: ConfigurationBase = OmegaConf.to_container(
         configuration, structured_config_mode=SCMode.INSTANTIATE
     )
 
@@ -301,11 +302,22 @@ def experiments_cli(  # noqa: C901
 
     workdir = ws_env.path
 
-    logging.info("Using working directory %s", str(workdir.resolve()))
+    # --- Sets up the experiment ID
 
     # --- Runs the experiment
+    if xp_configuration.add_timestamp:
+        timestamp = datetime.datetime.now().strftime("%Y%m%d-%H%M")
+        experiment_id = f"""{xp_configuration.id}-{timestamp}"""
+    else:
+        experiment_id = xp_configuration.id
+
+    logging.info(
+        "Running experiment %s working directory %s",
+        experiment_id,
+        str(workdir.resolve()),
+    )
     with experiment(
-        ws_env, configuration.id, host=host, port=port, run_mode=run_mode
+        ws_env, experiment_id, host=host, port=port, run_mode=run_mode
     ) as xp:
         # Set up the environment
         # (1) global settings (2) workspace settings and (3) command line settings
@@ -318,7 +330,7 @@ def experiments_cli(  # noqa: C901
         try:
             # Run the experiment
             helper.xp = xp
-            helper.run(list(args), configuration)
+            helper.run(list(args), xp_configuration)
 
             # ... and wait
             xp.wait()

{experimaestro-1.8.0rc0 → experimaestro-1.8.0rc2}/src/experimaestro/experiments/configuration.py

@@ -51,3 +51,6 @@ class ConfigurationBase:
 
     description: str = ""
     """Description of the experiment"""
+
+    add_timestamp: bool = False
+    """Adds a timestamp YYYY_MM_DD-HH_MM to the experiment ID"""

{experimaestro-1.8.0rc0 → experimaestro-1.8.0rc2}/src/experimaestro/tests/test_experiment.py

@@ -41,10 +41,10 @@ def test_experiment_history():
             task_a = TaskA().submit()
             TaskB(task_a=task_a, x=tag(1)).submit()
 
-    # Look at the experiment
-    xp = get_experiment("experiment", workdir=workdir)
+        # Look at the experiment
+        xp = get_experiment("experiment", workdir=workdir)
 
-    (task_a_info,) = xp.get_jobs(TaskA)
-    (task_b_info,) = xp.get_jobs(TaskB)
-    assert task_b_info.tags == {"x": 1}
-    assert task_b_info.depends_on == [task_a_info]
+        (task_a_info,) = xp.get_jobs(TaskA)
+        (task_b_info,) = xp.get_jobs(TaskB)
+        assert task_b_info.tags == {"x": 1}
+        assert task_b_info.depends_on == [task_a_info]