PySimultan 0.4.18__py3-none-any.whl → 0.4.20__py3-none-any.whl

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.4.18'
+version = '0.4.20'

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],
@@ -374,13 +377,54 @@ class ComponentDictionary(SimultanObject):
 
         if kwargs.get('check_dict', True) and comp_dict is not None and key in object.__getattribute__(self,
                                                                                                        '_dict').keys():
-            return object.__getattribute__(self, '_dict')[key]
+            return object.__getattribute__(self, '_dict').get(key, None)
         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)
+            data_model = self._data_model
+            object_mapper = self._object_mapper
+            wrapped_obj = self._wrapped_obj
+
+            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(wrapped_obj.Components.Items)
+                val = next((get_obj_value(x.Component,
+                                          data_model=data_model,
+                                          object_mapper=object_mapper) for x in components if
+                            x.Slot.SlotBase.Target.Key == text_or_key), None)
+                if val is None:
+                    ref_components = list(wrapped_obj.ReferencedComponents.Items)
+                    val = next((get_obj_value(x.Target,
+                                              data_model=data_model,
+                                              object_mapper=object_mapper) for x in ref_components
+                                if x.Slot.SlotBase.Target.Key == text_or_key), None)
+                if val is None:
+                    parameters = list(wrapped_obj.Parameters.Items)
+                    val = next((get_obj_value(x,
+                                              data_model=data_model,
+                                              object_mapper=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=data_model,
+                                            object_mapper=object_mapper)
         return self._dict[key]
 
     def __setitem__(self, key, value):
@@ -391,7 +435,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 +443,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 +468,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
@@ -436,11 +480,7 @@ class ComponentDictionary(SimultanObject):
         setter_fcn(*fcn_arg_list)
         item = self.__getitem__(key, check_dict=False)
 
-        # self._object_mapper.create_python_object(self._wrapped_obj)
-        #
-        # if isinstance(value, ):
-
-        self._dict[key] = self.__getitem__(key, check_dict=False)
+        self._dict[key] = item
 
     def __delitem__(self, key):
         self[key] = None
@@ -471,7 +511,7 @@ class ComponentDictionary(SimultanObject):
                                                                           data_model=self._data_model,
                                                                           object_mapper=self._object_mapper)
         for ref_component in self._wrapped_obj.ReferencedComponents.Items:
-            comp_dict[ref_component.Slot.SlotBase.Target.Name] = get_obj_value(ref_component.Target,
+            comp_dict[ref_component.Slot.SlotBase.Target.Key] = get_obj_value(ref_component.Target,
                                                                                data_model=self._data_model,
                                                                                object_mapper=self._object_mapper)
         for ref_asset in self._wrapped_obj.ReferencedAssets.Items:

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:

PySimultan2/utils.py

@@ -1,10 +1,16 @@
 from __future__ import annotations
 
+import sys
+import traceback
+
 from enum import Enum
 from weakref import WeakSet
 import numpy as np
 import pandas as pd
 from typing import List as TypeList, Union, Optional, Type, Any, TYPE_CHECKING
+
+from System import ArgumentException, NotSupportedException
+
 from SIMULTAN.Data.Components import (ComponentWalker, SimComponent, SimBoolParameter, SimDoubleParameter,
                                       SimEnumParameter, SimIntegerParameter, SimStringParameter, ComponentMapping,
                                       SimSlot, SimComponentVisibility, SimChildComponentEntry, SimDefaultSlots,
@@ -417,8 +423,31 @@ def add_sub_component(comp: SimComponent,
         new_slot = SimSlot(sub_comp.Slots[0].Target, str(slot_extension))
 
     entry = SimChildComponentEntry(new_slot, sub_comp)
+
+    error = None
+    new_slot_extension = 0
+
     if entry not in comp.Components.Items:
-        comp.Components.InsertItem(len(comp.Components.Items), entry)
+        try:
+            comp.Components.InsertItem(len(comp.Components.Items), entry)
+        except (ArgumentException, NotSupportedException) as e:
+            error = e
+
+            while error is not None and new_slot_extension < 100:
+                try:
+                    try:
+                        slot_extension += 1
+                        if slot_extension > 1000:
+                            break
+                    except Exception as e:
+                        new_slot_extension += 1
+                        slot_extension = slot_extension + f'_{new_slot_extension}'
+                    new_slot = SimSlot(sub_comp.Slots[0].Target, str(slot_extension))
+                    entry = SimChildComponentEntry(new_slot, sub_comp)
+                    comp.Components.InsertItem(len(comp.Components.Items), entry)
+                    error = None
+                except (ArgumentException, NotSupportedException) as e:
+                    error = e
     return True
 
 
@@ -727,7 +756,8 @@ type_convert_dict = {SimComponent: get_sim_component_value,
                      SimEnumParameter: get_parameter_value,
                      ResourceEntry: get_resource_entry_value,
                      ContainedResourceFileEntry: get_resource_entry_value,
-                     LinkedResourceFileEntry: get_resource_entry_value}
+                     LinkedResourceFileEntry: get_resource_entry_value
+                     }
 
 
 def get_obj_value(obj: Union[SimComponent, SimDoubleParameter, SimIntegerParameter, SimStringParameter,
@@ -738,6 +768,8 @@ def get_obj_value(obj: Union[SimComponent, SimDoubleParameter, SimIntegerParamet
 
     if obj is None:
         return
+    elif isinstance(obj, (int, float, str)):
+        return obj
     elif type(obj) in type_convert_dict.keys():
         return type_convert_dict[type(obj)](obj, data_model=data_model, object_mapper=object_mapper)
     else:

{pysimultan-0.4.18.dist-info → pysimultan-0.4.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.4.18
+Version: 0.4.20
 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,12 @@ C:\Program Files\FreeCAD
 │
 
 ```
+
+
+# Change Log
+
+## [0.4.20] - 2024-07-01
+- Fixed Bug in nested dictionary creation
+
+## [0.4.19] - 2024-07-01
+- Refactored dictionaries 

{pysimultan-0.4.18.dist-info → pysimultan-0.4.20.dist-info}/RECORD

@@ -1,13 +1,13 @@
-PySimultan2/__about__.py,sha256=NDfheEp8FwJqF_9iumAMNgYhdmAOIo7i6lRU_Li4zHE,20
+PySimultan2/__about__.py,sha256=5LZKy2_Q7Bsu50daCLBwex_Hb1mMwOUMiteIDt5jRXI,20
 PySimultan2/__init__.py,sha256=cabTN1Oz8xtFM31ouBKg5lwLqW5vtexDP669PYyNLnA,3224
 PySimultan2/data_model.py,sha256=xosu5TAfgsrxwyhd6SfHFp4Wvo1_YtxdHsSuZmuNVJU,27022
-PySimultan2/default_types.py,sha256=v_4awsUURLbu4Sfw7J_7BoQKirXbKdU9s7-wqgA4nNE,23112
+PySimultan2/default_types.py,sha256=MvZuU7qQW-ybRIT5Fl5yKdyidXhTQjFZuUq2W8hvEI4,25504
 PySimultan2/files.py,sha256=8F1QC9nTsTSrCpu5vGx1xGx-7UgkDwoICXau_5j7UzI,12725
 PySimultan2/multi_values.py,sha256=ZFXlTLuZo32x7_7diYAp2XEjp5uwgHLgNOzN7v74-5I,13650
 PySimultan2/object_mapper.py,sha256=yYVGeIzkdYvNMqW_kz9NwVxi6IJWGAqLS8CrYzW2oEg,13210
 PySimultan2/simultan_object.py,sha256=P047pfjgScysBMIsW7Co63VlzXGnLqGwxjyAEVLh8kg,16917
-PySimultan2/taxonomy_maps.py,sha256=IYpIat6ZJi5MyCbsjAxWvVOWDRp_VvSMWUY3CApKSik,8061
-PySimultan2/utils.py,sha256=qhF46rCHmI96Hdp9sdHAAkUJtaQxoG6YJu7Hx5IM4Go,62569
+PySimultan2/taxonomy_maps.py,sha256=YXOE-vUan2vLQyk96W728Vw5elBvIwH56tTuRBYeUyQ,8420
+PySimultan2/utils.py,sha256=NOetVGG51-JTCrTTXMMmUz2pZpAGmvuojtoXd1UmLtA,63716
 PySimultan2/geometry/__init__.py,sha256=nJolTD1i5J8qUkOQa-r3D20aq3Co3sN31Xc0n4wJpJo,248
 PySimultan2/geometry/geometry_base.py,sha256=nbb9U2W3vFviVLxISLHRi2CVyLEM-3zIKvoZ1uSYs_8,23420
 PySimultan2/geometry/utils.py,sha256=J25YsK8sso_UL7xRusItQZvyjtvxdOsSPelBQYFABhY,8519
@@ -75,7 +75,7 @@ PySimultan2/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 PySimultan2/resources/assimp.dll,sha256=HwfDwXqoPDTFRyoQpA3qmgZoUdFtziJkV5fNtktEZEU,6081536
 PySimultan2/resources/defaultsettings.xml,sha256=s6Tk1tubLz5UYqXZWpD42EDHzedemRY1nEneoIVcUfg,392
 PySimultan2/resources/setup.bat,sha256=fjvvYfVM6TalS-QTSiKAbAId5nTsk8kGGo06ba-wWaY,32
-pysimultan-0.4.18.dist-info/METADATA,sha256=tnKziIsTcgeCIf7BGaxdm1VhBQJPu6LROSu0E4mHZi4,2483
-pysimultan-0.4.18.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-pysimultan-0.4.18.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
-pysimultan-0.4.18.dist-info/RECORD,,
+pysimultan-0.4.20.dist-info/METADATA,sha256=TlRBXFruRV99PRNlQ_BOu8m4VeW3bgFu6-7Ufy-fjao,2619
+pysimultan-0.4.20.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+pysimultan-0.4.20.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
+pysimultan-0.4.20.dist-info/RECORD,,