metafold 0.13.dev1__py3-none-any.whl → 0.13.dev2__py3-none-any.whl

metafold/simulation/compression_experiment.py

@@ -206,15 +206,17 @@ class CompressionExperiment:
         return custom or f"{self.base_simulation.simulation_name}_sim{sim_index}"
 
     def _validate_simulation_names(self):
-        """Names must be a list of path-safe strings and resolve to a unique
-        name per sim (they become filenames and zip member paths)."""
+        """Names must be a list of path-safe strings (None or "" = use the
+        auto name) and resolve to a unique name per sim (they become filenames
+        and zip member paths)."""
         if not isinstance(self.simulation_names, list) or not all(
-            isinstance(n, str) for n in self.simulation_names
+            n is None or isinstance(n, str) for n in self.simulation_names
         ):
             raise ValueError(
                 f"simulation_names must be a list of strings, got: "
                 f"{self.simulation_names!r}"
             )
+        self.simulation_names = [n or "" for n in self.simulation_names]
         for name in self.simulation_names:
             if any(c in name for c in "/\\:"):
                 raise ValueError(

metafold/simulation/run_experiment.py

@@ -92,9 +92,9 @@ JSON manifest format
     ],
 
     # Optional display name per simulation variant, index-aligned with the variants
-    # the varying entries produce. A blank/missing entry falls back to "<name>_sim<i>".
-    # Names must be unique and must not contain path separators.
-    "simulation_names": ["slow piston", "fast piston", "fastest piston"]
+    # the varying entries produce. A null/blank/missing entry falls back to
+    # "<name>_sim<i>". Names must be unique and must not contain path separators.
+    "simulation_names": ["slow piston", null, "fastest piston"]
 }
 
 Available material presets
@@ -193,6 +193,8 @@ def _build_parts(parts_config: list[dict]) -> list[ExperimentPart]:
 
         if part_type == "piston_cylinder":
             kwargs = {}
+            if "name" in entry:
+                kwargs["name"] = entry["name"]
             if "velocity" in entry:
                 kwargs["velocity"] = entry["velocity"]
             if "shape_parameters" in entry:
@@ -203,6 +205,8 @@ def _build_parts(parts_config: list[dict]) -> list[ExperimentPart]:
 
         elif part_type == "piston_box":
             kwargs = {}
+            if "name" in entry:
+                kwargs["name"] = entry["name"]
             if "velocity" in entry:
                 kwargs["velocity"] = entry["velocity"]
             if "shape_parameters" in entry:
@@ -213,6 +217,8 @@ def _build_parts(parts_config: list[dict]) -> list[ExperimentPart]:
 
         elif part_type == "piston_mesh":
             kwargs = {"filename": entry["file"]}
+            if "name" in entry:
+                kwargs["name"] = entry["name"]
             if "velocity" in entry:
                 kwargs["velocity"] = entry["velocity"]
             if "material" in entry:
@@ -240,14 +246,6 @@ def _build_parts(parts_config: list[dict]) -> list[ExperimentPart]:
 def _build_varying(varying_config: list[dict]) -> list[ExperimentVarying]:
     varying: list[ExperimentVarying] = []
     for entry in varying_config:
-        # Each entry varies exactly one thing; to vary several, use several entries.
-        kinds = [k for k in ("files", "material", "velocity", "values") if k in entry]
-        if len(kinds) > 1:
-            raise ValueError(
-                f"varying entry may only vary one of files/material/velocity/values, "
-                f"got {kinds}: {entry}"
-            )
-
         if "part" in entry and "files" in entry:
             files = entry["files"]
             if not isinstance(files, list):

{metafold-0.13.dev1.dist-info → metafold-0.13.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metafold
-Version: 0.13.dev1
+Version: 0.13.dev2
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D

{metafold-0.13.dev1.dist-info → metafold-0.13.dev2.dist-info}/RECORD

@@ -10,11 +10,11 @@ metafold/projects.py,sha256=4APFtJQjycFhlIHCWTrOAuU3CLX8drSlgPz8lhVXhzI,6295
 metafold/utils.py,sha256=DnsW1Xr9mLpVHBNdPrdxNLLcjxSNMkWVvr7cH7UTAxY,1174
 metafold/workflows.py,sha256=Mhv3n3ChUHw1Vaj3q8HNDbOgljn03AF6WslZfXzexsI,7802
 metafold/simulation/__init__.py,sha256=tUW4PfyWnI6UFvIR__JKUD2FjNTM74fSeKuee7Ewjfo,816
-metafold/simulation/compression_experiment.py,sha256=i-KaWJAmQMvD1rD8EuzQyrV1I8pfQUsYqnt1Gy1LgxY,18315
+metafold/simulation/compression_experiment.py,sha256=kLtX6V4vc_v2l-mJqpkE29TWE-fb6fCudOqhxv1Bz9U,18442
 metafold/simulation/compression_simulation.py,sha256=pnAgadKWMj4Yexitz3wQRJsGbtV8iGxjdfXRe_rqJiM,118024
-metafold/simulation/run_experiment.py,sha256=TQ7QEjj1hELvF8NJB6GLtsgP-3bMf3h98QqJyCZA9Ns,17671
-metafold-0.13.dev1.dist-info/licenses/LICENSE,sha256=LejZXzGwe9t0Ezk6g0bRmWUuFSI9vQSk1wJAc1NrrhE,1059
-metafold-0.13.dev1.dist-info/METADATA,sha256=MLfz44vMOCvsrzo4F0qNqqu6fn53eQebkeI2LmZJ1IU,3495
-metafold-0.13.dev1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-metafold-0.13.dev1.dist-info/top_level.txt,sha256=0dvwa2N6gvl2x4T9c62V4MbYD2soFedI6hm3-lWgyew,9
-metafold-0.13.dev1.dist-info/RECORD,,
+metafold/simulation/run_experiment.py,sha256=_TRsm6pHtHCLBlw8wqiN9WcvoAwmI0APPru-0Nj2QJw,17533
+metafold-0.13.dev2.dist-info/licenses/LICENSE,sha256=LejZXzGwe9t0Ezk6g0bRmWUuFSI9vQSk1wJAc1NrrhE,1059
+metafold-0.13.dev2.dist-info/METADATA,sha256=RaoMGGgcxBiSOf9AOWTI9cvA0_BbT6N5t9nN8Xm0LDk,3495
+metafold-0.13.dev2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+metafold-0.13.dev2.dist-info/top_level.txt,sha256=0dvwa2N6gvl2x4T9c62V4MbYD2soFedI6hm3-lWgyew,9
+metafold-0.13.dev2.dist-info/RECORD,,