PySimultan 0.4.20__tar.gz → 0.4.22__tar.gz

{pysimultan-0.4.20 → pysimultan-0.4.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.4.20
+Version: 0.4.22
 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
 

{pysimultan-0.4.20 → pysimultan-0.4.22}/README.md

@@ -9,6 +9,9 @@
 
 - [Installation](#installation)
 - [License](#license)
+- [Usage](#usage)
+- [FreeCAD support](#freecad-support)
+- [Change Log](#change-log)
 
 ## Installation
 

pysimultan-0.4.22/src/PySimultan2/__about__.py

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

{pysimultan-0.4.20 → pysimultan-0.4.22}/src/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',
@@ -422,10 +401,14 @@ class ComponentDictionary(SimultanObject):
                 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]
+            val = get_obj_value(val,
+                                data_model=data_model,
+                                object_mapper=object_mapper)
+
+            if val is not None:
+                self._dict[key] = val
+
+        return self._dict.get(key, None)
 
     def __setitem__(self, key, value):
 
@@ -470,12 +453,8 @@ 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)

pysimultan-0.4.22/src/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()

{pysimultan-0.4.20 → pysimultan-0.4.22}/src/PySimultan2/utils.py

@@ -1313,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,
@@ -1334,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
 
@@ -1413,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.20/src/PySimultan2/__about__.py

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