PySimultan 0.4.5__tar.gz → 0.4.7__tar.gz

{pysimultan-0.4.5 → pysimultan-0.4.7}/PKG-INFO

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

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

{pysimultan-0.4.5 → pysimultan-0.4.7}/src/PySimultan2/__init__.py

@@ -109,3 +109,4 @@ config = Config()
 from .data_model import DataModel
 from .files import FileInfo
 from .object_mapper import PythonMapper
+from .taxonomy_maps import Content, TaxonomyMap

{pysimultan-0.4.5 → pysimultan-0.4.7}/src/PySimultan2/data_model.py

@@ -263,7 +263,9 @@ class DataModel:
     def project(self, value):
         self._project = value
 
-    def get_typed_data(self, mapper: 'PythonMapper', 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.4.5 → pysimultan-0.4.7}/src/PySimultan2/object_mapper.py

@@ -1,9 +1,7 @@
+from copy import copy
 from collections import UserList
-from weakref import WeakSet
-from typing import Type
 from colorlog import getLogger
 
-from . import config
 from .data_model import data_models
 from .utils import *
 from .default_types import ComponentList, component_list_map, ComponentDictionary, component_dict_map
@@ -16,6 +14,8 @@ from SIMULTAN.Data.Components import SimComponent
 from .geometry.geometry_base import (SimultanLayer, SimultanVertex, SimultanEdge, SimultanEdgeLoop, SimultanFace,
                                      SimultanVolume)
 
+from .taxonomy_maps import TaxonomyMap, Content
+
 logger = getLogger('PySimultan')
 
 default_registered_classes = {'ComponentList': ComponentList,
@@ -35,9 +35,12 @@ class PythonMapper(object):
     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}
+        self.registered_classes: dict[str: SimultanObject] = copy(default_registered_classes)  # dict with all registered classes: {taxonomy: class}
+
+        self.undefined_registered_classes: dict[str: SimultanObject] = {}  # dict with all registered classes: {taxonomy: class}
+
+        self.mapped_classes = copy(default_mapped_classes)  # dict with all mapped classes: {taxonomy: class}
+        self.taxonomy_maps = copy(default_taxonomy_maps)  # dict with all taxonomie maps: {taxonomy: taxonomie_map}
 
         self.registered_geometry_classes = {Layer: SimultanLayer,
                                             Vertex: SimultanVertex,
@@ -47,11 +50,18 @@ class PythonMapper(object):
                                             EdgeLoop: SimultanEdgeLoop}
 
         self.re_register = False
+        self.load_undefined = True
 
     def register(self, taxonomy, cls, taxonomy_map=None):
         if not self.re_register and taxonomy in self.registered_classes.keys():
             return
 
+        if taxonomy_map is None:
+            taxonomy_map = TaxonomyMap(taxonomy_name='PySimultan',
+                                       taxonomy_key='PySimultan',
+                                       taxonomy_entry_name=taxonomy,
+                                       taxonomy_entry_key=taxonomy)
+
         self.registered_classes[taxonomy] = cls
         self.taxonomy_maps[taxonomy] = taxonomy_map
 
@@ -167,16 +177,20 @@ class PythonMapper(object):
             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, 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]
             c_slot = list(set(c_slots) & set(self.registered_classes.keys()))
             if len(c_slot) == 0:
-                if c_slots[0] not in self.registered_classes.keys():
+                if c_slots[0] not in self.registered_classes.keys() and self.load_undefined:
                     self.register(c_slots[0], SimultanObject)
                     c_slot = [c_slots[0]]
+                    self.undefined_registered_classes[c_slot[0]] = SimultanObject
+                    self.create_mapped_class(c_slot[0], self.registered_classes[c_slot[0]])
             elif len(c_slot) > 1:
                 num_superclasses = [len(self.registered_classes[x].__mro__) for x in c_slot]
                 c_slot = [c_slot[num_superclasses.index(max(num_superclasses))]]

{pysimultan-0.4.5 → pysimultan-0.4.7}/tests/test_calculate_steady_state_temperature.py

@@ -560,13 +560,14 @@ def test_loaded_model(project_name=None):
 
     mapped_cls_dict, mapper = create_mapped_classes(create_classes())
 
-    # create copy of the mapper to test mapper.copy
-    mapper_copy = mapper.copy()
     data_model = DataModel(project_path=project_name,
                            user_name='admin',
                            password='admin')
 
-    typed_data = data_model.get_typed_data(mapper=mapper_copy)
+    typed_data = data_model.get_typed_data(mapper=mapper,
+                                           create_all=True)
+
+    new_undef_component = mapper.get_mapped_class('new_tax')()
 
     zone_cls = mapper.get_mapped_class('Zone')
 
@@ -580,16 +581,12 @@ def test_loaded_model(project_name=None):
     mapper.clear()
     del data_model
 
-    from PySimultan2.src.PySimultan2 import config
-
-    config.get_default_data_model()
-
 
 if __name__ == '__main__':
 
     for i in range(3):
         print(f'Iteration {i}')
-        create_model()
-        sleep(1)
+        # create_model()
+        # sleep(1)
         test_loaded_model()
         sleep(1)

pysimultan-0.4.5/src/PySimultan2/__about__.py

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