PySimultan 0.4.13__py3-none-any.whl → 0.4.16__py3-none-any.whl

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.4.13'
+version = '0.4.16'

PySimultan2/data_model.py

@@ -127,10 +127,6 @@ class DataModel:
 
         instance = super().__new__(cls)
         config.set_default_data_model(instance)
-        try:
-            default_data_model.set_default_data_model(instance)
-        except Exception as e:
-            logger.error(f'Error adding instance {instance} to data_models: {e}')
         return instance
 
     def __init__(self, *args, **kwargs):
@@ -179,7 +175,7 @@ class DataModel:
     @property
     def models(self) -> dict[int, 'GeometryModel']:
         """
-        Return the geometry models of the project
+        Return the fc_geometry models of the project
         :return: dict[int, GeometryModel]
         """
 
@@ -437,9 +433,9 @@ class DataModel:
 
     def add_new_geometry_model(self, file_name: str, model_name: str = None, return_resource=False):
         """
-        Create and add a new geometry model
+        Create and add a new fc_geometry model
         :param file_name: name of the created .simgeo file
-        :param model_name: name of the geometry model
+        :param model_name: name of the fc_geometry model
         :param return_resource: return the resource
         :return: GeometryViewer.Model.GeometryModel, geo_resource
         """
@@ -465,7 +461,7 @@ class DataModel:
 
     def add_geometry_resource(self, model_name: str):
         """
-        Add / create new geometry resource (.simgeo file)
+        Add / create new fc_geometry resource (.simgeo file)
         :param model_name: name of the new .simgeo file without file extension; Example: 'new_model'
         """
         self.service_provider.GetService[IGeometryViewerService]()
@@ -654,7 +650,7 @@ class DataModel:
                                                               name,
                                                               f'{0} ({1})',
                                                               self.project.AllProjectDataManagers.DispatcherTimerFactory)
-        # Load the geometry model
+        # Load the fc_geometry model
         model_to_work_with = SimGeoIO.Load(resource_file,
                                            self.project_data_manager,
                                            None)

PySimultan2/files.py

@@ -245,6 +245,7 @@ class FileInfo(object, metaclass=MetaMock):
                 self.data_model = config.get_default_data_model()
             if self.data_model is not None:
                 self.resource_entry = self.data_model.add_resource(self.file_path)
+                self.file_path = self.resource_entry.File.FullPath
         return self._resource_entry
 
     @resource_entry.setter

PySimultan2/geometry/geometry_base.py

@@ -108,7 +108,7 @@ class SimultanLayer(BaseGeometry):
     @classmethod
     def create_simultan_instance(cls, *args, **kwargs) -> 'SimultanLayer':
         """
-        Create a new SimultanLayer instance and add to the geometry model
+        Create a new SimultanLayer instance and add to the fc_geometry model
         :keyword geometry_model: GeometryModel
         :keyword name: str
         :return: SimultanLayer

PySimultan2/object_mapper.py

@@ -300,6 +300,13 @@ class PythonMapper(object):
         if remove_from_default and config.get_default_mapper() is self:
             config.set_default_mapper(None)
 
+    def create_sim_component(self,
+                             obj,
+                             data_model: 'DataModel'):
+        from . utils import create_mapped_python_object
+        new_val = create_mapped_python_object(obj, self, data_model)
+        return new_val
+
     def copy(self):
         new_mapper = PythonMapper()
         new_mapper.registered_classes = self.registered_classes

PySimultan2/simultan_object.py

@@ -6,7 +6,7 @@ from weakref import WeakSet
 from . import utils
 from numpy import ndarray
 import colorlog
-from typing import Union, Optional
+from typing import Union, Optional, Any
 
 logger = colorlog.getLogger('PySimultan')
 
@@ -148,16 +148,15 @@ 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.__obj_init__: bool = kwargs.get('__obj_init__', False)
         self._data_model: Union[DataModel, None] = kwargs.get('data_model', config.get_default_data_model())
         self._object_mapper: Union[PythonMapper, None] = kwargs.get('object_mapper', config.get_default_mapper())
-        self.name = kwargs.get('name', None)
+        self.name: str = kwargs.get('name', '')
 
         self.__property_cache__ = {}
-
         self._slot = None
 
-    def __getattribute__(self, attr):
+    def __getattribute__(self, attr) -> Any:
 
         try:
             return object.__getattribute__(self, attr)
@@ -168,7 +167,7 @@ class SimultanObject(object, metaclass=MetaMock):
             else:
                 raise KeyError
 
-    def __setattr__(self, attr, value):
+    def __setattr__(self, attr, value) -> None:
         if hasattr(self, '_wrapped_obj'):
             if hasattr(self._wrapped_obj, attr) and (self._wrapped_obj is not None) and not self.__obj_init__:
                 object.__setattr__(self._wrapped_obj, attr, value)
@@ -330,7 +329,7 @@ class SimultanObject(object, metaclass=MetaMock):
     def associate(self, other: 'ExtendedBaseGeometry'):
         """
         Associate this object with another object
-        :param other: geometry object to associate with
+        :param other: fc_geometry object to associate with
         :return: None
         """
         other.associate(self)

PySimultan2/utils.py

@@ -4,7 +4,7 @@ from enum import Enum
 from weakref import WeakSet
 import numpy as np
 import pandas as pd
-from typing import List as TypeList, Union, Optional, Type
+from typing import List as TypeList, Union, Optional, Type, Any, TYPE_CHECKING
 from SIMULTAN.Data.Components import (ComponentWalker, SimComponent, SimBoolParameter, SimDoubleParameter,
                                       SimEnumParameter, SimIntegerParameter, SimStringParameter, ComponentMapping,
                                       SimSlot, SimComponentVisibility, SimChildComponentEntry, SimDefaultSlots,
@@ -21,7 +21,6 @@ from .multi_values import (simultan_multi_value_field_3d_to_numpy, set_parameter
                            create_field_parameter, simultan_multi_value_big_table_to_pandas)
 from .files import FileInfo, remove_asset_from_component, add_asset_to_component
 
-from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from .default_types import ComponentList, ComponentDictionary
     from .simultan_object import SimultanObject
@@ -125,7 +124,7 @@ def create_python_object(wrapped_obj: SimComponent, cls: Type[SimultanObject], *
             logger.error(f'Error adding instance {obj} to _cls_instances: {e}')
 
         if hasattr(cls, '__load_init__'):
-            obj.__init__(*args, **kwargs)
+            obj.__load_init__(*args, **kwargs)
         #
         circ_ref_resolver.unresolved_objects.pop(wrapped_obj.Id)
 
@@ -563,7 +562,7 @@ def find_components_with_taxonomy(component_list: list[SimComponent], key, first
 
 def get_component_geometry(data_model, geometry_model, component) -> tuple[list[Vertex], list[Edge], list[Face], list[Volume]]:
     """
-    Get the geometry of a component from a geometry model
+    Get the fc_geometry of a component from a fc_geometry model
     :param data_model:
     :param geometry_model:
     :param component:
@@ -867,7 +866,7 @@ param_type_lookup_dict = {str: SimStringParameter,
                           bool: SimBoolParameter}
 
 
-def create_mapped_python_object(value: SimComponent,
+def create_mapped_python_object(value: Any,
                                 object_mapper: PythonMapper,
                                 data_model: DataModel,
                                 add_to_data_model=True) -> SimultanObject:
@@ -885,8 +884,9 @@ def create_mapped_python_object(value: SimComponent,
 
     # logger.debug(f'Creating mapped python object for {value}.')
     if type(value) in object_mapper.registered_classes.values():
-        key = list(filter(lambda x: object_mapper.registered_classes[x] ==
-                                    type(value), object_mapper.registered_classes))[0]
+        key = list(filter(lambda x: object_mapper.registered_classes[x] == type(value),
+                          object_mapper.registered_classes)
+                   )[0]
         mapped_cls = object_mapper.get_mapped_class(key)
         new_val = mapped_cls(**value.__dict__,
                              data_model=data_model,
@@ -1346,7 +1346,7 @@ def add_properties(prop_name: str,
     getx.__taxonomy__ = taxonomy
     content = taxonomy_map.get_content_by_property_name(prop_name)
 
-    def setx(self, value: Union[int, float, SimComponent, SimultanObject]):
+    def setx(self, value: Union[int, float, str, tuple, set, SimComponent, SimultanObject]):
         self.__property_cache__.pop(content.text_or_key, None)
 
         slot_extension = content.slot_extension

{pysimultan-0.4.13.dist-info → pysimultan-0.4.16.dist-info}/METADATA

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

@@ -1,15 +1,15 @@
-PySimultan2/__about__.py,sha256=EY8c7-iLRSsrqamMgeexR0J6u60PLRTp9GGf8iqIJsI,20
+PySimultan2/__about__.py,sha256=0e2on0xO5xwM95wRw1ckE4dW-wmxFjVGnM8xbJRrNEk,20
 PySimultan2/__init__.py,sha256=cabTN1Oz8xtFM31ouBKg5lwLqW5vtexDP669PYyNLnA,3224
-PySimultan2/data_model.py,sha256=bRApPggy5dOMFDt6MLctEDWevY9aOYB3OWQMCCsSa0k,27201
+PySimultan2/data_model.py,sha256=xosu5TAfgsrxwyhd6SfHFp4Wvo1_YtxdHsSuZmuNVJU,27022
 PySimultan2/default_types.py,sha256=v_4awsUURLbu4Sfw7J_7BoQKirXbKdU9s7-wqgA4nNE,23112
-PySimultan2/files.py,sha256=gx3BA6WYjNVplqqes7jkPopp6O50pgLvantXgmitx54,12657
+PySimultan2/files.py,sha256=8F1QC9nTsTSrCpu5vGx1xGx-7UgkDwoICXau_5j7UzI,12725
 PySimultan2/multi_values.py,sha256=ZFXlTLuZo32x7_7diYAp2XEjp5uwgHLgNOzN7v74-5I,13650
-PySimultan2/object_mapper.py,sha256=lGF9gJNMtrtfUErVnaDgTpLSaJh1wzdQdavTlWeBQho,12938
-PySimultan2/simultan_object.py,sha256=xpBmyJTkP7iHg4CgaoezBB5YxpES2RaoFOUSe_2jWwI,16899
+PySimultan2/object_mapper.py,sha256=2VewplU_qaJV-TBeirbOmDzdPJ8Ie6WMTFN7je-ydW0,13218
+PySimultan2/simultan_object.py,sha256=GJ_uivwmYxXDqkP-wda7dAQZ9R-FDiXKwJIA3iLHBfg,16929
 PySimultan2/taxonomy_maps.py,sha256=IYpIat6ZJi5MyCbsjAxWvVOWDRp_VvSMWUY3CApKSik,8061
-PySimultan2/utils.py,sha256=J3T7KDfONFeLWBulXmGMCaaOu5sfkDSHmI92JWO8dW4,62553
+PySimultan2/utils.py,sha256=qhF46rCHmI96Hdp9sdHAAkUJtaQxoG6YJu7Hx5IM4Go,62569
 PySimultan2/geometry/__init__.py,sha256=nJolTD1i5J8qUkOQa-r3D20aq3Co3sN31Xc0n4wJpJo,248
-PySimultan2/geometry/geometry_base.py,sha256=jOTNMISGLRjUUjVfPZ64A2Fp4oinv42polIct9bgIY4,23417
+PySimultan2/geometry/geometry_base.py,sha256=nbb9U2W3vFviVLxISLHRi2CVyLEM-3zIKvoZ1uSYs_8,23420
 PySimultan2/geometry/utils.py,sha256=J25YsK8sso_UL7xRusItQZvyjtvxdOsSPelBQYFABhY,8519
 PySimultan2/resources/AssimpNet.dll,sha256=x8uwMHPRmEH9fDQihfEQLUdblM1u7RP-CCnUjOpXcLo,205312
 PySimultan2/resources/AvalonDock.dll,sha256=9tCcw7cpaVq0bh1H2sfcxb8EWhySmgujPs89lAqIPZs,500224
@@ -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.13.dist-info/METADATA,sha256=AQifEiOB8xWkvUKa_ECTWSCvGhSrhlZ-7j7jSHwyRvI,2483
-pysimultan-0.4.13.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-pysimultan-0.4.13.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
-pysimultan-0.4.13.dist-info/RECORD,,
+pysimultan-0.4.16.dist-info/METADATA,sha256=HaedoQtjB0S9ke2jifPQiSDG9rB6aOqHv3JL2EvBJ9U,2483
+pysimultan-0.4.16.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+pysimultan-0.4.16.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
+pysimultan-0.4.16.dist-info/RECORD,,