PySimultan 0.4.13__tar.gz → 0.4.16__tar.gz

{pysimultan-0.4.13 → pysimultan-0.4.16}/PKG-INFO

@@ -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.16/src/PySimultan2/__about__.py

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

{pysimultan-0.4.13 → pysimultan-0.4.16}/src/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)

{pysimultan-0.4.13 → pysimultan-0.4.16}/src/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

{pysimultan-0.4.13 → pysimultan-0.4.16}/src/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

{pysimultan-0.4.13 → pysimultan-0.4.16}/src/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

{pysimultan-0.4.13 → pysimultan-0.4.16}/src/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)

{pysimultan-0.4.13 → pysimultan-0.4.16}/src/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.16/tests/resources/new_test_file.txt

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

pysimultan-0.4.16/tests/resources/new_test_file2.txt

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

{pysimultan-0.4.13 → pysimultan-0.4.16}/tests/test_calculate_steady_state_temperature.py

@@ -96,7 +96,7 @@ def create_classes() -> tuple[dict[str, type], PythonMapper]:
         def area(self):
 
             if not self.associated_geometry:
-                raise ValueError('No associated geometry')
+                raise ValueError('No associated fc_geometry')
 
             return sum((x.area for x in self.associated_geometry))
 

{pysimultan-0.4.13 → pysimultan-0.4.16}/tests/test_new_dll.py

@@ -16,8 +16,8 @@ ref = data_model.get_associated_geometry(list(of_volumes)[0])
 
 c = data_model.get_referenced_components(ref[0])
 
-# geometry = list(data_model.models)[2].Geometry.GeometryFromId(367)
-# component = data_model.exch.GetComponents(geometry)
+# fc_geometry = list(data_model.models)[2].Geometry.GeometryFromId(367)
+# component = data_model.exch.GetComponents(fc_geometry)
 
 [list(data_model.exch.GetComponents(x)) for x in list(list(data_model.models.values())[2].Geometry.Volumes)]
 

{pysimultan-0.4.13 → pysimultan-0.4.16}/tests/test_taxonomie_maps.py

@@ -7,7 +7,7 @@ def test_create_taxonomie_map(filename):
                        property_name='of_geometry',       # name of the generated property
                        type=None,                         # type of the content/parameter/property
                        unit=None,                         # unit of the content/parameter/property
-                       documentation='Component or reference which represents the case geometry')
+                       documentation='Component or reference which represents the case fc_geometry')
 
     content1 = Content(text_or_key='meshing',  # text or key of the content/parameter/property
                        property_name='meshing',  # name of the generated property

pysimultan-0.4.13/src/PySimultan2/__about__.py

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