PySimultan 0.6.4__tar.gz → 0.6.5__tar.gz

{pysimultan-0.6.4 → pysimultan-0.6.5}/.gitignore

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

{pysimultan-0.6.4 → pysimultan-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.6.4
+Version: 0.6.5
 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.6.5/src/PySimultan2/__about__.py

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

{pysimultan-0.6.4 → pysimultan-0.6.5}/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):
         """
@@ -601,9 +601,13 @@ 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 = str(filename)
+                act_filename = filename
 
             if not act_filename.startswith(self.project.ProjectUnpackFolder.FullPath) and target_dir is None:
                 target_dir_str = self.project.ProjectUnpackFolder.FullPath
@@ -978,6 +982,23 @@ 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:

{pysimultan-0.6.4 → pysimultan-0.6.5}/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.6.4/src/PySimultan2/__about__.py

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