PySimultan 0.7.1__py3-none-any.whl → 0.7.3__py3-none-any.whl

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.7.1'
+version = '0.7.3'

PySimultan2/data_model.py

@@ -474,7 +474,7 @@ class DataModel:
         :param return_resource: return the resource
         :return: GeometryViewer.Model.GeometryModel, geo_resource
         """
-        self.get_file_infos.cache_clear()
+        self.get_file_infos_cached.cache_clear()
         geo_resource = self.add_geometry_resource(file_name)
         file_info = SystemFileInfo(geo_resource.CurrentFullPath)
         try:
@@ -505,7 +505,7 @@ class DataModel:
                                                              model_name,
                                                              self.service_provider)
 
-        self.get_file_infos.cache_clear()
+        self.get_file_infos_cached.cache_clear()
         return new_resource
 
     def add_empty_resource(self,
@@ -519,7 +519,7 @@ class DataModel:
         """
         # return self.project.AddResourceFile(FileInfo(str(filename)))
 
-        self.get_file_infos.cache_clear()
+        self.get_file_infos_cached.cache_clear()
         if target_dir is None:
             return self.project.AddEmptyResource(SystemFileInfo(str(filename)))
         else:
@@ -701,7 +701,7 @@ class DataModel:
             logger.info(f'Deleted resource {resource.Name} from project {self.project_path}')
         else:
             logger.error(f'Could not delete resource {resource.Name} from project {self.project_path}')
-        self.get_file_infos.cache_clear()
+        self.get_file_infos_cached.cache_clear()
         return success
 
     def get_existing_resource_directory_entry(self,
@@ -974,11 +974,13 @@ class DataModel:
         self.component_dict = {x.Id: x for x in component_list}
         return self.component_dict
 
-    @lru_cache()
     def get_component_by_id(self,
-                            item_id: SimId,
+                            item_id: Union[SimId, int],
                             search_subcomponents=False) -> Union[SimComponent, None]:
 
+        if isinstance(item_id, int):
+            item_id = SimId(self.project.GlobalID, item_id)
+
         # print(item_id.GlobalId, item_id.LocalId)
         # _ = [print((x.Id.GlobalId, x.Id.LocalId)) for x in self.data.Items]
 
@@ -1004,6 +1006,7 @@ class DataModel:
         if component is None and search_subcomponents:
             component = self.component_dict.get(item_id, None)
             if component is None:
+                self.create_component_dict.cache_clear()
                 self.create_component_dict()
                 component = self.component_dict.get(item_id, None)
 
@@ -1012,8 +1015,22 @@ class DataModel:
     def get_component_by_name(self, name: str) -> list[SimComponent]:
         return [x for x in self.create_component_dict.values() if x.Name == name]
 
-    @lru_cache()
     def get_file_infos(self) -> list[PythonFileInfo]:
+        """
+        Get all file infos from the project
+        :return: list of PythonFileInfo objects
+        """
+        file_infos = self.get_file_infos_cached()
+        if file_infos.__len__() != self.assets.__len__():
+            logger.warning(f'No file infos found in project {self.project_path}. '
+                           f'Please check if the project is loaded correctly.')
+            # try to reload the file infos
+            self.get_file_infos_cached.cache_clear()
+
+        return self.get_file_infos_cached()
+
+    @lru_cache()
+    def get_file_infos_cached(self) -> list[PythonFileInfo]:
         file_infos = []
         for asset in self.assets:
             if isinstance(asset, ResourceFileEntry):

PySimultan2/object_mapper.py

@@ -13,6 +13,7 @@ from .geometry.utils import create_python_geometry
 
 from SIMULTAN.Data.Geometry import (Layer, Vertex, Edge, PEdge, Face, Volume, EdgeLoop)
 from SIMULTAN.Data.Components import SimComponent
+from SIMULTAN.Data import SimId
 from .geometry.geometry_base import (SimultanLayer, SimultanVertex, SimultanEdge, SimultanEdgeLoop, SimultanFace,
                                      SimultanVolume)
 
@@ -457,6 +458,18 @@ class PythonMapper(object):
         except IndexError:
             return None
 
+    def get_mapped_object_by_id(self,
+                                component_id: Union[SimId, int],
+                                data_model: 'DataModel',
+                                search_subcomponents: bool = True) -> Optional[SimultanObject]:
+
+        component = data_model.get_component_by_id(component_id, search_subcomponents=search_subcomponents)
+        if component is None:
+            logger.error(f'Component with id {id} not found in the data model')
+            return None
+        typed_object = self.create_python_object(component, data_model=data_model)
+        return typed_object
+
     def __repr__(self):
         return f'PythonMapper(module={self.module}, {len(self.registered_classes)} registered classes)'
 

{pysimultan-0.7.1.dist-info → pysimultan-0.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.7.1
+Version: 0.7.3
 Project-URL: Documentation, https://github.com/Bühler Maximilian/PySimultan2#readme
 Project-URL: Issues, https://github.com/Bühler Maximilian/PySimultan2/issues
 Project-URL: Source, https://github.com/Bühler Maximilian/PySimultan2

{pysimultan-0.7.1.dist-info → pysimultan-0.7.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
 PySimultan2/CHANGELOG.md,sha256=sFTVr_AgFyqf4HPmShaAHKaHcT5A3MjL2s2VVzEdoyM,1340
-PySimultan2/__about__.py,sha256=CofaMtE6-CSasTw6dBDKRTVix5Q4zlkB7yu8mbXp9uk,19
+PySimultan2/__about__.py,sha256=Yl5Obh3nV2cgQAb9sShmU5W55HPrpYbI_WGlWqZ5S6Y,19
 PySimultan2/__init__.py,sha256=PGVR1uhY01dF5tHyad-znURUZ_LVB95vsjId2BT0aJM,3245
-PySimultan2/data_model.py,sha256=7qYAVHT8IbbKUy25g0CiPQrloLh7ukReIThatVGcWEs,45109
+PySimultan2/data_model.py,sha256=3KX3cjsEB-9G-FzRVd0Zo1FpoAgR8cFOCo-drPoXJKg,45894
 PySimultan2/default_types.py,sha256=NnBgf16CElEAWH7tA0qLKqFHZ4_YS00HAJpKHG1CmjQ,30581
 PySimultan2/files.py,sha256=8JCWtUPS89POsPrmn_kCrHzmiBsLb1iWhw-A9qQLcR8,34716
 PySimultan2/multi_values.py,sha256=CkmfifA-mHL3Cnm496tGQuUchpmNF7JCulyrhUFAM_I,15638
-PySimultan2/object_mapper.py,sha256=iVjQBV0mwVxCxSCloBrV0Jq8oR9BG34EIEf90bXweHM,19912
+PySimultan2/object_mapper.py,sha256=0qiVEjn6q24u2_YZGOyD4ESXZ-0tfJjGjSowT8wa2wM,20568
 PySimultan2/simultan_object.py,sha256=-3dTlkyoVdrXmSZgozz7fTHJnaxN63utYPXOXTCuEOY,20837
 PySimultan2/taxonomy_maps.py,sha256=hhgXhRXIPTD2briG_yYZssJ9musOnzs0LC4e8e78e40,10323
 PySimultan2/type_setter_lookup.py,sha256=PGa5_EtV7SM15w3uxy0fA3LiQ0TaS4Ys0LYR5zs8aNk,3748
@@ -44,7 +44,7 @@ PySimultan2/resources/System.Data.OleDb.dll,sha256=-AAzdmyo01QNgD9qnUIewEImplJFV
 PySimultan2/resources/System.Net.Http.Formatting.dll,sha256=xQBIin4YpqDObdqwau_5dr8XQEq54hlxV4gBgNtUqbc,179672
 PySimultan2/resources/System.Reflection.MetadataLoadContext.dll,sha256=P4PBRwAGWL27sNc754Wd28t_koJKBFYJ2FyolrD1xo0,242296
 PySimultan2/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pysimultan-0.7.1.dist-info/METADATA,sha256=J-zJleZLZr1YGrUvr9Jdj2FugAslZm_K-jIybKZboow,6608
-pysimultan-0.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pysimultan-0.7.1.dist-info/licenses/LICENSE.txt,sha256=FgR_YZkk7oYz4087xYXfcBCXGuTStFrsOWTH4bbpa3c,1821
-pysimultan-0.7.1.dist-info/RECORD,,
+pysimultan-0.7.3.dist-info/METADATA,sha256=ZDkGZr0z2LnB2G2eMgKHQdb2tIM8nMeCT5Plo4C_2Tc,6608
+pysimultan-0.7.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pysimultan-0.7.3.dist-info/licenses/LICENSE.txt,sha256=FgR_YZkk7oYz4087xYXfcBCXGuTStFrsOWTH4bbpa3c,1821
+pysimultan-0.7.3.dist-info/RECORD,,