PySimultan 0.2.10__py3-none-any.whl → 0.3.1__py3-none-any.whl

{PySimultan-0.2.10.dist-info → PySimultan-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySimultan
-Version: 0.2.10
+Version: 0.3.1
 Home-page: 
 Author: Max Buehler
 Author-email: Max Bühler <maximilian.buehler@tuwien.ac.at>

{PySimultan-0.2.10.dist-info → PySimultan-0.3.1.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=2Qq_JyUxtDgsIt3p5hIXIqNy7eAtvn-6Of_Wzb9AWoE,28004
-PySimultan2/default_types.py,sha256=1HJ6IZt3Lm3Hhq3A9dDmvIO46Fk9bGqDng6yTtYKmO4,22585
+PySimultan2/default_types.py,sha256=E4aS3NuLl0mG5vBJv0saxbBFWk1s4eSg21cl4bcNAH8,22880
 PySimultan2/files.py,sha256=q6A5KTqU1nCwh0W0Qf3Se7qcvhGiDAWza2v-X-rt6E4,12473
 PySimultan2/multi_values.py,sha256=ZFXlTLuZo32x7_7diYAp2XEjp5uwgHLgNOzN7v74-5I,13650
-PySimultan2/object_mapper.py,sha256=Dsr05gdZxcECr14TVzswHNuE4HQhxyhjQwNWlgDrzwc,9010
-PySimultan2/simultan_object.py,sha256=EpmerK5vtPa87MZtetN8fBAXtET9vRGai5ODKPAW86c,15864
+PySimultan2/object_mapper.py,sha256=cvw0gJk3NzsSkN2UNd7nRxhBkTe7TYddmHwxW7VpIHg,8973
+PySimultan2/simultan_object.py,sha256=PWpveGPFi1nlcHSK8vT_3lyEoa27eBY6ZpKAtgR-KGg,16215
 PySimultan2/taxonomy_maps.py,sha256=qgKM0CdwwgLCFj-ivzY38VaCpE_eCPKyCiBaTBazpBk,7509
-PySimultan2/utils.py,sha256=a_2BA2P5lVZ6gVBNad43bYg-VL5WtHjm2nrFiyY39Fc,62067
+PySimultan2/utils.py,sha256=U3Eru2uQbDCxraFbbbUO1wmVRxLXmo4lFksVcJcrtmg,62818
 PySimultan2/geometry/__init__.py,sha256=nJolTD1i5J8qUkOQa-r3D20aq3Co3sN31Xc0n4wJpJo,248
 PySimultan2/geometry/geometry_base.py,sha256=IQQPVxkgIdBsFJp8rPSCNiCiKO7TxkVWy-XmE8GjDbE,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.10.dist-info/LICENSE.txt,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-PySimultan-0.2.10.dist-info/METADATA,sha256=GOU8tqXM6DijHdbhz_XhuVhyUuAoxvQEqF_19sVqcog,1991
-PySimultan-0.2.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-PySimultan-0.2.10.dist-info/top_level.txt,sha256=pbE6SbdKIEEK4vaDNmmdRTj0vesrjgRXGow8QWMTXvk,12
-PySimultan-0.2.10.dist-info/RECORD,,
+PySimultan-0.3.1.dist-info/LICENSE.txt,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
+PySimultan-0.3.1.dist-info/METADATA,sha256=sikNq1pLMe2i0Gx3X1RFSofB9Rxae3u-PL0AJgefSto,1990
+PySimultan-0.3.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+PySimultan-0.3.1.dist-info/top_level.txt,sha256=pbE6SbdKIEEK4vaDNmmdRTj0vesrjgRXGow8QWMTXvk,12
+PySimultan-0.3.1.dist-info/RECORD,,

PySimultan2/default_types.py

@@ -97,7 +97,7 @@ class ComponentList(SimultanObject):
 
     @property
     def ref_components(self):
-        return [x.Target for x in self._wrapped_obj.ReferencedComponents.Items]
+        return [x.Target for x in self._wrapped_obj.ReferencedComponents.Items if x.Target is not None]
 
     @property
     def data(self) -> List[SimultanObject]:
@@ -109,7 +109,7 @@ class ComponentList(SimultanObject):
             all_components = [*components, *ref_components]
 
             slots = [*[x.Slot for x in self._wrapped_obj.Components.Items],
-                     *[x.Slot for x in self._wrapped_obj.ReferencedComponents.Items]]
+                     *[x.Slot for x in self._wrapped_obj.ReferencedComponents.Items if x.Target is not None]]
 
             try:
                 indices = sort_slots(slots)
@@ -433,6 +433,12 @@ class ComponentDictionary(SimultanObject):
             setter_fcn = self.type_setter_fcn_lookup_dict.get(type(value), set_property_to_unknown_type)
 
         setter_fcn(*fcn_arg_list)
+        item = self.__getitem__(key, check_dict=False)
+
+        # self._object_mapper.create_python_object(self._wrapped_obj)
+        #
+        # if isinstance(value, ):
+
         self._dict[key] = self.__getitem__(key, check_dict=False)
 
     def __delitem__(self, key):
@@ -460,9 +466,9 @@ class ComponentDictionary(SimultanObject):
                                                                              data_model=self._data_model,
                                                                              object_mapper=self._object_mapper)
         for component in self._wrapped_obj.Components.Items:
-            comp_dict[component.Name] = get_obj_value(component,
-                                                      data_model=self._data_model,
-                                                      object_mapper=self._object_mapper)
+            comp_dict[component.Slot.SlotBase.Target.Key] = get_obj_value(component.Component,
+                                                                          data_model=self._data_model,
+                                                                          object_mapper=self._object_mapper)
         for ref_component in self._wrapped_obj.ReferencedComponents.Items:
             comp_dict[ref_component.Slot.SlotBase.Target.Name] = get_obj_value(ref_component.Target,
                                                                                data_model=self._data_model,

PySimultan2/object_mapper.py

@@ -12,6 +12,7 @@ from .simultan_object import SimultanObject
 from .geometry.utils import create_python_geometry
 
 from SIMULTAN.Data.Geometry import (Layer, Vertex, Edge, PEdge, Face, Volume, EdgeLoop)
+from SIMULTAN.Data.Components import SimComponent
 from .geometry.geometry_base import (SimultanLayer, SimultanVertex, SimultanEdge, SimultanEdgeLoop, SimultanFace,
                                      SimultanVolume)
 
@@ -94,31 +95,37 @@ class PythonMapper(object):
         if data_model is None:
             data_model = list(data_models)[0]
 
+        if create_all:
+            new_component_list = set()
+
+            def get_subcomponents(sim_component: Union[SimComponent, SimultanObject]):
+                print(sim_component.Id)
+                new_subcomponents = set()
+                if isinstance(sim_component, SimultanObject):
+                    sim_component = sim_component._wrapped_obj
+
+                if sim_component in new_component_list:
+                    return
+                else:
+                    new_component_list.add(sim_component)
+
+                for sub_component in sim_component.Components.Items:
+                    new_subcomponents.add(sub_component.Component)
+                for ref_component in sim_component.ReferencedComponents.Items:
+                    new_subcomponents.add(ref_component.Target)
+
+                for new_subcomponent in new_subcomponents:
+                    get_subcomponents(new_subcomponent)
+
+                new_component_list.update(new_subcomponents)
+
+            for component in component_list:
+                get_subcomponents(component)
+            component_list = list(new_component_list)
+
         for component in component_list:
             typed_object = self.create_python_object(component, data_model=data_model)
             typed_data.append(typed_object)
-            if create_all:
-
-                def get_content(typed_object):
-                    if isinstance(typed_object, SimultanObject):
-                        for content in typed_object.__class__._taxonomy_map.content:
-                            val = getattr(typed_object, content.property_name)
-                            if isinstance(val, (SimultanObject, ComponentList, ComponentDictionary)):
-                                typed_data.append(val)
-                                get_content(val)
-                    elif isinstance(typed_object, ComponentList):
-                        for item in typed_object:
-                            if isinstance(item, (SimultanObject, ComponentList, ComponentDictionary)):
-                                typed_data.append(item)
-                                get_content(item)
-                    elif isinstance(typed_object, ComponentDictionary):
-                        for item in typed_object.values():
-                            if isinstance(item, (SimultanObject, ComponentList, ComponentDictionary)):
-                                typed_data.append(item)
-                                get_content(item)
-
-                get_content(typed_object)
-
         return typed_data
 
     # @lru_cache(maxsize=None)

PySimultan2/simultan_object.py

@@ -136,6 +136,15 @@ class SimultanObject(object, metaclass=MetaMock):
         return instance
 
     def __init__(self, *args, **kwargs):
+        """
+        Initialize the SimultanObject. This method is only called if the object is initialized the first time without a
+        wrapped_obj. If a wrapped_obj is defined, the __new__ method is called and the object can be initialized with
+        the __load_init__ method.
+
+        :param args:
+        :param kwargs:
+        """
+
         self._wrapped_obj: Union[SimComponent, None] = kwargs.get('wrapped_obj', None)
         self.__obj_init__ = kwargs.get('__obj_init__', False)
         self._data_model_id = kwargs.get('data_model_id', None)

PySimultan2/utils.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from . import config
 from enum import Enum
+from weakref import WeakSet
 from functools import lru_cache
 import numpy as np
 import pandas as pd
@@ -45,6 +46,9 @@ class UnresolvedObject(object):
     def resolve(self):
         return self.cls._cls_instances_dict[self.wrapped_obj.Id]
 
+    def __getattr__(self, item):
+        return getattr(self.wrapped_obj, item)
+
 
 class CircularReferenceResolver(object):
 
@@ -91,11 +95,25 @@ def create_python_object(wrapped_obj: SimComponent, cls: Type[SimultanObject], *
                                                            prop_name=content.text_or_key,
                                                            object_mapper=kwargs.get('object_mapper', None),
                                                            )
+
         kwargs['name'] = wrapped_obj.Name
         kwargs['__obj_init__'] = True
-        obj = cls(wrapped_obj=wrapped_obj, *args, **kwargs)
-        obj.__obj_init__ = False
 
+        obj = cls.__new__(cls)
+        obj._wrapped_obj = wrapped_obj
+        obj._data_model = kwargs.get('data_model', None)
+        obj._object_mapper = kwargs.get('object_mapper', None)
+
+        if "_cls_instances" not in cls.__dict__:
+            cls._cls_instances = WeakSet()
+        try:
+            cls._cls_instances.add(obj)
+        except Exception as e:
+            logger.error(f'Error adding instance {obj} to _cls_instances: {e}')
+
+        if hasattr(cls, '__load_init__'):
+            obj.__init__(*args, **kwargs)
+        #
         circ_ref_resolver.unresolved_objects.pop(wrapped_obj.Id)
 
         return obj
@@ -380,13 +398,15 @@ def add_sub_component(comp: SimComponent,
             sub_comp.Slots.InsertItem(0, slot)
 
     if slot_extension is None:
-        new_slot = comp.Components.FindAvailableSlot(slot, "{0}")
+        new_slot = comp.Components.FindAvailableSlot(slot.Target if isinstance(slot,
+                                                                               SimTaxonomyEntryReference)
+                                                     else slot, "{0}")
     else:
         new_slot = SimSlot(sub_comp.Slots[0].Target, str(slot_extension))
 
     entry = SimChildComponentEntry(new_slot, sub_comp)
     if entry not in comp.Components.Items:
-        comp.Components.InsertItem(len(comp.Components.Items) + 1, entry)
+        comp.Components.InsertItem(len(comp.Components.Items), entry)
     return True
 
 
@@ -1281,7 +1301,6 @@ def add_properties(prop_name: str,
                                    np.ndarray: set_property_to_value_field,
                                    pd.DataFrame: set_property_to_value_field}
 
-    # @lru_cache()
     def getx(self):
         return get_property(component=self,
                             prop_name=content.text_or_key,