PySimultan 0.4.2__tar.gz → 0.4.6__tar.gz

{pysimultan-0.4.2 → pysimultan-0.4.6}/PKG-INFO

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

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

{pysimultan-0.4.2 → pysimultan-0.4.6}/src/PySimultan2/__init__.py

@@ -1,8 +1,12 @@
 import os
 import sys
 import colorlog
-# from .config import *
-from ruamel.yaml import YAML, yaml_object, add_representer
+from ruamel.yaml import YAML, add_representer
+
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from .data_model import DataModel
+    from .object_mapper import PythonMapper
 
 def setup_logging():
     handler = colorlog.StreamHandler()
@@ -85,16 +89,18 @@ class Config:
         self._default_mapper = None
         self.logger = logger
 
-    def get_default_data_model(self, *args, **kwargs):
+    def get_default_data_model(self, *args, **kwargs) -> 'DataModel':
         return self._default_data_model
 
-    def get_default_mapper(self, *args, **kwargs):
+    def get_default_mapper(self, *args, **kwargs) -> 'PythonMapper':
         return self._default_mapper
 
-    def set_default_data_model(self, data_model):
+    def set_default_data_model(self, data_model: 'DataModel'):
+        self.logger.debug(f'set_default_data_model: {id(data_model)}')
         self._default_data_model = data_model
 
-    def set_default_mapper(self, mapper):
+    def set_default_mapper(self, mapper: 'PythonMapper'):
+        self.logger.debug(f'set_default_mapper: {id(mapper)}')
         self._default_mapper = mapper
 
 

{pysimultan-0.4.2 → pysimultan-0.4.6}/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.2 → pysimultan-0.4.6}/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
@@ -33,9 +31,12 @@ class PythonMapper(object):
         return instance
 
     def __init__(self, *args, **kwargs):
-        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.name = kwargs.get('name', 'PythonMapper')
+        self.registered_classes = copy(
+            default_registered_classes)  # 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,
@@ -136,8 +137,7 @@ 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
@@ -145,11 +145,6 @@ class PythonMapper(object):
         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()
-            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
 
         if isinstance(component, (Layer, Vertex, Edge, PEdge, Face, Volume, EdgeLoop)):
             if isinstance(component, Layer):
@@ -157,7 +152,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 +191,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)
 
@@ -211,7 +219,7 @@ class PythonMapper(object):
 
         return prop_dict
 
-    def clear(self):
+    def clear(self, remove_from_default=False):
         for cls in self.registered_classes.values():
             cls._cls_instances = WeakSet()
 
@@ -219,7 +227,7 @@ class PythonMapper(object):
             cls._cls_instances = WeakSet()
             cls.__property_cache__ = {}
 
-        if config.get_default_mapper() is self:
+        if remove_from_default and config.get_default_mapper() is self:
             config.set_default_mapper(None)
 
     def copy(self):

{pysimultan-0.4.2 → pysimultan-0.4.6}/src/PySimultan2/simultan_object.py

@@ -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.2 → pysimultan-0.4.6}/src/PySimultan2/utils.py

@@ -64,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
@@ -103,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')
 

pysimultan-0.4.6/tests/resources/new_test_file.txt

@@ -0,0 +1 @@
+This is the content of the file.

pysimultan-0.4.6/tests/resources/new_test_file2.txt

@@ -0,0 +1 @@
+This is the content of the file 2.

pysimultan-0.4.2/src/PySimultan2/__about__.py

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