PySimultan 0.3.0__tar.gz → 0.3.1__tar.gz

{pysimultan-0.3.0 → pysimultan-0.3.1}/LICENSE.txt

@@ -1,17 +1,17 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.

{pysimultan-0.3.0 → pysimultan-0.3.1}/MANIFEST.in

@@ -1,9 +1,9 @@
-include README.rst
-include LICENSE.txt
-include requirements.txt
-
-graft src/py_plot_tools/resources
-graft src/py_plot_tools/basic_geometries/gui_adaptions/infos/generated
-graft src/py_plot_tools/generated
-recursive-exclude src/tests *
-recursive-include src/resources *
+include README.rst
+include LICENSE.txt
+include requirements.txt
+
+graft src/py_plot_tools/resources
+graft src/py_plot_tools/basic_geometries/gui_adaptions/infos/generated
+graft src/py_plot_tools/generated
+recursive-exclude src/tests *
+recursive-include src/resources *

{pysimultan-0.3.0/src/PySimultan.egg-info → pysimultan-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySimultan
-Version: 0.3.0
+Version: 0.3.1
 Home-page: 
 Author: Max Buehler
 Author-email: Max Bühler <maximilian.buehler@tuwien.ac.at>

{pysimultan-0.3.0 → pysimultan-0.3.1}/README.md

@@ -1,5 +1,5 @@
-===================================================
-geometry_utils: Several tools to work with geometry
-===================================================
-
-Python library with several tools to work with geometry
+===================================================
+geometry_utils: Several tools to work with geometry
+===================================================
+
+Python library with several tools to work with geometry

{pysimultan-0.3.0 → pysimultan-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PySimultan"
-version = "0.3.0"
+version = "0.3.1"
 authors = [
     {name = "Max Bühler", email = "maximilian.buehler@tuwien.ac.at"}
 ]

{pysimultan-0.3.0 → pysimultan-0.3.1}/requirements.txt

@@ -1,14 +1,14 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile requirements.in
-#
-six
-numpy
-pythonnet
-colorlog
-ruamel.yaml
-tqdm
-pandas
-pyarrow
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile requirements.in
+#
+six
+numpy
+pythonnet
+colorlog
+ruamel.yaml
+tqdm
+pandas
+pyarrow

{pysimultan-0.3.0 → pysimultan-0.3.1}/setup.py

@@ -11,7 +11,7 @@ with project_dir.joinpath("requirements.txt").open() as f:
 
 setuptools.setup(
     name="PySimultan",
-    version="0.3.0",
+    version="0.3.1",
     description="Integrate SIMULTAN into Python",
     # Allow UTF-8 characters in README with encoding argument.
     long_description=project_dir.joinpath("README.md").read_text(encoding="utf-8"),

{pysimultan-0.3.0 → pysimultan-0.3.1/src/PySimultan.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySimultan
-Version: 0.3.0
+Version: 0.3.1
 Home-page: 
 Author: Max Buehler
 Author-email: Max Bühler <maximilian.buehler@tuwien.ac.at>

{pysimultan-0.3.0 → pysimultan-0.3.1}/src/PySimultan.egg-info/SOURCES.txt

@@ -90,6 +90,7 @@ src/PySimultan2/resources/defaultsettings.xml
 src/PySimultan2/resources/setup.bat
 tests/test_calc_static_zone_temperature.py
 tests/test_calculate_steady_state_temperature.py
+tests/test_circular_references.py
 tests/test_create_geometry.py
 tests/test_files.py
 tests/test_files_load.py

{pysimultan-0.3.0 → pysimultan-0.3.1}/src/PySimultan.egg-info/top_level.txt

@@ -1 +1,2 @@
 PySimultan2
+SOF

{pysimultan-0.3.0 → pysimultan-0.3.1}/src/PySimultan2/default_types.py

@@ -97,7 +97,7 @@ class ComponentList(SimultanObject):
 
     @property
     def ref_components(self):
-        return [x.Target for x in self._wrapped_obj.ReferencedComponents.Items]
+        return [x.Target for x in self._wrapped_obj.ReferencedComponents.Items if x.Target is not None]
 
     @property
     def data(self) -> List[SimultanObject]:
@@ -109,7 +109,7 @@ class ComponentList(SimultanObject):
             all_components = [*components, *ref_components]
 
             slots = [*[x.Slot for x in self._wrapped_obj.Components.Items],
-                     *[x.Slot for x in self._wrapped_obj.ReferencedComponents.Items]]
+                     *[x.Slot for x in self._wrapped_obj.ReferencedComponents.Items if x.Target is not None]]
 
             try:
                 indices = sort_slots(slots)

{pysimultan-0.3.0 → pysimultan-0.3.1}/src/PySimultan2/object_mapper.py

@@ -12,6 +12,7 @@ from .simultan_object import SimultanObject
 from .geometry.utils import create_python_geometry
 
 from SIMULTAN.Data.Geometry import (Layer, Vertex, Edge, PEdge, Face, Volume, EdgeLoop)
+from SIMULTAN.Data.Components import SimComponent
 from .geometry.geometry_base import (SimultanLayer, SimultanVertex, SimultanEdge, SimultanEdgeLoop, SimultanFace,
                                      SimultanVolume)
 
@@ -94,31 +95,37 @@ class PythonMapper(object):
         if data_model is None:
             data_model = list(data_models)[0]
 
+        if create_all:
+            new_component_list = set()
+
+            def get_subcomponents(sim_component: Union[SimComponent, SimultanObject]):
+                print(sim_component.Id)
+                new_subcomponents = set()
+                if isinstance(sim_component, SimultanObject):
+                    sim_component = sim_component._wrapped_obj
+
+                if sim_component in new_component_list:
+                    return
+                else:
+                    new_component_list.add(sim_component)
+
+                for sub_component in sim_component.Components.Items:
+                    new_subcomponents.add(sub_component.Component)
+                for ref_component in sim_component.ReferencedComponents.Items:
+                    new_subcomponents.add(ref_component.Target)
+
+                for new_subcomponent in new_subcomponents:
+                    get_subcomponents(new_subcomponent)
+
+                new_component_list.update(new_subcomponents)
+
+            for component in component_list:
+                get_subcomponents(component)
+            component_list = list(new_component_list)
+
         for component in component_list:
             typed_object = self.create_python_object(component, data_model=data_model)
             typed_data.append(typed_object)
-            if create_all:
-
-                def get_content(typed_object):
-                    if isinstance(typed_object, SimultanObject):
-                        for content in typed_object.__class__._taxonomy_map.content:
-                            val = getattr(typed_object, content.property_name)
-                            if isinstance(val, (SimultanObject, ComponentList, ComponentDictionary)):
-                                typed_data.append(val)
-                                get_content(val)
-                    elif isinstance(typed_object, ComponentList):
-                        for item in typed_object:
-                            if isinstance(item, (SimultanObject, ComponentList, ComponentDictionary)):
-                                typed_data.append(item)
-                                get_content(item)
-                    elif isinstance(typed_object, ComponentDictionary):
-                        for item in typed_object.values():
-                            if isinstance(item, (SimultanObject, ComponentList, ComponentDictionary)):
-                                typed_data.append(item)
-                                get_content(item)
-
-                get_content(typed_object)
-
         return typed_data
 
     # @lru_cache(maxsize=None)

{pysimultan-0.3.0 → pysimultan-0.3.1}/src/PySimultan2/simultan_object.py

@@ -136,6 +136,15 @@ class SimultanObject(object, metaclass=MetaMock):
         return instance
 
     def __init__(self, *args, **kwargs):
+        """
+        Initialize the SimultanObject. This method is only called if the object is initialized the first time without a
+        wrapped_obj. If a wrapped_obj is defined, the __new__ method is called and the object can be initialized with
+        the __load_init__ method.
+
+        :param args:
+        :param kwargs:
+        """
+
         self._wrapped_obj: Union[SimComponent, None] = kwargs.get('wrapped_obj', None)
         self.__obj_init__ = kwargs.get('__obj_init__', False)
         self._data_model_id = kwargs.get('data_model_id', None)

{pysimultan-0.3.0 → pysimultan-0.3.1}/src/PySimultan2/utils.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from . import config
 from enum import Enum
+from weakref import WeakSet
 from functools import lru_cache
 import numpy as np
 import pandas as pd
@@ -45,6 +46,9 @@ class UnresolvedObject(object):
     def resolve(self):
         return self.cls._cls_instances_dict[self.wrapped_obj.Id]
 
+    def __getattr__(self, item):
+        return getattr(self.wrapped_obj, item)
+
 
 class CircularReferenceResolver(object):
 
@@ -91,11 +95,25 @@ def create_python_object(wrapped_obj: SimComponent, cls: Type[SimultanObject], *
                                                            prop_name=content.text_or_key,
                                                            object_mapper=kwargs.get('object_mapper', None),
                                                            )
+
         kwargs['name'] = wrapped_obj.Name
         kwargs['__obj_init__'] = True
-        obj = cls(wrapped_obj=wrapped_obj, *args, **kwargs)
-        obj.__obj_init__ = False
 
+        obj = cls.__new__(cls)
+        obj._wrapped_obj = wrapped_obj
+        obj._data_model = kwargs.get('data_model', None)
+        obj._object_mapper = kwargs.get('object_mapper', None)
+
+        if "_cls_instances" not in cls.__dict__:
+            cls._cls_instances = WeakSet()
+        try:
+            cls._cls_instances.add(obj)
+        except Exception as e:
+            logger.error(f'Error adding instance {obj} to _cls_instances: {e}')
+
+        if hasattr(cls, '__load_init__'):
+            obj.__init__(*args, **kwargs)
+        #
         circ_ref_resolver.unresolved_objects.pop(wrapped_obj.Id)
 
         return obj
@@ -1283,7 +1301,6 @@ def add_properties(prop_name: str,
                                    np.ndarray: set_property_to_value_field,
                                    pd.DataFrame: set_property_to_value_field}
 
-    # @lru_cache()
     def getx(self):
         return get_property(component=self,
                             prop_name=content.text_or_key,

{pysimultan-0.3.0 → pysimultan-0.3.1}/tests/test_calculate_steady_state_temperature.py

@@ -533,5 +533,3 @@ if __name__ == '__main__':
 
     # create_model()
     typed_data = load_model()
-
-    pass

pysimultan-0.3.1/tests/test_circular_references.py

@@ -0,0 +1,162 @@
+from src.PySimultan2 import FileInfo
+from src.PySimultan2 import DataModel
+from src.PySimultan2 import PythonMapper
+from src.PySimultan2.taxonomy_maps import TaxonomyMap, Content
+
+from typing import List
+
+from tests import resources
+
+try:
+    import importlib.resources as pkg_resources
+except ImportError:
+    import importlib_resources as pkg_resources
+
+with pkg_resources.path(resources, 'new_geometry_test.simultan') as r_path:
+    project_path = str(r_path)
+
+
+def create_classes() -> tuple[dict[str, type], PythonMapper]:
+
+    class Class1(object):
+        def __init__(self, *args, **kwargs):
+            self.temperature = kwargs.get('temperature', 125.15)
+            self.obj_1 = kwargs.get('obj_1', None)
+
+    class Class2(object):
+        def __init__(self, *args, **kwargs):
+            self.temperature = kwargs.get('temperature', 225.15)
+            self.obj_1 = kwargs.get('obj_1', None)
+
+    class Class3(object):
+        def __init__(self, *args, **kwargs):
+            self.temperature = kwargs.get('temperature', 325.15)
+            self.obj_1 = kwargs.get('obj_1', None)
+
+    cls_dict = {'Class1': Class1,
+                'Class2': Class2,
+                'Class3': Class3,
+                }
+
+    return cls_dict
+
+
+def create_mapped_classes(classes: dict[str, type]) -> dict[str, type]:
+    mapper = PythonMapper()
+
+    def create_contents() -> dict[str, Content]:
+        contents = {}
+
+        contents['temperature'] = Content(text_or_key='temperature',
+                                                   property_name='temperature',
+                                                   type=None,
+                                                   unit='K',
+                                                   documentation='temperature in K')
+
+        contents['obj_1'] = Content(text_or_key='obj_1',
+                                    property_name='obj_1',
+                                    type=None,
+                                    unit=None,
+                                    documentation='obj_1')
+
+        contents['obj_2'] = Content(text_or_key='obj_2',
+                                    property_name='obj_2',
+                                    type=None,
+                                    unit=None,
+                                    documentation='obj_2')
+
+        return contents
+
+    def create_mapped_cls_1(cls, contents: dict[str, Content]):
+        cls_map = TaxonomyMap(taxonomy_name='PySimultan',
+                              taxonomy_key='PySimultan',
+                              taxonomy_entry_name='Class1',
+                              taxonomy_entry_key='Class1',
+                              content=[contents['temperature'],
+                                       contents['obj_1']],
+                              )
+
+        mapper.register(cls_map.taxonomy_entry_key, cls, taxonomy_map=cls_map)
+        mapped_cls = mapper.get_mapped_class(cls_map.taxonomy_entry_key)
+        return mapped_cls
+
+    def create_mapped_cls_2(cls, contents: dict[str, Content]):
+        cls_map = TaxonomyMap(taxonomy_name='PySimultan',
+                              taxonomy_key='PySimultan',
+                              taxonomy_entry_name='Class2',
+                              taxonomy_entry_key='Class2',
+                              content=[contents['temperature'],
+                                       contents['obj_1']],
+                              )
+
+        mapper.register(cls_map.taxonomy_entry_key, cls, taxonomy_map=cls_map)
+        mapped_cls = mapper.get_mapped_class(cls_map.taxonomy_entry_key)
+        return mapped_cls
+
+    def create_mapped_cls_3(cls, contents: dict[str, Content]):
+        cls_map = TaxonomyMap(taxonomy_name='PySimultan',
+                              taxonomy_key='PySimultan',
+                              taxonomy_entry_name='Class3',
+                              taxonomy_entry_key='Class3',
+                              content=[contents['temperature'],
+                                       contents['obj_1']],
+                              )
+
+        mapper.register(cls_map.taxonomy_entry_key, cls, taxonomy_map=cls_map)
+        mapped_cls = mapper.get_mapped_class(cls_map.taxonomy_entry_key)
+        return mapped_cls
+
+    tax_contents = create_contents()
+
+    mapped_cls_1 = create_mapped_cls_1(classes['Class1'], tax_contents)
+    mapped_cls_2 = create_mapped_cls_2(classes['Class2'], tax_contents)
+    mapped_cls_3 = create_mapped_cls_3(classes['Class3'], tax_contents)
+
+    mapped_cls_dict = {'Class1': mapped_cls_1,
+                       'Class2': mapped_cls_2,
+                       'Class3': mapped_cls_3}
+
+    return mapped_cls_dict, mapper
+
+
+def create_model():
+    data_model = DataModel.create_new_project(project_path=project_path,
+                                              user_name='admin',
+                                              password='admin')
+    classes = create_classes()
+    mapped_classes, mapper = create_mapped_classes(classes)
+
+    class_1 = mapped_classes['Class1']
+    class_2 = mapped_classes['Class2']
+    class_3 = mapped_classes['Class3']
+
+    obj_1 = class_1(temperature=125.15)
+    obj_2 = class_2(temperature=225.15, obj_1=obj_1)
+    obj_3 = class_3(temperature=325.15, obj_1=obj_2)
+
+    obj_1.obj_1 = obj_2
+
+    data_model.save()
+
+    data_model.cleanup()
+    mapper.clear()
+
+
+def load_model():
+    mapped_cls_dict, mapper = create_mapped_classes(create_classes())
+
+    # create copy of the mapper to test mapper.copy
+    mapper_copy = mapper.copy()
+    data_model = DataModel(project_path=project_path,
+                           user_name='admin',
+                           password='admin')
+    typed_data = data_model.get_typed_data(mapper=mapper_copy, create_all=True)
+    class_1 = mapper.get_mapped_class('Class1')
+    obj_1 = list(class_1._cls_instances_dict.values())[0]
+    assert obj_1.obj_1.obj_1 is obj_1
+    return typed_data
+
+
+if __name__ == '__main__':
+    create_model()
+    typed_data = load_model()

{pysimultan-0.3.0 → pysimultan-0.3.1}/tests/test_set_attr_property.py

@@ -1,7 +1,7 @@
 import resources
-from PySimultan2.data_model import DataModel
-from PySimultan2.object_mapper import PythonMapper
-from PySimultan2.taxonomy_maps import TaxonomyMap, Content
+from src.PySimultan2.data_model import DataModel
+from src.PySimultan2.object_mapper import PythonMapper
+from src.PySimultan2.taxonomy_maps import TaxonomyMap, Content
 
 try:
     import importlib.resources as pkg_resources
@@ -63,3 +63,14 @@ component.set_attr_prop('value', 'ValueMax', 200)
 
 data_model.save()
 data_model.cleanup()
+mapper.clear()
+
+
+data_model = DataModel(project_path=project_path,
+                       user_name='admin',
+                       password='admin')
+
+
+typed_data = mapper.get_typed_data(component_list=data_model.data, data_model=data_model)
+
+pass