metafold 0.13.dev1__tar.gz → 0.13.dev3__tar.gz

{metafold-0.13.dev1 → metafold-0.13.dev3}/PKG-INFO

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

{metafold-0.13.dev1 → metafold-0.13.dev3}/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-0.13.dev1 → metafold-0.13.dev3}/metafold/simulation/compression_simulation.py

@@ -2544,6 +2544,10 @@ class CompressionSimulation:
                 server_result["data"] = {}
             server_results.append(server_result)
 
+        # ensure material index is set on all parts for a multi-simulation experiment
+        for i, part_info in enumerate(self.part_infos):
+            part_info.material_index = i
+
         self.make_manifest_v2(results=server_results)
         manifest = copy.deepcopy(self.manifest)
         manifest["results"] = server_results

{metafold-0.13.dev1 → metafold-0.13.dev3}/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 → metafold-0.13.dev3}/metafold.egg-info/PKG-INFO

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

{metafold-0.13.dev1 → metafold-0.13.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "metafold"
-version = "0.13.dev1"
+version = "0.13.dev3"
 authors = [
     {name = "Metafold 3D", email = "info@metafold3d.com"},
 ]

{metafold-0.13.dev1 → metafold-0.13.dev3}/tests/test_compession_experiment.py

@@ -331,6 +331,12 @@ class TestSimulationNames:
         with pytest.raises(ValueError, match="path separator"):
             self._experiment(mock_sim, ["run/1"])
 
+    def test_none_entry_falls_back_to_auto(self, mock_sim):
+        exp = self._experiment(mock_sim, [None, "custom2", None])
+        exp.prepare()
+        assert [s.simulation_name for s in exp.sims] == [
+            "base_sim_sim0", "custom2", "base_sim_sim2"]
+
     def test_non_list_rejected(self, mock_sim):
         with pytest.raises(ValueError, match="list of strings"):
             self._experiment(mock_sim, "baseline")

{metafold-0.13.dev1 → metafold-0.13.dev3}/tests/test_run_experiment.py

@@ -110,6 +110,18 @@ class TestBuildParts:
         assert isinstance(parts[0], ExperimentPistonMesh)
         assert parts[0].filename == "piston.ply"
 
+    def test_piston_parts_custom_name(self):
+        parts = _build_parts([
+            {"type": "piston_mesh", "name": "last", "file": "last.ply"},
+            {"type": "piston_cylinder", "name": "press"},
+            {"type": "piston_box", "name": "anvil"},
+        ])
+        assert [p.name for p in parts] == ["last", "press", "anvil"]
+
+    def test_piston_parts_default_name_when_omitted(self):
+        parts = _build_parts([{"type": "piston_mesh", "file": "piston.ply"}])
+        assert parts[0].name == "piston"
+
     def test_piston_mesh_with_velocity(self):
         velocity = [[0.0, 0, 0, 0.0], [0.02, 0, 0, -1.25], [0.04, 0, 0, 0.0]]
         parts = _build_parts([{"type": "piston_mesh", "file": "piston.ply", "velocity": velocity}])