metafold 0.12.dev9__tar.gz → 0.12.dev11__tar.gz

{metafold-0.12.dev9 → metafold-0.12.dev11}/PKG-INFO

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

{metafold-0.12.dev9 → metafold-0.12.dev11}/metafold/simulation/compression_simulation.py

@@ -437,7 +437,7 @@ class CompressionSimulation:
             WorkflowStep(WorkflowStepType.VON_MISES_STRESS),
             WorkflowStep(WorkflowStepType.EFFECTIVE_STRAIN),
             WorkflowStep(WorkflowStepType.FORCE_DISPLACEMENT),
-            WorkflowStep(WorkflowStepType.STRESS_STRAIN),
+            # stress_strain is opt-in (not default): callers add it via workflow_steps.
             WorkflowStep(WorkflowStepType.PARTICLE_DISPLACEMENT),
             WorkflowStep(WorkflowStepType.ENERGY_METRICS),
         ],
@@ -535,20 +535,6 @@ class CompressionSimulation:
     def download_results(self):
         self.write_results()
 
-    def _get_primary_deformable_info(self):
-        """The specimen part for stress/strain and the featured histogram: the
-        first part that isn't a rigid piston/support (pistons are inserted at
-        index 0, so this is the first deformable body in the stack)."""
-        return next(
-            (
-                p for p in self.part_infos
-                if not isinstance(
-                    p.part, (ExperimentPistonBase, ExperimentSupportBase)
-                )
-            ),
-            None,
-        )
-
     def setup_results(self, output_path):
         self.out_dir = Path(output_path)
         self.out_dir.mkdir(parents=True, exist_ok=True)
@@ -2673,24 +2659,8 @@ class CompressionSimulation:
                 },
             ]
 
-        self.manifest["cardsConfig"]["B"] = []
-        specimen = self._get_primary_deformable_info()
-        if self._contains_step(WorkflowStepType.VON_MISES_STRESS) and specimen is not None:
-            rep_idx = specimen.material_index
-            self.manifest["cardsConfig"]["B"].append(
-                {
-                    "id": "vonMisesStress",
-                    "title": "von Mises Stress",
-                    "component": "SingleExperimentHistogram",
-                    "props": {
-                        "dataSource": f"vonMisesStressHistogram{rep_idx}",
-                        "xAxisLabel": "von Mises Stress",
-                        "yAxisLabel": "Frequency",
-                    },
-                }
-            )
-
-        # One stress-strain card per deformable part (keyed stressStrain{i}).
+        # One stress-strain card per deformable part (keyed stressStrain{i}),
+        # under force-displacement: same data, per-part normalizations.
         if self._contains_step(WorkflowStepType.STRESS_STRAIN):
             for part_info in self.part_infos:
                 if not self._is_analysis_target(part_info.part):
@@ -2698,7 +2668,7 @@ class CompressionSimulation:
                 if part_info.disabled:
                     continue
                 i = part_info.material_index
-                self.manifest["cardsConfig"]["B"].append(
+                self.manifest["cardsConfig"]["A"].append(
                     {
                         "id": f"stressStrain{i}",
                         "title": f"{part_info.part_unique_name} Stress-Strain",
@@ -2714,6 +2684,29 @@ class CompressionSimulation:
                     }
                 )
 
+        # One von Mises histogram card per deformable part (keyed
+        # vonMisesStressHistogram{i}).
+        self.manifest["cardsConfig"]["B"] = []
+        if self._contains_step(WorkflowStepType.VON_MISES_STRESS):
+            for part_info in self.part_infos:
+                if not self._is_analysis_target(part_info.part):
+                    continue
+                if part_info.disabled:
+                    continue
+                i = part_info.material_index
+                self.manifest["cardsConfig"]["B"].append(
+                    {
+                        "id": f"vonMisesStress{i}",
+                        "title": f"{part_info.part_unique_name} von Mises Stress",
+                        "component": "SingleExperimentHistogram",
+                        "props": {
+                            "dataSource": f"vonMisesStressHistogram{i}",
+                            "xAxisLabel": "von Mises Stress",
+                            "yAxisLabel": "Frequency",
+                        },
+                    }
+                )
+
         if self._results_have_energy_metrics(results):
             self.manifest["resultsListConfig"].append(
                 {"key": "volume", "heading": "Volume (mm³)", "filtering": False},
@@ -2739,7 +2732,7 @@ class CompressionSimulation:
                     "filtering": False,
                 }
             )
-            self.manifest["cardsConfig"]["C"] = [
+            self.manifest["cardsConfig"]["C"].append(
                 {
                     "id": "energyVolume",
                     "title": "Energy Absorbed-Interior Volume",
@@ -2751,7 +2744,7 @@ class CompressionSimulation:
                         "yAxisLabel": "Energy Absorbed (J)",
                         "colorScaleMeasurement": "energyAbsorbed",
                     },
-                },
-            ]
+                }
+            )
 
 

{metafold-0.12.dev9 → metafold-0.12.dev11}/metafold/simulation/run_experiment.py

@@ -98,12 +98,15 @@ Available material presets
                 "material_pla", "material_stainless_steel",
                 "material_ti64", "material_tpu"
 
-Available workflow steps (default: all)
-----------------------------------------
+Available workflow steps (default: all except stress_strain)
+------------------------------------------------------------
     "compute_bvh", "metrics", "compress", "von_mises_stress",
-    "effective_strain", "force_displacement", "stress_strain",
+    "effective_strain", "force_displacement",
     "particle_displacement", "energy_metrics"
 
+    Opt-in (not run by default; add explicitly to workflow_steps):
+    "stress_strain"
+
 Zip format (for run_experiment_from_zip)
 -----------------------------------------
 A zip containing:

{metafold-0.12.dev9 → metafold-0.12.dev11}/metafold.egg-info/PKG-INFO

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

{metafold-0.12.dev9 → metafold-0.12.dev11}/pyproject.toml

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

{metafold-0.12.dev9 → metafold-0.12.dev11}/tests/test_compression_simulation.py

@@ -565,24 +565,6 @@ jobs:
     - compress
     assets:
       data: compress
-  stress-strain-upper_foam:
-    type: sim/postprocess/stress-strain
-    needs:
-    - force-displacement
-    assets:
-      data: force-displacement
-  stress-strain-midsole:
-    type: sim/postprocess/stress-strain
-    needs:
-    - force-displacement
-    assets:
-      data: force-displacement
-  stress-strain-outsole:
-    type: sim/postprocess/stress-strain
-    needs:
-    - force-displacement
-    assets:
-      data: force-displacement
   particle-displacement:
     type: sim/postprocess/particle-displacement
     needs:
@@ -638,12 +620,6 @@ jobs:
         "metrics-upper_foam.volume_resolution": "[32, 32, 16]",
         "metrics-upper_foam.volume_size": "[0.1, 0.1, 0.05]",
         "particle-displacement.keys": "[\"/material0/position\", \"/material1/position\", \"/material2/position\", \"/material3/position\"]",
-        "stress-strain-midsole.initial_length": "0.05",
-        "stress-strain-midsole.keys": "[\"/force_displacement\"]",
-        "stress-strain-outsole.initial_length": "0.05",
-        "stress-strain-outsole.keys": "[\"/force_displacement\"]",
-        "stress-strain-upper_foam.initial_length": "0.05",
-        "stress-strain-upper_foam.keys": "[\"/force_displacement\"]",
         "von-mises-stress.keys": "[\"/material0/cauchy_stress\", \"/material1/cauchy_stress\", \"/material2/cauchy_stress\", \"/material3/cauchy_stress\"]"
         }
         """)
@@ -653,7 +629,8 @@ jobs:
 
 
 class TestStressStrainPerPart:
-    """stress-strain runs once per deformable part (not one representative)."""
+    """stress-strain runs once per deformable part (not one representative).
+    It is opt-in: callers must add the step to workflow_steps."""
 
     def _built_sim(self, ply_folder, basic_parts, tmp_path):
         sim = CompressionSimulation(
@@ -662,6 +639,12 @@ class TestStressStrainPerPart:
             stl_folder_path=str(ply_folder),
             output_path=str(tmp_path / "out"),
             client=MagicMock(),
+            # stress_strain is not default; opt in (needs compress + force-displacement).
+            workflow_steps=[
+                WorkflowStep(WorkflowStepType.COMPRESS),
+                WorkflowStep(WorkflowStepType.FORCE_DISPLACEMENT),
+                WorkflowStep(WorkflowStepType.STRESS_STRAIN),
+            ],
         )
         # Distinct X/Y so compression_area = X*Y is unambiguous.
         fake_patch = {"size": [0.1, 0.2, 0.05], "offset": [0.0, 0.0, 0.0], "resolution": [32, 32, 16]}
@@ -673,6 +656,16 @@ class TestStressStrainPerPart:
         sim.build_workflow()
         return sim
 
+    def test_not_run_by_default(self, ply_folder, basic_parts, tmp_path):
+        sim = CompressionSimulation(
+            parts=basic_parts,
+            simulation_name="t",
+            stl_folder_path=str(ply_folder),
+            output_path=str(tmp_path / "out"),
+            client=MagicMock(),
+        )
+        assert not sim._contains_step(WorkflowStepType.STRESS_STRAIN)
+
     def test_one_job_per_deformable_part(self, ply_folder, basic_parts, tmp_path):
         sim = self._built_sim(ply_folder, basic_parts, tmp_path)
         for name in ("upper_foam", "midsole", "outsole"):
@@ -721,6 +714,18 @@ class TestMakeManifestV2:
             stl_folder_path=str(ply_folder),
             output_path=str(tmp_path / "out"),
             client=MagicMock(),
+            # Every step, including opt-in stress_strain, so all cards render.
+            workflow_steps=[
+                WorkflowStep(WorkflowStepType.COMPUTE_BVH),
+                WorkflowStep(WorkflowStepType.METRICS),
+                WorkflowStep(WorkflowStepType.COMPRESS),
+                WorkflowStep(WorkflowStepType.VON_MISES_STRESS),
+                WorkflowStep(WorkflowStepType.EFFECTIVE_STRAIN),
+                WorkflowStep(WorkflowStepType.FORCE_DISPLACEMENT),
+                WorkflowStep(WorkflowStepType.STRESS_STRAIN),
+                WorkflowStep(WorkflowStepType.PARTICLE_DISPLACEMENT),
+                WorkflowStep(WorkflowStepType.ENERGY_METRICS),
+            ],
         )
         # In the real flow create_sim_config() assigns material indices before
         # make_manifest_v2() runs; mirror that so per-part cards key correctly.
@@ -754,7 +759,6 @@ class TestMakeManifestV2:
     def test_card_c_present_when_energy_metrics_step_present(self, sim_with_full_steps):
         sim_with_full_steps.make_manifest_v2(results=[])
         card_c = sim_with_full_steps.manifest["cardsConfig"]["C"]
-        assert len(card_c) == 1
         assert card_c[0]["id"] == "energyVolume"
 
     def test_card_c_absent_when_no_energy_metrics(self, ply_folder, basic_parts, tmp_path):
@@ -847,12 +851,38 @@ class TestMakeManifestV2:
         sim.make_manifest_v2()
         assert sim.manifest["cardsConfig"]["A"] == []
 
-    def test_stress_strain_cards_one_per_deformable_part(self, sim_with_full_steps):
+    def test_von_mises_cards_one_per_deformable_part(self, sim_with_full_steps):
+        sim_with_full_steps.make_manifest_v2()
+        cards = sim_with_full_steps.manifest["cardsConfig"]["B"]
+        ids = [c["id"] for c in cards]
+        assert ids == ["vonMisesStress1", "vonMisesStress2", "vonMisesStress3"]
+        for card in cards:
+            assert card["component"] == "SingleExperimentHistogram"
+            assert card["props"]["dataSource"] == card["id"].replace(
+                "vonMisesStress", "vonMisesStressHistogram"
+            )
+
+    def test_von_mises_cards_absent_when_step_missing(self, ply_folder, basic_parts, tmp_path):
+        sim = CompressionSimulation(
+            parts=basic_parts,
+            simulation_name="t",
+            stl_folder_path=str(ply_folder),
+            output_path=str(tmp_path / "out"),
+            client=MagicMock(),
+            workflow_steps=[WorkflowStep(WorkflowStepType.COMPRESS)],
+        )
+        sim.make_manifest_v2()
+        assert sim.manifest["cardsConfig"]["B"] == []
+
+    def test_stress_strain_cards_in_pane_a_after_force_displacement(self, sim_with_full_steps):
         sim_with_full_steps.make_manifest_v2()
-        ids = [c["id"] for c in sim_with_full_steps.manifest["cardsConfig"]["B"]]
-        assert "stressStrain1" in ids
-        assert "stressStrain2" in ids
-        assert "stressStrain3" in ids
+        ids = [c["id"] for c in sim_with_full_steps.manifest["cardsConfig"]["A"]]
+        assert ids == [
+            "forceDisplacement",
+            "stressStrain1",
+            "stressStrain2",
+            "stressStrain3",
+        ]
         # Piston (material_index 0) gets no stress-strain card.
         assert "stressStrain0" not in ids
 
@@ -860,7 +890,7 @@ class TestMakeManifestV2:
         sim_with_full_steps.make_manifest_v2()
         cards = [
             c
-            for c in sim_with_full_steps.manifest["cardsConfig"]["B"]
+            for c in sim_with_full_steps.manifest["cardsConfig"]["A"]
             if c["id"].startswith("stressStrain")
         ]
         assert cards
@@ -880,9 +910,14 @@ class TestMakeManifestV2:
             workflow_steps=[WorkflowStep(WorkflowStepType.COMPRESS)],
         )
         sim.make_manifest_v2()
-        ids = [c["id"] for c in sim.manifest["cardsConfig"]["B"]]
+        ids = [c["id"] for c in sim.manifest["cardsConfig"]["A"]]
         assert not any(i.startswith("stressStrain") for i in ids)
 
+    def test_pane_c_is_energy_volume_only(self, sim_with_full_steps):
+        sim_with_full_steps.make_manifest_v2(results=[])
+        ids = [c["id"] for c in sim_with_full_steps.manifest["cardsConfig"]["C"]]
+        assert ids == ["energyVolume"]
+
 
 class TestResultsHaveEnergyMetrics:
     def test_returns_true_when_energy_metrics_step_present(self, ply_folder, basic_parts, tmp_path):