PySimultan 0.4.1__tar.gz → 0.4.3__tar.gz

{pysimultan-0.4.1 → pysimultan-0.4.3}/PKG-INFO

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

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

{pysimultan-0.4.1 → pysimultan-0.4.3}/src/PySimultan2/__init__.py

@@ -91,6 +91,12 @@ class Config:
     def get_default_mapper(self, *args, **kwargs):
         return self._default_mapper
 
+    def set_default_data_model(self, data_model):
+        self._default_data_model = data_model
+
+    def set_default_mapper(self, mapper):
+        self._default_mapper = mapper
+
 
 config = Config()
 

{pysimultan-0.4.1 → pysimultan-0.4.3}/src/PySimultan2/data_model.py

@@ -119,7 +119,7 @@ class DataModel:
     def __new__(cls, *args, **kwargs):
 
         instance = super().__new__(cls)
-        config.default_data_model = instance
+        config.set_default_data_model(instance)
         try:
             data_models.add(instance)
         except Exception as e:
@@ -378,8 +378,8 @@ class DataModel:
             data_models = WeakSet()
             data_models_dict = WeakValueDictionary()
 
-            if config.default_data_model is self:
-                config.default_data_model = None
+            if config.get_default_data_model() is self:
+                config.set_default_data_model(None)
 
             del self
 

{pysimultan-0.4.1 → pysimultan-0.4.3}/src/PySimultan2/default_types.py

@@ -117,7 +117,7 @@ class ComponentList(SimultanObject):
                         [all_components[i] for i in np.argsort(indices)]]
             except TypeError as e:
                 logger.warning(f'Could not sort list {all_components}:\n{e}')
-                return [self._object_mapper.create_python_object(x) for x in all_components]
+                return [self._object_mapper.create_python_object(x, data_model=self._data_model) for x in all_components]
         except Exception as e:
             logger.error(f'Could not get data from list {self}:\n{e}')
             return []
@@ -249,11 +249,12 @@ class ComponentList(SimultanObject):
         if isinstance(i, slice):
             if self._object_mapper is None:
                 return self.__class__(self.data[i])
-            return [self._object_mapper.create_python_object(x) for x in self.__class__(self.data[i])]
+            return [self._object_mapper.create_python_object(x, data_model=self._data_model)
+                    for x in self.__class__(self.data[i])]
         else:
             if self._object_mapper is None:
                 return self.data[i]
-            return self._object_mapper.create_python_object(self.data[i])
+            return self._object_mapper.create_python_object(self.data[i], data_model=self._data_model)
 
     def __repr__(self):
         return f'List {self.name}: ' + repr(list(self.data))
@@ -278,13 +279,13 @@ class ComponentList(SimultanObject):
             return None
 
         if self._wrapped_obj.Parent is not None:
-            return self._object_mapper.create_python_object(self._wrapped_obj.Parent)
+            return self._object_mapper.create_python_object(self._wrapped_obj.Parent, data_model=self._data_model)
         else:
             return None
 
     @property
     def referenced_by(self):
-        return set([self._object_mapper.create_python_object(x.Target) for x in self._wrapped_obj.ReferencedBy if
+        return set([self._object_mapper.create_python_object(x.Target, data_model=self._data_model) for x in self._wrapped_obj.ReferencedBy if
                     x.Target != self._wrapped_obj])
 
     def clear(self):

{pysimultan-0.4.1 → pysimultan-0.4.3}/src/PySimultan2/files.py

@@ -20,7 +20,7 @@ from SIMULTAN.Data.Components import SimComponent, ComponentMapping
 
 # from .config import default_data_model
 
-from . import config
+from . import config, logger
 
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
@@ -197,7 +197,7 @@ class FileInfo(object, metaclass=MetaMock):
         :return: FileInfo
         """
 
-        data_model = kwargs.get('data_model', config.default_data_model)
+        data_model = kwargs.get('data_model', config.get_default_data_model())
         resource = create_asset_from_string(filename, content, *args, **kwargs)
 
         file_info = cls(resource_entry=resource,
@@ -241,8 +241,8 @@ class FileInfo(object, metaclass=MetaMock):
     def resource_entry(self) -> Union[ResourceFileEntry, ContainedResourceFileEntry, None]:
         if self._resource_entry is None:
             if self.data_model is None:
-                logger.warning(f'No data model provided. Using default data model: {config.default_data_model.id}.')
-                self.data_model = config.default_data_model
+                logger.warning(f'No data model provided. Using default data model: {config.get_default_data_model().id}.')
+                self.data_model = config.get_default_data_model()
             if self.data_model is not None:
                 self.resource_entry = self.data_model.add_resource(self.file_path)
         return self._resource_entry

{pysimultan-0.4.1 → pysimultan-0.4.3}/src/PySimultan2/geometry/geometry_base.py

@@ -63,7 +63,7 @@ class BaseGeometry(object, metaclass=MetaMock):
     def __init__(self, *args, **kwargs):
         self._wrapped_object: Union[Vertex, Edge, Face, Volume, EdgeLoop, Layer] = kwargs.get('wrapped_object', None)
         self._geometry_model: Optional[GeometryModel] = kwargs.get('geometry_model', None)
-        self._object_mapper = kwargs.get('object_mapper', config.default_mapper)
+        self._object_mapper = kwargs.get('object_mapper', config.get_default_mapper())
         self._data_model = kwargs.get('data_model', None)
 
     @property
@@ -537,7 +537,7 @@ class GeometryModel(object, metaclass=MetaMock):
     @classmethod
     def create_simultan_instance(cls, *args, **kwargs):
 
-        data_model: DataModel = kwargs.get('data_model', config.default_data_model)
+        data_model: DataModel = kwargs.get('data_model', config.get_default_data_model())
         name: str = kwargs.get('name', 'GeometryModel')
 
         new_geo_model, resource = data_model.create_new_geometry_model(name=name)
@@ -549,8 +549,8 @@ class GeometryModel(object, metaclass=MetaMock):
 
     def __init__(self, *args, **kwargs):
         self._wrapped_object: NetGeometryModel = kwargs.get('wrapped_object', None)
-        self._object_mapper = kwargs.get('object_mapper', config.default_mapper)
-        self._data_model = kwargs.get('data_model', config.default_data_model)
+        self._object_mapper = kwargs.get('object_mapper', config.get_default_mapper())
+        self._data_model = kwargs.get('data_model', config.get_default_data_model())
 
     @property
     def name(self):

{pysimultan-0.4.1 → pysimultan-0.4.3}/src/PySimultan2/object_mapper.py

@@ -29,10 +29,12 @@ class PythonMapper(object):
 
     def __new__(cls, *args, **kwargs):
         instance = super(PythonMapper, cls).__new__(cls)
-        config.default_mapper = instance
+        config.set_default_mapper(instance)
         return instance
 
     def __init__(self, *args, **kwargs):
+
+        self.name = kwargs.get('name', 'PythonMapper')
         self.registered_classes = default_registered_classes   # dict with all registered classes: {taxonomy: class}
         self.mapped_classes = default_mapped_classes           # dict with all mapped classes: {taxonomy: class}
         self.taxonomy_maps = default_taxonomy_maps             # dict with all taxonomie maps: {taxonomy: taxonomie_map}
@@ -136,20 +138,14 @@ class PythonMapper(object):
             typed_data.append(typed_object)
         return typed_data
 
-    # @lru_cache(maxsize=500)
-    def create_python_object(self, component, cls=None, data_model=None, *args, **kwargs):
+    def create_python_geometry_object(self, component, data_model=None, *args, **kwargs):
 
         if component is None:
             return None
 
         if data_model is None:
-            logger.warning(f'No data model provided. Using default data model: {config.default_data_model.id}.')
-            data_model = config.default_data_model
-            data_model_id = data_model.id
-            # data_model_id = list(data_models)[0].id
-            # data_model = list(data_models)[0]
-        else:
-            data_model_id = data_model.id
+            logger.warning(f'No data model provided. Using default data model: {config.get_default_data_model().id}.')
+            data_model = config.get_default_data_model()
 
         if isinstance(component, (Layer, Vertex, Edge, PEdge, Face, Volume, EdgeLoop)):
             if isinstance(component, Layer):
@@ -157,7 +153,22 @@ class PythonMapper(object):
             else:
                 geometry_model = component.Layer.Model.Model
             cls = self.registered_geometry_classes[type(component)]
-            return create_python_geometry(cls, component, data_model_id, self, geometry_model)
+            return create_python_geometry(cls, component, data_model, self, geometry_model)
+        else:
+            self.create_python_object(component, data_model, *args, **kwargs)
+
+    # @lru_cache(maxsize=500)
+    def create_python_object(self, component, cls=None, data_model=None, *args, **kwargs):
+
+        if component is None:
+            return None
+
+        if data_model is 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()
+
+        if isinstance(component, (Layer, Vertex, Edge, PEdge, Face, Volume, EdgeLoop)):
+            self.create_python_geometry_object(component, data_model, *args, **kwargs)
 
         if cls is None:
             c_slots = [x.Target.Key for x in component.Slots.Items]
@@ -181,10 +192,8 @@ class PythonMapper(object):
         else:
             return create_python_object(component,
                                         cls,
-                                        data_model_id=data_model_id,
                                         object_mapper=self,
                                         data_model=data_model,
-
                                         *args,
                                         **kwargs)
 
@@ -219,8 +228,8 @@ class PythonMapper(object):
             cls._cls_instances = WeakSet()
             cls.__property_cache__ = {}
 
-        if config.default_mapper is self:
-            config.default_mapper = None
+        if config.get_default_mapper() is self:
+            config.set_default_mapper(None)
 
     def copy(self):
         new_mapper = PythonMapper()
@@ -231,4 +240,4 @@ class PythonMapper(object):
 
 
 if config.get_default_mapper() is None:
-    config._default_mapper = PythonMapper()
+    config.set_default_mapper(PythonMapper())

{pysimultan-0.4.1 → pysimultan-0.4.3}/src/PySimultan2/simultan_object.py

@@ -68,10 +68,10 @@ class MetaMock(type):
                     data_model = list(data_models.data)[0]()
                     kwargs['data_model'] = data_model
                 else:
-                    if config.default_data_model is not None:
+                    if config.get_default_data_model() is not None:
                         logger.warning(
-                            f'No data model provided. Using default data model: {config.default_data_model.id}.')
-                        data_model = config.default_data_model
+                            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'
@@ -154,8 +154,8 @@ class SimultanObject(object, metaclass=MetaMock):
 
         self._wrapped_obj: Union[SimComponent, None] = kwargs.get('wrapped_obj', None)
         self.__obj_init__ = kwargs.get('__obj_init__', False)
-        self._data_model: Union[DataModel, None] = kwargs.get('data_model', config.default_data_model)
-        self._object_mapper: Union[PythonMapper, None] = kwargs.get('object_mapper', config.default_mapper)
+        self._data_model: Union[DataModel, None] = kwargs.get('data_model', config.get_default_data_model())
+        self._object_mapper: Union[PythonMapper, None] = kwargs.get('object_mapper', config.get_default_mapper())
         self.name = kwargs.get('name', None)
 
         self.__property_cache__ = {}
@@ -223,7 +223,7 @@ class SimultanObject(object, metaclass=MetaMock):
             return None
 
         if self._wrapped_obj.Parent is not None:
-            return self._object_mapper.create_python_object(self._wrapped_obj.Parent)
+            return self._object_mapper.create_python_object(self._wrapped_obj.Parent, data_model=self._data_model)
         else:
             return None
 
@@ -239,7 +239,8 @@ class SimultanObject(object, metaclass=MetaMock):
 
     @property
     def referenced_by(self) -> set['SimultanObject']:
-        return set([self._object_mapper.create_python_object(x.Target) for x in self._wrapped_obj.ReferencedBy if
+        return set([self._object_mapper.create_python_object(x.Target, data_model=self._data_model)
+                    for x in self._wrapped_obj.ReferencedBy if
                     x.Target != self._wrapped_obj])
 
     @property
@@ -259,14 +260,17 @@ class SimultanObject(object, metaclass=MetaMock):
     def get_subcomponents(self) -> dict[[str, str], Union['SimultanObject', SimComponent]]:
         subcomponents = {}
         for comp in self._wrapped_obj.Components:
-            subcomponents[(comp.Slot.SlotBase.Target.Key, comp.Slot.SlotExtension)] = self._object_mapper.create_python_object(comp.Component)
+            subcomponents[(comp.Slot.SlotBase.Target.Key,
+                           comp.Slot.SlotExtension)] = self._object_mapper.create_python_object(comp.Component,
+                                                                                                data_model=self._data_model)
         return subcomponents
 
     def get_subcomponent_list(self) -> list[Union['SimultanObject', SimComponent]]:
         return list(self.get_subcomponents().values())
 
     def get_referenced_components(self) -> list['SimultanObject']:
-        return [self._object_mapper.create_python_object(x) for x in self._wrapped_obj.ReferencedComponents]
+        return [self._object_mapper.create_python_object(x, data_model=self._data_model)
+                for x in self._wrapped_obj.ReferencedComponents]
 
     def add_taxonomy_entry_reference(self,
                                      taxonomy_entry_reference: SimTaxonomyEntryReference,

{pysimultan-0.4.1 → pysimultan-0.4.3}/src/PySimultan2/utils.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from . import config
 from enum import Enum
 from weakref import WeakSet
 import numpy as np
@@ -65,14 +64,19 @@ def create_python_object(wrapped_obj: SimComponent, cls: Type[SimultanObject], *
     :param cls: class of the python object
     :param args: additional arguments
     :param kwargs: additional keyword arguments
+        :param data_model: DataModel
+        :param object_mapper: PythonMapper
+
+    :return: SimultanObject
     :return:
     """
 
     from .default_types import ComponentList, ComponentDictionary
 
-    if kwargs.get('data_model_id', None) is None:
-        from .data_model import data_models
-        kwargs['data_model_id'] = list(data_models)[0].id
+    data_model = kwargs.get('data_model', None)
+
+    if data_model is None:
+        data_model = config.get_default_data_model()
 
     if wrapped_obj is None:
         return None
@@ -104,7 +108,7 @@ def create_python_object(wrapped_obj: SimComponent, cls: Type[SimultanObject], *
         obj.__obj_init__ = True
         obj.__property_cache__ = dict()
         obj._wrapped_obj = wrapped_obj
-        obj._data_model = kwargs.get('data_model', None)
+        obj._data_model = data_model
         obj._object_mapper = kwargs.get('object_mapper', None)
         obj.component_policy = kwargs.get('component_policy', 'subcomponent')
 
@@ -227,7 +231,7 @@ def get_default_slot(default_type: Union[SimTaxonomyEntryReference, SimTaxonomyE
     :return:
     """
 
-    default_taxonomy_entry = SimDefaultSlotKeys.GetDefaultSlot(config.default_data_model.project_data_manager.Taxonomies,
+    default_taxonomy_entry = SimDefaultSlotKeys.GetDefaultSlot(config.get_default_data_model().project_data_manager.Taxonomies,
                                                                SimDefaultSlotKeys.Undefined)
 
     if default_type is SimTaxonomyEntryReference:
@@ -604,7 +608,7 @@ def create_simultan_component_for_taxonomy(cls, *args, **kwargs) -> SimComponent
 
     data_model = kwargs.get('data_model', None)
     if data_model is None:
-        data_model = config.default_data_model
+        data_model = config.get_default_data_model()
 
     # simultan_taxonomy = cls._taxonomy_map.get_or_create_simultan_taxonomy(data_model=data_model)
     # tayonomy_entry = cls._taxonomy_map.get_or_create_simultan_taxonomy_entry(data_model=data_model)
@@ -679,7 +683,7 @@ def get_property(prop_name: Optional[str] = None,
         data_model = component._data_model
         object_mapper = component._object_mapper
     else:
-        data_model = config.default_data_model
+        data_model = config.get_default_data_model()
         obj = get_component_taxonomy_entry(wrapped_obj, text_or_key)
 
     return get_obj_value(obj, data_model=data_model, object_mapper=object_mapper)
@@ -877,7 +881,7 @@ def create_mapped_python_object(value: SimComponent,
     """
 
     if object_mapper is None:
-        object_mapper = config.default_mapper
+        object_mapper = config.get_default_mapper()
 
     # logger.debug(f'Creating mapped python object for {value}.')
     if type(value) in object_mapper.registered_classes.values():
@@ -973,13 +977,13 @@ def set_property_to_list(value: Union[list, tuple, set, ComponentList],
 
         if 'ComponentList' in [x.Target.Key for x in component.Slots]:
             if not hasattr(component, '_object_mapper'):
-                mapper = config.default_mapper
+                mapper = config.get_default_mapper()
                 component._object_mapper = mapper
             else:
                 mapper = component._object_mapper
 
             if not hasattr(component, '_data_model'):
-                data_model = config.default_data_model
+                data_model = config.get_default_data_model()
                 component._data_model = data_model
             else:
                 data_model = component._data_model
@@ -1240,13 +1244,13 @@ def set_property_to_dict(value: dict,
 
         if 'ComponentDictionary' in [x.Target.Key for x in component.Slots]:
             if not hasattr(component, '_object_mapper'):
-                mapper = config.default_mapper
+                mapper = config.get_default_mapper()
                 component._object_mapper = mapper
             else:
                 mapper = component._object_mapper
 
             if not hasattr(component, '_data_model'):
-                data_model = config.default_data_model
+                data_model = config.get_default_data_model()
                 component._data_model = data_model
             else:
                 data_model = component._data_model

{pysimultan-0.4.1 → pysimultan-0.4.3}/tests/test_calculate_steady_state_temperature.py

@@ -582,12 +582,12 @@ def test_loaded_model(project_name=None):
 
     from PySimultan2.src.PySimultan2 import config
 
-    config.default_data_model
+    config.get_default_data_model()
 
 
 if __name__ == '__main__':
 
-    for i in range(10):
+    for i in range(3):
         print(f'Iteration {i}')
         create_model()
         sleep(1)

pysimultan-0.4.1/src/PySimultan2/__about__.py

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