experimaestro 1.8.0rc1__py3-none-any.whl → 1.8.0rc2__py3-none-any.whl

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/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/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]

{experimaestro-1.8.0rc1.dist-info → experimaestro-1.8.0rc2.dist-info}/METADATA

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

{experimaestro-1.8.0rc1.dist-info → experimaestro-1.8.0rc2.dist-info}/RECORD

@@ -22,8 +22,8 @@ experimaestro/core/types.py,sha256=gSLv9F1HszVxI8jla6e-aVVS7q3KBwSzG1MImUHdGMg,2
 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=iQrUjY6mmJpT-tj-Ek1QPbzNs27x4jsKjciCMgaTKZw,9722
-experimaestro/experiments/configuration.py,sha256=cFDiUHnUGblJsctAUxAqx0jlM7_Ja_527lzk-4G-44k,1368
+experimaestro/experiments/cli.py,sha256=4jTDzQWtrdm_ZgwdkVmz5WQX9RFVCqxZV5w1e7Yymhs,10085
+experimaestro/experiments/configuration.py,sha256=vVm40BJW5sZNgSDZ0oBzX15jTO9rmOewVYrm0k9iXXY,1466
 experimaestro/generators.py,sha256=DQsEgdMwRUud9suWr-QGxI3vCO5sywP6MVGZWRNQXkk,1372
 experimaestro/huggingface.py,sha256=gnVlr6SZnbutYz4PLH0Q77n1TRF-uk-dR-3UFzFqAY0,2956
 experimaestro/ipc.py,sha256=Xn3tYME83jLEB0nFak3DwEIhpL5IRZpCl3jirBF_jl4,1570
@@ -117,7 +117,7 @@ experimaestro/tests/tasks/all.py,sha256=OMkHsWZkErCmTajiNO7hNhvnk9eKzJC-VatWgabW
 experimaestro/tests/tasks/foreign.py,sha256=uhXDOcWozkcm26ybbeEU9RElJpbhjC-zdzmlSKfPcdY,122
 experimaestro/tests/test_checkers.py,sha256=Kg5frDNRE3pvWVmmYzyk0tJFNO885KOrK48lSu-NlYA,403
 experimaestro/tests/test_dependencies.py,sha256=xfWrSkvjT45G4FSCL535m1huLT2ghmyW7kvP_XvvCJQ,2005
-experimaestro/tests/test_experiment.py,sha256=MXpVsWZpxINBianuTQ8vJ5iwmpIUq-GcS7YwSjLJUxM,1260
+experimaestro/tests/test_experiment.py,sha256=maCpZIkufbS2MdJVQ3uWNklDq4VlPmi5SUegqAx4zp8,1284
 experimaestro/tests/test_findlauncher.py,sha256=8tjpR8bLMi6Gjs7KpY2t64izZso6bmY7vIivMflm-Bc,2965
 experimaestro/tests/test_forward.py,sha256=9y1zYm7hT_Lx5citxnK7n20cMZ2WJbsaEeY5irCZ9U4,735
 experimaestro/tests/test_identifier.py,sha256=L-r0S0dI9ErOZSmqGOPbbUZBvWJ-uzc3sijoyTPyMYU,13680
@@ -149,8 +149,8 @@ experimaestro/utils/jupyter.py,sha256=JcEo2yQK7x3Cr1tNl5FqGMZOICxCv9DwMvL5xsWdQP
 experimaestro/utils/resources.py,sha256=j-nvsTFwmgENMoVGOD2Ap-UD3WU85WkI0IgeSszMCX4,1328
 experimaestro/utils/settings.py,sha256=jpFMqF0DLL4_P1xGal0zVR5cOrdD8O0Y2IOYvnRgN3k,793
 experimaestro/xpmutils.py,sha256=S21eMbDYsHfvmZ1HmKpq5Pz5O-1HnCLYxKbyTBbASyQ,638
-experimaestro-1.8.0rc1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-experimaestro-1.8.0rc1.dist-info/METADATA,sha256=GKxZQlL20q47h2TzK9Y2ej5ymYPVZ9qjeuXDGM_t6_w,6162
-experimaestro-1.8.0rc1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-experimaestro-1.8.0rc1.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
-experimaestro-1.8.0rc1.dist-info/RECORD,,
+experimaestro-1.8.0rc2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+experimaestro-1.8.0rc2.dist-info/METADATA,sha256=QyrGnbt0od9cdPTTl5KPzrma-Qlenbq4ZTnz7sUZQOY,6162
+experimaestro-1.8.0rc2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+experimaestro-1.8.0rc2.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
+experimaestro-1.8.0rc2.dist-info/RECORD,,