metafold 0.13.2.dev0__tar.gz → 0.14.dev0__tar.gz

{metafold-0.13.2.dev0 → metafold-0.14.dev0}/PKG-INFO

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

{metafold-0.13.2.dev0 → metafold-0.14.dev0}/metafold/simulation/compression_simulation.py

@@ -245,12 +245,21 @@ class ExperimentParallelepiped(ExperimentPrimitive):
         return pts.min(axis=0), pts.max(axis=0)
 
 
+@dataclass
+class ForceLimit:
+    face: str
+    value: float
+
+
 @dataclass
 class ExperimentPistonBase:
     velocity: Optional[list] = field(default_factory=lambda: DEFAULT_PISTON_VELOCITY)
     contact_type: str = "rigid"
     mu: float = 0.0
 
+    force_limit: ForceLimit | None = None
+    """Apply condition to jump to zero velocity when the given force is reached."""
+
 
 @dataclass
 class ExperimentPistonMesh(ExperimentMesh, ExperimentPistonBase):
@@ -1287,6 +1296,13 @@ class CompressionSimulation:
             if info.disabled:
                 continue
             if isinstance(info.part, (ExperimentPistonBase, ExperimentSupportBase)):
+                kwargs = {}
+                if isinstance(info.part, ExperimentPistonBase) and info.part.force_limit:
+                    kwargs.update({
+                        "condition": info.part.force_limit.face,
+                        "conditionValue": info.part.force_limit.value,
+                        "conditionAction": "GoToZeroVelocity",
+                    })
                 rigid_contacts.append(
                     Contact(
                         type=info.part.contact_type,
@@ -1295,6 +1311,7 @@ class CompressionSimulation:
                         master_material=info.material_index,
                         direction=[1, 1, 1],
                         materials=deformable_indices,
+                        **kwargs
                     )
                 )
 

{metafold-0.13.2.dev0 → metafold-0.14.dev0}/metafold/simulation/run_experiment.py

@@ -158,6 +158,7 @@ from metafold.simulation.compression_simulation import (
     ExperimentPistonBox,
     ExperimentPistonCylinder,
     ExperimentPistonMesh,
+    ForceLimit,
     SimulationParameters,
     WorkflowStep,
     validate_simulation_parts,
@@ -202,6 +203,8 @@ def _build_parts(parts_config: list[dict]) -> list[ExperimentPart]:
                 kwargs["shape_parameters"] = entry["shape_parameters"]
             if "material" in entry:
                 kwargs["material"] = _resolve_material(entry["material"])
+            if "force_limit" in entry:
+                kwargs["force_limit"] = ForceLimit(**entry["force_limit"])
             parts.append(ExperimentPistonCylinder(**kwargs))
 
         elif part_type == "piston_box":
@@ -214,6 +217,8 @@ def _build_parts(parts_config: list[dict]) -> list[ExperimentPart]:
                 kwargs["shape_parameters"] = entry["shape_parameters"]
             if "material" in entry:
                 kwargs["material"] = _resolve_material(entry["material"])
+            if "force_limit" in entry:
+                kwargs["force_limit"] = ForceLimit(**entry["force_limit"])
             parts.append(ExperimentPistonBox(**kwargs))
 
         elif part_type == "piston_mesh":
@@ -224,6 +229,8 @@ def _build_parts(parts_config: list[dict]) -> list[ExperimentPart]:
                 kwargs["velocity"] = entry["velocity"]
             if "material" in entry:
                 kwargs["material"] = _resolve_material(entry["material"])
+            if "force_limit" in entry:
+                kwargs["force_limit"] = ForceLimit(**entry["force_limit"])
             parts.append(ExperimentPistonMesh(**kwargs))
 
         else:

{metafold-0.13.2.dev0 → metafold-0.14.dev0}/metafold.egg-info/PKG-INFO

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

{metafold-0.13.2.dev0 → metafold-0.14.dev0}/pyproject.toml

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

{metafold-0.13.2.dev0 → metafold-0.14.dev0}/tests/test_compression_simulation.py

@@ -1,4 +1,5 @@
 from io import BytesIO
+from copy import deepcopy
 from types import SimpleNamespace
 from zipfile import ZipFile
 
@@ -16,6 +17,7 @@ from metafold.simulation.compression_simulation import (
     ExperimentPistonCylinder,
     ExperimentPistonMesh,
     ExperimentSupportMesh,
+    ForceLimit,
     SimulationParameters,
     WorkflowStep,
     WorkflowStepType,
@@ -725,6 +727,28 @@ jobs:
             assert workflow_params[key] == value, f"mismatch for {key}: {workflow_params[key]!r} != {value!r}"
 
 
+class TestSimConfig:
+    def test_force_limit(self, ply_folder, basic_parts, tmp_path):
+        parts = deepcopy(basic_parts)
+        parts[0].force_limit = ForceLimit("zminus", 2000)
+        sim = CompressionSimulation(
+            parts=parts,
+            simulation_name="test_sim",
+            stl_folder_path=str(ply_folder),
+            output_path=str(tmp_path / "out"),
+            client=MagicMock(),
+        )
+        sim.create_sim_config()
+        contact = sim.ups.findall("./MaterialProperties/MPM/contact")[0]
+        for tag, value in [
+            ("condition", "zminus"),
+            ("conditionValue", "2000"),
+            ("conditionAction", "GoToZeroVelocity"),
+        ]:
+            assert contact.find(tag) is not None
+            assert contact.find(tag).text == value
+
+
 class TestStressStrainPerPart:
     """stress-strain runs once per deformable part (not one representative).
     It is opt-in: callers must add the step to workflow_steps."""
@@ -1439,74 +1463,3 @@ class TestFindOrCreateProjectCancel:
 
         assert pid == "new-pid"
         client.workflows.cancel.assert_not_called()
-
-
-class TestFindOrCreateProjectUserScope:
-    """With user set, only the caller's own project is reused; a same-named
-    project owned by someone else (visible under org access) is ignored."""
-
-    @pytest.fixture
-    def patched_client_class(self, monkeypatch):
-        from metafold.simulation import compression_simulation
-        fake_class = MagicMock()
-        monkeypatch.setattr(compression_simulation, "MetafoldClient", fake_class)
-        return fake_class
-
-    def _project(self, pid, name, user):
-        p = MagicMock()
-        p.id = pid
-        p.name = name
-        p.user = user
-        return p
-
-    def test_ignores_same_name_owned_by_other_user(self, patched_client_class):
-        client = patched_client_class.return_value
-        # A defensive belt-and-suspenders case: even if the API returned another
-        # user's project, the Python filter drops it and we create a new one.
-        client.projects.list.return_value = [self._project("other-pid", "shared", "userB")]
-        client.projects.create.return_value = self._project("new-pid", "shared", "userA")
-
-        pid = CompressionSimulation.find_or_create_project(
-            "shared", access_token="tok", base_url="http://x/", user="userA",
-        )
-
-        assert pid == "new-pid"
-        client.projects.create.assert_called_once()
-
-    def test_reuses_callers_own_project(self, patched_client_class):
-        client = patched_client_class.return_value
-        client.projects.list.return_value = [self._project("mine", "shared", "userA")]
-
-        pid = CompressionSimulation.find_or_create_project(
-            "shared", access_token="tok", base_url="http://x/", user="userA",
-            cancel_existing_workflows=False,
-        )
-
-        assert pid == "mine"
-        client.projects.create.assert_not_called()
-
-    def test_scopes_query_to_user(self, patched_client_class):
-        client = patched_client_class.return_value
-        client.projects.list.return_value = []
-        client.projects.create.return_value = self._project("new-pid", "shared", "userA")
-
-        CompressionSimulation.find_or_create_project(
-            "shared", access_token="tok", base_url="http://x/", user="userA",
-        )
-
-        q = client.projects.list.call_args.kwargs["q"]
-        assert 'name:"shared"' in q
-        assert 'user:"userA"' in q
-
-    def test_no_user_keeps_unscoped_behavior(self, patched_client_class):
-        client = patched_client_class.return_value
-        client.projects.list.return_value = [self._project("any-pid", "shared", "userB")]
-
-        pid = CompressionSimulation.find_or_create_project(
-            "shared", access_token="tok", base_url="http://x/",
-            cancel_existing_workflows=False,
-        )
-
-        assert pid == "any-pid"
-        q = client.projects.list.call_args.kwargs["q"]
-        assert "user:" not in q