yuclid 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

yuclid/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.7"

yuclid/run.py

@@ -13,6 +13,14 @@ def substitute_point_yvars(x, point_map, point_id):
     # replace ${yuclid.<name>} and ${yuclid.@} with point values
     value_pattern = r"\$\{yuclid\.([a-zA-Z0-9_]+)(?:\.value)?\}"
     name_pattern = r"\$\{yuclid\.([a-zA-Z0-9_]+)\.name\}"
+    matches = re.findall(name_pattern, x)
+    for name in matches:
+        if name not in point_map:
+            report(
+                LogLevel.FATAL,
+                f"point variable '{name}' not found in point_map",
+                hint=f"available variables: {', '.join(point_map.keys())}",
+            )
     y = re.sub(value_pattern, lambda m: str(point_map[m.group(1)]["value"]), x)
     y = re.sub(name_pattern, lambda m: str(point_map[m.group(1)]["name"]), y)
     if point_id is not None:
@@ -32,69 +40,56 @@ def substitute_global_yvars(x, subspace):
     return y
 
 
-def get_yvar_pattern():
-    return r"\$\{yuclid\.([a-zA-Z0-9_@]+)\}"
+def validate_point_yvars(space, exps):
+    for exp in exps:
+        matches = re.findall(
+            r"\$\{yuclid\.([a-zA-Z0-9_@]+)(?:\.(?:name|value|names|values))?\}", exp
+        )
+        for dim in matches:
+            if dim not in space and dim != "@":
+                report(LogLevel.FATAL, f"invalid variable 'yuclid.{dim}'", exp)
 
 
-def validate_yvars_in_env(env):
-    for key, value in env.items():
-        if re.search(get_yvar_pattern(), value):
+def validate_global_yvars(space, exps):
+    for exp in exps:
+        exp = str(exp)
+        point_matches = re.findall(
+            r"\$\{yuclid\.([a-zA-Z0-9_@]+)(?:\.(?:name|value))?\}", exp
+        )
+        for dim in point_matches:
             hint = (
                 "maybe you meant ${{yuclid.{}.names}} or ${{yuclid.{}.values}}?".format(
-                    key, key
+                    dim, dim
                 )
             )
             report(
                 LogLevel.FATAL,
-                f"cannot use yuclid point variables in env",
-                value,
+                "wrong use of yuclid point variable 'yuclid.{}'".format(dim),
                 hint=hint,
             )
+        global_matches = re.findall(
+            r"\$\{yuclid\.([a-zA-Z0-9_@]+)\.(?:names|values)\}", exp
+        )
+        for dim in global_matches:
+            if dim not in space:
+                breakpoint()
+                report(LogLevel.FATAL, f"invalid variable 'yuclid.{dim}'", exp)
 
 
-def validate_yvars_in_setup(data):
-    setup = data["setup"]
+def validate_yvars_in_env(space, env):
+    validate_global_yvars(space, env.values())
 
-    # global setup
-    for command in setup["global"]:
-        # match ${yuclid.<name>}
-        # for all matches, check if the name is in on_dims
-        names = re.findall(get_yvar_pattern(), command)
-        for name in names:
-            hint = (
-                "maybe you meant ${{yuclid.{}.names}} or ${{yuclid.{}.values}}?".format(
-                    name, name
-                )
-            )
-            report(
-                LogLevel.FATAL,
-                f"cannot use yuclid point variables in global setup",
-                command,
-                hint=hint,
-            )
 
-    # point setup
-    for point_item in setup["point"]:
-        on_dims = point_item["on"] or data["space"].keys()
-        commands = point_item["commands"]
-        for command in commands:
-            # match ${yuclid.(<name>|@)}
-            pattern = r"\$\{yuclid\.([a-zA-Z0-9_@]+)\}"
-            # for all matches, check if the name is in on_dims
-            names = re.findall(pattern, command)
-            for name in names:
-                if name not in on_dims:
-                    hint = "available variables: {}".format(
-                        ", ".join(["${{yuclid.{}}}".format(d) for d in on_dims])
-                    )
-                    if name == "@":
-                        hint = ". ${yuclid.@} is reserved for trial commands"
-                        report(
-                            LogLevel.FATAL,
-                            f"invalid yuclid variable '{name}' in point setup",
-                            command,
-                            hint=hint,
-                        )
+def validate_yvars_in_setup(space, setup):
+    validate_global_yvars(space, setup["global"])
+
+    for point in setup["point"]:
+        validate_point_yvars(space, point["commands"])
+
+
+def validate_yvars_in_trials(space, trials):
+    commands = [trial["command"] for trial in trials]
+    validate_point_yvars(space, commands)
 
 
 def load_json(f):
@@ -1158,8 +1153,8 @@ def normalize_point_setup(point_setup, space):
     # check validity of 'parallel' fields
     for item in normalized_items:
         parallel = item["parallel"]
-        if not isinstance(parallel, (bool, list)) or any(
-            x for x in parallel if not isinstance(x, str)
+        if not isinstance(parallel, (bool, list)) or (
+            isinstance(parallel, list) and any(not isinstance(x, str) for x in parallel)
         ):
             report(
                 LogLevel.FATAL,
@@ -1245,8 +1240,10 @@ def launch(args):
     validate_settings(data, settings)
     env = build_environment(settings, data)
     order = define_order(settings, data)
-    validate_yvars_in_env(env)
-    validate_yvars_in_setup(data)
+    validate_yvars_in_env(data["space"], data["env"])
+    validate_yvars_in_setup(data["space"], data["setup"])
+    validate_yvars_in_trials(data["space"], data["trials"])
+
     validate_presets(settings, data)
 
     if len(settings["presets"]) > 0:

{yuclid-0.1.5.dist-info → yuclid-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yuclid
-Version: 0.1.5
+Version: 0.1.7
 Summary: Run experiments and interactively plot results across combinations of user-specified dimensions
 Author-email: Federico Sossai <federico.sossai@gmail.com>
 Project-URL: Homepage, https://github.com/fsossai/yuclid

yuclid-0.1.7.dist-info/RECORD

@@ -0,0 +1,11 @@
+yuclid/__init__.py,sha256=GmypIHlw9-BaSEaoucCIwm0ut1DUut0hUvsyTCr17qk,21
+yuclid/cli.py,sha256=YZzxJty5wlUhCOEELvEcJeQb_lQ1Qc89RG4_s5IyKWU,6224
+yuclid/log.py,sha256=GR_FVfNroumuonKguAPd6H1rKjxJKRc8tAS2sVNTbzE,1655
+yuclid/plot.py,sha256=R6IXw6hHuXYFx1MjTKLCIqBfdNORStVEoDidAr-jEuE,29697
+yuclid/run.py,sha256=0zrQS6b_o-NkB1ijRPkSP4hI_qh3SkenXK2Oy72DK4g,44954
+yuclid/spread.py,sha256=4Ci3nsu8n_dhG-AK2IWHKRElQ8oaGdw14LrgNu79biM,4938
+yuclid-0.1.7.dist-info/METADATA,sha256=uV-39IZ2q1xV5dLMu_v99dMfIh9-h_dRKAOlfASMKS4,673
+yuclid-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yuclid-0.1.7.dist-info/entry_points.txt,sha256=2AvTtyt5iBnjr6HnjqH_3PeSoq9UzIbT92qivmEbOYA,43
+yuclid-0.1.7.dist-info/top_level.txt,sha256=cL5mb4h_4etwTsqhPvSnoVBXImIzPFGd3rINV1nEjPo,7
+yuclid-0.1.7.dist-info/RECORD,,

yuclid-0.1.5.dist-info/RECORD

@@ -1,11 +0,0 @@
-yuclid/__init__.py,sha256=Nmswip0IUvJenHIhdfSyTYurDcwWTvOQ8mPDREtwE1o,21
-yuclid/cli.py,sha256=YZzxJty5wlUhCOEELvEcJeQb_lQ1Qc89RG4_s5IyKWU,6224
-yuclid/log.py,sha256=GR_FVfNroumuonKguAPd6H1rKjxJKRc8tAS2sVNTbzE,1655
-yuclid/plot.py,sha256=R6IXw6hHuXYFx1MjTKLCIqBfdNORStVEoDidAr-jEuE,29697
-yuclid/run.py,sha256=N6zAxYFOOfVGxlY55IIR62jl1HJm4xVQcQjl-a6f_U4,45076
-yuclid/spread.py,sha256=4Ci3nsu8n_dhG-AK2IWHKRElQ8oaGdw14LrgNu79biM,4938
-yuclid-0.1.5.dist-info/METADATA,sha256=T6IqTWuc7V7JPG4xmKezpyE0mbRMGnLB11-jBwGoY5c,673
-yuclid-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-yuclid-0.1.5.dist-info/entry_points.txt,sha256=2AvTtyt5iBnjr6HnjqH_3PeSoq9UzIbT92qivmEbOYA,43
-yuclid-0.1.5.dist-info/top_level.txt,sha256=cL5mb4h_4etwTsqhPvSnoVBXImIzPFGd3rINV1nEjPo,7
-yuclid-0.1.5.dist-info/RECORD,,