metafold 0.12.dev3__tar.gz → 0.12.dev5__tar.gz

{metafold-0.12.dev3 → metafold-0.12.dev5}/PKG-INFO

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

{metafold-0.12.dev3 → metafold-0.12.dev5}/metafold/simulation/compression_simulation.py

@@ -589,8 +589,12 @@ class CompressionSimulation:
         cancelled = []
         for state in ("pending", "started"):
             for wf in client.workflows.list(q=f"state:{state}", project_id=project_id):
-                client.workflows.cancel(wf.id, project_id=project_id)
-                cancelled.append(wf.id)
+                try:
+                    client.workflows.cancel(wf.id, project_id=project_id)
+                    cancelled.append(wf.id)
+                except HTTPError:
+                    # Workflow already finished/uncancellable — ignore and move on.
+                    pass
         return cancelled
 
     @staticmethod
@@ -887,10 +891,10 @@ class CompressionSimulation:
             grid_min = np.minimum(grid_min, pmin)
             grid_max = np.maximum(grid_max, pmax)
 
-        # Apply margins after all parts included
+        # Apply margins after all parts are included. Note z- gets no margin
+        # since the bottom of the grid is the support boundary the stack sits on
         grid_min[:2] -= self.simulation_parameters.margin_xy
         grid_max[:2] += self.simulation_parameters.margin_xy
-        grid_min[2] -= self.simulation_parameters.margin_z
         grid_max[2] += self.simulation_parameters.margin_z
 
         grid_size = grid_max - grid_min

{metafold-0.12.dev3 → metafold-0.12.dev5}/metafold/simulation/run_experiment.py

@@ -18,6 +18,8 @@ JSON manifest format
     "parts": [
         {
             "type": "piston_cylinder",
+            # optional geometry - omit to use default
+            "shape_parameters": {"top": [...], "bottom": [...], "radius": 0.02},
             "velocity": [           # optional — defaults to DEFAULT_PISTON_VELOCITY
                 [0.0,    0, 0,  0.0],
                 [0.002,  0, 0, -1.25],
@@ -26,6 +28,7 @@ JSON manifest format
                 [0.04,   0, 0,  0.0]
             ]
         },
+        {"type": "piston_box", "shape_parameters": {"min": [...], "max": [...]}},
         {"type": "piston_mesh", "file": "piston.ply", "velocity": [...]},
         {
             "type":           "mesh",
@@ -132,6 +135,7 @@ from metafold.simulation.compression_simulation import (
     CompressionSimulation,
     ExperimentMesh,
     ExperimentPart,
+    ExperimentPistonBox,
     ExperimentPistonCylinder,
     ExperimentPistonMesh,
     SimulationParameters,
@@ -171,8 +175,18 @@ def _build_parts(parts_config: list[dict]) -> list[ExperimentPart]:
             kwargs = {}
             if "velocity" in entry:
                 kwargs["velocity"] = entry["velocity"]
+            if "shape_parameters" in entry:
+                kwargs["shape_parameters"] = entry["shape_parameters"]
             parts.append(ExperimentPistonCylinder(**kwargs))
 
+        elif part_type == "piston_box":
+            kwargs = {}
+            if "velocity" in entry:
+                kwargs["velocity"] = entry["velocity"]
+            if "shape_parameters" in entry:
+                kwargs["shape_parameters"] = entry["shape_parameters"]
+            parts.append(ExperimentPistonBox(**kwargs))
+
         elif part_type == "piston_mesh":
             kwargs = {"filename": entry["file"]}
             if "velocity" in entry:

{metafold-0.12.dev3 → metafold-0.12.dev5}/metafold.egg-info/PKG-INFO

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

{metafold-0.12.dev3 → metafold-0.12.dev5}/pyproject.toml

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

{metafold-0.12.dev3 → metafold-0.12.dev5}/tests/test_compression_simulation.py

@@ -277,21 +277,23 @@ class TestGridBounds:
         }
         self._prepare(sim, patches)
         lower, _ = self._grid_bounds(sim)
-        mz = sim.simulation_parameters.margin_z
-        # grid bottom (metres) = outsole bottom (-50 mm = -0.05 m) minus margin.
-        assert lower[2] == pytest.approx(-0.05 - mz, abs=1e-6)
-
-    def test_bottom_margin_clearance_added(self, sim):
-        # Bottom (z-) clearance was previously missing entirely. With all parts
-        # flush at z=0, the grid bottom must sit margin_z below the lowest part.
-        flat = {"size": [0.1, 0.1, 0.05], "offset": [0.0, 0.0, 0.0], "resolution": [32, 32, 16]}
+        # grid bottom (metres) = outsole bottom (-50 mm = -0.05 m), flush — the
+        # z- face is the support boundary and gets NO margin.
+        assert lower[2] == pytest.approx(-0.05, abs=1e-6)
+
+    def test_bottom_is_flush_no_margin(self, sim):
+        # The z- face is the support boundary the stack reacts against, so it
+        # must sit flush with the lowest part — adding margin there leaves the
+        # stack unsupported and it sags under the piston before compressing.
+        flat = {"size": [100.0, 100.0, 50.0], "offset": [0.0, 0.0, 0.0], "resolution": [32, 32, 16]}
         self._prepare(sim, {n: flat for n in
                             ["piston", "upper_foam", "midsole", "outsole"]})
-        lower, _ = self._grid_bounds(sim)
+        lower, upper = self._grid_bounds(sim)
         mz = sim.simulation_parameters.margin_z
-        # Lowest part bottom is z=0 (piston cylinder sits higher), so the grid
-        # bottom is exactly -margin_z.
-        assert lower[2] == pytest.approx(-mz, abs=1e-6)
+        # Lowest part bottom is z=0 -> grid bottom is exactly 0 (no margin).
+        assert lower[2] == pytest.approx(0.0, abs=1e-6)
+        # Top (z+, above the piston) still gets clearance.
+        assert upper[2] > 0.05 + mz - 1e-6
 
 
 class TestSampleAssets:

{metafold-0.12.dev3 → metafold-0.12.dev5}/tests/test_run_experiment.py

@@ -16,6 +16,7 @@ from metafold.materials import (
 )
 from metafold.simulation.compression_simulation import (
     ExperimentMesh,
+    ExperimentPistonBox,
     ExperimentPistonCylinder,
     ExperimentPistonMesh,
     SimulationParameters,
@@ -92,6 +93,17 @@ class TestBuildParts:
         parts = _build_parts([{"type": "piston_cylinder"}])
         assert parts[0].velocity == DEFAULT_PISTON_VELOCITY
 
+    def test_piston_cylinder_with_shape_parameters(self):
+        shape = {"top": [0, 0, 0.01], "bottom": [0, 0, 0.012], "radius": 0.015}
+        parts = _build_parts([{"type": "piston_cylinder", "shape_parameters": shape}])
+        assert parts[0].shape_parameters == shape
+
+    def test_piston_box(self):
+        shape = {"min": [0, 0, 0.01], "max": [0.02, 0.02, 0.012]}
+        parts = _build_parts([{"type": "piston_box", "shape_parameters": shape}])
+        assert isinstance(parts[0], ExperimentPistonBox)
+        assert parts[0].shape_parameters == shape
+
     def test_piston_mesh(self):
         parts = _build_parts([{"type": "piston_mesh", "file": "piston.ply"}])
         assert isinstance(parts[0], ExperimentPistonMesh)