PySimultan 0.7.1__tar.gz → 0.7.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.7.1
+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

pysimultan-0.7.2/src/PySimultan2/__about__.py

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

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

@@ -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:
@@ -701,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,
@@ -974,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]:
@@ -1004,6 +1003,7 @@ class DataModel:
         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)
 
@@ -1012,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.1/src/PySimultan2/__about__.py

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