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

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.5.5'
+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.7.dist-info/METADATA

@@ -0,0 +1,173 @@
+Metadata-Version: 2.3
+Name: PySimultan
+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
+Author-email: Bühler Maximilian <maximilian.buehler@tuwien.ac.at>
+License: MIT
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.8
+Requires-Dist: colorlog
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: pyarrow
+Requires-Dist: pythonnet
+Requires-Dist: ruamel-yaml
+Requires-Dist: six
+Requires-Dist: tqdm
+Description-Content-Type: text/markdown
+
+# pysimultan
+
+[![PyPI - Version](https://img.shields.io/pypi/v/pysimultan.svg)](https://pypi.org/project/pysimultan)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pysimultan.svg)](https://pypi.org/project/pysimultan)
+
+PySimultan is a Python library designed to facilitate the creation, manipulation, and management of SIMULTAN data models, taxonomies, and templates. It provides a structured way to define and interact with complex data structures, making it particularly useful for applications that require detailed data organization and templating.  
+Key Features:
+- Data Models: Create and manage data SIMULTAN models with ease.
+- Taxonomies: Define and use taxonomies to categorize and structure data.
+- File and Directory Management: Handle files and directories within the data models.
+- Mapping of Python objects to SIMULTAN data models: Map Python objects to SIMULTAN data models for easy data creation and manipulation.
+- Simple integration in existing Python projects: Easily integrate PySimultan into existing Python projects to enhance data management capabilities.
+
+
+-----
+
+## Table of Contents
+
+- [Installation](#installation)
+- [License](#license)
+- [Usage](#usage)
+- [Change Log](#change-log)
+
+## Installation
+
+```console
+pip install PySimultan
+```
+
+## License
+
+`PySimultan` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license.
+
+
+# Usage
+
+### Data Models
+
+Create a new data model:
+```python
+from PySimultan2 import DataModel
+
+# Create a new data model
+data_model = DataModel.create_new_project(project_path='my_project.simultan',
+                                          user_name='admin',
+                                          password='admin')
+```
+
+Load an existing data model:
+```python
+from PySimultan2 import DataModel
+
+# Load an existing data model
+data_model = DataModel(project_path='my_project.simultan',
+                       user_name='admin',
+                       password='admin')
+```
+
+save the data model:
+```python
+data_model.save()
+```
+
+close and cleanup the data model:
+```python
+data_model.cleanup()
+```
+
+
+### Mapping python to SIMULTAN
+
+#### Create a mapped class:
+```python
+from PySimultan2 import DataModel, TaxonomyMap, Content, PythonMapper
+
+mapper = PythonMapper()
+
+class TestComponent(object):
+    def __init__(self, *args, **kwargs):
+        self.param_1 = kwargs.get('param_1')
+        self.param_2 = kwargs.get('param_2')
+
+content0 = Content(text_or_key='param_1',  # text or key of the content/parameter/property
+                   property_name='param_1',  # name of the generated property
+                   type=None,  # type of the content/parameter/property
+                   unit=None,  # unit of the content/parameter/property
+                   documentation='param_1 to test')
+
+content1 = Content(text_or_key='param_2',  # text or key of the content/parameter/property
+                   property_name='param_2',  # name of the generated property
+                   type=None,  # type of the content/parameter/property
+                   unit=None,  # unit of the content/parameter/property
+                   documentation='param_2 to test')
+
+test_component_map = TaxonomyMap(taxonomy_name='PySimultan',
+                                 taxonomy_key='Test',
+                                 taxonomy_entry_name='test_component',
+                                 taxonomy_entry_key='test_component',
+                                 content=[content0, content1],
+                                 )
+
+mapper.register(test_component_map.taxonomy_entry_key, TestComponent, taxonomy_map=test_component_map)
+```
+
+#### Create an instance of the mapped class:
+```python
+# get the mapped class
+mapped_test_component_cls = mapper.get_mapped_class('test_component')
+
+# create an instance of the mapped class
+mapped_test_component = mapped_test_component_cls(param_1='value1', 
+                                                  param_2='value2',
+                                                  data_model=data_model)
+
+# save the data_model
+data_model.save()
+
+# cleanup the data_model
+data_model.cleanup()
+```
+
+#### Load an instance of the mapped class:
+```python
+# load the data_model
+data_model = DataModel(project_path='my_project.simultan',
+                       user_name='admin',
+                       password='admin')
+                       
+# get the mapped class
+mapped_test_component_cls = mapper.get_mapped_class('test_component')
+
+# get the instances of the mapped class
+instances = mapped_test_component_cls.cls_instaces
+
+print(instances[0].param_1)
+```
+
+
+# Change Log
+
+## [0.4.20] - 2024-07-01
+- Fixed Bug in nested dictionary creation
+
+## [0.4.19] - 2024-07-01
+- Refactored dictionaries 

{pysimultan-0.5.5.dist-info → pysimultan-0.5.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 PySimultan2/CHANGELOG.md,sha256=LeVHBC6dGDwDwgXipNrwgvgews9QkyjsqtYa_jiLMm0,217
-PySimultan2/__about__.py,sha256=vzEzJZ6JrU1XuEoNmBm-CHsw0z44e2mWFvuJveRe8YM,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.5.dist-info/METADATA,sha256=vqTp0MfBHnJUxHyFF_DCVeAXKICkXCsiVvuRINKvZXw,2665
-pysimultan-0.5.5.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-pysimultan-0.5.5.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
-pysimultan-0.5.5.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,,

pysimultan-0.5.5.dist-info/METADATA

@@ -1,91 +0,0 @@
-Metadata-Version: 2.3
-Name: PySimultan
-Version: 0.5.5
-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
-Author-email: Bühler Maximilian <maximilian.buehler@tuwien.ac.at>
-License: MIT
-Classifier: Development Status :: 4 - Beta
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.8
-Requires-Dist: colorlog
-Requires-Dist: numpy
-Requires-Dist: pandas
-Requires-Dist: pyarrow
-Requires-Dist: pythonnet
-Requires-Dist: ruamel-yaml
-Requires-Dist: six
-Requires-Dist: tqdm
-Description-Content-Type: text/markdown
-
-# pysimultan_api
-
-[![PyPI - Version](https://img.shields.io/pypi/v/pysimultan-api.svg)](https://pypi.org/project/pysimultan-api)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pysimultan-api.svg)](https://pypi.org/project/pysimultan-api)
-
------
-
-## Table of Contents
-
-- [Installation](#installation)
-- [License](#license)
-- [Usage](#usage)
-- [FreeCAD support](#freecad-support)
-- [Change Log](#change-log)
-
-## Installation
-
-```console
-pip install PySimultan
-```
-
-## License
-
-`pysimultan-api` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license.
-
-
-### Usage
-
-```python
-from PySimultan2 import DataModel, Content, TaxonomyMap, PythonMapper
-```
-
-
-## FreeCAD support
-
-PySimultanUI looks for a FreeCAD version in C:\Program Files\FreeCAD. If you don't have FreeCAD installed, you can 
-download it from the FreeCAD website or use the FreeCAD version provided in the FreeCAD-Bundle repository.
-Go to https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds and download the latest version 
-of FreeCAD for your OS. The version must be compiled with the same python version you are using (e.g. py311). 
-
-Extract the zip file to C:\Program Files\FreeCAD
-
-The directory structure should look like this:
-
-```
-C:\Program Files\FreeCAD
-│   ...
-│   FreeCAD_weekly-builds-37730-conda-Windows-x86_64-py311
-│       │   bin
-│       │   lib
-│       │   ...
-│
-
-```
-
-
-# Change Log
-
-## [0.4.20] - 2024-07-01
-- Fixed Bug in nested dictionary creation
-
-## [0.4.19] - 2024-07-01
-- Refactored dictionaries