solidipes-solid-mech-plugin 0.0.11__tar.gz → 0.0.13__tar.gz

{solidipes_solid_mech_plugin-0.0.11 → solidipes_solid_mech_plugin-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solidipes-solid-mech-plugin
-Version: 0.0.11
+Version: 0.0.13
 Summary: Plugin for Solidipes with solid mechanics components
 Author-email: Son Pham-Ba <son.phamba@epfl.ch>, Guillaume Anciaux <guillaume.anciaux@epfl.ch>
 License: GPL-3.0-or-later

{solidipes_solid_mech_plugin-0.0.11 → solidipes_solid_mech_plugin-0.0.13}/solidipes_solid_mech_plugin/loaders/abaqus.py

@@ -4,6 +4,7 @@ import mergedeep
 import numpy as np
 import pandas as pd
 import pyparsing as pp
+from solidipes.validators.validator import validator
 from solidipes_core_plugin.loaders.code_snippet import CodeSnippet
 
 
@@ -114,11 +115,11 @@ class ParseAbaqus:
 class Abaqus(CodeSnippet):
     supported_mime_types = {"application/fem/abaqus": "inp"}
 
-    from solidipes_core_plugin.viewers.xml import XML
+    from solidipes_core_plugin.viewers.dictionary import DictViewer
 
     from ..viewers.pyvista_plotter import PyvistaPlotter
 
-    _compatible_viewers = [PyvistaPlotter, XML]
+    _compatible_viewers = [PyvistaPlotter, DictViewer]
 
     @CodeSnippet.loadable
     def structure(self):
@@ -129,6 +130,16 @@ class Abaqus(CodeSnippet):
         except Exception as e:
             print(e)
 
+    @validator(description="Loadable meshes")
+    def _is_mesh_loadable(self) -> bool:
+        if not self.structure:
+            self.add_validation_error([f"Invalid structure: {self.structure}"])
+            return False
+        if not self.meshes:
+            self.add_validation_error([f"Invalid meshes: {self.meshes}"])
+            return False
+        return True
+
     @property
     def xml(self):
         return self.structure
@@ -166,31 +177,18 @@ class Abaqus(CodeSnippet):
     @CodeSnippet.loadable
     def meshes(self):
         import pyvista as pv
+        from solidipes.loaders.data_container import ExitCalled
 
         try:
             fname = self.file_info.path
-            import sys
-
-            from pyvista.core.utilities import from_meshio
-
-            original_exit = sys.exit
-
-            def my_exit(code):
-                raise RuntimeError(f"Meshio: sys.exit({code})")
-
-            sys.exit = my_exit
             import meshio
+            from pyvista.core.utilities import from_meshio
 
             _mesh = meshio.read(fname)
 
-            res = {"meshio_reader": from_meshio(_mesh)}
-            sys.exit = original_exit
-            return res
-        except Exception as e:
+            return {"meshio_reader": from_meshio(_mesh)}
+        except ExitCalled as e:
             print(e)
-            pass
-
-        sys.exit = original_exit
 
         meshes = {}
         for p, part in enumerate(self.parts):
@@ -201,8 +199,6 @@ class Abaqus(CodeSnippet):
                 if param.startswith("name="):
                     param = param[5:]
                     meshes[param] = mesh
-        if not meshes:
-            return None
         return meshes
 
     @property

{solidipes_solid_mech_plugin-0.0.11 → solidipes_solid_mech_plugin-0.0.13}/solidipes_solid_mech_plugin/viewers/xdmf.py

@@ -1,10 +1,10 @@
 import streamlit as st
 from IPython.display import display
 from solidipes.viewers import backends as viewer_backends
-from solidipes_core_plugin.viewers.xml import XML
+from solidipes_core_plugin.viewers.dictionary import DictViewer
 
 
-class XDMF(XML):
+class XDMF(DictViewer):
     """Viewer for xml text files"""
 
     def __init__(self, data=None):

{solidipes_solid_mech_plugin-0.0.11 → solidipes_solid_mech_plugin-0.0.13}/solidipes_solid_mech_plugin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solidipes-solid-mech-plugin
-Version: 0.0.11
+Version: 0.0.13
 Summary: Plugin for Solidipes with solid mechanics components
 Author-email: Son Pham-Ba <son.phamba@epfl.ch>, Guillaume Anciaux <guillaume.anciaux@epfl.ch>
 License: GPL-3.0-or-later

{solidipes_solid_mech_plugin-0.0.11 → solidipes_solid_mech_plugin-0.0.13}/tests/test_ontologies.py

@@ -4,6 +4,7 @@ from pathlib import Path
 import pytest
 import solidipes as sp
 import utils
+from solidipes.loaders.rocrate_metadata import rocrate
 from solidipes.validators.ontology import set_ontology_identifier
 
 ontology_identifier = os.path.join(
@@ -27,6 +28,7 @@ class TestPyvistaMeshOntology:
         validator = get_global_validator(OntologyValidator)
         file_path = utils.get_asset_path("pyvista_mesh_no_fields.vtu")
         file = sp.load_file(file_path)
+        rocrate.write_json()
         class_name = validator.ontology.get_file_class_name(file)
         assert class_name == "InputMesh"
 
@@ -37,5 +39,6 @@ class TestPyvistaMeshOntology:
         validator = get_global_validator(OntologyValidator)
         file_path = utils.get_asset_path("pyvista_mesh.vtu")
         file = sp.load_file(file_path)
+        rocrate.write_json()
         class_name = validator.ontology.get_file_class_name(file)
         assert class_name == "OutputMesh"