PySimultan 0.5.0__tar.gz → 0.5.2.5__tar.gz

{pysimultan-0.5.0 → pysimultan-0.5.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.5.0
+Version: 0.5.2.5
 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.5.2.5/src/PySimultan2/CHANGELOG.md

@@ -0,0 +1,4 @@
+Version 0.5.1 (25.11.2024)
+
+- setting re-register default in Mapper to True
+- added uncache method to utils for monkey patching

pysimultan-0.5.2.5/src/PySimultan2/__about__.py

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

{pysimultan-0.5.0 → pysimultan-0.5.2.5}/src/PySimultan2/default_types.py

@@ -1,14 +1,10 @@
 from __future__ import annotations
 
-import xxsubtype
 from collections.abc import Iterable
 import numpy as np
-import pandas as pd
 import colorlog
 from typing import Union, List, Type, Set, Tuple, Any, Optional
 
-from reactivex import return_value
-
 from .utils import (sort_slots, create_simultan_component_for_taxonomy, create_mapped_python_object,
                     set_property_to_sim_component, set_property_to_parameter, set_property_to_file_info,
                     set_property_to_list, set_property_to_value_field, set_property_to_unknown_type,

{pysimultan-0.5.0 → pysimultan-0.5.2.5}/src/PySimultan2/object_mapper.py

@@ -32,9 +32,21 @@ default_taxonomy_maps = {'ComponentList': component_list_map,
 
 class PythonMapper(object):
 
+    mappers = {}
+
     def __new__(cls, *args, **kwargs):
         instance = super(PythonMapper, cls).__new__(cls)
         config.set_default_mapper(instance)
+
+        if kwargs.get('add_to_mappers', True):
+            initial_module_name = kwargs.get('module', 'unknown_module')
+            module_name = initial_module_name
+            i = 0
+            while module_name in cls.mappers.keys():
+                module_name = f'{initial_module_name}_{i}'
+                i+=1
+            cls.mappers[module_name] = instance
+
         return instance
 
     def __init__(self, *args, **kwargs):
@@ -42,6 +54,9 @@ class PythonMapper(object):
         self._mapped_classes = {}
 
         self.name = kwargs.get('name', 'PythonMapper')
+        self._module = kwargs.get('module', 'unknown_module')
+        self.submodules = kwargs.get('submodules', {})
+
         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}
@@ -59,6 +74,18 @@ class PythonMapper(object):
         self.re_register = False
         self.load_undefined = False
 
+    @property
+    def module(self):
+        return self._module
+
+    @module.setter
+    def module(self, value):
+        if self._module != value:
+            del self.mappers[self._module]
+
+        self._module = value
+        self.mappers[value] = self
+
     @property
     def mapped_classes(self):
         if len(self.registered_classes) > len(self._mapped_classes):
@@ -73,10 +100,14 @@ class PythonMapper(object):
         self._mapped_classes = value
 
     def register(self,
-                 taxonomy,
-                 cls,
-                 re_register=False,
+                 taxonomy: str,
+                 cls: Type[Any],
+                 re_register=True,
+                 update_in_other_mappers=False,
                  taxonomy_map=None):
+
+        # print(f'Registering {taxonomy} with {cls} {hash(cls)}')
+
         if not (self.re_register or re_register) and taxonomy in self.registered_classes.keys():
             return
 
@@ -95,8 +126,28 @@ class PythonMapper(object):
         self.registered_classes[taxonomy] = cls
         self.taxonomy_maps[taxonomy] = taxonomy_map
 
+        if update_in_other_mappers:
+            self.update_from_other_mappers()
+
         return self.get_mapped_class(taxonomy)
 
+    def update_from_other_mappers(self):
+        for mapper in self.mappers.values():
+            if mapper is not self:
+                for cls, taxonomy in mapper.registered_classes.items():
+                    if cls in self.registered_classes.values():
+                        key = list(filter(lambda x: mapper.registered_classes[x] == cls,
+                                          mapper.registered_classes)
+                                   )[0]
+                        mapper.registered_classes[key] = cls
+                        print(f'Updated {cls} in {mapper.module} with {taxonomy}')
+
+    def update_from_submodules(self):
+        for submodule in self.submodules.values():
+            self.registered_classes.update(submodule.registered_classes)
+            self.taxonomy_maps.update(submodule.taxonomy_maps)
+            self.registered_geometry_classes.update(submodule.registered_geometry_classes)
+
     def create_mapped_class(self, taxonomy, cls):
 
         if any([issubclass(cls, x) for x in (SimultanObject, UserList)]):
@@ -342,19 +393,31 @@ class PythonMapper(object):
     def copy(self,
              *args,
              **kwargs) -> 'PythonMapper':
-        new_mapper = PythonMapper()
+
+        orig_new_module_name = kwargs.get('module', self.module)
+        new_module_name = orig_new_module_name
+        i = 0
+        while new_module_name in self.mappers.keys():
+            new_module_name = f'copy_{i}_of_{new_module_name}'
+            i+=1
+
+        new_mapper = PythonMapper(add_to_mappers=kwargs.get('add_to_mappers', True),
+                                  module=new_module_name)
         new_mapper.registered_classes = self.registered_classes
         new_mapper.taxonomy_maps = self.taxonomy_maps
         new_mapper.registered_geometry_classes = self.registered_geometry_classes
         new_mapper.load_undefined = self.load_undefined
+
         return new_mapper
 
     def __add__(self, other: 'PythonMapper') -> 'PythonMapper':
-        new_mapper = self.copy()
-        new_mapper.registered_classes.update(other.registered_classes)
-        new_mapper.taxonomy_maps.update(other.taxonomy_maps)
-        new_mapper.registered_geometry_classes.update(other.registered_geometry_classes)
-        return new_mapper
+        # new_mapper = self.copy(add_to_mappers=True)
+        self.submodules[other.module] = other
+        self.submodules.update(other.submodules)
+        self.registered_classes.update(other.registered_classes)
+        self.taxonomy_maps.update(other.taxonomy_maps)
+        self.registered_geometry_classes.update(other.registered_geometry_classes)
+        return self
 
     def get_mapped_class_for_python_type(self, python_type: type) -> Optional[Type[SimultanObject]]:
         try:
@@ -366,6 +429,29 @@ class PythonMapper(object):
         except IndexError:
             return None
 
+    def __repr__(self):
+        return f'PythonMapper(module={self.module}, {len(self.registered_classes)} registered classes)'
+
 
 if config.get_default_mapper() is None:
-    config.set_default_mapper(PythonMapper())
+    config.set_default_mapper(PythonMapper(module='default'))
+
+
+def register(taxonomy: str,
+             taxonomy_map: TaxonomyMap,
+             re_register=True,
+             module: str = 'unknown_module') -> Any:
+
+    if module not in PythonMapper.mappers.keys():
+        PythonMapper(module=module)
+
+    mapper = PythonMapper.mappers[module]
+
+    def decorator(cls):
+        mapper.register(taxonomy,
+                        cls,
+                        re_register=re_register,
+                        taxonomy_map=taxonomy_map)
+        return cls
+
+    return decorator

{pysimultan-0.5.0 → pysimultan-0.5.2.5}/src/PySimultan2/utils.py

@@ -1448,3 +1448,33 @@ def add_properties(prop_name: str,
     delx.__taxonomy__ = taxonomy
 
     return property(getx, setx, delx, "automatic created property")
+
+
+def uncache(exclude):
+    """Remove package modules from cache except excluded ones.
+    On next import they will be reloaded.
+
+    Args:
+        exclude (iter<str>): Sequence of module paths.
+    """
+    pkgs = []
+    for mod in exclude:
+        pkg = mod.split('.', 1)[0]
+        pkgs.append(pkg)
+
+    to_uncache = []
+    for mod in sys.modules:
+        if mod in exclude:
+            continue
+
+        if mod in pkgs:
+            to_uncache.append(mod)
+            continue
+
+        for pkg in pkgs:
+            if mod.startswith(pkg + '.'):
+                to_uncache.append(mod)
+                break
+
+    for mod in to_uncache:
+        del sys.modules[mod]

pysimultan-0.5.2.5/tests/test_register_decorator.py

@@ -0,0 +1,41 @@
+from PySimultan2.taxonomy_maps import TaxonomyMap, Content
+from PySimultan2.object_mapper import register
+from PySimultan2 import PythonMapper
+
+
+content_a = Content(text_or_key='a',
+                    property_name='a',
+                    type=None,
+                    unit=None,
+                    documentation='Property a',)
+
+content_b = Content(text_or_key='b',
+                    property_name='b',
+                    type=None,
+                    unit=None,
+                    documentation='Property a',)
+
+test_map = TaxonomyMap(taxonomy_name='Test',
+                       taxonomy_key='Test',
+                       taxonomy_entry_name='TestClass',
+                       taxonomy_entry_key='TestClass',
+                       content=[content_a, content_b],
+                       )
+
+@register(test_map.taxonomy_entry_key, taxonomy_map=test_map, re_register=True, module='test_mapper')
+class TestClass(object):
+
+    def __init__(self, *args, **kwargs):
+        self.a = kwargs.get('a', 1)
+        self.b = kwargs.get('b', 2)
+
+    def add(self):
+        return self.a + self.b
+
+    def __repr__(self):
+        return f'TestClass(a={self.a}, b={self.b})'
+
+
+
+mapped_test_cls = PythonMapper.mappers['test_mapper'].get_mapped_class('TestClass')
+print(mapped_test_cls)

pysimultan-0.5.0/src/PySimultan2/__about__.py

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