PySimultan 0.4.12__tar.gz → 0.4.14__tar.gz

{pysimultan-0.4.12 → pysimultan-0.4.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.4.12
+Version: 0.4.14
 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.14/src/PySimultan2/__about__.py

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

{pysimultan-0.4.12 → pysimultan-0.4.14}/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
@@ -120,11 +127,6 @@ class DataModel:
 
         instance = super().__new__(cls)
         config.set_default_data_model(instance)
-        try:
-            data_models.add(instance)
-        except Exception as e:
-            logger.error(f'Error adding instance {instance} to data_models: {e}')
-        return instance
 
     def __init__(self, *args, **kwargs):
         """
@@ -140,7 +142,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 +378,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.12 → pysimultan-0.4.14}/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
 
@@ -128,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()
@@ -301,6 +300,13 @@ class PythonMapper(object):
         if remove_from_default and config.get_default_mapper() is self:
             config.set_default_mapper(None)
 
+    def create_sim_component(self,
+                             obj,
+                             data_model: 'DataModel'):
+        from . utils import create_mapped_python_object
+        new_val = create_mapped_python_object(obj, self, data_model)
+        return new_val
+
     def copy(self):
         new_mapper = PythonMapper()
         new_mapper.registered_classes = self.registered_classes

{pysimultan-0.4.12 → pysimultan-0.4.14}/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.12 → pysimultan-0.4.14}/src/PySimultan2/utils.py

@@ -4,7 +4,7 @@ from enum import Enum
 from weakref import WeakSet
 import numpy as np
 import pandas as pd
-from typing import List as TypeList, Union, Optional, Type
+from typing import List as TypeList, Union, Optional, Type, Any, TYPE_CHECKING
 from SIMULTAN.Data.Components import (ComponentWalker, SimComponent, SimBoolParameter, SimDoubleParameter,
                                       SimEnumParameter, SimIntegerParameter, SimStringParameter, ComponentMapping,
                                       SimSlot, SimComponentVisibility, SimChildComponentEntry, SimDefaultSlots,
@@ -21,7 +21,6 @@ from .multi_values import (simultan_multi_value_field_3d_to_numpy, set_parameter
                            create_field_parameter, simultan_multi_value_big_table_to_pandas)
 from .files import FileInfo, remove_asset_from_component, add_asset_to_component
 
-from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from .default_types import ComponentList, ComponentDictionary
     from .simultan_object import SimultanObject
@@ -125,7 +124,7 @@ def create_python_object(wrapped_obj: SimComponent, cls: Type[SimultanObject], *
             logger.error(f'Error adding instance {obj} to _cls_instances: {e}')
 
         if hasattr(cls, '__load_init__'):
-            obj.__init__(*args, **kwargs)
+            obj.__load_init__(*args, **kwargs)
         #
         circ_ref_resolver.unresolved_objects.pop(wrapped_obj.Id)
 
@@ -867,7 +866,7 @@ param_type_lookup_dict = {str: SimStringParameter,
                           bool: SimBoolParameter}
 
 
-def create_mapped_python_object(value: SimComponent,
+def create_mapped_python_object(value: Any,
                                 object_mapper: PythonMapper,
                                 data_model: DataModel,
                                 add_to_data_model=True) -> SimultanObject:
@@ -885,8 +884,9 @@ def create_mapped_python_object(value: SimComponent,
 
     # logger.debug(f'Creating mapped python object for {value}.')
     if type(value) in object_mapper.registered_classes.values():
-        key = list(filter(lambda x: object_mapper.registered_classes[x] ==
-                                    type(value), object_mapper.registered_classes))[0]
+        key = list(filter(lambda x: object_mapper.registered_classes[x] == type(value),
+                          object_mapper.registered_classes)
+                   )[0]
         mapped_cls = object_mapper.get_mapped_class(key)
         new_val = mapped_cls(**value.__dict__,
                              data_model=data_model,
@@ -1346,7 +1346,7 @@ def add_properties(prop_name: str,
     getx.__taxonomy__ = taxonomy
     content = taxonomy_map.get_content_by_property_name(prop_name)
 
-    def setx(self, value: Union[int, float, SimComponent, SimultanObject]):
+    def setx(self, value: Union[int, float, str, tuple, set, SimComponent, SimultanObject]):
         self.__property_cache__.pop(content.text_or_key, None)
 
         slot_extension = content.slot_extension

pysimultan-0.4.12/src/PySimultan2/__about__.py

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