PySimultan 0.5.6__tar.gz → 0.5.7__tar.gz

{pysimultan-0.5.6 → pysimultan-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.5.6
+Version: 0.5.7
 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.5.7/src/PySimultan2/__about__.py

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

{pysimultan-0.5.6 → pysimultan-0.5.7}/src/PySimultan2/taxonomy_maps.py

@@ -46,6 +46,8 @@ class Content(object):
         self._taxonomy_entries = {}
         self._taxonomy_map = kwargs.get('taxonomy_map', None)
 
+        self.taxonomy_key = kwargs.get('taxonomy_key')
+
         add_kwargs = kwargs.copy()
         _ = [add_kwargs.pop(key, None) for key in ['taxonomy_name', 'taxonomy_key', 'taxonomy_entry_name',
                                                    'taxonomy_entry_key', 'content', 'documentation', 'python_mapper',
@@ -54,10 +56,20 @@ class Content(object):
 
         self.additional_attributes = add_kwargs
 
+        self.taxonomy_key = kwargs.get('taxonomy_key')
+        self.taxonomy_name = kwargs.get('taxonomy_name')
+
+
     def get_taxonomie_entry(self, data_model: 'DataModel'):
         if self._taxonomy_entries.get(data_model, None) is None:
 
-            taxonomy = self._taxonomy_map.get_or_create_simultan_taxonomy(data_model=data_model, create=True)
+            if self.taxonomy_key is None:
+                taxonomy = self._taxonomy_map.get_or_create_simultan_taxonomy(data_model=data_model, create=True)
+            else:
+                taxonomy = data_model.get_or_create_taxonomy(taxonomy_name=self.taxonomy_name,
+                                                             taxonomy_key=self.taxonomy_key,
+                                                             create=True)
+
             self._taxonomy_entries[data_model] = data_model.get_or_create_taxonomy_entry(name=self.text_or_key,
                                                                                          key=self.text_or_key,
                                                                                          description=self.documentation,

{pysimultan-0.5.6 → pysimultan-0.5.7}/src/PySimultan2/type_setter_lookup.py

@@ -20,7 +20,6 @@ from SIMULTAN.Data.Components import (ComponentWalker, SimComponent, SimBoolPara
 
 
 class TypeSetterFcnLookupDict(object):
-
     lookup_dict = {None: lambda x: None,
                    SimComponent: set_property_to_sim_component,
                    SimultanObject: set_property_to_sim_component,
@@ -32,7 +31,11 @@ class TypeSetterFcnLookupDict(object):
                    SimMultiValueField3D: set_property_to_value_field,
                    SimMultiValueBigTable: set_property_to_value_field,
                    int: set_property_to_parameter,
+                   np.int32: set_property_to_parameter,
+                   np.int64: set_property_to_parameter,
                    float: set_property_to_parameter,
+                   np.float32: set_property_to_parameter,
+                   np.float64: set_property_to_parameter,
                    str: set_property_to_parameter,
                    bool: set_property_to_parameter,
                    FileInfo: set_property_to_file_info,

{pysimultan-0.5.6 → pysimultan-0.5.7}/src/PySimultan2/utils.py

@@ -360,9 +360,9 @@ def create_parameter(value: Union[int, float, str, SimTaxonomyEntry] = 0,
         taxonomy_entry = get_default_slot(SimTaxonomyEntry)
 
     if parameter_type is None:
-        if type(value) is float:
+        if type(value) in (float, np.float64, np.float32):
             parameter_type = float
-        elif type(value) is int:
+        elif type(value) in (int, np.int64, np.int32):
             parameter_type = int
         elif type(value) is str:
             parameter_type = str

pysimultan-0.5.6/src/PySimultan2/__about__.py

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