PySimultan 0.4.18__tar.gz → 0.4.19__tar.gz

{pysimultan-0.4.18 → pysimultan-0.4.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.4.18
+Version: 0.4.19
 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
@@ -78,3 +78,9 @@ C:\Program Files\FreeCAD
 │
 
 ```
+
+
+# Change Log
+
+## [0.4.19] - 2024-07-01
+- Refactored dictionaries 

{pysimultan-0.4.18 → pysimultan-0.4.19}/README.md

@@ -49,3 +49,9 @@ C:\Program Files\FreeCAD
 │
 
 ```
+
+
+# Change Log
+
+## [0.4.19] - 2024-07-01
+- Refactored dictionaries 

pysimultan-0.4.19/src/PySimultan2/__about__.py

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

{pysimultan-0.4.18 → pysimultan-0.4.19}/src/PySimultan2/default_types.py

@@ -341,6 +341,9 @@ class ComponentDictionary(SimultanObject):
         super().__init__(*args, **kwargs)
         self.component_policy = kwargs.get('component_policy', 'subcomponent')  # component add policy of the content/parameter/property, 'reference' or 'subcomponent'
 
+    def __load_init__(self, *args, **kwargs):
+        self._dict = {}
+
     @classmethod
     def create_from_values(cls,
                            values: dict[str, Any],
@@ -377,10 +380,48 @@ class ComponentDictionary(SimultanObject):
             return object.__getattribute__(self, '_dict')[key]
         else:
             # data_model = config.default_data_model
-            obj = get_component_taxonomy_entry(self._wrapped_obj, key)
-            if obj is not None:
-                val = get_obj_value(obj, data_model=self._data_model, object_mapper=self._object_mapper)
-                self._dict[key] = val
+            # obj = get_component_taxonomy_entry(self._wrapped_obj, key)
+            # if obj is not None:
+            # val = get_obj_value(obj, data_model=self._data_model, object_mapper=self._object_mapper)
+
+            if key in self._taxonomy_map.parameter_taxonomy_entry_dict.keys():
+                text_or_key = self._taxonomy_map.parameter_taxonomy_entry_dict[key]
+            else:
+                content = Content(text_or_key=f'__dict_key__{key}',
+                                  property_name=key,
+                                  type=None,
+                                  unit=None,
+                                  documentation=f'Property {key} in ComponentDictionary',
+                                  component_policy=self.component_policy)
+                self._taxonomy_map.add_content(content)
+                text_or_key = content.text_or_key
+
+            try:
+                components = list(self._wrapped_obj.Components.Items)
+                val = next((get_obj_value(x.Component,
+                                          data_model=self._data_model,
+                                          object_mapper=self._object_mapper) for x in components if
+                            x.Slot.SlotBase.Target.Key == text_or_key), None)
+                if val is None:
+                    ref_components = list(self._wrapped_obj.ReferencedComponents.Items)
+                    val = next((get_obj_value(x.Target,
+                                              data_model=self._data_model,
+                                              object_mapper=self._object_mapper) for x in ref_components
+                                if x.Slot.SlotBase.Target.Key == text_or_key), None)
+                if val is None:
+                    parameters = list(self._wrapped_obj.Parameters.Items)
+                    val = next((get_obj_value(x,
+                                              data_model=self._data_model,
+                                              object_mapper=self._object_mapper) for x in parameters if
+                                x.NameTaxonomyEntry.TextOrKey == text_or_key), None)
+
+            except Exception as e:
+                logger.error(f'Could not get value for key {key} ({text_or_key}) in {self}:\n{e}')
+                raise ValueError(f'Could not get value for key {key} ({text_or_key}) in {self}:\n{e}')
+
+            self._dict[key] = get_obj_value(val,
+                                            data_model=self._data_model,
+                                            object_mapper=self._object_mapper)
         return self._dict[key]
 
     def __setitem__(self, key, value):
@@ -391,7 +432,7 @@ class ComponentDictionary(SimultanObject):
         if key in self._taxonomy_map.content_dict.keys():
             content = self._taxonomy_map.content_dict[key]
         else:
-            content = Content(text_or_key=key,
+            content = Content(text_or_key=f'__dict_key__{key}',
                               property_name=key,
                               type=None,
                               unit=None,
@@ -399,7 +440,6 @@ class ComponentDictionary(SimultanObject):
                               component_policy=self.component_policy)
             self._taxonomy_map.add_content(content)
         taxonomy_entry = content.get_taxonomie_entry(self._data_model)
-
         component_idx, ref_component_idx, parameter_idx, ref_asset_idx = get_param_indices(self._wrapped_obj,
                                                                                            taxonomy_entry)
 
@@ -425,6 +465,7 @@ class ComponentDictionary(SimultanObject):
                                            ref_component_idx=ref_component_idx,
                                            parameter_idx=parameter_idx,
                                            keep=[])
+            return
 
         if isinstance(value, (list, tuple, set, ComponentList)):
             setter_fcn = set_property_to_list

{pysimultan-0.4.18 → pysimultan-0.4.19}/src/PySimultan2/taxonomy_maps.py

@@ -87,6 +87,7 @@ class TaxonomyMap(object):
 
         self._content = []
         self._content_dict = {}
+        self._parameter_taxonomy_entry_dict = {}
 
         self.taxonomy_name = kwargs.get('taxonomy_name', kwargs.get('taxonomy_key', None))
         self.taxonomy_key = kwargs.get('taxonomy_key', None)
@@ -124,6 +125,13 @@ class TaxonomyMap(object):
                 self._content_dict[content.text_or_key] = content
         return self._content_dict
 
+    @property
+    def parameter_taxonomy_entry_dict(self):
+        if not self._parameter_taxonomy_entry_dict:
+            for content in self._content:
+                self._parameter_taxonomy_entry_dict[content.property_name] = content.text_or_key
+        return self._parameter_taxonomy_entry_dict
+
     def write(self, filename=None):
         if filename is not None:
             with open(filename, mode='w') as f:

{pysimultan-0.4.18 → pysimultan-0.4.19}/tests/test_set_dictionary.py

@@ -1,6 +1,6 @@
-from PySimultan2.data_model import DataModel
-from PySimultan2.object_mapper import PythonMapper
-from PySimultan2.taxonomy_maps import TaxonomyMap, Content
+from PySimultan2.src.PySimultan2.data_model import DataModel
+from PySimultan2.src.PySimultan2.object_mapper import PythonMapper
+from PySimultan2.src.PySimultan2.taxonomy_maps import TaxonomyMap, Content
 
 import resources
 
@@ -70,19 +70,76 @@ component = mapped_cls_1(name='test_component',
 
 
 def test_set_dictionary_param(component):
+
+    other_component = mapped_cls_2(name='other_component',
+                                   mapped_property=None)
+    other_component_2 = mapped_cls_2(name='other_component_2',
+                                     mapped_property=None)
+    other_component_3 = mapped_cls_2(name='other_component_3',
+                                     mapped_property=None)
+    other_component_4 = mapped_cls_2(name='other_component_4',
+                                     mapped_property=None)
+
     test_dict = {'val_a': 1,
                  'val_b': 2.0,
-                 'val_c': 'test'}
+                 'val_c': 'test',
+                 'val_d': True,
+                 'val_e': [other_component, other_component_2, other_component_3],
+                 'val_f': {'a': other_component_2, 'b': other_component_3},
+                 'val_g': None,
+                 'val_h': other_component,
+                 }
     component.mapped_property = test_dict
-
     component.mapped_property['val_a'] = 222
 
+    component.mapped_property['val_i'] = other_component_4
+
     print(component.mapped_property)
 
 
+def load_data_model(data_model: DataModel):
+    data_model = DataModel(project_path=project_path,
+                           user_name='admin',
+                           password='admin')
+    typed_data = data_model.get_typed_data(mapper=mapper,
+                                           create_all=True)
+
+    TestComponent = mapper.get_mapped_class('TestComponent')
+    test_component = TestComponent.cls_instances[0]
+
+    TestComponent2 = mapper.get_mapped_class('TestComponent2')
+    other_component = next(x for x in TestComponent2.cls_instances if x.name == 'other_component')
+    other_component_2 = next(x for x in TestComponent2.cls_instances if x.name == 'other_component_2')
+    other_component_3 = next(x for x in TestComponent2.cls_instances if x.name == 'other_component_3')
+    other_component_4 = next(x for x in TestComponent2.cls_instances if x.name == 'other_component_4')
+
+    assert test_component.mapped_property['val_a'] == 222
+    assert test_component.mapped_property['val_b'] == 2.0
+    assert test_component.mapped_property['val_c'] == 'test'
+    assert test_component.mapped_property['val_d'] is True
+    assert test_component.mapped_property['val_g'] is None
+    assert test_component.mapped_property['val_h'] == other_component
+    assert len(test_component.mapped_property['val_e']) == 3
+    assert test_component.mapped_property['val_e'][0] == other_component
+    assert test_component.mapped_property['val_e'][1] == other_component_2
+    assert test_component.mapped_property['val_e'][2] == other_component_3
+    assert test_component.mapped_property['val_f']['a'] == other_component_2
+    assert test_component.mapped_property['val_f']['b'] == other_component_3
+    assert test_component.mapped_property['val_i'] == other_component_4
+
+    return data_model
+
+
 if __name__ == '__main__':
     test_set_dictionary_param(component)
     data_model.save()
+    mapper.clear()
+    data_model.cleanup()
+    data_model = DataModel(project_path=project_path,
+                           user_name='admin',
+                           password='admin')
+    load_data_model(data_model)
+
 
 data_model.cleanup()
 print('Test passed')

pysimultan-0.4.18/src/PySimultan2/__about__.py

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