PySimultan 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

{PySimultan-0.2.2.dist-info → PySimultan-0.2.4.dist-info}/METADATA

@@ -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.dist-info → PySimultan-0.2.4.dist-info}/RECORD

@@ -1,13 +1,13 @@
 PySimultan2/__init__.py,sha256=X10eSCNtac3CG28w7Ogo1csNalhapO9V4oVSIucc0Kw,1121
 PySimultan2/config.py,sha256=Bazt2vDSEga_cFEIPWcAYBsj3TUN5jgtob8TtUvGm5E,1523
-PySimultan2/data_model.py,sha256=juyjhyYwewkh_VCeopSM9JDNFGKsjH30pC-ATDJsZy8,27784
+PySimultan2/data_model.py,sha256=2Qq_JyUxtDgsIt3p5hIXIqNy7eAtvn-6Of_Wzb9AWoE,28004
 PySimultan2/default_types.py,sha256=1HJ6IZt3Lm3Hhq3A9dDmvIO46Fk9bGqDng6yTtYKmO4,22585
 PySimultan2/files.py,sha256=q6A5KTqU1nCwh0W0Qf3Se7qcvhGiDAWza2v-X-rt6E4,12473
 PySimultan2/multi_values.py,sha256=w8fy0Is5Eqr4dQ0De0ikWH__qtWtvC6NGEYreIW7VUw,12961
-PySimultan2/object_mapper.py,sha256=dg5Nw_oEWb3jTRFAU4CopNGsereITGcdHM1ZoKO_qNk,8564
-PySimultan2/simultan_object.py,sha256=XvjoqmbSG0R9kEvD4lXS4IMCZrI2_Zp5TatxGnwYxBk,15101
+PySimultan2/object_mapper.py,sha256=fpr8HsnMfhzCNSLenWHDyUtkKQdeCjaSdjIV5ofmed8,8720
+PySimultan2/simultan_object.py,sha256=Kv6UziARvvYmTcuagA8k3HrAUwWVNO3BrvUqeA3LpzE,15067
 PySimultan2/taxonomy_maps.py,sha256=qgKM0CdwwgLCFj-ivzY38VaCpE_eCPKyCiBaTBazpBk,7509
-PySimultan2/utils.py,sha256=5Qrlbsd3K-sZsBUl2hHGl-JV-WJtN2_GTZshMv-dcl0,61849
+PySimultan2/utils.py,sha256=uxnvqa6JYo28h8eDg1hbxXithVNUImn9JkbW6TtGdFE,61861
 PySimultan2/geometry/__init__.py,sha256=nJolTD1i5J8qUkOQa-r3D20aq3Co3sN31Xc0n4wJpJo,248
 PySimultan2/geometry/geometry_base.py,sha256=9qePzRroQ4vDckTT9L7vI4KMydpYO8Rsj5OvbU4ZRSo,23367
 PySimultan2/geometry/utils.py,sha256=K_3HnqPMAlJkOh01oqjspeqsLrooG9NwIQKWf14IJ48,8513
@@ -75,8 +75,8 @@ PySimultan2/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 PySimultan2/resources/assimp.dll,sha256=HwfDwXqoPDTFRyoQpA3qmgZoUdFtziJkV5fNtktEZEU,6081536
 PySimultan2/resources/defaultsettings.xml,sha256=s6Tk1tubLz5UYqXZWpD42EDHzedemRY1nEneoIVcUfg,392
 PySimultan2/resources/setup.bat,sha256=fjvvYfVM6TalS-QTSiKAbAId5nTsk8kGGo06ba-wWaY,32
-PySimultan-0.2.2.dist-info/LICENSE.txt,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-PySimultan-0.2.2.dist-info/METADATA,sha256=cPZkD23Jxyx1CpBLoZ-4GM_4PvhfpIxc3WgChMkDHow,1801
-PySimultan-0.2.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-PySimultan-0.2.2.dist-info/top_level.txt,sha256=pbE6SbdKIEEK4vaDNmmdRTj0vesrjgRXGow8QWMTXvk,12
-PySimultan-0.2.2.dist-info/RECORD,,
+PySimultan-0.2.4.dist-info/LICENSE.txt,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
+PySimultan-0.2.4.dist-info/METADATA,sha256=xShPfKbqMDA-N_l9VH0D7zjayN8IlAlEj4ENWxeGggw,1801
+PySimultan-0.2.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+PySimultan-0.2.4.dist-info/top_level.txt,sha256=pbE6SbdKIEEK4vaDNmmdRTj0vesrjgRXGow8QWMTXvk,12
+PySimultan-0.2.4.dist-info/RECORD,,

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:

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()
 

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)

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