PySimultan 0.5.6__py3-none-any.whl → 0.5.7__py3-none-any.whl

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.5.6'
+version = '0.5.7'

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,

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,

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.dist-info → pysimultan-0.5.7.dist-info}/METADATA

@@ -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.6.dist-info → pysimultan-0.5.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 PySimultan2/CHANGELOG.md,sha256=LeVHBC6dGDwDwgXipNrwgvgews9QkyjsqtYa_jiLMm0,217
-PySimultan2/__about__.py,sha256=ahwIJXU28jCG9DVuIM_KtpxcsovPdHHik2HOD6G7DgQ,19
+PySimultan2/__about__.py,sha256=NWLby5oM381mpRW-BF0cOAskZDpkNYAHG1kf2Mr6xZE,19
 PySimultan2/__init__.py,sha256=PGVR1uhY01dF5tHyad-znURUZ_LVB95vsjId2BT0aJM,3245
 PySimultan2/data_model.py,sha256=YYtfcR6jvGztng6Be8Vw9FQ02cPkl8ATHTZMoIu1ABQ,34140
 PySimultan2/default_types.py,sha256=K-Eka5BCKk8DT3HU5761Ym_-ZFmu1_Dro0zW0LVGoHA,27157
@@ -7,9 +7,9 @@ PySimultan2/files.py,sha256=BCETl4M8qedw7Bjt8QXvY6Rl3U6Lou36XqPY2ST1o9Q,22447
 PySimultan2/multi_values.py,sha256=ZFXlTLuZo32x7_7diYAp2XEjp5uwgHLgNOzN7v74-5I,13650
 PySimultan2/object_mapper.py,sha256=_SQye38NmIr4m_-X9CuvUJnVDBmjmUDdPH2bnaxpzKY,18546
 PySimultan2/simultan_object.py,sha256=akaSUZZWIVfwx1wT5EdOgRR2UeShUthX-LE2Uk6w8CQ,19058
-PySimultan2/taxonomy_maps.py,sha256=abMB2RSKEaliW-Ewegq-Inq9npHeOD1VVrMYoKJAlC0,8762
-PySimultan2/type_setter_lookup.py,sha256=px92E-BlnvY-11F-F7L7cOwbE1_L8FQVqi-23nJi5j4,3518
-PySimultan2/utils.py,sha256=TOrMMTh6n63VgjEGVX6j67_jhUx4ImFI39X61g0OegQ,66692
+PySimultan2/taxonomy_maps.py,sha256=K8lwiBkEnQkx40YZxqSJAHdqwuo6ssvkXLL_GBxVYO0,9271
+PySimultan2/type_setter_lookup.py,sha256=PGa5_EtV7SM15w3uxy0fA3LiQ0TaS4Ys0LYR5zs8aNk,3748
+PySimultan2/utils.py,sha256=1e2sYW1ioV0L9NREbBr03Y2tK1Hx9HxQv1pdXnIPIGY,66740
 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/assimp.dll,sha256=HwfDwXqoPDTFRyoQpA3qmgZoUdFtziJkV5fNtktE
 PySimultan2/resources/componentmanager.user,sha256=hrzr1US4pqkFnLHXcvPkvrgGd7QvlxaV8mhS6fuikEs,760
 PySimultan2/resources/defaultsettings.xml,sha256=s6Tk1tubLz5UYqXZWpD42EDHzedemRY1nEneoIVcUfg,392
 PySimultan2/resources/setup.bat,sha256=fjvvYfVM6TalS-QTSiKAbAId5nTsk8kGGo06ba-wWaY,32
-pysimultan-0.5.6.dist-info/METADATA,sha256=MblBIAKHvlsGbA3u5BVv5rycD0yqSqph_B4nNyEyfOA,5815
-pysimultan-0.5.6.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-pysimultan-0.5.6.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
-pysimultan-0.5.6.dist-info/RECORD,,
+pysimultan-0.5.7.dist-info/METADATA,sha256=6I6o-yu_L5IPQxveKqC9hpki0YXFmWdOfiH82iZhIsM,5815
+pysimultan-0.5.7.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+pysimultan-0.5.7.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
+pysimultan-0.5.7.dist-info/RECORD,,