PySimultan 0.7.0__tar.gz → 0.7.2__tar.gz

{pysimultan-0.7.0 → pysimultan-0.7.2}/.gitignore

@@ -23,6 +23,7 @@ simultan_exception*
 /PySimultan2/tests/readme_examples/resources/~*
 /tests/readme_examples/resources/*.codxf
 *.creds
+*.env
 
 *.AppImage
 

{pysimultan-0.7.0 → pysimultan-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.7.0
+Version: 0.7.2
 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
@@ -14,8 +14,6 @@ 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 :: 3.13
-Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.8
@@ -168,6 +166,9 @@ print(instances[0].param_1)
 
 
 # Change Log
+## [0.6.4] - 2025-06-06
+Updated SIMULTAN version to 0.7.18
+
 ## [0.5.9.7] - 2025-01-09
 - Added default component support to Mapper: if a default component is not present in the datamodel, it is automatically added
 - Fixed content naming bug: Content.name is now used for the name of the TaxonomyEntry in SIMULTAN

{pysimultan-0.7.0 → pysimultan-0.7.2}/README.md

@@ -137,6 +137,9 @@ print(instances[0].param_1)
 
 
 # Change Log
+## [0.6.4] - 2025-06-06
+Updated SIMULTAN version to 0.7.18
+
 ## [0.5.9.7] - 2025-01-09
 - Added default component support to Mapper: if a default component is not present in the datamodel, it is automatically added
 - Fixed content naming bug: Content.name is now used for the name of the TaxonomyEntry in SIMULTAN

{pysimultan-0.7.0 → pysimultan-0.7.2}/pyproject.toml

@@ -21,8 +21,6 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
-  "Programming Language :: Python :: 3.13",
-  "Programming Language :: Python :: 3.14",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]

pysimultan-0.7.2/src/PySimultan2/__about__.py

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

{pysimultan-0.7.0 → pysimultan-0.7.2}/src/PySimultan2/data_model.py

@@ -284,7 +284,7 @@ class DataModel:
         self.data = self.project_data_manager.Components
 
         self.create_component_dict.cache_clear()
-        self.get_component_by_id.cache_clear()
+        self.get_component_by_id_cached.cache_clear()
 
         return self.data
 
@@ -357,7 +357,7 @@ class DataModel:
             self.data.RemoveItem(index)
 
         self.create_component_dict.cache_clear()
-        self.get_component_by_id.cache_clear()
+        self.get_component_by_id_cached.cache_clear()
 
     def remove_component(self,
                          component: Union[SimComponent, SimultanObject] = None,
@@ -380,7 +380,7 @@ class DataModel:
             self.data.RemoveItem(index)
 
         self.create_component_dict.cache_clear()
-        self.get_component_by_id.cache_clear()
+        self.get_component_by_id_cached.cache_clear()
 
     def save(self):
         """
@@ -464,7 +464,7 @@ class DataModel:
             self.data.RemoveItem(index)
 
         self.create_component_dict.cache_clear()
-        self.get_component_by_id.cache_clear()
+        self.get_component_by_id_cached.cache_clear()
 
     def add_new_geometry_model(self, file_name: str, model_name: str = None, return_resource=False):
         """
@@ -474,7 +474,7 @@ class DataModel:
         :param return_resource: return the resource
         :return: GeometryViewer.Model.GeometryModel, geo_resource
         """
-        self.get_file_infos.cache_clear()
+        self.get_file_infos_cached.cache_clear()
         geo_resource = self.add_geometry_resource(file_name)
         file_info = SystemFileInfo(geo_resource.CurrentFullPath)
         try:
@@ -505,7 +505,7 @@ class DataModel:
                                                              model_name,
                                                              self.service_provider)
 
-        self.get_file_infos.cache_clear()
+        self.get_file_infos_cached.cache_clear()
         return new_resource
 
     def add_empty_resource(self,
@@ -519,7 +519,7 @@ class DataModel:
         """
         # return self.project.AddResourceFile(FileInfo(str(filename)))
 
-        self.get_file_infos.cache_clear()
+        self.get_file_infos_cached.cache_clear()
         if target_dir is None:
             return self.project.AddEmptyResource(SystemFileInfo(str(filename)))
         else:
@@ -601,7 +601,11 @@ class DataModel:
 
             existing_files = [x.current_full_path for x in self.project_data_manager.AssetManager.Resources]
             try:
-                act_filename = filename.replace('\\', os.sep)
+                if isinstance(filename, (PosixPath, WindowsPath)):
+                    # convert to SystemFileInfo
+                    act_filename = str(filename)
+                else:
+                    act_filename = filename.replace('\\', os.sep)
             except TypeError:
                 act_filename = filename
 
@@ -697,7 +701,7 @@ class DataModel:
             logger.info(f'Deleted resource {resource.Name} from project {self.project_path}')
         else:
             logger.error(f'Could not delete resource {resource.Name} from project {self.project_path}')
-        self.get_file_infos.cache_clear()
+        self.get_file_infos_cached.cache_clear()
         return success
 
     def get_existing_resource_directory_entry(self,
@@ -970,7 +974,6 @@ class DataModel:
         self.component_dict = {x.Id: x for x in component_list}
         return self.component_dict
 
-    @lru_cache()
     def get_component_by_id(self,
                             item_id: SimId,
                             search_subcomponents=False) -> Union[SimComponent, None]:
@@ -978,11 +981,29 @@ class DataModel:
         # print(item_id.GlobalId, item_id.LocalId)
         # _ = [print((x.Id.GlobalId, x.Id.LocalId)) for x in self.data.Items]
 
+        component = self.get_component_by_id_cached(item_id=item_id,
+                                                    search_subcomponents=search_subcomponents)
+        if component is None:
+            self.get_component_by_id_cached.cache_clear()
+            component = self.get_component_by_id_cached(item_id=item_id,
+                                                    search_subcomponents=search_subcomponents)
+
+        return component
+
+    @lru_cache()
+    def get_component_by_id_cached(self,
+                            item_id: SimId,
+                            search_subcomponents=False) -> Union[SimComponent, None]:
+
+        # print(item_id.GlobalId, item_id.LocalId)
+        # _ = [print((x.Id.GlobalId, x.Id.LocalId)) for x in self.data.Items]
+
         component = next((x for x in self.data.Items if x.Id.Equals(item_id)), None)
 
         if component is None and search_subcomponents:
             component = self.component_dict.get(item_id, None)
             if component is None:
+                self.create_component_dict.cache_clear()
                 self.create_component_dict()
                 component = self.component_dict.get(item_id, None)
 
@@ -991,8 +1012,23 @@ class DataModel:
     def get_component_by_name(self, name: str) -> list[SimComponent]:
         return [x for x in self.create_component_dict.values() if x.Name == name]
 
-    @lru_cache()
     def get_file_infos(self) -> list[PythonFileInfo]:
+        """
+        Get all file infos from the project
+        :return: list of PythonFileInfo objects
+        """
+        file_infos = self.get_file_infos_cached()
+        if file_infos.__len__() != self.assets.__len__():
+            logger.warning(f'No file infos found in project {self.project_path}. '
+                           f'Please check if the project is loaded correctly.')
+            # try to reload the file infos
+            self.get_file_infos_cached.cache_clear()
+            file_infos = self.get_file_infos_cached()
+
+        return self.get_file_infos_cached()
+
+    @lru_cache()
+    def get_file_infos_cached(self) -> list[PythonFileInfo]:
         file_infos = []
         for asset in self.assets:
             if isinstance(asset, ResourceFileEntry):

{pysimultan-0.7.0 → pysimultan-0.7.2}/src/PySimultan2/object_mapper.py

@@ -104,9 +104,9 @@ class PythonMapper(object):
     def register(self,
                  taxonomy: str,
                  cls: Type[Any],
-                 re_register=True,
-                 update_in_other_mappers=False,
-                 taxonomy_map=None):
+                 taxonomy_map: TaxonomyMap,
+                 re_register: bool = True,
+                 update_in_other_mappers: bool = False):
 
         # print(f'Registering {taxonomy} with {cls} {hash(cls)}')
 

pysimultan-0.7.2/tests/resources/new_test_file.txt

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

pysimultan-0.7.2/tests/resources/new_test_file2.txt

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

{pysimultan-0.7.0 → pysimultan-0.7.2}/tests/test_files.py

@@ -118,6 +118,7 @@ def test_add_resource_file():
         f.write('This is the content of the already existing file 2.')
 
     file = data_model.add_resource_file(file_path)
+    file = data_model.add_resource(file_path)
     print(file)
 
     file_path = os.path.join(str(data_model.project.ProjectUnpackFolder), 'already_exising_3.txt')
@@ -133,8 +134,6 @@ def test_add_resource_file():
                                                file_value_2=file_info)
 
 
-
-
 if __name__ == '__main__':
     new_resource = test_create_resource()
     test_create_resource_from_string()

pysimultan-0.7.0/src/PySimultan2/__about__.py

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