PySimultan 0.5.9.3__tar.gz → 0.5.9.5__tar.gz

{pysimultan-0.5.9.3 → pysimultan-0.5.9.5}/.gitignore

@@ -15,6 +15,7 @@ build
 *.codxf
 *.grdxf
 ~*.simultan
+*.simultan
 *.simultanbackup
 simultan_exception*
 /PySimultan2/tests/resources/~*

{pysimultan-0.5.9.3 → pysimultan-0.5.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.5.9.3
+Version: 0.5.9.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
@@ -167,6 +167,9 @@ print(instances[0].param_1)
 
 # Change Log
 
+## [0.5.9.4] - 2024-12-31
+- Fixed bug in DirectoryInfo where \_\_dir_helper_file__ was not found if already existing
+
 ## [0.5.8] - 2024-12-17
 - Added FileInfo.from_existing_file method to create FileInfo object from existing file in ProjectUnpackFolder
 

{pysimultan-0.5.9.3 → pysimultan-0.5.9.5}/README.md

@@ -138,6 +138,9 @@ print(instances[0].param_1)
 
 # Change Log
 
+## [0.5.9.4] - 2024-12-31
+- Fixed bug in DirectoryInfo where \_\_dir_helper_file__ was not found if already existing
+
 ## [0.5.8] - 2024-12-17
 - Added FileInfo.from_existing_file method to create FileInfo object from existing file in ProjectUnpackFolder
 

{pysimultan-0.5.9.3 → pysimultan-0.5.9.5}/src/PySimultan2/CHANGELOG.md

@@ -1,3 +1,6 @@
+Version 0.5.9.4 (31.12.2024)
+- Fixed bug in DirectoryInfo where __dir__helper_file__ was not found if already existing
+
 Version 0.5.7 (11.12.2024)
 - Added get_orientation_to_volume method to SimultanFace which returns the orientation of the face to the volume
 

pysimultan-0.5.9.5/src/PySimultan2/__about__.py

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

{pysimultan-0.5.9.3 → pysimultan-0.5.9.5}/src/PySimultan2/__init__.py

@@ -29,7 +29,6 @@ def setup_logging():
 
     logger = colorlog.getLogger('PySimultan')
     logger.addHandler(handler)
-    logger.setLevel('DEBUG')
 
     return logger
 

{pysimultan-0.5.9.3 → pysimultan-0.5.9.5}/src/PySimultan2/data_model.py

@@ -38,6 +38,7 @@ from System.Security import SecureString
 from SIMULTAN.Data import SimId
 from System import Guid
 from System.IO import DirectoryInfo
+from System.IO import FileInfo as SystemFileInfo
 from System.IO import *
 from System.Security import *
 from System.Security.Cryptography import *
@@ -99,7 +100,7 @@ class DataModel:
                                             SimultanUsers.SimUserRole.ADMINISTRATOR)
 
         tempPath = Path.GetTempPath()
-        projectFile = FileInfo(project_path)
+        projectFile = SystemFileInfo(project_path)
         projectData = ExtendedProjectData()
 
         projectData.UsersManager.EncryptionKey = encryptionKey
@@ -249,7 +250,7 @@ class DataModel:
     def project(self):
         if (self._project is None) and (self.project_path is not None) and (self.project_data_manager is not None):
             logger.debug('loading project')
-            self.project = ZipProjectIO.Load(FileInfo(self.project_path), self.project_data_manager)
+            self.project = ZipProjectIO.Load(SystemFileInfo(self.project_path), self.project_data_manager)
             exit_code = ZipProjectIO.AuthenticateUserAfterLoading(self.project,
                                                                   self.project_data_manager,
                                                                   self.service_provider)
@@ -474,7 +475,7 @@ class DataModel:
         """
         self.get_file_infos.cache_clear()
         geo_resource = self.add_geometry_resource(file_name)
-        file_info = FileInfo(geo_resource.CurrentFullPath)
+        file_info = SystemFileInfo(geo_resource.CurrentFullPath)
         try:
             model = SimGeoIO.Load(file_info, self.inst, self.serv)
             self.models_dict[geo_resource.Key] = model
@@ -508,7 +509,7 @@ class DataModel:
 
     def add_empty_resource(self,
                            filename: str,
-                           target_dir: Union[ResourceDirectoryEntry, FileInfo, str] = None) -> ResourceEntry:
+                           target_dir: Union[ResourceDirectoryEntry, SystemFileInfo, str] = None) -> ResourceEntry:
         """
         Add an empty resource to the project
         :param filename: name of the new resource
@@ -519,12 +520,12 @@ class DataModel:
 
         self.get_file_infos.cache_clear()
         if target_dir is None:
-            return self.project.AddEmptyResource(FileInfo(str(filename)))
+            return self.project.AddEmptyResource(SystemFileInfo(str(filename)))
         else:
 
             if isinstance(target_dir, ResourceDirectoryEntry):
                 target_dir = target_dir.CurrentFullPath
-            if isinstance(target_dir, FileInfo):
+            if isinstance(target_dir, SystemFileInfo):
                 target_dir = target_dir.FullPath
 
             return self.project.AddEmptyResource(FileInfo(
@@ -533,8 +534,8 @@ class DataModel:
                                                  )
 
     def add_resource_file(self,
-                          filename: Union[str, FileInfo, PythonFileInfo],
-                          target_dir: Union[ResourceDirectoryEntry, FileInfo, str] = None) -> ResourceEntry:
+                          filename: Union[str, SystemFileInfo, PythonFileInfo],
+                          target_dir: Union[ResourceDirectoryEntry, SystemFileInfo, str] = None) -> ResourceEntry:
 
         """
         Add a file as resource to the project which already exists in the project folder
@@ -544,9 +545,9 @@ class DataModel:
         """
 
         if isinstance(filename, str):
-            filename = FileInfo(filename)
+            filename = SystemFileInfo(filename)
         elif isinstance(filename, PythonFileInfo):
-            filename = FileInfo(filename.full_path)
+            filename = SystemFileInfo(filename.full_path)
 
         if target_dir is None:
             # check if file is already in project folder
@@ -562,7 +563,7 @@ class DataModel:
                 target_dir = DirectoryInfo(target_dir)
             elif isinstance(target_dir, ResourceDirectoryEntry):
                 target_dir = DirectoryInfo(target_dir.CurrentFullPath)
-            elif isinstance(target_dir, FileInfo):
+            elif isinstance(target_dir, SystemFileInfo):
                 pass
 
             # check if file is already in project folder
@@ -573,7 +574,7 @@ class DataModel:
             return self.project_data_manager.AssetManager.GetResource(key)
 
     def add_resource(self,
-                     filename: Union[str, FileInfo],
+                     filename: Union[str, SystemFileInfo],
                      target_dir: Optional[Union[DirectoryInfo, ResourceDirectoryEntry, str]] = None,
                      tag: Union[SimTaxonomyEntry, SimTaxonomyEntryReference] = None) -> ResourceEntry:
         """
@@ -605,7 +606,7 @@ class DataModel:
                 del_copy = True
 
             if isinstance(filename, (str, PosixPath, WindowsPath)):
-                filename = FileInfo(str(filename))
+                filename = SystemFileInfo(str(filename))
 
             if target_dir is None:
                 resource = self.project.CopyResourceAsContainedFileEntry(filename,
@@ -616,7 +617,7 @@ class DataModel:
                     target_dir = DirectoryInfo(target_dir)
                 elif isinstance(target_dir, ResourceDirectoryEntry):
                     target_dir = DirectoryInfo(target_dir.CurrentFullPath)
-                elif isinstance(target_dir, FileInfo):
+                elif isinstance(target_dir, SystemFileInfo):
                     pass
 
                 resource = self.project.CopyResourceAsContainedFileEntry(filename,
@@ -626,7 +627,7 @@ class DataModel:
             if del_copy:
                 os.remove(str(filename))
 
-            # file_id = self.project_data_manager.AssetManager.AddResourceEntry(FileInfo(filename))
+            # file_id = self.project_data_manager.AssetManager.AddResourceEntry(SystemFileInfo(filename))
             # return self.project_data_manager.AssetManager.Resources[file_id]
             if tag is not None:
                 add_tag_to_resource(resource, tag)
@@ -639,14 +640,14 @@ class DataModel:
             logger.error(f'Error while adding resource {filename} to project {self.project_path}: {e}')
             raise e
 
-    def delete_resource(self, resource: Union[ResourceEntry, FileInfo, ContainedResourceFileEntry]):
+    def delete_resource(self, resource: Union[ResourceEntry, SystemFileInfo, ContainedResourceFileEntry]):
         """
         Delete a resource from the project and the project folder
         :param resource: resource to delete
         :return:
         """
 
-        if isinstance(resource, FileInfo):
+        if isinstance(resource, SystemFileInfo):
             resource = resource.resource_entry
 
         success = self.project.DeleteResource(resource)

{pysimultan-0.5.9.3 → pysimultan-0.5.9.5}/src/PySimultan2/files.py

@@ -20,6 +20,7 @@ from SIMULTAN.Data.Taxonomy import SimTaxonomyEntry, SimTaxonomyEntryReference,
 from SIMULTAN.Data.Components import SimComponent, ComponentMapping
 
 from System.IO import DirectoryInfo as SystemDirectoryInfo
+from System.IO import FileInfo as SystemFileInfo
 
 # from .config import default_data_model
 
@@ -436,6 +437,21 @@ class FileInfo(object, metaclass=MetaMock):
     def __repr__(self):
         return f'FileInfo({self.file_path})'
 
+    def move(self, new_directory_path: Union[str, DirectoryInfo]) -> FileInfo:
+
+        if isinstance(new_directory_path, str):
+            new_directory_path = DirectoryInfo.from_existing_directory(new_directory_path,
+                                                                       data_model=self.data_model)
+
+        # check if file can be moved
+        try:
+            self.resource_entry.ChangeLocation(SystemDirectoryInfo(new_directory_path.full_path),
+                                                   '1',
+                                                   True)
+        except Exception as e:
+            logger.error(f'Error moving file: {e}')
+            raise e
+
     def get_content(self, encoding='utf-8') -> Optional[Union[str, dict[str, str]]]:
         """
         Get the content of the file.
@@ -455,14 +471,19 @@ class FileInfo(object, metaclass=MetaMock):
         else:
             return
 
-    def copy(self, new_file_path: Optional) -> FileInfo:
+    def copy(self,
+             new_file_path: Union[str, DirectoryInfo]) -> FileInfo:
         """
         Copy the file to a new location.
         :param new_file_path: New file path.
         :return: FileInfo
         """
+        if isinstance(new_file_path, DirectoryInfo):
+            new_file_path = os.path.join(new_file_path.full_path, self.filename)
+
         shutil.copy(self.full_path, new_file_path)
-        return FileInfo(new_file_path)
+        return FileInfo.from_existing_file(file_path=new_file_path,
+                                           data_model=self.data_model)
 
     def write_content(self, content: str, encoding='utf-8') -> None:
         """
@@ -693,10 +714,13 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
 
         return res
 
+    def file_exists(self, filename: str) -> bool:
+        return any(x for x in self.files if x.resource_entry.Name == filename)
+
     def get_file(self, filename: str) -> Optional[FileInfo]:
         resource = next((x for x in self.files if x.resource_entry.Name == filename), None)
         if resource is not None:
-            return FileInfo(resource_entry=entry,
+            return FileInfo(resource_entry=resource,
                             data_model=self.data_model)
         else:
             return None
@@ -705,6 +729,10 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
                  filename: str,
                  content: Optional[str] = None) -> FileInfo:
 
+        if Path(self.full_path).joinpath(filename).exists():
+            return FileInfo.from_existing_file(str(Path(self.full_path).joinpath(filename)), data_model=self.data_model)
+
+
         if self.resource_entry.Children:
             file = self.get_file(filename)
             if file is not None:

{pysimultan-0.5.9.3 → pysimultan-0.5.9.5}/src/PySimultan2/utils.py

@@ -21,7 +21,7 @@ from SIMULTAN.Data.MultiValues import (SimMultiValueField3D, SimMultiValueField3
                                        SimMultiValueBigTableHeader, SimMultiValueBigTableParameterSource)
 
 from SIMULTAN.Data.Assets import (ResourceEntry, ResourceFileEntry, ContainedResourceFileEntry, Asset,
-                                  LinkedResourceFileEntry, ResourceDirectoryEntry)
+                                  LinkedResourceFileEntry, ResourceDirectoryEntry, DocumentAsset)
 from SIMULTAN.Data.Geometry import Face, Edge, Vertex, Volume
 
 from .multi_values import (simultan_multi_value_field_3d_to_numpy, set_parameter_to_value_field,
@@ -695,10 +695,13 @@ def get_component_taxonomy_entry(component, taxonomy: str):
             return param
 
     for referenced_asset in component.ReferencedAssets:
+        if referenced_asset.Resource is None:
+            return None
         resource_taxonomy_keys = [x.Target.Key for x in referenced_asset.Resource.Tags]
         if taxonomy in resource_taxonomy_keys:
             return referenced_asset.Resource
 
+
     if obj is None:
         return None