PySimultan 0.5.9.4__tar.gz → 0.5.9.6__tar.gz

{pysimultan-0.5.9.4 → pysimultan-0.5.9.6}/PKG-INFO

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

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

{pysimultan-0.5.9.4 → pysimultan-0.5.9.6}/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.4 → pysimultan-0.5.9.6}/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:
         """
@@ -586,18 +587,33 @@ class DataModel:
 
             del_copy = False
 
-            existing_files = [x.Name for x in self.project_data_manager.AssetManager.Resources]
+            existing_files = [x.current_full_path for x in self.project_data_manager.AssetManager.Resources]
             try:
                 act_filename = filename.replace('\\', os.sep)
             except TypeError:
                 act_filename = filename
 
-            if os.path.basename(act_filename) in existing_files:
+            if not act_filename.startswith(self.project.ProjectUnpackFolder.FullPath) and target_dir is None:
+                target_dir_str = self.project.ProjectUnpackFolder.FullPath
+            elif target_dir is not None:
+                if isinstance(target_dir, ResourceDirectoryEntry):
+                    target_dir_str = target_dir.CurrentFullPath
+                elif isinstance(target_dir, SystemFileInfo):
+                    target_dir_str = target_dir.FullPath
+                elif isinstance(target_dir, str):
+                    target_dir_str = target_dir
+                elif isinstance(target_dir, DirectoryInfo):
+                    target_dir_str = target_dir.FullPath
+
+            full_filename = os.path.join(target_dir_str, os.path.basename(act_filename))
+
+            if full_filename in existing_files:
                 # create copy with running counter in temp dir and use this file:
                 counter = 1
                 while True:
                     new_filename = os.path.basename(filename) + f'({str(counter)})'
-                    if new_filename not in existing_files and not os.path.exists(new_filename):
+                    full_filename = os.path.join(target_dir_str, new_filename)
+                    if full_filename not in existing_files and not os.path.exists(new_filename):
                         break
                     counter += 1
                 shutil.copy(filename, os.path.join(os.path.dirname(filename),  new_filename))
@@ -605,7 +621,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 +632,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 +642,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 +655,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)
@@ -859,7 +875,18 @@ class DataModel:
 
     @lru_cache()
     def get_file_infos(self) -> list[PythonFileInfo]:
-        return [PythonFileInfo(resource_entry=asset) for asset in self.assets]
+        file_infos = []
+        for asset in self.assets:
+            if isinstance(asset, ResourceFileEntry):
+                file_infos.append(PythonFileInfo(resource_entry=asset))
+        return file_infos
+
+    def get_directory_infos(self) -> list[PythonDirectoryInfo]:
+        dir_infos = []
+        for asset in self.assets:
+            if isinstance(asset, ResourceDirectoryEntry):
+                dir_infos.append(PythonDirectoryInfo(resource_entry=asset, data_model=self))
+        return dir_infos
 
     def get_file_info_by_key(self,
                              key: int) -> Optional[PythonFileInfo]:

{pysimultan-0.5.9.4 → pysimultan-0.5.9.6}/src/PySimultan2/default_types.py

@@ -17,6 +17,9 @@ from SIMULTAN.Data.Components import (ComponentWalker, SimComponent, SimBoolPara
                                       SimEnumParameter, SimIntegerParameter, SimStringParameter, ComponentMapping,
                                       SimSlot, SimComponentVisibility, SimChildComponentEntry, SimDefaultSlots,
                                       SimParameterOperations, SimComponentReference)
+
+from SIMULTAN.Data.Assets import DocumentAsset
+
 from .files import FileInfo
 
 from . import config
@@ -562,9 +565,14 @@ class ComponentDictionary(SimultanObject):
         for ref_asset in self._wrapped_obj.ReferencedAssets.Items:
             for tag in ref_asset.Resource.Tags:
                 key = tag.Target.Key.replace('__dict_key__', '')
-                comp_dict[key] = get_obj_value(ref_asset.Target,
-                                               data_model=self._data_model,
-                                               object_mapper=self._object_mapper)
+                if isinstance(ref_asset, DocumentAsset):
+                    comp_dict[key] = get_obj_value(ref_asset.Resource,
+                                                   data_model=self._data_model,
+                                                   object_mapper=self._object_mapper)
+                else:
+                    comp_dict[key] = get_obj_value(ref_asset.Target,
+                                                   data_model=self._data_model,
+                                                   object_mapper=self._object_mapper)
 
         object.__setattr__(self, '_dict', comp_dict)
 

{pysimultan-0.5.9.4 → pysimultan-0.5.9.6}/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

{pysimultan-0.5.9.4 → pysimultan-0.5.9.6}/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