PySimultan 0.4.14__tar.gz → 0.4.17__tar.gz

{pysimultan-0.4.14 → pysimultan-0.4.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.4.14
+Version: 0.4.17
 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.17/src/PySimultan2/__about__.py

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

{pysimultan-0.4.14 → pysimultan-0.4.17}/src/PySimultan2/data_model.py

@@ -127,6 +127,7 @@ class DataModel:
 
         instance = super().__new__(cls)
         config.set_default_data_model(instance)
+        return instance
 
     def __init__(self, *args, **kwargs):
         """
@@ -174,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]
         """
 
@@ -432,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
         """
@@ -460,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]()
@@ -649,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.14 → pysimultan-0.4.17}/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.14 → pysimultan-0.4.17}/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.14 → pysimultan-0.4.17}/src/PySimultan2/object_mapper.py

@@ -291,10 +291,10 @@ class PythonMapper(object):
 
     def clear(self, remove_from_default=False):
         for cls in self.registered_classes.values():
-            cls._cls_instances = WeakSet()
+            cls._cls_instances = set()
 
         for cls in self.mapped_classes.values():
-            cls._cls_instances = WeakSet()
+            cls._cls_instances = set()
             cls.__property_cache__ = {}
 
         if remove_from_default and config.get_default_mapper() is self:

{pysimultan-0.4.14 → pysimultan-0.4.17}/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')
 
@@ -94,14 +94,14 @@ class MetaMock(type):
 
 class SimultanObject(object, metaclass=MetaMock):
 
-    _cls_instances = WeakSet()  # weak set with all created objects
+    _cls_instances = set()  # weak set with all created objects
     _create_all = False  # if true all properties are evaluated to create python objects when initialized
     _cls_instances_dict_cache = None
     __type_view__ = None      # ui view cls
 
     @classmethod
     def reset_cls(cls):
-        cls._cls_instances = WeakSet()
+        cls._cls_instances = set()
         cls._cls_instances_dict_cache = None
 
     @classmethod
@@ -129,7 +129,7 @@ class SimultanObject(object, metaclass=MetaMock):
     def __new__(cls, *args, **kwargs):
         instance = super().__new__(cls)
         if "_cls_instances" not in cls.__dict__:
-            cls._cls_instances = WeakSet()
+            cls._cls_instances = set()
         try:
             cls._cls_instances.add(instance)
         except Exception as e:
@@ -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.14 → pysimultan-0.4.17}/src/PySimultan2/utils.py

@@ -562,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:

{pysimultan-0.4.14 → pysimultan-0.4.17}/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.14 → pysimultan-0.4.17}/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.14 → pysimultan-0.4.17}/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.14/src/PySimultan2/__about__.py

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