PySimultan 0.4.11__tar.gz → 0.4.13__tar.gz

{pysimultan-0.4.11 → pysimultan-0.4.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.4.11
+Version: 0.4.13
 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

pysimultan-0.4.13/src/PySimultan2/__about__.py

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

{pysimultan-0.4.11 → pysimultan-0.4.13}/src/PySimultan2/data_model.py

@@ -3,7 +3,6 @@ import os
 import shutil
 from uuid import uuid4
 from colorlog import getLogger
-from weakref import WeakSet, WeakValueDictionary
 from . import config
 from .utils import *
 from pathlib import PosixPath, WindowsPath
@@ -73,8 +72,16 @@ class IAuthenticationServiceNew(SimultanUsers.IAuthenticationService):
         return user.Item1
 
 
-data_models = WeakSet()
-data_models_dict = WeakValueDictionary()
+# data_models = WeakSet()
+# data_models_dict = WeakValueDictionary()
+
+
+# def get_default_data_model():
+#     return data_models[0]
+#
+#
+# def add_data_model(data_model):
+#     data_models.add(data_model)
 
 
 # noinspection PyUnresolvedReferences
@@ -121,7 +128,7 @@ class DataModel:
         instance = super().__new__(cls)
         config.set_default_data_model(instance)
         try:
-            data_models.add(instance)
+            default_data_model.set_default_data_model(instance)
         except Exception as e:
             logger.error(f'Error adding instance {instance} to data_models: {e}')
         return instance
@@ -140,7 +147,6 @@ class DataModel:
         atexit.register(self.cleanup)
 
         self.id = uuid4()
-        data_models_dict[self.id] = self
         self.data = None
         self._project_data_manager = None
         self._user = None
@@ -377,9 +383,6 @@ class DataModel:
                 del self._project_data_manager
             self._project_data_manager = None
 
-            data_models = WeakSet()
-            data_models_dict = WeakValueDictionary()
-
             if config.get_default_data_model() is self:
                 config.set_default_data_model(None)
 

{pysimultan-0.4.11 → pysimultan-0.4.13}/src/PySimultan2/object_mapper.py

@@ -5,7 +5,6 @@ from colorlog import getLogger
 from weakref import WeakSet
 
 from . import config
-from .data_model import data_models
 from .utils import create_python_object, add_properties
 from .default_types import ComponentList, component_list_map, ComponentDictionary, component_dict_map
 
@@ -40,6 +39,8 @@ class PythonMapper(object):
 
     def __init__(self, *args, **kwargs):
 
+        self._mapped_classes = {}
+
         self.name = kwargs.get('name', 'PythonMapper')
         self.registered_classes: dict[str: SimultanObject] = copy(default_registered_classes)  # dict with all registered classes: {taxonomy: class}
 
@@ -58,6 +59,19 @@ class PythonMapper(object):
         self.re_register = False
         self.load_undefined = False
 
+    @property
+    def mapped_classes(self):
+        if len(self.registered_classes) > len(self._mapped_classes):
+            for taxonomy in self.registered_classes.keys():
+                if self._mapped_classes.get(taxonomy, None) is None:
+                    self.create_mapped_class(taxonomy, self.registered_classes[taxonomy])
+
+        return self._mapped_classes
+
+    @mapped_classes.setter
+    def mapped_classes(self, value):
+        self._mapped_classes = value
+
     def register(self, taxonomy, cls, taxonomy_map=None):
         if not self.re_register and taxonomy in self.registered_classes.keys():
             return
@@ -95,7 +109,7 @@ class PythonMapper(object):
         new_class_dict.update(self.get_properties(taxonomy))
         new_class = type(cls.__name__, bases, new_class_dict)
 
-        self.mapped_classes[taxonomy] = new_class
+        self._mapped_classes[taxonomy] = new_class
 
         return new_class
 
@@ -113,7 +127,7 @@ class PythonMapper(object):
             component_list = list(data_model.data.Items)
 
         if data_model is None:
-            data_model = list(data_models)[0]
+            data_model = config.get_default_data_model()
 
         if create_all:
             new_component_list = set()

{pysimultan-0.4.11 → pysimultan-0.4.13}/src/PySimultan2/simultan_object.py

@@ -2,7 +2,7 @@ import hashlib
 import json
 
 from copy import copy
-from weakref import WeakSet, WeakValueDictionary
+from weakref import WeakSet
 from . import utils
 from numpy import ndarray
 import colorlog
@@ -63,20 +63,15 @@ class MetaMock(type):
 
             data_model = kwargs.get('data_model', None)
             if data_model is None:
-                from .data_model import data_models
-                if list(data_models.data).__len__() == 1:
-                    data_model = list(data_models.data)[0]()
+                if config.get_default_data_model() is not None:
+                    logger.warning(
+                        f'No data model provided. Using default data model: {config.get_default_data_model().id}')
+                    data_model = config.get_default_data_model()
                     kwargs['data_model'] = data_model
                 else:
-                    if config.get_default_data_model() is not None:
-                        logger.warning(
-                            f'No data model provided. Using default data model: {config.get_default_data_model().id}')
-                        data_model = config.get_default_data_model()
-                        kwargs['data_model'] = data_model
-                    else:
-                        raise TypeError((f'Error creating new instance of class {cls.__name__}:\n'
-                                         f'Any data model was defined. Tried to use default data model but there are multiple datamodels.\n'
-                                         f'Define the data model to use with the key: data_model'))
+                    raise TypeError((f'Error creating new instance of class {cls.__name__}:\n'
+                                     f'Any data model was defined. Tried to use default data model but there are multiple datamodels.\n'
+                                     f'Define the data model to use with the key: data_model'))
 
             wrapped_obj = cls.create_simultan_component(*args, **kwargs)
 

pysimultan-0.4.11/src/PySimultan2/__about__.py

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