PySimultan 0.3.3__py3-none-any.whl → 0.4.1__py3-none-any.whl

PySimultan2/__about__.py

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

PySimultan2/__init__.py

@@ -1,38 +1,99 @@
+import os
 import sys
 import colorlog
-from .config import *
+# from .config import *
+from ruamel.yaml import YAML, yaml_object, add_representer
+
+def setup_logging():
+    handler = colorlog.StreamHandler()
+    formatter = colorlog.ColoredFormatter(
+        "%(log_color)s%(levelname)-8s%(reset)s %(blue)s%(message)s",
+        datefmt=None,
+        reset=True,
+        log_colors={
+            'DEBUG':    'cyan',
+            'INFO':     'green',
+            'WARNING':  'yellow',
+            'ERROR':    'red',
+            'CRITICAL': 'red,bg_white',
+        },
+        secondary_log_colors={},
+        style='%'
+    )
+
+    handler.setFormatter(formatter)
+
+    logger = colorlog.getLogger('PySimultan')
+    logger.addHandler(handler)
+
+    return logger
+
+
+def setup():
+    import colorlog
+    try:
+        import importlib.resources as pkg_resources
+    except ImportError:
+        # Try backported to PY<37 importlib_resources.
+        import importlib_resources as pkg_resources
+
+    from . import resources
+    sys.path.append(str(pkg_resources.files(resources)))
+
+    logger = colorlog.getLogger('PySimultan')
+    logger.setLevel('DEBUG')
+
+    dll_path = os.environ.get('SIMULTAN_SDK_DIR', None)
+    if dll_path is None:
+        with pkg_resources.path(resources, 'SIMULTAN.dll') as r_path:
+            dll_path = str(r_path)
+    sys.path.append(dll_path)
+
+    from pythonnet import load
+    from pythonnet import clr_loader, set_runtime
+    list(clr_loader.find_runtimes())
+    load('coreclr')
+    import clr
+    test = clr.AddReference(
+        os.path.join(dll_path, 'SIMULTAN.dll') if not dll_path.endswith('SIMULTAN.dll') else dll_path)
+    clr.AddReference("System.Security.Cryptography")
+    # clr.AddReference(os.path.join(dll_path, 'SIMULTAN'))
+
+    from SIMULTAN.Data.Components import SimComponent
+
+    continue_on_error = True
+
+    def represent_none(self, _):
+        return self.represent_scalar('tag:yaml.org,2002:null', '')
+
+    add_representer(type(None), represent_none)
+    yaml = YAML()
+    yaml.default_flow_style = None
+    yaml.preserve_quotes = True
+    yaml.allow_unicode = True
+
+    return yaml
+
+
+logger = setup_logging()
+yaml = setup()
+
+
+class Config:
+    def __init__(self):
+        self._default_data_model = None
+        self._default_mapper = None
+        self.logger = logger
+
+    def get_default_data_model(self, *args, **kwargs):
+        return self._default_data_model
+
+    def get_default_mapper(self, *args, **kwargs):
+        return self._default_mapper
+
+
+config = Config()
+
 from .data_model import DataModel
 from .files import FileInfo
 from .object_mapper import PythonMapper
-
-# from .simultan_utils import create_component
-# from .template_tools import Template, TemplateParser
-# from .geo_default_types import BaseGeometricLayer, BaseGeometricVertex, BaseGeometricEdge, BaseGeometricEdgeLoop, BaseGeometricFace, BaseGeometricVolume
-#
-# print(sys.version)
-#
-# from ParameterStructure.Components import SimComponent
-# from ParameterStructure.Parameters import SimParameter
-
-# from .utils import create_component
-
-handler = colorlog.StreamHandler()
-formatter = colorlog.ColoredFormatter(
-    "%(log_color)s%(levelname)-8s%(reset)s %(blue)s%(message)s",
-    datefmt=None,
-    reset=True,
-    log_colors={
-        'DEBUG':    'cyan',
-        'INFO':     'green',
-        'WARNING':  'yellow',
-        'ERROR':    'red',
-        'CRITICAL': 'red,bg_white',
-    },
-    secondary_log_colors={},
-    style='%'
-)
-
-handler.setFormatter(formatter)
-
-logger = colorlog.getLogger('PySimultan')
-logger.addHandler(handler)

PySimultan2/data_model.py

@@ -3,7 +3,6 @@ import os
 import shutil
 from uuid import uuid4
 from colorlog import getLogger
-from functools import lru_cache, reduce
 from weakref import WeakSet, WeakValueDictionary
 from . import config
 from .utils import *
@@ -46,6 +45,7 @@ from .files import add_tag_to_resource
 
 if TYPE_CHECKING:
     from .object_mapper import PythonMapper
+    from .geometry import GeometryModel
 
 
 logger = getLogger('PySimultan')
@@ -114,7 +114,7 @@ class DataModel:
         else:
             print("Failed to create project")
 
-        return cls(project_path=project_path, user_name=user_name, password=password)
+        return cls(project_path=project_path, user_name=user_name, password=password, project_data_manager=projectData)
 
     def __new__(cls, *args, **kwargs):
 
@@ -147,6 +147,8 @@ class DataModel:
         self._project = None
         self._zip_loader = None
 
+        self.project_data_manager = kwargs.get('project_data_manager', None)
+
         self.project_path = kwargs.get('project_path', None)
 
         self.service_provider = Utils.ServicesProvider()
@@ -156,38 +158,10 @@ class DataModel:
         self.i_aut_service.password = self.password
 
         self.service_provider.AddService[SimultanUsers.IAuthenticationService](self.i_aut_service())
-
-        # self.serv = GeometryViewerService([], self.service_provider)
-        # self.service_provider.AddService[IGeometryViewerService](self.serv)
-
         self.exch = self.project.AllProjectDataManagers.ComponentGeometryExchange
         # self.exch.ModelStore = self.serv
 
         self.resources = {}
-        # self.models_dict = {}
-        #
-        # if self.project_data_manager.AssetManager.Resources.__len__() > 0:
-        #     for resource in self.project_data_manager.AssetManager.Resources:
-        #         if resource is None:
-        #             continue
-        #         self.resources[resource.Key] = resource
-        #         self.models_dict[resource.Key] = None
-        #         current_full_path = resource.CurrentFullPath
-        #         if current_full_path == '?':
-        #             continue
-        #
-        #         if resource.Extension == '.simgeo':
-        #             error_list = NetList[SimGeoIOError]()
-        #
-        #             model = SimGeoIO.Load(resource, self.project_data_manager, error_list, OffsetAlgorithm.Full)
-        #             self.models_dict[resource.Key] = model
-        #             try:
-        #                 self.project_data_manager.GeometryModels.AddGeometryModel(model)
-        #             except Exception as e:
-        #                 logger.warning(f'Error while loading Model: {model} from {model.File}: {e}. Trying reload...')
-        #                 raise e
-
-        self.ValueFields = self.project_data_manager.ValueManager.Items
         self.import_data_model()
 
         self.__mongo_instance = None
@@ -197,40 +171,41 @@ class DataModel:
         return self.project_data_manager.AssetManager.Resources
 
     @property
-    def _mongo_instance(self):
-        if self.__mongo_instance is None:
-            self.create_mongo_instance()
-        return self.__mongo_instance
+    def models(self) -> dict[int, 'GeometryModel']:
+        """
+        Return the geometry models of the project
+        :return: dict[int, GeometryModel]
+        """
 
-    @_mongo_instance.setter
-    def _mongo_instance(self, value):
-        self.__mongo_instance = value
+        # if self.models_dict:
+        #     return self.models_dict
 
-    @property
-    def models(self):
         self.models_dict = {}
 
-        if self.project_data_manager.AssetManager.Resources.__len__() > 0:
-            for resource in self.project_data_manager.AssetManager.Resources:
-                if resource is None:
-                    continue
-                self.resources[resource.Key] = resource
+        # self.project_data_manager.Reset()
+
+        resources = self.project_data_manager.AssetManager.Resources
+
+        for resource in resources:
+            if resource is None:
+                continue
+            self.resources[resource.Key] = resource
 
-                current_full_path = resource.CurrentFullPath
-                if current_full_path == '?':
-                    continue
+            current_full_path = resource.CurrentFullPath
+            if current_full_path == '?':
+                continue
 
-                if resource.Extension == '.simgeo':
-                    self.models_dict[resource.Key] = None
-                    error_list = NetList[SimGeoIOError]()
+            if resource.Extension == '.simgeo':
+                self.models_dict[resource.Key] = None
+                error_list = NetList[SimGeoIOError]()
 
-                    model = SimGeoIO.Load(resource, self.project_data_manager, error_list, OffsetAlgorithm.Full)
-                    self.models_dict[resource.Key] = model
-                    try:
-                        self.project_data_manager.GeometryModels.AddGeometryModel(model)
-                    except Exception as e:
-                        logger.warning(f'Error while loading Model: {model} from {model.File}: {e}. Trying reload...')
-                        raise e
+                model = SimGeoIO.Load(resource, self.project_data_manager, error_list, OffsetAlgorithm.Full)
+                self.models_dict[resource.Key] = model
+                try:
+                    self.project_data_manager.GeometryModels.AddGeometryModel(model)
+                except Exception as e:
+                    logger.warning(f'Error while loading Model: {model} from {model.File}: {e}')
+                    raise e
 
         return self.models_dict
 
@@ -238,14 +213,20 @@ class DataModel:
     def taxonomies(self):
         return self.project_data_manager.Taxonomies
 
+    @property
+    def ValueFields(self):
+        return self.project_data_manager.ValueManager.Items
+
     @property
     def value_fields(self):
         return self.project_data_manager.ValueManager
 
     @property
     def project_data_manager(self):
-        if (self._project_data_manager) is None and (self.user is not None):
+
+        if self._project_data_manager is None:
             self._project_data_manager = ExtendedProjectData()
+
         return self._project_data_manager
 
     @project_data_manager.setter
@@ -261,7 +242,6 @@ class DataModel:
     @user.setter
     def user(self, value: SimultanUsers.SimUserRole):
         if value != self._user:
-            self.project_data_manager = None
             self._project = None
         self._user = value
 
@@ -306,7 +286,6 @@ class DataModel:
     def remove_field(self, field: SimMultiValueField3D):
         self.project_data_manager.ValueManager.Remove(field)
 
-    @lru_cache(maxsize=None)
     def get_geo_instance(self, file_id, type, id):
         geo_model = self.models[file_id]
         objects = getattr(geo_model.Geometry, type)
@@ -381,16 +360,28 @@ class DataModel:
         """
         logger.info('closing project...')
         try:
+
             self._project.DisableProjectUnpackFolderWatcher()
             if self._project is not None:
+                if self._project.IsOpened:
+                    ZipProjectIO.Close(self._project, True)
                 if self._project.IsLoaded:
                     ZipProjectIO.Unload(self._project)
-                if self._project.IsOpened:
-                    ZipProjectIO.Close(self._project, False, True)
 
-            self._project_data_manager.Reset()
         except Exception as e:
             pass
+        finally:
+            if self._project_data_manager is not None:
+                del self._project_data_manager
+            self._project_data_manager = None
+
+            data_models = WeakSet()
+            data_models_dict = WeakValueDictionary()
+
+            if config.default_data_model is self:
+                config.default_data_model = None
+
+            del self
 
     # def create_new_component(self):
     #
@@ -570,14 +561,13 @@ class DataModel:
         if isinstance(component, SimultanObject):
             component = component._wrapped_obj
 
-        if not component.Instances:
-            return []
-
         for instance in component.Instances:
             for placement in instance.Placements.Items:
                 geo_model = next((x for x in self.models.values() if x is not None and x.File.Key == placement.FileId), None)
                 if geo_model is not None:
                     ref_geometries.append((geo_model.Geometry.GeometryFromId(placement.GeometryId), geo_model))
+                if geo_model is None:
+                    logger.warning(f'Geometry model with id {placement.FileId} not found in project {self.project_path}')
 
         return ref_geometries
 
@@ -665,7 +655,6 @@ class DataModel:
                                            None)
         return model_to_work_with, resource_file
 
-    @lru_cache(maxsize=None)
     def get_or_create_taxonomy(self, taxonomy_key: str, taxonomy_name: str = None, description='', create=True):
         taxonomy = next((x for x in self.taxonomies if x.Key == taxonomy_key), None)
         if taxonomy is None:
@@ -676,7 +665,6 @@ class DataModel:
 
         return next((x for x in self.taxonomies if x.Key == taxonomy_key), None)
 
-    @lru_cache(maxsize=None)
     def get_or_create_taxonomy_entry(self,
                                      name: str,
                                      key: str,

PySimultan2/default_types.py

@@ -113,7 +113,7 @@ class ComponentList(SimultanObject):
 
             try:
                 indices = sort_slots(slots)
-                return [self._object_mapper.create_python_object(x) for x in
+                return [self._object_mapper.create_python_object(x, data_model=self._data_model) for x in
                         [all_components[i] for i in np.argsort(indices)]]
             except TypeError as e:
                 logger.warning(f'Could not sort list {all_components}:\n{e}')
@@ -259,7 +259,7 @@ class ComponentList(SimultanObject):
         return f'List {self.name}: ' + repr(list(self.data))
 
     def __iter__(self):
-        return iter([self._object_mapper.create_python_object(x) for x in self.data])
+        return iter([self._object_mapper.create_python_object(x, data_model=self._data_model) for x in self.data])
 
     def __next__(self):
         try:
@@ -375,10 +375,10 @@ class ComponentDictionary(SimultanObject):
                                                                                                        '_dict').keys():
             return object.__getattribute__(self, '_dict')[key]
         else:
-            data_model = config.default_data_model
+            # data_model = config.default_data_model
             obj = get_component_taxonomy_entry(self._wrapped_obj, key)
             if obj is not None:
-                val = get_obj_value(obj, data_model=data_model, object_mapper=self._object_mapper)
+                val = get_obj_value(obj, data_model=self._data_model, object_mapper=self._object_mapper)
                 self._dict[key] = val
         return self._dict[key]
 

PySimultan2/files.py

@@ -18,7 +18,9 @@ from SIMULTAN.Data.Assets import ResourceEntry, ResourceFileEntry, ContainedReso
 from SIMULTAN.Data.Taxonomy import SimTaxonomyEntry, SimTaxonomyEntryReference, SimTaxonomy
 from SIMULTAN.Data.Components import SimComponent, ComponentMapping
 
-from .config import default_data_model
+# from .config import default_data_model
+
+from . import config
 
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
@@ -195,7 +197,7 @@ class FileInfo(object, metaclass=MetaMock):
         :return: FileInfo
         """
 
-        data_model = kwargs.get('data_model', default_data_model)
+        data_model = kwargs.get('data_model', config.default_data_model)
         resource = create_asset_from_string(filename, content, *args, **kwargs)
 
         file_info = cls(resource_entry=resource,
@@ -239,7 +241,8 @@ class FileInfo(object, metaclass=MetaMock):
     def resource_entry(self) -> Union[ResourceFileEntry, ContainedResourceFileEntry, None]:
         if self._resource_entry is None:
             if self.data_model is None:
-                self.data_model = default_data_model
+                logger.warning(f'No data model provided. Using default data model: {config.default_data_model.id}.')
+                self.data_model = config.default_data_model
             if self.data_model is not None:
                 self.resource_entry = self.data_model.add_resource(self.file_path)
         return self._resource_entry

PySimultan2/geometry/geometry_base.py

@@ -30,7 +30,7 @@ from SIMULTAN.Data.Geometry import VolumeAlgorithms
 # from ..utils import create_mapped_python_object, create_python_object
 # from ..files import create_asset_from_file, FileInfo, create_asset_from_string
 from .. import config
-from ..config import logger
+from .. import logger
 
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
@@ -538,11 +538,12 @@ class GeometryModel(object, metaclass=MetaMock):
     def create_simultan_instance(cls, *args, **kwargs):
 
         data_model: DataModel = kwargs.get('data_model', config.default_data_model)
-        name = kwargs.get('name', 'GeometryModel')
+        name: str = kwargs.get('name', 'GeometryModel')
 
         new_geo_model, resource = data_model.create_new_geometry_model(name=name)
         data_model.project_data_manager.GeometryModels.AddGeometryModel(new_geo_model)
         data_model.models_dict[resource.Key] = new_geo_model
+        data_model.save()
 
         return new_geo_model
 

PySimultan2/geometry/utils.py

@@ -57,7 +57,7 @@ def create_cube(data_model,
                 scale: Optional[float] = 1):
 
     if obj_mapper is None:
-        obj_mapper = config.default_mapper
+        obj_mapper = config.get_default_mapper()
 
     new_layer = obj_mapper.registered_geometry_classes[Layer](geometry_model=geo_model,
                                                               data_model=data_model,

PySimultan2/object_mapper.py

@@ -99,7 +99,6 @@ class PythonMapper(object):
             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
@@ -109,9 +108,16 @@ class PythonMapper(object):
                 else:
                     new_component_list.add(sim_component)
 
+                if sim_component is None:
+                    return []
+
                 for sub_component in sim_component.Components.Items:
+                    if sub_component is None:
+                        continue
                     new_subcomponents.add(sub_component.Component)
                 for ref_component in sim_component.ReferencedComponents.Items:
+                    if ref_component is None:
+                        continue
                     new_subcomponents.add(ref_component.Target)
 
                 for new_subcomponent in new_subcomponents:
@@ -120,6 +126,8 @@ class PythonMapper(object):
                 new_component_list.update(new_subcomponents)
 
             for component in component_list:
+                if component is None:
+                    continue
                 get_subcomponents(component)
             component_list = list(new_component_list)
 
@@ -128,15 +136,18 @@ class PythonMapper(object):
             typed_data.append(typed_object)
         return typed_data
 
-    # @lru_cache(maxsize=None)
+    # @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:
-            data_model_id = list(data_models)[0].id
-            data_model = list(data_models)[0]
+            logger.warning(f'No data model provided. Using default data model: {config.default_data_model.id}.')
+            data_model = config.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
 
@@ -193,6 +204,7 @@ class PythonMapper(object):
         for prop in taxonomy_map.content:
 
             prop_dict[prop.property_name] = add_properties(prop_name=prop.property_name,
+                                                           text_or_key=prop.text_or_key,
                                                            content=prop,
                                                            taxonomy_map=taxonomy_map,
                                                            taxonomy=taxonomy)
@@ -205,6 +217,10 @@ class PythonMapper(object):
 
         for cls in self.mapped_classes.values():
             cls._cls_instances = WeakSet()
+            cls.__property_cache__ = {}
+
+        if config.default_mapper is self:
+            config.default_mapper = None
 
     def copy(self):
         new_mapper = PythonMapper()
@@ -214,5 +230,5 @@ class PythonMapper(object):
         return new_mapper
 
 
-if config.default_mapper is None:
-    config.default_mapper = PythonMapper()
+if config.get_default_mapper() is None:
+    config._default_mapper = PythonMapper()

PySimultan2/simultan_object.py

@@ -6,7 +6,7 @@ from weakref import WeakSet, WeakValueDictionary
 from . import utils
 from numpy import ndarray
 import colorlog
-from typing import Union
+from typing import Union, Optional
 
 logger = colorlog.getLogger('PySimultan')
 
@@ -69,6 +69,8 @@ class MetaMock(type):
                     kwargs['data_model'] = data_model
                 else:
                     if config.default_data_model is not None:
+                        logger.warning(
+                            f'No data model provided. Using default data model: {config.default_data_model.id}.')
                         data_model = config.default_data_model
                         kwargs['data_model'] = data_model
                     else:
@@ -102,6 +104,11 @@ class SimultanObject(object, metaclass=MetaMock):
     _cls_instances_dict_cache = None
     __type_view__ = None      # ui view cls
 
+    @classmethod
+    def reset_cls(cls):
+        cls._cls_instances = WeakSet()
+        cls._cls_instances_dict_cache = None
+
     @classmethod
     def get_instance_by_id(cls, id: SimId) -> 'SimultanObject':
         return cls._cls_instances_dict.get(id, None)
@@ -147,11 +154,12 @@ class SimultanObject(object, metaclass=MetaMock):
 
         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)
         self._data_model: Union[DataModel, None] = kwargs.get('data_model', config.default_data_model)
         self._object_mapper: Union[PythonMapper, None] = kwargs.get('object_mapper', config.default_mapper)
         self.name = kwargs.get('name', None)
 
+        self.__property_cache__ = {}
+
         self._slot = None
 
     def __getattribute__(self, attr):
@@ -328,8 +336,16 @@ class SimultanObject(object, metaclass=MetaMock):
         """
         other.associate(self)
 
-    def get_raw_attr(self, attr: str):
-        return utils.get_component_taxonomy_entry(self._wrapped_obj, attr)
+    def get_raw_attr(self, attr: Optional[str] = None, text_or_key: Optional[str] = None):
+        if attr is not None:
+            content = self._taxonomy_map.get_content_by_property_name(attr)
+            if content is None:
+                raise KeyError(f'No content found for attribute {attr}')
+
+            return utils.get_component_taxonomy_entry(self._wrapped_obj, content.text_or_key)
+
+        if text_or_key is not None:
+            return utils.get_component_taxonomy_entry(self._wrapped_obj, text_or_key)
 
     def set_attr_prop(self, attr: str, prop: str, value):
         """

PySimultan2/taxonomy_maps.py

@@ -1,6 +1,7 @@
 import io
+from functools import cache
 from ruamel.yaml import YAML, yaml_object, add_representer
-from .config import yaml
+from . import yaml
 
 from typing import TYPE_CHECKING, Optional, Union, Literal
 if TYPE_CHECKING:
@@ -113,6 +114,9 @@ class TaxonomyMap(object):
             content._taxonomy_map = self
         self._content_dict = {}
 
+        self.get_content_by_property_name.cache_clear()
+        self.get_content_by_text_or_key.cache_clear()
+
     @property
     def content_dict(self):
         if self._content_dict == {}:
@@ -167,3 +171,11 @@ class TaxonomyMap(object):
 
     def get_slot(self, data_model: 'DataModel'):
         return SimTaxonomyEntryReference(self.get_or_create_simultan_taxonomy_entry(data_model=data_model, create=True))
+
+    @cache
+    def get_content_by_property_name(self, property_name: str):
+        return next((x for x in self.content if x.property_name == property_name), None)
+
+    @cache
+    def get_content_by_text_or_key(self, text_or_key: str):
+        return next((x for x in self.content if x.text_or_key == text_or_key), None)

PySimultan2/utils.py

@@ -3,7 +3,6 @@ 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
 from typing import List as TypeList, Union, Optional, Type
@@ -32,7 +31,7 @@ if TYPE_CHECKING:
     from .taxonomy_maps import TaxonomyMap, Content
 
 
-from .config import logger
+from . import logger
 from . import config
 from .simultan_object import SimultanObject
 
@@ -69,6 +68,8 @@ def create_python_object(wrapped_obj: SimComponent, cls: Type[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
@@ -92,7 +93,7 @@ def create_python_object(wrapped_obj: SimComponent, cls: Type[SimultanObject], *
             for content in cls._taxonomy_map.content:
                 # logger.debug(f'Get property {content.text_or_key} from wrapped object {wrapped_obj.Name}')
                 kwargs[content.text_or_key] = get_property(wrapped_obj=wrapped_obj,
-                                                           prop_name=content.text_or_key,
+                                                           text_or_key=content.text_or_key,
                                                            object_mapper=kwargs.get('object_mapper', None),
                                                            )
 
@@ -101,11 +102,17 @@ def create_python_object(wrapped_obj: SimComponent, cls: Type[SimultanObject], *
 
         obj = cls.__new__(cls)
         obj.__obj_init__ = True
+        obj.__property_cache__ = dict()
         obj._wrapped_obj = wrapped_obj
         obj._data_model = kwargs.get('data_model', None)
         obj._object_mapper = kwargs.get('object_mapper', None)
         obj.component_policy = kwargs.get('component_policy', 'subcomponent')
 
+        if isinstance(obj, ComponentList):
+            obj.index = kwargs.get('index', 0)
+        if isinstance(obj, ComponentDictionary):
+            obj._dict = {}
+
         if "_cls_instances" not in cls.__dict__:
             cls._cls_instances = WeakSet()
         try:
@@ -655,15 +662,25 @@ def sort_slots(slots, check_same_slot=False) -> list[SimSlot]:
     return slot_extensions
 
 
-def get_property(prop_name, component=None, wrapped_obj=None, object_mapper=None):
+def get_property(prop_name: Optional[str] = None,
+                 text_or_key: Optional[str] = None,
+                 component=None,
+                 wrapped_obj=None,
+                 object_mapper=None):
+
+    if prop_name is None and text_or_key is None:
+        raise ValueError('Either prop_name or text_or_key must be set.')
+    if prop_name is not None:
+        content = component._taxonomy_map.get_content_by_property_name(prop_name)
+        text_or_key = content.text_or_key
 
     if component is not None:
-        obj = get_component_taxonomy_entry(component._wrapped_obj, prop_name)
+        obj = get_component_taxonomy_entry(component._wrapped_obj, text_or_key)
         data_model = component._data_model
         object_mapper = component._object_mapper
     else:
         data_model = config.default_data_model
-        obj = get_component_taxonomy_entry(wrapped_obj, prop_name)
+        obj = get_component_taxonomy_entry(wrapped_obj, text_or_key)
 
     return get_obj_value(obj, data_model=data_model, object_mapper=object_mapper)
 
@@ -1262,6 +1279,7 @@ def set_property_to_dict(value: dict,
 
 
 def add_properties(prop_name: str,
+                   text_or_key: str,
                    content: Content,
                    taxonomy: str,
                    taxonomy_map: 'TaxonomyMap') -> property:
@@ -1269,6 +1287,7 @@ def add_properties(prop_name: str,
     """
     create property for a class
     :param prop_name: name of the property (str)
+    :param text_or_key: text or key of the taxonomy entry (str)
     :param content: content of the property (Content)
     :param prop_name: name of the synonym (str)
     :param taxonomy: taxonomy to use (str)
@@ -1303,32 +1322,36 @@ def add_properties(prop_name: str,
                                    np.ndarray: set_property_to_value_field,
                                    pd.DataFrame: set_property_to_value_field}
 
+    class Empty:
+        pass
+
     def getx(self):
-        return get_property(component=self,
-                            prop_name=content.text_or_key,
-                            object_mapper=self._object_mapper)
 
-    getx.__taxonomy__ = taxonomy
+        cache_value = self.__property_cache__.get(content.text_or_key, Empty)
+
+        if cache_value is not Empty:
+            return self.__property_cache__[content.text_or_key]
 
-    content = next((x for x in taxonomy_map.content if x.property_name == prop_name), None)
+        val = get_property(component=self,
+                           text_or_key=content.text_or_key,
+                           object_mapper=self._object_mapper)
+
+        self.__property_cache__[content.text_or_key] = val
+        return val
+
+    getx.__taxonomy__ = taxonomy
+    content = taxonomy_map.get_content_by_property_name(prop_name)
 
     def setx(self, value: Union[int, float, SimComponent, SimultanObject]):
-        # logger.debug(f'{self.name} {self.id}: Setting {prop_name} to {value}.')
+        self.__property_cache__.pop(content.text_or_key, None)
+
         slot_extension = content.slot_extension
 
         if slot_extension is None:
             slot_extension = 0
 
-        # sim_taxonomy = taxonomy_map.get_or_create_simultan_taxonomy(self._data_model)
         taxonomy_entry = content.get_taxonomie_entry(self._data_model)
 
-        # sim_taxonomy = self._data_model.get_or_create_taxonomy(taxonomy_name=taxonomy_map.taxonomy_name,
-        #                                                        taxonomy_key=taxonomy_map.taxonomy_key)
-        # taxonomy_entry = self._data_model.get_or_create_taxonomy_entry(key=content.text_or_key,
-        #                                                                name=content.property_name,
-        #                                                                sim_taxonomy=sim_taxonomy)
-        # getx.cache_clear()
-
         component_idx, ref_component_idx, parameter_idx, ref_asset_idx = get_param_indices(self._wrapped_obj,
                                                                                            taxonomy_entry)
 
@@ -1365,25 +1388,6 @@ def add_properties(prop_name: str,
 
         setter_fcn(*fcn_arg_list)
 
-        # elif isinstance(value, (SimComponent, SimultanObject)) and not isinstance(value, ComponentList):
-        #     set_property_to_sim_component(*fcn_arg_list)
-        #
-        # elif isinstance(value, (str, int, float)):
-        #     set_property_to_parameter(*fcn_arg_list)
-        #
-        # elif isinstance(value, (np.ndarray, pd.DataFrame)):
-        #     set_propperty_to_value_field(*fcn_arg_list)
-        #
-        # elif isinstance(value, (list, tuple, set, ComponentList)):
-        #     set_property_to_list(*fcn_arg_list)
-        #
-        # elif isinstance(value, FileInfo):
-        #     set_property_to_file_info(*fcn_arg_list, content=content)
-        #
-        # else:
-        #     new_val = create_mapped_python_object(value, self._object_mapper, self._data_model)
-        #     setattr(self, prop_name, new_val)
-
     setx.__taxonomy__ = taxonomy
 
     def delx(self):

pysimultan-0.4.1.dist-info/METADATA

@@ -0,0 +1,50 @@
+Metadata-Version: 2.3
+Name: PySimultan
+Version: 0.4.1
+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
+Author-email: Bühler Maximilian <maximilian.buehler@tuwien.ac.at>
+License-Expression: MIT
+License-File: LICENSE.txt
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.8
+Requires-Dist: colorlog
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: pyarrow
+Requires-Dist: pythonnet
+Requires-Dist: ruamel-yaml
+Requires-Dist: six
+Requires-Dist: tqdm
+Description-Content-Type: text/markdown
+
+# pysimultan_api
+
+[![PyPI - Version](https://img.shields.io/pypi/v/pysimultan-api.svg)](https://pypi.org/project/pysimultan-api)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pysimultan-api.svg)](https://pypi.org/project/pysimultan-api)
+
+-----
+
+## Table of Contents
+
+- [Installation](#installation)
+- [License](#license)
+
+## Installation
+
+```console
+pip install pysimultan-api
+```
+
+## License
+
+`pysimultan-api` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license.

{PySimultan-0.3.3.dist-info → pysimultan-0.4.1.dist-info}/RECORD

@@ -1,16 +1,16 @@
-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=E4aS3NuLl0mG5vBJv0saxbBFWk1s4eSg21cl4bcNAH8,22880
-PySimultan2/files.py,sha256=q6A5KTqU1nCwh0W0Qf3Se7qcvhGiDAWza2v-X-rt6E4,12473
+PySimultan2/__about__.py,sha256=L2Offsg-6m5gCNnCgevSz7hv6G-kIe1QidASLbohFtk,19
+PySimultan2/__init__.py,sha256=00tn7bPM8yncDR41VxBYm5_gVy6i7ZdzpRJoop2pbLc,2692
+PySimultan2/data_model.py,sha256=FBYw5yz4lNGgbpnuCnkkwBEkSxI3bv9eE4vumoxCeLU,26956
+PySimultan2/default_types.py,sha256=GGAnuOCwF7YSt6tPDMr6houAILWyRsAhMfb9Y_Rpetk,22946
+PySimultan2/files.py,sha256=97lRYzKP9hEqP0vKRUbYdd4WSRkgVQ-mJhSJuP_CYSY,12631
 PySimultan2/multi_values.py,sha256=ZFXlTLuZo32x7_7diYAp2XEjp5uwgHLgNOzN7v74-5I,13650
-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=PBmXTchWc7neXdBcYRx60Qo1-JSvvOJu2t6nrq_7Ht4,62930
+PySimultan2/object_mapper.py,sha256=FvZR6qEB_dbsaH6V3EE9JgZdTgRTEvbYus01xp6wt9k,9676
+PySimultan2/simultan_object.py,sha256=nK28YKOMAQfRJZGwjgbI9sFtJBb84kEaTIwGzWBiAqw,16900
+PySimultan2/taxonomy_maps.py,sha256=aU9zUJph7QcInIZq0W-Vqoy4DYr0CEs-VsXwPMK_cxU,7976
+PySimultan2/utils.py,sha256=w806h9aKT3T8Qn178qpXvuzaNpoNGzQVKORhtt3VGBM,62456
 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
+PySimultan2/geometry/geometry_base.py,sha256=HMz4jZk9Himd5zXZw642kX80bs5TcZNzAE4lPTIRwas,23393
+PySimultan2/geometry/utils.py,sha256=J25YsK8sso_UL7xRusItQZvyjtvxdOsSPelBQYFABhY,8519
 PySimultan2/resources/AssimpNet.dll,sha256=x8uwMHPRmEH9fDQihfEQLUdblM1u7RP-CCnUjOpXcLo,205312
 PySimultan2/resources/AvalonDock.dll,sha256=9tCcw7cpaVq0bh1H2sfcxb8EWhySmgujPs89lAqIPZs,500224
 PySimultan2/resources/BruTile.dll,sha256=ZiE_vovBW_CZOjDgOn8eaq_tfWRBD3-nSEk0ctBSdKI,198144
@@ -75,8 +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.3.3.dist-info/LICENSE.txt,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-PySimultan-0.3.3.dist-info/METADATA,sha256=zdtPzID1vCUiaHgqWw_ZbZXXKdE8Bmb9QszX04zXANU,1990
-PySimultan-0.3.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-PySimultan-0.3.3.dist-info/top_level.txt,sha256=pbE6SbdKIEEK4vaDNmmdRTj0vesrjgRXGow8QWMTXvk,12
-PySimultan-0.3.3.dist-info/RECORD,,
+pysimultan-0.4.1.dist-info/METADATA,sha256=J3X6HkTS9PHazoL50e2K-cugM3v3-7dRXjPe-oEVnRM,1657
+pysimultan-0.4.1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+pysimultan-0.4.1.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
+pysimultan-0.4.1.dist-info/RECORD,,

{PySimultan-0.3.3.dist-info → pysimultan-0.4.1.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: hatchling 1.24.2
 Root-Is-Purelib: true
 Tag: py3-none-any
-

pysimultan-0.4.1.dist-info/licenses/LICENSE.txt

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2024-present Bühler Maximilian <maximilian.buehler@a1.digital>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

PySimultan-0.3.3.dist-info/LICENSE.txt

@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.

PySimultan-0.3.3.dist-info/METADATA

@@ -1,44 +0,0 @@
-Metadata-Version: 2.1
-Name: PySimultan
-Version: 0.3.3
-Home-page: 
-Author: Max Buehler
-Author-email: Max Bühler <maximilian.buehler@tuwien.ac.at>
-License: Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to
-        deal in the Software without restriction, including without limitation the
-        rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-        sell copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in
-        all copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-        FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-        IN THE SOFTWARE.
-        
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-License-File: LICENSE.txt
-Requires-Dist: six
-Requires-Dist: numpy
-Requires-Dist: pythonnet
-Requires-Dist: colorlog
-Requires-Dist: ruamel.yaml
-Requires-Dist: tqdm
-Requires-Dist: pandas
-Requires-Dist: pyarrow
-
-===================================================
-geometry_utils: Several tools to work with geometry
-===================================================
-
-Python library with several tools to work with geometry

PySimultan-0.3.3.dist-info/top_level.txt

@@ -1 +0,0 @@
-PySimultan2

PySimultan2/config.py

@@ -1,52 +0,0 @@
-import os
-import sys
-from ruamel.yaml import YAML, yaml_object, add_representer
-
-import colorlog
-try:
-    import importlib.resources as pkg_resources
-except ImportError:
-    # Try backported to PY<37 importlib_resources.
-    import importlib_resources as pkg_resources
-
-
-from . import resources
-sys.path.append(str(pkg_resources.files(resources)))
-
-logger = colorlog.getLogger('PySimultan')
-logger.setLevel('DEBUG')
-
-dll_path = os.environ.get('SIMULTAN_SDK_DIR', None)
-if dll_path is None:
-    with pkg_resources.path(resources, 'SIMULTAN.dll') as r_path:
-        dll_path = str(r_path)
-sys.path.append(dll_path)
-
-from pythonnet import load
-from pythonnet import clr_loader, set_runtime
-list(clr_loader.find_runtimes())
-load('coreclr')
-import clr
-test = clr.AddReference(os.path.join(dll_path, 'SIMULTAN.dll') if not dll_path.endswith('SIMULTAN.dll') else dll_path)
-clr.AddReference("System.Security.Cryptography")
-# clr.AddReference(os.path.join(dll_path, 'SIMULTAN'))
-
-from SIMULTAN.Data.Components import SimComponent
-
-continue_on_error = True
-
-
-def represent_none(self, _):
-    return self.represent_scalar('tag:yaml.org,2002:null', '')
-
-
-add_representer(type(None), represent_none)
-yaml = YAML()
-yaml.default_flow_style = None
-yaml.preserve_quotes = True
-yaml.allow_unicode = True
-
-# define which axis is in up/down direction; 0: x-axis; 1: y-axis; 2: z-axis; In SIMULTAN the y-axis is the up/down axis
-cs_axis_up = 2
-default_data_model = None
-default_mapper = None