metafold 0.12.dev4__tar.gz → 0.12.dev6__tar.gz

{metafold-0.12.dev4 → metafold-0.12.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metafold
-Version: 0.12.dev4
+Version: 0.12.dev6
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D
@@ -38,7 +38,7 @@ Requires-Dist: dotenv>=0.9.9; extra == "simulation"
 Requires-Dist: pandas>=2.3.3; extra == "simulation"
 Requires-Dist: plyfile>=1.1.3; extra == "simulation"
 Requires-Dist: pyyaml>=6.0.3; extra == "simulation"
-Requires-Dist: simulation-configurator==0.1.1; extra == "simulation"
+Requires-Dist: simulation-configurator==0.1.2; extra == "simulation"
 Requires-Dist: tables>=3.11.1; extra == "simulation"
 Dynamic: license-file
 

{metafold-0.12.dev4 → metafold-0.12.dev6}/metafold/materials.py

@@ -32,6 +32,94 @@ class RigidParams(ParamsBase):
         return {"shear_modulus": self.shear_modulus, "bulk_modulus": self.bulk_modulus}
 
 
+@dataclass
+class HypoElasticParams(ParamsBase):
+    G: float
+    K: float
+
+    @classmethod
+    def get_type(self):
+        return "hypo_elastic"
+
+    def to_dict(self):
+        return {"G": self.G, "K": self.K}
+
+
+@dataclass
+class ViscoTransIsoHyperParams(ParamsBase):
+    bulk_modulus: float
+    c1: float
+    c2: float
+    c3: float
+    c4: float
+    c5: float
+    fiber_stretch: float
+    direction_of_symm: List[float]
+    failure_option: int
+    max_fiber_strain: float
+    max_matrix_strain: float
+    y1: float
+    y2: float
+    y3: float
+    y4: float
+    y5: float
+    y6: float
+    t1: float
+    t2: float
+    t3: float
+    t4: float
+    t5: float
+    t6: float
+
+    @classmethod
+    def get_type(cls):
+        return "visco_trans_iso_hyper"
+
+    @classmethod
+    def from_dict(cls, d: dict) -> "ViscoTransIsoHyperParams":
+        dos = d["direction_of_symm"]
+        direction = [float(x) for x in dos.split()] if isinstance(dos, str) else [float(x) for x in dos]
+        return cls(
+            bulk_modulus=d["bulk_modulus"],
+            c1=d["c1"], c2=d["c2"], c3=d["c3"], c4=d["c4"], c5=d["c5"],
+            fiber_stretch=d["fiber_stretch"],
+            direction_of_symm=direction,
+            failure_option=d["failure_option"],
+            max_fiber_strain=d["max_fiber_strain"],
+            max_matrix_strain=d["max_matrix_strain"],
+            y1=d["y1"], y2=d["y2"], y3=d["y3"], y4=d["y4"], y5=d["y5"], y6=d["y6"],
+            t1=d["t1"], t2=d["t2"], t3=d["t3"], t4=d["t4"], t5=d["t5"], t6=d["t6"],
+        )
+
+    def to_dict(self):
+        return {
+            "bulk_modulus": float(self.bulk_modulus),
+            "c1": float(self.c1),
+            "c2": float(self.c2),
+            "c3": float(self.c3),
+            "c4": float(self.c4),
+            "c5": float(self.c5),
+            "fiber_stretch": float(self.fiber_stretch),
+            # Emit as a numeric list so simulation_configurator serialises it correctly
+            "direction_of_symm": [float(x) for x in self.direction_of_symm],
+            "failure_option": int(self.failure_option),
+            "max_fiber_strain": float(self.max_fiber_strain),
+            "max_matrix_strain": float(self.max_matrix_strain),
+            "y1": float(self.y1),
+            "y2": float(self.y2),
+            "y3": float(self.y3),
+            "y4": float(self.y4),
+            "y5": float(self.y5),
+            "y6": float(self.y6),
+            "t1": float(self.t1),
+            "t2": float(self.t2),
+            "t3": float(self.t3),
+            "t4": float(self.t4),
+            "t5": float(self.t5),
+            "t6": float(self.t6),
+        }
+
+
 @dataclass
 class CompMooneyRivlinParams(ParamsBase):
     he_constant_1: float
@@ -220,12 +308,16 @@ class ConstitutiveModel:
         UCNHParams,
         CompNeoHookParams,
         ElasticPlasticParams,
+        HypoElasticParams,
+        ViscoTransIsoHyperParams,
     ]
 
     def to_dict(self):
         return {"type": self.params.get_type(), "params": self.params.to_dict()}
 
 
+
+
 @dataclass
 class Material:
     density: float
@@ -257,6 +349,8 @@ class Material:
             MaxwellWeichertParams,
             CompNeoHookParams,
             ElasticPlasticParams,
+            HypoElasticParams,
+            ViscoTransIsoHyperParams,
         ]
         PARAMS_CLASSES = {c.get_type(): c for c in params_classes}
         cm = d["constitutive_model"]

{metafold-0.12.dev4 → metafold-0.12.dev6}/metafold/simulation/compression_simulation.py

@@ -625,10 +625,11 @@ class CompressionSimulation:
             auth_domain=auth_domain,
             base_url=base_url,
         )
-        try:
-            existing = client.projects.list(q=f"name:{project_name}")
-        except HTTPError:
-            existing = []
+        # Quote the project_name string for multi-word name searchess
+        existing = [
+            p for p in client.projects.list(q=f'name:"{project_name}"')
+            if p.name == project_name  # ensure full match
+        ]
         if existing:
             project_id = existing[0].id
             if cancel_existing_workflows:

{metafold-0.12.dev4 → metafold-0.12.dev6}/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.dev4 → metafold-0.12.dev6}/metafold.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metafold
-Version: 0.12.dev4
+Version: 0.12.dev6
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D
@@ -38,7 +38,7 @@ Requires-Dist: dotenv>=0.9.9; extra == "simulation"
 Requires-Dist: pandas>=2.3.3; extra == "simulation"
 Requires-Dist: plyfile>=1.1.3; extra == "simulation"
 Requires-Dist: pyyaml>=6.0.3; extra == "simulation"
-Requires-Dist: simulation-configurator==0.1.1; extra == "simulation"
+Requires-Dist: simulation-configurator==0.1.2; extra == "simulation"
 Requires-Dist: tables>=3.11.1; extra == "simulation"
 Dynamic: license-file
 

{metafold-0.12.dev4 → metafold-0.12.dev6}/metafold.egg-info/SOURCES.txt

@@ -25,6 +25,7 @@ tests/test_assets.py
 tests/test_compession_experiment.py
 tests/test_compression_simulation.py
 tests/test_jobs.py
+tests/test_materials.py
 tests/test_projects.py
 tests/test_run_experiment.py
 tests/test_shear_simulation.py

{metafold-0.12.dev4 → metafold-0.12.dev6}/metafold.egg-info/requires.txt

@@ -9,5 +9,5 @@ dotenv>=0.9.9
 pandas>=2.3.3
 plyfile>=1.1.3
 pyyaml>=6.0.3
-simulation-configurator==0.1.1
+simulation-configurator==0.1.2
 tables>=3.11.1

{metafold-0.12.dev4 → metafold-0.12.dev6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "metafold"
-version = "0.12.dev4"
+version = "0.12.dev6"
 authors = [
     {name = "Metafold 3D", email = "info@metafold3d.com"},
 ]
@@ -38,7 +38,7 @@ simulation = [
     "pandas>=2.3.3",
     "plyfile>=1.1.3",
     "pyyaml>=6.0.3",
-    "simulation-configurator==0.1.1",
+    "simulation-configurator==0.1.2",
     "tables>=3.11.1",
 ]
 

{metafold-0.12.dev4 → metafold-0.12.dev6}/tests/test_compression_simulation.py

@@ -890,6 +890,7 @@ class TestSetupClient:
         # projects.list() finds an existing match.
         existing = MagicMock()
         existing.id = "existing-pid"
+        existing.name = "my_project"
         first_client = MagicMock()
         first_client.projects.list.return_value = [existing]
         patched_client_class.side_effect = [first_client, MagicMock()]
@@ -901,12 +902,34 @@ class TestSetupClient:
         )
 
         assert sim.project_id == "existing-pid"
-        first_client.projects.list.assert_called_once_with(q="name:my_project")
+        first_client.projects.list.assert_called_once_with(q='name:"my_project"')
         first_client.projects.create.assert_not_called()
         # MetafoldClient called twice — once without project_id, once with
         assert patched_client_class.call_count == 2
         assert patched_client_class.call_args_list[1].kwargs["project_id"] == "existing-pid"
 
+    def test_multiword_name_is_quoted_and_reused(
+        self, ply_folder, basic_parts, tmp_path, patched_client_class
+    ):
+        # Names with spaces must be quoted in the search query, otherwise the
+        # server's parser errors and a duplicate project gets created.
+        existing = MagicMock()
+        existing.id = "existing-pid"
+        existing.name = "grasshopper test 3"
+        first_client = MagicMock()
+        first_client.projects.list.return_value = [existing]
+        patched_client_class.side_effect = [first_client, MagicMock()]
+
+        sim = self._build_sim(
+            ply_folder, basic_parts, tmp_path,
+            project_name="grasshopper test 3",
+            create_project_if_needed=True,
+        )
+
+        assert sim.project_id == "existing-pid"
+        first_client.projects.list.assert_called_once_with(q='name:"grasshopper test 3"')
+        first_client.projects.create.assert_not_called()
+
     def test_new_project_created_when_name_not_found(
         self, ply_folder, basic_parts, tmp_path, patched_client_class
     ):
@@ -949,25 +972,24 @@ class TestSetupClient:
         assert first_client.projects.create.call_args.args[0].startswith("experiment_")
         assert sim.project_id == "auto-pid"
 
-    def test_http_error_during_list_falls_through_to_create(
+    def test_http_error_during_list_propagates_and_does_not_create(
         self, ply_folder, basic_parts, tmp_path, patched_client_class
     ):
+        # A failed search must NOT silently fall through to creating a project
+        # (that path produced duplicate projects). The error should surface.
         from requests import HTTPError
-        created = MagicMock()
-        created.id = "fallback-pid"
         first_client = MagicMock()
-        first_client.projects.list.side_effect = HTTPError("404")
-        first_client.projects.create.return_value = created
+        first_client.projects.list.side_effect = HTTPError("500")
         patched_client_class.side_effect = [first_client, MagicMock()]
 
-        sim = self._build_sim(
-            ply_folder, basic_parts, tmp_path,
-            project_name="xyz",
-            create_project_if_needed=True,
-        )
+        with pytest.raises(HTTPError):
+            self._build_sim(
+                ply_folder, basic_parts, tmp_path,
+                project_name="xyz",
+                create_project_if_needed=True,
+            )
 
-        assert sim.project_id == "fallback-pid"
-        first_client.projects.create.assert_called_once()
+        first_client.projects.create.assert_not_called()
 
 
 class TestFindOrCreateProjectCancel:
@@ -991,6 +1013,7 @@ class TestFindOrCreateProjectCancel:
         client = patched_client_class.return_value
         existing = MagicMock()
         existing.id = "pid-1"
+        existing.name = "existing"
         client.projects.list.return_value = [existing]
         # list(q="state:pending") -> [w1]; list(q="state:started") -> [w2]
         client.workflows.list.side_effect = [
@@ -1011,6 +1034,7 @@ class TestFindOrCreateProjectCancel:
         client = patched_client_class.return_value
         existing = MagicMock()
         existing.id = "pid-1"
+        existing.name = "existing"
         client.projects.list.return_value = [existing]
 
         CompressionSimulation.find_or_create_project(

metafold-0.12.dev6/tests/test_materials.py

@@ -0,0 +1,281 @@
+import pytest
+from metafold.materials import (
+    CompMooneyRivlinParams,
+    CompNeoHookParams,
+    ConstitutiveModel,
+    ElasticPlasticParams,
+    FlowModel,
+    HypoElasticParams,
+    JohnsonCookParams,
+    Material,
+    MaxwellWeichertParams,
+    RigidParams,
+    StabilityCheck,
+    UCNHParams,
+    ViscoelasticMode,
+    ViscoTransIsoHyperParams,
+    YieldCondition,
+)
+
+
+def roundtrip(material: Material) -> Material:
+    return Material.from_dict(material.to_dict())
+
+
+class TestRigidParams:
+    def test_roundtrip(self):
+        m = Material(
+            density=1730.0,
+            thermal_conductivity=45.0,
+            specific_heat=4.8e-4,
+            constitutive_model=ConstitutiveModel(
+                params=RigidParams(shear_modulus=2667e6, bulk_modulus=8000e6)
+            ),
+        )
+        assert roundtrip(m).to_dict() == m.to_dict()
+
+    def test_type_key(self):
+        d = ConstitutiveModel(params=RigidParams(1.0, 2.0)).to_dict()
+        assert d["type"] == "rigid"
+
+
+class TestCompMooneyRivlinParams:
+    def test_roundtrip(self):
+        m = Material(
+            density=150.0,
+            thermal_conductivity=45.0,
+            specific_heat=4.8e-4,
+            constitutive_model=ConstitutiveModel(
+                params=CompMooneyRivlinParams(he_constant_1=1.5e5, he_constant_2=1.75e5, he_PR=0.41)
+            ),
+        )
+        assert roundtrip(m).to_dict() == m.to_dict()
+
+    def test_type_key(self):
+        d = ConstitutiveModel(params=CompMooneyRivlinParams(1.0, 2.0, 0.3)).to_dict()
+        assert d["type"] == "comp_mooney_rivlin"
+
+
+class TestCompNeoHookParams:
+    def test_roundtrip(self):
+        m = Material(
+            density=100.0,
+            thermal_conductivity=1.0,
+            specific_heat=1.0,
+            constitutive_model=ConstitutiveModel(
+                params=CompNeoHookParams(bulk_modulus=1e6, shear_modulus=5e5)
+            ),
+        )
+        assert roundtrip(m).to_dict() == m.to_dict()
+
+    def test_type_key(self):
+        d = ConstitutiveModel(params=CompNeoHookParams(1.0, 2.0)).to_dict()
+        assert d["type"] == "comp_neo_hook"
+
+
+class TestUCNHParams:
+    def test_roundtrip_minimal(self):
+        m = Material(
+            density=500.0,
+            thermal_conductivity=1.0,
+            specific_heat=1.0,
+            constitutive_model=ConstitutiveModel(
+                params=UCNHParams(shear_modulus=1e6, bulk_modulus=2e6, useModifiedEOS=True)
+            ),
+        )
+        assert roundtrip(m).to_dict() == m.to_dict()
+
+    def test_roundtrip_with_plasticity(self):
+        m = Material(
+            density=500.0,
+            thermal_conductivity=1.0,
+            specific_heat=1.0,
+            constitutive_model=ConstitutiveModel(
+                params=UCNHParams(
+                    shear_modulus=1e6,
+                    bulk_modulus=2e6,
+                    useModifiedEOS=False,
+                    usePlasticity=True,
+                    yield_stress=1e4,
+                    hardening_modulus=1e3,
+                    alpha=0.5,
+                )
+            ),
+        )
+        assert roundtrip(m).to_dict() == m.to_dict()
+
+    def test_bool_serialised_as_lowercase_string(self):
+        p = UCNHParams(shear_modulus=1.0, bulk_modulus=1.0, useModifiedEOS=True)
+        assert p.to_dict()["useModifiedEOS"] == "true"
+        p2 = UCNHParams(shear_modulus=1.0, bulk_modulus=1.0, useModifiedEOS=False)
+        assert p2.to_dict()["useModifiedEOS"] == "false"
+
+    def test_optional_fields_omitted_when_none(self):
+        p = UCNHParams(shear_modulus=1.0, bulk_modulus=1.0, useModifiedEOS=True)
+        d = p.to_dict()
+        assert "usePlasticity" not in d
+        assert "yield_stress" not in d
+
+    def test_type_key(self):
+        d = ConstitutiveModel(params=UCNHParams(1.0, 2.0, True)).to_dict()
+        assert d["type"] == "UCNH"
+
+
+class TestMaxwellWeichertParams:
+    def test_roundtrip(self):
+        m = Material(
+            density=200.0,
+            thermal_conductivity=45.0,
+            specific_heat=4.8e-4,
+            constitutive_model=ConstitutiveModel(
+                params=MaxwellWeichertParams(
+                    bulk_modulus=931250,
+                    terminal_shear_modulus=43750,
+                    viscoelastic_series=[
+                        ViscoelasticMode("mode1", 0.15, 25000),
+                        ViscoelasticMode("mode2", 0.20, 30000),
+                    ],
+                )
+            ),
+        )
+        assert roundtrip(m).to_dict() == m.to_dict()
+
+    def test_viscoelastic_modes_preserved(self):
+        params = MaxwellWeichertParams(
+            bulk_modulus=1.0,
+            terminal_shear_modulus=1.0,
+            viscoelastic_series=[
+                ViscoelasticMode("mode1", 0.1, 100.0),
+                ViscoelasticMode("mode2", 0.2, 200.0),
+            ],
+        )
+        d = params.to_dict()
+        assert len(d["viscoelastic_series"]) == 2
+        assert d["viscoelastic_series"][0]["mode"] == "mode1"
+        assert d["viscoelastic_series"][1]["relaxation_time"] == 0.2
+
+    def test_type_key(self):
+        d = ConstitutiveModel(
+            params=MaxwellWeichertParams(1.0, 1.0, [])
+        ).to_dict()
+        assert d["type"] == "Maxwell_Weichert"
+
+
+class TestElasticPlasticParams:
+    def test_roundtrip(self):
+        m = Material(
+            density=7850.0,
+            thermal_conductivity=45.0,
+            specific_heat=4.8e-4,
+            constitutive_model=ConstitutiveModel(
+                params=ElasticPlasticParams(
+                    shear_modulus=8e10,
+                    bulk_modulus=1.6e11,
+                    yield_condition=YieldCondition(type="vonMises"),
+                    stability_check=StabilityCheck(type="drucker"),
+                    flow_model=FlowModel(
+                        params=JohnsonCookParams(A=0.9e9, B=0.5e9, C=0.014, n=0.26, m=1.03)
+                    ),
+                )
+            ),
+        )
+        assert roundtrip(m).to_dict() == m.to_dict()
+
+    def test_type_key(self):
+        d = ConstitutiveModel(
+            params=ElasticPlasticParams(
+                shear_modulus=1.0,
+                bulk_modulus=1.0,
+                yield_condition=YieldCondition("vonMises"),
+                stability_check=StabilityCheck("drucker"),
+                flow_model=FlowModel(params=JohnsonCookParams(1, 1, 1, 1, 1)),
+            )
+        ).to_dict()
+        assert d["type"] == "elastic_plastic"
+
+
+class TestHypoElasticParams:
+    def test_roundtrip(self):
+        m = Material(
+            density=1000.0,
+            thermal_conductivity=1.0,
+            specific_heat=1.0,
+            constitutive_model=ConstitutiveModel(
+                params=HypoElasticParams(G=1.5e6, K=3.0e6)
+            ),
+        )
+        assert roundtrip(m).to_dict() == m.to_dict()
+
+    def test_type_key(self):
+        d = ConstitutiveModel(params=HypoElasticParams(G=1.0, K=2.0)).to_dict()
+        assert d["type"] == "hypo_elastic"
+
+
+class TestViscoTransIsoHyperParams:
+    def _make_params(self, **overrides):
+        defaults = dict(
+            bulk_modulus=1.0e6,
+            c1=1.0,
+            c2=2.0,
+            c3=3.0,
+            c4=4.0,
+            c5=5.0,
+            fiber_stretch=1.1,
+            direction_of_symm=[0.0, 1.0, 0.0],
+            failure_option=0,
+            max_fiber_strain=0.1,
+            max_matrix_strain=0.2,
+            y1=0.1, y2=0.2, y3=0.3, y4=0.4, y5=0.5, y6=0.6,
+            t1=1.0, t2=2.0, t3=3.0, t4=4.0, t5=5.0, t6=6.0,
+        )
+        defaults.update(overrides)
+        return ViscoTransIsoHyperParams(**defaults)
+
+    def test_roundtrip(self):
+        m = Material(
+            density=1200.0,
+            thermal_conductivity=0.5,
+            specific_heat=1.0e-3,
+            constitutive_model=ConstitutiveModel(params=self._make_params()),
+        )
+        assert roundtrip(m).to_dict() == m.to_dict()
+
+    def test_type_key(self):
+        d = ConstitutiveModel(params=self._make_params()).to_dict()
+        assert d["type"] == "visco_trans_iso_hyper"
+
+    def test_int_inputs_serialized_as_float(self):
+        params = self._make_params(c3=0, c4=0, c5=0, direction_of_symm=[0, 1, 0])
+        d = params.to_dict()
+        assert isinstance(d["c3"], float)
+        assert isinstance(d["c4"], float)
+        assert isinstance(d["c5"], float)
+        assert d["direction_of_symm"] == [0.0, 1.0, 0.0]
+        assert all(isinstance(x, float) for x in d["direction_of_symm"])
+
+    def test_failure_option_serialized_as_int(self):
+        params = self._make_params(failure_option=1)
+        d = params.to_dict()
+        assert isinstance(d["failure_option"], int)
+
+
+class TestMaterialOptionalFields:
+    def test_optional_fields_omitted_when_none(self):
+        m = Material(density=1.0, thermal_conductivity=1.0, specific_heat=1.0,
+                     constitutive_model=ConstitutiveModel(params=RigidParams(1.0, 1.0)))
+        d = m.to_dict()
+        assert "room_temp" not in d
+        assert "melt_temp" not in d
+
+    def test_optional_fields_roundtrip(self):
+        m = Material(
+            density=1.0,
+            thermal_conductivity=1.0,
+            specific_heat=1.0,
+            constitutive_model=ConstitutiveModel(params=RigidParams(1.0, 1.0)),
+            room_temp=300.0,
+            melt_temp=1500.0,
+        )
+        r = roundtrip(m)
+        assert r.room_temp == 300.0
+        assert r.melt_temp == 1500.0

{metafold-0.12.dev4 → metafold-0.12.dev6}/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)