PySimultan 0.4.19__py3-none-any.whl → 0.4.21__py3-none-any.whl

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.4.19'
+version = '0.4.21'

PySimultan2/default_types.py

@@ -307,27 +307,6 @@ class ComponentDictionary(SimultanObject):
     component_policy = 'subcomponent'  # component add policy of the content/parameter/property, 'reference'
     # or 'subcomponent'
 
-    type_setter_fcn_lookup_dict = {None: lambda x: None,
-                                   SimComponent: set_property_to_sim_component,
-                                   SimultanObject: set_property_to_sim_component,
-                                   SimDoubleParameter: set_property_to_parameter,
-                                   SimIntegerParameter: set_property_to_parameter,
-                                   SimStringParameter: set_property_to_parameter,
-                                   SimBoolParameter: set_property_to_parameter,
-                                   SimEnumParameter: set_property_to_parameter,
-                                   int: set_property_to_parameter,
-                                   float: set_property_to_parameter,
-                                   str: set_property_to_parameter,
-                                   bool: set_property_to_parameter,
-                                   FileInfo: set_property_to_file_info,
-                                   list: set_property_to_list,
-                                   tuple: set_property_to_list,
-                                   set: set_property_to_list,
-                                   dict: set_property_to_dict,
-                                   ComponentList: set_property_to_list,
-                                   np.ndarray: set_property_to_value_field,
-                                   pd.DataFrame: set_property_to_value_field}
-
     _taxonomy_map = TaxonomyMap(taxonomy_name='Dictionaries',
                                 taxonomy_key='Dictionaries',
                                 taxonomy_entry_name='ComponentDict',
@@ -377,12 +356,15 @@ 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)
+            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]
@@ -397,22 +379,22 @@ class ComponentDictionary(SimultanObject):
                 text_or_key = content.text_or_key
 
             try:
-                components = list(self._wrapped_obj.Components.Items)
+                components = list(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
+                                          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(self._wrapped_obj.ReferencedComponents.Items)
+                    ref_components = list(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
+                                              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(self._wrapped_obj.Parameters.Items)
+                    parameters = list(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
+                                              data_model=data_model,
+                                              object_mapper=object_mapper) for x in parameters if
                                 x.NameTaxonomyEntry.TextOrKey == text_or_key), None)
 
             except Exception as e:
@@ -420,8 +402,8 @@ class ComponentDictionary(SimultanObject):
                 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)
+                                            data_model=data_model,
+                                            object_mapper=object_mapper)
         return self._dict[key]
 
     def __setitem__(self, key, value):
@@ -467,21 +449,13 @@ class ComponentDictionary(SimultanObject):
                                            keep=[])
             return
 
-        if isinstance(value, (list, tuple, set, ComponentList)):
-            setter_fcn = set_property_to_list
-        elif isinstance(value, SimultanObject):
-            setter_fcn = set_property_to_sim_component
-        else:
-            setter_fcn = self.type_setter_fcn_lookup_dict.get(type(value), set_property_to_unknown_type)
+        from .type_setter_lookup import type_setter_fcn_lookup_dict
+        setter_fcn = type_setter_fcn_lookup_dict.get(type(value), set_property_to_unknown_type)
 
         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
@@ -512,7 +486,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/type_setter_lookup.py

@@ -0,0 +1,62 @@
+import numpy as np
+import pandas as pd
+
+from .utils import (SimComponent, SimultanObject, SimDoubleParameter, SimIntegerParameter, SimStringParameter,
+                    SimBoolParameter, SimEnumParameter, SimMultiValueField3D, SimMultiValueBigTable, FileInfo,
+                    set_property_to_sim_component, set_property_to_parameter, set_property_to_value_field,
+                    set_property_to_file_info, set_property_to_list, set_property_to_dict)
+
+from .default_types import ComponentList, ComponentDictionary
+
+from SIMULTAN.Data.Components import (ComponentWalker, SimComponent, SimBoolParameter, SimDoubleParameter,
+                                      SimEnumParameter, SimIntegerParameter, SimStringParameter, ComponentMapping,
+                                      SimSlot, SimComponentVisibility, SimChildComponentEntry, SimDefaultSlots,
+                                      SimParameterOperations, SimComponentReference)
+
+
+lookup_dict = {None: lambda x: None,
+               SimComponent: set_property_to_sim_component,
+               SimultanObject: set_property_to_sim_component,
+               SimDoubleParameter: set_property_to_parameter,
+               SimIntegerParameter: set_property_to_parameter,
+               SimStringParameter: set_property_to_parameter,
+               SimBoolParameter: set_property_to_parameter,
+               SimEnumParameter: set_property_to_parameter,
+               SimMultiValueField3D: set_property_to_value_field,
+               SimMultiValueBigTable: set_property_to_value_field,
+               int: set_property_to_parameter,
+               float: set_property_to_parameter,
+               str: set_property_to_parameter,
+               bool: set_property_to_parameter,
+               FileInfo: set_property_to_file_info,
+               list: set_property_to_list,
+               tuple: set_property_to_list,
+               set: set_property_to_list,
+               dict: set_property_to_dict,
+               ComponentDictionary: set_property_to_dict,
+               ComponentList: set_property_to_list,
+               np.ndarray: set_property_to_value_field,
+               pd.DataFrame: set_property_to_value_field}
+
+
+class TypeSetterFcnLookupDict(object):
+
+    def __getitem__(self, item: type):
+        if item in lookup_dict:
+            return lookup_dict[item]
+        elif SimultanObject in item.__bases__:
+            return set_property_to_sim_component
+        else:
+            return None
+
+    def get(self,
+            item: type,
+            default=None):
+        val = self.__getitem__(item)
+        if val is None:
+            return default
+        else:
+            return val
+
+
+type_setter_fcn_lookup_dict = TypeSetterFcnLookupDict()

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:
@@ -1281,7 +1313,6 @@ def set_property_to_dict(value: dict,
                                slot_extension=slot_extension,
                                slot=slot)
 
-
 def add_properties(prop_name: str,
                    text_or_key: str,
                    content: Content,
@@ -1302,30 +1333,6 @@ def add_properties(prop_name: str,
 
     from .default_types import ComponentList, ComponentDictionary
 
-    type_setter_fcn_lookup_dict = {None: lambda x: None,
-                                   SimComponent: set_property_to_sim_component,
-                                   SimultanObject: set_property_to_sim_component,
-                                   SimDoubleParameter: set_property_to_parameter,
-                                   SimIntegerParameter: set_property_to_parameter,
-                                   SimStringParameter: set_property_to_parameter,
-                                   SimBoolParameter: set_property_to_parameter,
-                                   SimEnumParameter: set_property_to_parameter,
-                                   SimMultiValueField3D: set_property_to_value_field,
-                                   SimMultiValueBigTable: set_property_to_value_field,
-                                   int: set_property_to_parameter,
-                                   float: set_property_to_parameter,
-                                   str: set_property_to_parameter,
-                                   bool: set_property_to_parameter,
-                                   FileInfo: set_property_to_file_info,
-                                   list: set_property_to_list,
-                                   tuple: set_property_to_list,
-                                   set: set_property_to_list,
-                                   dict: set_property_to_dict,
-                                   ComponentDictionary: set_property_to_dict,
-                                   ComponentList: set_property_to_list,
-                                   np.ndarray: set_property_to_value_field,
-                                   pd.DataFrame: set_property_to_value_field}
-
     class Empty:
         pass
 
@@ -1381,15 +1388,8 @@ def add_properties(prop_name: str,
         if isinstance(value, UnresolvedObject):
             return
 
-        if isinstance(value, (list, tuple, set, ComponentList)):
-            setter_fcn = set_property_to_list
-        elif isinstance(value, SimultanObject):
-            setter_fcn = set_property_to_sim_component
-        elif isinstance(value, dict):
-            setter_fcn = set_property_to_dict
-        else:
-            setter_fcn = type_setter_fcn_lookup_dict.get(type(value), set_property_to_unknown_type)
-
+        from .type_setter_lookup import type_setter_fcn_lookup_dict
+        setter_fcn = type_setter_fcn_lookup_dict.get(type(value), set_property_to_unknown_type)
         setter_fcn(*fcn_arg_list)
 
     setx.__taxonomy__ = taxonomy

{pysimultan-0.4.19.dist-info → pysimultan-0.4.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.4.19
+Version: 0.4.21
 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
@@ -38,6 +38,9 @@ Description-Content-Type: text/markdown
 
 - [Installation](#installation)
 - [License](#license)
+- [Usage](#usage)
+- [FreeCAD support](#freecad-support)
+- [Change Log](#change-log)
 
 ## Installation
 
@@ -82,5 +85,8 @@ 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.19.dist-info → pysimultan-0.4.21.dist-info}/RECORD

@@ -1,13 +1,14 @@
-PySimultan2/__about__.py,sha256=Z9VH1opxusXUHCDJeWUusEwptfCLQBbFMXR9ph5aJS4,20
+PySimultan2/__about__.py,sha256=BcY2O7QAmjmLO_2EMS3Qs445TkjNXhtVzC4D0HWZntw,20
 PySimultan2/__init__.py,sha256=cabTN1Oz8xtFM31ouBKg5lwLqW5vtexDP669PYyNLnA,3224
 PySimultan2/data_model.py,sha256=xosu5TAfgsrxwyhd6SfHFp4Wvo1_YtxdHsSuZmuNVJU,27022
-PySimultan2/default_types.py,sha256=hE_JyKcykL3bSqpeEj-zSA04oLJ6UnsGR17SfdjkXNo,25578
+PySimultan2/default_types.py,sha256=v8kfoR-csDlYEDUBk9rM89LcoH2Yyox7PbO1y2zPsmc,23862
 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=YXOE-vUan2vLQyk96W728Vw5elBvIwH56tTuRBYeUyQ,8420
-PySimultan2/utils.py,sha256=qhF46rCHmI96Hdp9sdHAAkUJtaQxoG6YJu7Hx5IM4Go,62569
+PySimultan2/type_setter_lookup.py,sha256=mCOYAnxNxofPcWUl59axNCFXe1gkilV_yWz2-0MGeGM,2782
+PySimultan2/utils.py,sha256=32pHmzSIITC7WjFsfxmcMxMhHZPsk5K_KtQ5Uwi-pUs,61735
 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 +76,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.19.dist-info/METADATA,sha256=1uJ2SKZAtUEgv2A_EB35HQMeh0jCfA1AM0PW8EMGW1w,2551
-pysimultan-0.4.19.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-pysimultan-0.4.19.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
-pysimultan-0.4.19.dist-info/RECORD,,
+pysimultan-0.4.21.dist-info/METADATA,sha256=vPm27zwQIfL9aOCtdCIFRu5_FiCCBS5KZ3AoJEsr_nY,2703
+pysimultan-0.4.21.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+pysimultan-0.4.21.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
+pysimultan-0.4.21.dist-info/RECORD,,