PySimultan 0.7.2__tar.gz → 0.7.4__tar.gz

{pysimultan-0.7.2 → pysimultan-0.7.4}/.gitignore

@@ -28,3 +28,5 @@ simultan_exception*
 *.AppImage
 
 storage-user*
+
+variables.tf

{pysimultan-0.7.2 → pysimultan-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.7.2
+Version: 0.7.4
 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.4/src/PySimultan2/__about__.py

@@ -0,0 +1 @@
+version = '0.7.4'

{pysimultan-0.7.2 → pysimultan-0.7.4}/src/PySimultan2/data_model.py

@@ -975,9 +975,12 @@ class DataModel:
         return self.component_dict
 
     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]
 
@@ -1023,7 +1026,6 @@ class DataModel:
                            f'Please check if the project is loaded correctly.')
             # try to reload the file infos
             self.get_file_infos_cached.cache_clear()
-            file_infos = self.get_file_infos_cached()
 
         return self.get_file_infos_cached()
 

{pysimultan-0.7.2 → pysimultan-0.7.4}/src/PySimultan2/multi_values.py

@@ -16,6 +16,18 @@ from pandas import DataFrame
 import System
 
 
+class SimultanPandasDataFrame(pd.DataFrame):
+    # temporary properties
+
+    # normal properties
+    _metadata = ["SimultanField"]
+
+    @property
+    def _constructor(self):
+        return SimultanPandasDataFrame
+
+
+
 def numpy_to_simultan_multi_value_field_3d(array: np.ndarray,
                                            name: str = 'UnnamedField',
                                            x_axis: list = None,
@@ -124,7 +136,8 @@ def simultan_multi_value_big_table_to_pandas(field: SimMultiValueBigTable) -> pd
     for i in range(field.RowHeaders.Count):
         data[i, :] = list(field.GetRow(i))
 
-    df = pd.DataFrame(data, columns=[x.Name for x in field.ColumnHeaders], index=[x.Name for x in field.RowHeaders])
+    df = SimultanPandasDataFrame(data, columns=[x.Name for x in field.ColumnHeaders], index=[x.Name for x in field.RowHeaders])
+    df.SimultanField = {'id': field.Id, 'name': field.Name}
 
     return df
 
@@ -224,8 +237,16 @@ def set_parameter_to_value_field(parameter: SimDoubleParameter,
         #
         # source = SimMultiValueField3DParameterSource(value_field, x_ax_val, y_ax_val, z_ax_val)
         source = default_value_source(value_field, x_ax_val, y_ax_val, z_ax_val)
+    elif isinstance(value, SimultanPandasDataFrame):
+        field = next(x for x in data_model.value_fields if x.Id.Equals(value.SimultanField['id']))  # check if field is in data model
+        value_field = pandas_to_simultan_multi_value_big_table(value,
+                                                               name=field_name if field_name is not None else str(
+                                                               parameter.Id) + '_field')
+        field.ReplaceData(value_field)
+        source = SimMultiValueBigTableParameterSource(field, 0, 0)
 
     elif isinstance(value, pd.DataFrame):
+        value.__class__ = SimultanPandasDataFrame  # change class to add temporary properties
         value_field = pandas_to_simultan_multi_value_big_table(value,
                                                                name=field_name if field_name is not None else str(
                                                                    parameter.Id) + '_field')
@@ -233,6 +254,7 @@ def set_parameter_to_value_field(parameter: SimDoubleParameter,
             data_model.add_field(value_field)
 
         source = SimMultiValueBigTableParameterSource(value_field, 0, 0)
+        value.SimultanField = {'id': value_field.Id, 'name': value_field.Name}
 
     else:
         raise ValueError('The value of the field parameter must be a numpy array or a DataFrame.')

{pysimultan-0.7.2 → pysimultan-0.7.4}/src/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.2 → pysimultan-0.7.4}/src/PySimultan2/type_setter_lookup.py

@@ -12,6 +12,7 @@ from .utils import (SimComponent, SimDoubleParameter, SimIntegerParameter, SimSt
 from .simultan_object import SimultanObject, MetaMock
 
 from .default_types import ComponentList, ComponentDictionary
+from .multi_values import SimultanPandasDataFrame
 
 from SIMULTAN.Data.Components import (ComponentWalker, SimComponent, SimBoolParameter, SimDoubleParameter,
                                       SimEnumParameter, SimIntegerParameter, SimStringParameter, ComponentMapping,
@@ -50,7 +51,8 @@ class TypeSetterFcnLookupDict(object):
                    ComponentDictionary: set_property_to_sim_component,
                    ComponentList: set_property_to_list,
                    np.ndarray: set_property_to_value_field,
-                   pd.DataFrame: set_property_to_value_field}
+                   pd.DataFrame: set_property_to_value_field,
+                   SimultanPandasDataFrame: set_property_to_value_field}
 
     def __getitem__(self, item: type):
         bases = [item, *inspect.getmro(type(item))]

{pysimultan-0.7.2 → pysimultan-0.7.4}/src/PySimultan2/utils.py

@@ -27,7 +27,7 @@ from SIMULTAN.Data.Assets import (ResourceEntry, ResourceFileEntry, ContainedRes
 from SIMULTAN.Data.Geometry import Face, Edge, Vertex, Volume
 
 from .multi_values import (simultan_multi_value_field_3d_to_numpy, set_parameter_to_value_field,
-                           create_field_parameter, simultan_multi_value_big_table_to_pandas)
+                           create_field_parameter, simultan_multi_value_big_table_to_pandas, SimultanPandasDataFrame)
 from .files import FileInfo, remove_asset_from_component, add_asset_to_component, DirectoryInfo
 
 if TYPE_CHECKING:
@@ -1442,9 +1442,11 @@ def add_properties(prop_name: str,
     def getx(self):
 
         cache_value = self.__property_cache__.get(content.text_or_key, Empty)
+        if isinstance(cache_value, SimultanPandasDataFrame):
+            cache_value = Empty
 
         if cache_value is not Empty:
-            return self.__property_cache__[content.text_or_key]
+            return cache_value
 
         val = get_property(component=self,
                            text_or_key=content.text_or_key,

pysimultan-0.7.4/tests/resources/new_test_file_1.txt

@@ -0,0 +1 @@
+This is the content of the file 1.

pysimultan-0.7.4/tests/resources/new_test_file_2.txt

@@ -0,0 +1 @@
+This is the content of the file 2.

{pysimultan-0.7.2 → pysimultan-0.7.4}/tests/test_set_properties.py

@@ -121,6 +121,12 @@ def test_set_value_field(test_component):
     test_component.mapped_property = df
     assert np.array_equal(test_component.mapped_property.values, df.values)
 
+    df['A'] = df['A'] * 2
+
+    test_component.value2 = df
+    assert np.array_equal(test_component.value2.values, df.values)
+    assert np.array_equal(test_component.mapped_property.values, df.values)
+
 
 def set_referenced_component(test_component):
     referenced_component = mapped_cls_2(name='referenced_component',
@@ -152,7 +158,7 @@ if __name__ == '__main__':
     test_set_set_file(component)
     test_set_value_field(component)
     set_referenced_component(component)
-    set_new_component(component)
+    # set_new_component(component)
     data_model.save()
 
 data_model.cleanup()

pysimultan-0.7.2/src/PySimultan2/__about__.py

@@ -1 +0,0 @@
-version = '0.7.2'