PySimultan 0.4.8__tar.gz → 0.4.10__tar.gz

{pysimultan-0.4.8 → pysimultan-0.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.4.8
+Version: 0.4.10
 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
@@ -42,9 +42,39 @@ Description-Content-Type: text/markdown
 ## Installation
 
 ```console
-pip install pysimultan-api
+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
+│       │   ...
+│
+
+```

pysimultan-0.4.10/README.md

@@ -0,0 +1,51 @@
+# 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)
+
+## 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
+│       │   ...
+│
+
+```

pysimultan-0.4.10/src/PySimultan2/__about__.py

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

{pysimultan-0.4.8 → pysimultan-0.4.10}/src/PySimultan2/data_model.py

@@ -674,6 +674,10 @@ class DataModel:
                                      sim_taxonomy: SimTaxonomy = None) -> SimTaxonomyEntry:
         return get_or_create_taxonomy_entry(name, key, description, sim_taxonomy, data_model=self, create=True)
 
+    def get_root_components(self, mapper: 'PythonMapper'):
+        mapper.current_data_model = self
+        return mapper.get_typed_data(self, component_list=self.data.Items, create_all=False)
+
     def __del__(self):
         self.cleanup()
 

{pysimultan-0.4.8 → pysimultan-0.4.10}/src/PySimultan2/object_mapper.py

@@ -1,9 +1,12 @@
+from typing import Optional, Type, TYPE_CHECKING, Union
 from copy import copy
 from collections import UserList
 from colorlog import getLogger
+from weakref import WeakSet
 
+from . import config
 from .data_model import data_models
-from .utils import *
+from .utils import create_python_object, add_properties
 from .default_types import ComponentList, component_list_map, ComponentDictionary, component_dict_map
 
 from .simultan_object import SimultanObject
@@ -16,6 +19,9 @@ from .geometry.geometry_base import (SimultanLayer, SimultanVertex, SimultanEdge
 
 from .taxonomy_maps import TaxonomyMap, Content
 
+if TYPE_CHECKING:
+    from .data_model import DataModel
+
 logger = getLogger('PySimultan')
 
 default_registered_classes = {'ComponentList': ComponentList,
@@ -50,7 +56,7 @@ class PythonMapper(object):
                                             EdgeLoop: SimultanEdgeLoop}
 
         self.re_register = False
-        self.load_undefined = True
+        self.load_undefined = False
 
     def register(self, taxonomy, cls, taxonomy_map=None):
         if not self.re_register and taxonomy in self.registered_classes.keys():
@@ -145,7 +151,8 @@ class PythonMapper(object):
 
         for component in component_list:
             typed_object = self.create_python_object(component, data_model=data_model)
-            typed_data.append(typed_object)
+            if typed_object is not None:
+                typed_data.append(typed_object)
         return typed_data
 
     def create_python_geometry_object(self, component, data_model=None, *args, **kwargs):
@@ -167,9 +174,11 @@ class PythonMapper(object):
         else:
             self.create_python_object(component, data_model, *args, **kwargs)
 
-    # @lru_cache(maxsize=500)
-    def create_python_object(self, component, cls=None, data_model=None, *args, **kwargs):
-
+    def get_mapped_class_from_component(self,
+                                        component,
+                                        data_model: Optional['DataModel'] = None,
+                                        *args,
+                                        **kwargs) -> Optional[Type[SimultanObject]]:
         if component is None:
             return None
 
@@ -182,33 +191,54 @@ class PythonMapper(object):
                       ):
             self.create_python_geometry_object(component, data_model, *args, **kwargs)
 
-        if cls is None:
-            c_slots = [x.Target.Key for x in component.Slots.Items]
-            c_slot = list(set(c_slots) & set(self.registered_classes.keys()))
-            if len(c_slot) == 0:
-                if c_slots[0] not in self.registered_classes.keys() and self.load_undefined:
-
-                    def new_init(self, *args, **kwargs):
-                        pass
+        c_slots = [x.Target.Key for x in component.Slots.Items]
+        c_slot = list(set(c_slots) & set(self.registered_classes.keys()))
+        if len(c_slot) == 0:
+            if c_slots[0] not in self.registered_classes.keys() and self.load_undefined:
+
+                def new_init(self, *args, **kwargs):
+                    """
+                    Init method for undefined classes
+                    :param self:
+                    :param args:
+                    :param kwargs:
+                    :return:
+                    """
+                    pass
+
+                new_cls = type(c_slots[0],
+                               (object,),
+                               {'__init__': new_init}
+                               )
+
+                self.register(c_slots[0], new_cls)
+                c_slot = [c_slots[0]]
+                self.undefined_registered_classes[c_slot[0]] = new_cls
+                # self.create_mapped_class(c_slot[0], self.registered_classes[c_slot[0]])
+            elif c_slots[0] not in self.registered_classes.keys() and not self.load_undefined:
+                logger.debug(f'Component {component} has no registered taxonomy: {c_slots}')
+                return
+        elif len(c_slot) > 1:
+            num_superclasses = [len(self.registered_classes[x].__mro__) for x in c_slot]
+            c_slot = [c_slot[num_superclasses.index(max(num_superclasses))]]
+
+        if c_slot[0] not in self.mapped_classes.keys():
+            self.create_mapped_class(c_slot[0], self.registered_classes[c_slot[0]])
+
+        cls = self.mapped_classes[c_slot[0]]
+
+        return cls
 
-                    new_cls = type(c_slots[0],
-                                   (object,),
-                                   {'__init__': new_init}
-                                   )
-
-                    self.register(c_slots[0], new_cls)
-                    c_slot = [c_slots[0]]
-                    self.undefined_registered_classes[c_slot[0]] = new_cls
-                    # self.create_mapped_class(c_slot[0], self.registered_classes[c_slot[0]])
-            elif len(c_slot) > 1:
-                num_superclasses = [len(self.registered_classes[x].__mro__) for x in c_slot]
-                c_slot = [c_slot[num_superclasses.index(max(num_superclasses))]]
-                # raise Warning(f'Component {component} has more than one registered taxonomy: {c_slot}')
+    # @lru_cache(maxsize=500)
+    def create_python_object(self, component, cls=None, data_model=None, *args, **kwargs) -> Optional[SimultanObject]:
 
-            if c_slot[0] not in self.mapped_classes.keys():
-                self.create_mapped_class(c_slot[0], self.registered_classes[c_slot[0]])
+        if cls is None:
+            cls = self.get_mapped_class_from_component(component,
+                                                       data_model,
+                                                       *args, **kwargs)
 
-            cls = self.mapped_classes[c_slot[0]]
+        if cls is None:
+            return None
 
         if component is not None and component.Id in cls._cls_instances_dict.keys():
             return cls._cls_instances_dict[component.Id]
@@ -259,6 +289,7 @@ class PythonMapper(object):
         new_mapper.registered_classes = self.registered_classes
         new_mapper.taxonomy_maps = self.taxonomy_maps
         new_mapper.registered_geometry_classes = self.registered_geometry_classes
+        new_mapper.load_undefined = self.load_undefined
         return new_mapper
 
 

{pysimultan-0.4.8 → pysimultan-0.4.10}/tests/test_calculate_steady_state_temperature.py

@@ -564,6 +564,9 @@ def test_loaded_model(project_name=None):
                            user_name='admin',
                            password='admin')
 
+    # mapper.load_undefined = False
+    mapper.load_undefined = True
+
     typed_data = data_model.get_typed_data(mapper=mapper,
                                            create_all=True)
 

pysimultan-0.4.8/README.md

@@ -1,21 +0,0 @@
-# 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)
-
-## Installation
-
-```console
-pip install pysimultan-api
-```
-
-## License
-
-`pysimultan-api` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license.

pysimultan-0.4.8/src/PySimultan2/__about__.py

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