PySimultan 0.2.2__tar.gz → 0.2.4__tar.gz

{pysimultan-0.2.2/src/PySimultan.egg-info → pysimultan-0.2.4}/PKG-INFO

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

{pysimultan-0.2.2 → pysimultan-0.2.4}/pyproject.toml

@@ -1,58 +1,58 @@
-[project]
-name = "PySimultan"
-version = "0.2.2"
-authors = [
-    {name = "Max Bühler", email = "maximilian.buehler@tuwien.ac.at"}
-]
-readme = "README.md"
-requires-python = ">=3.8"
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent"
-]
-license = {file = "LICENSE.txt"}
-
-[build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[tool.black]
-# Use the more relaxed max line length permitted in PEP8.
-line-length = 99
-target-version = ["py38", "py39", "py310", "py311", "py312"]
-exclude = '''
-/(
-    \.eggs
-  | \.git
-  | \.mypy_cache
-  | \.tox
-  | \venv
-  | build
-  | dist
-  | htmlcov
-)/
-'''
-
-[tool.isort]
-profile = "black"
-line_length = 99
-force_sort_within_sections = true
-src_paths = ["docs", "src", "tests", "setup.py"]
-
-[tool.coverage.run]
-branch = true
-
-[tool.coverage.paths]
-# Files with these prefixes are treated as identical for the purposes of coverage combine.
-source = [
-    # The first path is the name to which all paths get unified
-    "src/",
-    # tox on Linux
-    ".tox/py*/lib/python*/site-packages/",
-    # tox on Windows
-    ".tox/py*/Lib/site-packages/",
-]
+[project]
+name = "PySimultan"
+version = "0.2.4"
+authors = [
+    {name = "Max Bühler", email = "maximilian.buehler@tuwien.ac.at"}
+]
+readme = "README.md"
+requires-python = ">=3.8"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent"
+]
+license = {file = "LICENSE.txt"}
+
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.black]
+# Use the more relaxed max line length permitted in PEP8.
+line-length = 99
+target-version = ["py38", "py39", "py310", "py311", "py312"]
+exclude = '''
+/(
+    \.eggs
+  | \.git
+  | \.mypy_cache
+  | \.tox
+  | \venv
+  | build
+  | dist
+  | htmlcov
+)/
+'''
+
+[tool.isort]
+profile = "black"
+line_length = 99
+force_sort_within_sections = true
+src_paths = ["docs", "src", "tests", "setup.py"]
+
+[tool.coverage.run]
+branch = true
+
+[tool.coverage.paths]
+# Files with these prefixes are treated as identical for the purposes of coverage combine.
+source = [
+    # The first path is the name to which all paths get unified
+    "src/",
+    # tox on Linux
+    ".tox/py*/lib/python*/site-packages/",
+    # tox on Windows
+    ".tox/py*/Lib/site-packages/",
+]

{pysimultan-0.2.2 → pysimultan-0.2.4}/setup.py

@@ -1,52 +1,52 @@
-#!/usr/bin/env python3
-
-from pathlib import Path
-
-import setuptools
-
-project_dir = Path(__file__).parent
-
-setuptools.setup(
-    name="PySimultan",
-    version="0.2.2",
-    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"),
-    keywords=["python"],
-    author="Max Buehler",
-    url="",
-    packages=setuptools.find_packages("src"),
-    package_dir={"": "src"},
-    package_data={
-            # This assumes your package is named "your_package_name"
-            "PySimultan2": ["resources/*", "tests/*"]
-        },
-    # pip 9.0+ will inspect this field when installing to help users install a
-    # compatible version of the library for their Python version.
-    python_requires=">=3.10",
-    setup_requires=["wheel"],
-    # There are some peculiarities on how to include package data for source
-    # distributions using setuptools. You also need to add entries for package
-    # data to MANIFEST.in.
-    # See https://stackoverflow.com/questions/7522250/
-    include_package_data=True,
-    # This is a trick to avoid duplicating dependencies between both setup.py and
-    # requirements.txt.
-    # requirements.txt must be included in MANIFEST.in for this to work.
-    # It does not work for all types of dependencies (e.g. VCS dependencies).
-    # For VCS dependencies, use pip >= 19 and the PEP 508 syntax.
-    #   Example: 'requests @ git+https://github.com/requests/requests.git@branch_or_tag'
-    #   See: https://github.com/pypa/pip/issues/6162
-    install_requires=project_dir.joinpath("requirements.txt").read_text().split("\n"),
-    zip_safe=False,
-    license="MIT",
-    license_files=["LICENSE.txt"],
-    classifiers=[
-        "Development Status :: 4 - Beta",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3 :: Only",
-    ],
-)
+#!/usr/bin/env python3
+
+from pathlib import Path
+
+import setuptools
+
+project_dir = Path(__file__).parent
+
+setuptools.setup(
+    name="PySimultan",
+    version="0.2.4",
+    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"),
+    keywords=["python"],
+    author="Max Buehler",
+    url="",
+    packages=setuptools.find_packages("src"),
+    package_dir={"": "src"},
+    package_data={
+            # This assumes your package is named "your_package_name"
+            "PySimultan2": ["resources/*", "tests/*"]
+        },
+    # pip 9.0+ will inspect this field when installing to help users install a
+    # compatible version of the library for their Python version.
+    python_requires=">=3.10",
+    setup_requires=["wheel"],
+    # There are some peculiarities on how to include package data for source
+    # distributions using setuptools. You also need to add entries for package
+    # data to MANIFEST.in.
+    # See https://stackoverflow.com/questions/7522250/
+    include_package_data=True,
+    # This is a trick to avoid duplicating dependencies between both setup.py and
+    # requirements.txt.
+    # requirements.txt must be included in MANIFEST.in for this to work.
+    # It does not work for all types of dependencies (e.g. VCS dependencies).
+    # For VCS dependencies, use pip >= 19 and the PEP 508 syntax.
+    #   Example: 'requests @ git+https://github.com/requests/requests.git@branch_or_tag'
+    #   See: https://github.com/pypa/pip/issues/6162
+    install_requires=project_dir.joinpath("requirements.txt").read_text().split("\n"),
+    zip_safe=False,
+    license="MIT",
+    license_files=["LICENSE.txt"],
+    classifiers=[
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3 :: Only",
+    ],
+)

{pysimultan-0.2.2 → pysimultan-0.2.4/src/PySimultan.egg-info}/PKG-INFO

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

{pysimultan-0.2.2 → pysimultan-0.2.4}/src/PySimultan2/data_model.py

@@ -8,7 +8,7 @@ from weakref import WeakSet, WeakValueDictionary
 from . import config
 from .utils import *
 from pathlib import PosixPath, WindowsPath
-from typing import Union, Tuple
+from typing import Union, Tuple, TYPE_CHECKING
 
 
 # from SIMULTAN import Projects
@@ -17,7 +17,7 @@ from SIMULTAN.Projects import ExtendedProjectData
 # noinspection PyUnresolvedReferences
 from SIMULTAN import Utils
 # noinspection PyUnresolvedReferences
-from SIMULTAN.Data import Users
+from SIMULTAN.Data import Users as SimultanUsers
 # from SIMULTAN.Serializer import Projects
 from SIMULTAN.Serializer.SimGeo import *
 from SIMULTAN.Serializer.Projects import *
@@ -44,10 +44,14 @@ from System.Text import *
 from .files import add_tag_to_resource
 
 
+if TYPE_CHECKING:
+    from .object_mapper import PythonMapper
+
+
 logger = getLogger('PySimultan')
 
 
-class IAuthenticationServiceNew(Users.IAuthenticationService):
+class IAuthenticationServiceNew(SimultanUsers.IAuthenticationService):
     __namespace__ = "authenticate_namespace"
 
     user_name = None
@@ -88,13 +92,13 @@ class DataModel:
 
         passwordArray = Encoding.UTF8.GetBytes(password)
         encryptionKey = RandomNumberGenerator.GetBytes(32)
-        encryptedEncryptionKey = Users.SimUsersManager.EncryptEncryptionKey(encryptionKey, passwordArray)
-        passwordHash = Users.SimUsersManager.HashPassword(passwordArray)
-        initialUser = Users.SimUser(Guid.NewGuid(),
-                                    user_name,
-                                    passwordHash,
-                                    encryptedEncryptionKey,
-                                    Users.SimUserRole.ADMINISTRATOR)
+        encryptedEncryptionKey = SimultanUsers.SimUsersManager.EncryptEncryptionKey(encryptionKey, passwordArray)
+        passwordHash = SimultanUsers.SimUsersManager.HashPassword(passwordArray)
+        initialUser = SimultanUsers.SimUser(Guid.NewGuid(),
+                                            user_name,
+                                            passwordHash,
+                                            encryptedEncryptionKey,
+                                            SimultanUsers.SimUserRole.ADMINISTRATOR)
 
         tempPath = Path.GetTempPath()
         projectFile = FileInfo(project_path)
@@ -151,7 +155,7 @@ class DataModel:
         self.i_aut_service.user_name = self.user_name
         self.i_aut_service.password = self.password
 
-        self.service_provider.AddService[Users.IAuthenticationService](self.i_aut_service())
+        self.service_provider.AddService[SimultanUsers.IAuthenticationService](self.i_aut_service())
 
         # self.serv = GeometryViewerService([], self.service_provider)
         # self.service_provider.AddService[IGeometryViewerService](self.serv)
@@ -249,13 +253,13 @@ class DataModel:
         self._project_data_manager = value
 
     @property
-    def user(self) -> Users.SimUserRole:
+    def user(self) -> SimultanUsers.SimUserRole:
         if self._user is None:
-            self._user = Users.SimUserRole.ADMINISTRATOR
+            self._user = SimultanUsers.SimUserRole.ADMINISTRATOR
         return self._user
 
     @user.setter
-    def user(self, value: Users.SimUserRole):
+    def user(self, value: SimultanUsers.SimUserRole):
         if value != self._user:
             self.project_data_manager = None
             self._project = None
@@ -279,7 +283,7 @@ class DataModel:
     def project(self, value):
         self._project = value
 
-    def get_typed_data(self, mapper, create_all=False) -> list[SimultanObject]:
+    def get_typed_data(self, mapper: 'PythonMapper', create_all=False) -> list[SimultanObject]:
         """
         Return the typed data from the project
         :param mapper:

{pysimultan-0.2.2 → pysimultan-0.2.4}/src/PySimultan2/object_mapper.py

@@ -66,6 +66,7 @@ class PythonMapper(object):
         new_class_dict = {'__init__': new_init,
                           '__name__': cls.__name__,
                           '_taxonomy': taxonomy,
+                          '_cls_instances': WeakSet(),
                           '_taxonomy_map': self.taxonomy_maps.get(taxonomy, None),
                           '_base': bases,
                           '_object_mapper': self}
@@ -192,6 +193,9 @@ class PythonMapper(object):
         return prop_dict
 
     def clear(self):
+        for cls in self.registered_classes.values():
+            cls._cls_instances = WeakSet()
+
         for cls in self.mapped_classes.values():
             cls._cls_instances = WeakSet()
 

{pysimultan-0.2.2 → pysimultan-0.2.4}/src/PySimultan2/simultan_object.py

@@ -109,7 +109,6 @@ class SimultanObject(object, metaclass=MetaMock):
     @classproperty
     def cls_instances(cls) -> list['SimultanObject']:
         try:
-            _ = cls._cls_instances
             return list(cls._cls_instances)
         except Exception as e:
             logger.error(f'Error getting cls_instances: {e}')
@@ -123,7 +122,7 @@ class SimultanObject(object, metaclass=MetaMock):
 
     def __new__(cls, *args, **kwargs):
         instance = super().__new__(cls)
-        if not hasattr(cls, '_cls_instances'):
+        if "_cls_instances" not in cls.__dict__:
             cls._cls_instances = WeakSet()
         try:
             cls._cls_instances.add(instance)

{pysimultan-0.2.2 → pysimultan-0.2.4}/src/PySimultan2/utils.py

@@ -5,7 +5,7 @@ from enum import Enum
 from functools import lru_cache
 import numpy as np
 import pandas as pd
-from typing import List as TypeList, Union, Optional
+from typing import List as TypeList, Union, Optional, Type
 from SIMULTAN.Data.Components import (ComponentWalker, SimComponent, SimBoolParameter, SimDoubleParameter,
                                       SimEnumParameter, SimIntegerParameter, SimStringParameter, ComponentMapping,
                                       SimSlot, SimComponentVisibility, SimChildComponentEntry, SimDefaultSlots,
@@ -55,7 +55,7 @@ class CircularReferenceResolver(object):
 circ_ref_resolver = CircularReferenceResolver()
 
 
-def create_python_object(wrapped_obj: SimComponent, cls: SimultanObject, *args, **kwargs):
+def create_python_object(wrapped_obj: SimComponent, cls: Type[SimultanObject], *args, **kwargs):
     """
     Create a new mapped python object from a wrapped object
     :param wrapped_obj: wrapped object to create the python object from

{pysimultan-0.2.2 → pysimultan-0.2.4}/tests/test_calculate_steady_state_temperature.py

@@ -1,14 +1,14 @@
-from PySimultan2 import FileInfo
-from PySimultan2 import DataModel
-from PySimultan2 import PythonMapper
-from PySimultan2.taxonomy_maps import TaxonomyMap, Content
+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
-from PySimultan2.geometry.geometry_base import (GeometryModel, SimultanLayer, SimultanVertex, SimultanEdge,
+from src.PySimultan2.geometry.geometry_base import (GeometryModel, SimultanLayer, SimultanVertex, SimultanEdge,
                                                     SimultanEdgeLoop, SimultanFace, SimultanVolume)
-from PySimultan2.geometry.utils import create_cube
+from src.PySimultan2.geometry.utils import create_cube
 
 try:
     import importlib.resources as pkg_resources
@@ -20,17 +20,12 @@ with pkg_resources.path(resources, 'new_geometry_test.simultan') as r_path:
     project_path = str(r_path)
 
 
-data_model = DataModel.create_new_project(project_path=project_path,
-                                          user_name='admin',
-                                          password='admin')
-
-
-def create_geometry_model(name='new_geometry_test'):
+def create_geometry_model(name='new_geometry_test', data_model=None):
     return GeometryModel(name=name,
                          data_model=data_model)
 
 
-def create_classes() -> dict[str, type]:
+def create_classes() -> tuple[dict[str, type], PythonMapper]:
 
     class Source(object):
         def __init__(self, *args, **kwargs):
@@ -400,16 +395,21 @@ def create_mapped_classes(classes: dict[str, type]) -> dict[str, type]:
                        'HeatFluxBoundaryCondition': mapped_heat_flux_bc_cls,
                        'Source': mapped_source_cls}
 
-    return mapped_cls_dict
+    return mapped_cls_dict, mapper
 
 
-if __name__ == '__main__':
-    geo_model = create_geometry_model(name='new_geometry_test')
+def create_model():
+    data_model = DataModel.create_new_project(project_path=project_path,
+                                              user_name='admin',
+                                              password='admin')
+
+    geo_model = create_geometry_model(name='new_geometry_test',
+                                      data_model=data_model)
 
     cube = create_cube(data_model, geo_model, scale=10)
 
     classes = create_classes()
-    mapped_classes = create_mapped_classes(classes)
+    mapped_classes, mapper = create_mapped_classes(classes)
 
     Material = mapped_classes['Material']
     WallLayer = mapped_classes['Layer']
@@ -510,3 +510,25 @@ if __name__ == '__main__':
 
     data_model.save()
     data_model.cleanup()
+    mapper.clear()
+
+
+def load_model():
+
+    mapped_cls_dict, mapper = create_mapped_classes(create_classes())
+    data_model = DataModel(project_path=project_path,
+                           user_name='admin',
+                           password='admin')
+    typed_data = data_model.get_typed_data(mapper=mapper)
+    zone_cls = mapper.get_mapped_class('Zone')
+    zone1 = zone_cls.cls_instances[0]
+    zone1.calculate_steady_state_temperature()
+    return typed_data
+
+
+if __name__ == '__main__':
+
+    #create_model()
+    typed_data = load_model()
+
+    pass