PySimultan 0.4.3__py3-none-any.whl → 0.4.6__py3-none-any.whl

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.4.3'
+version = '0.4.6'

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
 
 

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
@@ -35,9 +33,10 @@ 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 = 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,
@@ -220,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()
 
@@ -228,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.3.dist-info → pysimultan-0.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.4.3
+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.3.dist-info → pysimultan-0.4.6.dist-info}/RECORD

@@ -1,10 +1,10 @@
-PySimultan2/__about__.py,sha256=l1cddhN_DochM-HfCX27Wng2U2p8iuhA7C5-Wd08cIA,19
-PySimultan2/__init__.py,sha256=2pdrZP8ECaVRlaCfwzFblht_30JfenzyQ2rEt-QldeU,2876
+PySimultan2/__about__.py,sha256=UCTGJEVb-PbbGu_x1hnvDBb7cwYzpkNeq4iR7-6Jofo,19
+PySimultan2/__init__.py,sha256=Ikslbg50cGpasYNu28JiYrNr_-OxOpz14YX-JMhAYDM,3175
 PySimultan2/data_model.py,sha256=m9q3P5SfxYXdmwdQuPoTazHZAJ1xwazixFtdetJ2Dgk,26968
 PySimultan2/default_types.py,sha256=v_4awsUURLbu4Sfw7J_7BoQKirXbKdU9s7-wqgA4nNE,23112
 PySimultan2/files.py,sha256=gx3BA6WYjNVplqqes7jkPopp6O50pgLvantXgmitx54,12657
 PySimultan2/multi_values.py,sha256=ZFXlTLuZo32x7_7diYAp2XEjp5uwgHLgNOzN7v74-5I,13650
-PySimultan2/object_mapper.py,sha256=UUP8oZNkCG68DpizNJlcj14nrPTKMiq5oWAmA_XO1AY,10116
+PySimultan2/object_mapper.py,sha256=d60SksRBKXA5GcvcXKgxv4XiTm8L99RB3hz0tyce1Sw,10125
 PySimultan2/simultan_object.py,sha256=Plr9nwgRmKzdkTO7l8ksWekEow9pT-MgjjAfLlChgDI,17208
 PySimultan2/taxonomy_maps.py,sha256=aU9zUJph7QcInIZq0W-Vqoy4DYr0CEs-VsXwPMK_cxU,7976
 PySimultan2/utils.py,sha256=J3T7KDfONFeLWBulXmGMCaaOu5sfkDSHmI92JWO8dW4,62553
@@ -75,7 +75,7 @@ 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.4.3.dist-info/METADATA,sha256=Pf9TmV9HU7TQg3_pk6bdKxPs_zXZjppZpgEvOCwUMAk,1657
-pysimultan-0.4.3.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-pysimultan-0.4.3.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
-pysimultan-0.4.3.dist-info/RECORD,,
+pysimultan-0.4.6.dist-info/METADATA,sha256=0-4rmOjgV_OfFFN8_abeGg53oOiXrWIFH-kXGW3Sqdw,1657
+pysimultan-0.4.6.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+pysimultan-0.4.6.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
+pysimultan-0.4.6.dist-info/RECORD,,