PySimultan 0.5.8__tar.gz → 0.5.9.1__tar.gz

{pysimultan-0.5.8 → pysimultan-0.5.9.1}/PKG-INFO

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.5.8
+Version: 0.5.9.1
 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
 Author-email: Bühler Maximilian <maximilian.buehler@tuwien.ac.at>
-License: MIT
+License-Expression: MIT
+License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
@@ -166,6 +167,9 @@ print(instances[0].param_1)
 
 # Change Log
 
+## [0.5.8] - 2024-12-17
+- Added FileInfo.from_existing_file method to create FileInfo object from existing file in ProjectUnpackFolder
+
 ## [0.5.7] - 2024-12-09
 - Added support for different taxonomy for content
 - Added support for numpy np.float32, np.float64 and np.int32, np.int64

{pysimultan-0.5.8 → pysimultan-0.5.9.1}/README.md

@@ -138,6 +138,9 @@ print(instances[0].param_1)
 
 # Change Log
 
+## [0.5.8] - 2024-12-17
+- Added FileInfo.from_existing_file method to create FileInfo object from existing file in ProjectUnpackFolder
+
 ## [0.5.7] - 2024-12-09
 - Added support for different taxonomy for content
 - Added support for numpy np.float32, np.float64 and np.int32, np.int64

pysimultan-0.5.9.1/src/PySimultan2/__about__.py

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

{pysimultan-0.5.8 → pysimultan-0.5.9.1}/src/PySimultan2/__init__.py

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

{pysimultan-0.5.8 → pysimultan-0.5.9.1}/src/PySimultan2/data_model.py

@@ -532,6 +532,46 @@ class DataModel:
                                                           )
                                                  )
 
+    def add_resource_file(self,
+                          filename: Union[str, FileInfo, PythonFileInfo],
+                          target_dir: Union[ResourceDirectoryEntry, FileInfo, str] = None) -> ResourceEntry:
+
+        """
+        Add a file as resource to the project which already exists in the project folder
+        :param filename: path to the file or FileInfo object
+        :param target_dir:
+        :return:
+        """
+
+        if isinstance(filename, str):
+            filename = FileInfo(filename)
+        elif isinstance(filename, PythonFileInfo):
+            filename = FileInfo(filename.full_path)
+
+        if target_dir is None:
+            # check if file is already in project folder
+
+            if not filename.FullName.startswith(str(self.project.ProjectUnpackFolder)) and not os.path.exists(os.path.join(str(self.project.ProjectUnpackFolder), filename.Name)):
+                raise FileNotFoundError(f'File {filename} not found in project folder {self.project.ProjectUnpackFolder}')
+
+            key = self.project_data_manager.AssetManager.AddResourceEntry(filename)
+            return self.project_data_manager.AssetManager.GetResource(key)
+
+        else:
+            if isinstance(target_dir, str):
+                target_dir = DirectoryInfo(target_dir)
+            elif isinstance(target_dir, ResourceDirectoryEntry):
+                target_dir = DirectoryInfo(target_dir.CurrentFullPath)
+            elif isinstance(target_dir, FileInfo):
+                pass
+
+            # check if file is already in project folder
+            if not os.path.exists(os.path.join(target_dir.FullPath, filename.Name)):
+                raise FileNotFoundError(f'File {filename} not found in project folder {target_dir.FullPath}')
+
+            key = self.project_data_manager.AssetManager.AddResourceEntry(os.path.join(target_dir.FullPath, filename.Name))
+            return self.project_data_manager.AssetManager.GetResource(key)
+
     def add_resource(self,
                      filename: Union[str, FileInfo],
                      target_dir: Optional[Union[DirectoryInfo, ResourceDirectoryEntry, str]] = None,

{pysimultan-0.5.8 → pysimultan-0.5.9.1}/src/PySimultan2/files.py

@@ -12,13 +12,14 @@ import tempfile
 from typing import List, Union, Optional
 import shutil
 import zipfile
+from pathlib import Path
 # from System.IO import FileInfo  # public FileInfo (string fileName);
 
 from SIMULTAN.Data.Assets import ResourceEntry, ResourceFileEntry, ContainedResourceFileEntry, Asset, ResourceDirectoryEntry
 from SIMULTAN.Data.Taxonomy import SimTaxonomyEntry, SimTaxonomyEntryReference, SimTaxonomy
 from SIMULTAN.Data.Components import SimComponent, ComponentMapping
 
-from System.IO import DirectoryInfo
+from System.IO import DirectoryInfo as SystemDirectoryInfo
 
 # from .config import default_data_model
 
@@ -281,6 +282,20 @@ class FileInfo(object, metaclass=MetaMock):
         file_info.write_content(content)
         return file_info
 
+    @classmethod
+    def from_existing_file(cls,
+                           file_path: str,
+                           *args,
+                           **kwargs) -> FileInfo:
+
+        data_model = kwargs.get('data_model', config.get_default_data_model())
+        resource = data_model.add_resource_file(file_path)
+
+        return cls(resource_entry=resource,
+                   *args,
+                   **kwargs)
+
+
     def __init__(self, file_path=None, *args, **kwargs):
         """
         Custom file info object to be used with the with statement. This object is used to open a file and close it
@@ -475,7 +490,10 @@ class FileInfo(object, metaclass=MetaMock):
         :return: None
         """
         if self.resource_entry is not None:
+            if self.resource_entry.Key in self._cls_instances:
+                del self._cls_instances[self.resource_entry.Key]
             self.data_model.delete_resource(self.resource_entry)
+
         os.remove(self.file_path)
 
     def to_json(self) -> dict:
@@ -508,6 +526,46 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
     def get_by_key(cls, key: int) -> Optional[DirectoryInfo]:
         return cls._cls_instances.get(key, None)
 
+    @classmethod
+    def from_existing_directory(cls,
+                                directory_path: str,
+                                add_files: bool = True,
+                                add_sub_directories: bool = True,
+                                *args,
+                                **kwargs) -> DirectoryInfo:
+
+        data_model = kwargs.get('data_model', config.get_default_data_model())
+
+        if not directory_path.startswith(str(data_model.project.ProjectUnpackFolder)):
+            directory_path = os.path.join(str(data_model.project.ProjectUnpackFolder), directory_path)
+
+        res = data_model.project_data_manager.AssetManager.CreateResourceDirIn(os.path.basename(directory_path),
+                                                     SystemDirectoryInfo(os.path.dirname(directory_path)),
+                                                     '')
+
+        resource = data_model.project_data_manager.AssetManager.GetResource(res.Item1)
+
+        directory_info = cls(resource_entry=resource,
+                             *args,
+                             **kwargs)
+
+
+        if add_files:
+            directory_info.add_all_contained_files()
+
+            # for file in os.listdir(directory_path):
+            #     file_path = os.path.join(directory_path, file)
+            #     data_model.add_resource_file(file_path, target_dir=resource)
+
+        if add_sub_directories:
+            directory_info.add_all_contained_directories()
+
+            # for sub_dir in os.listdir(directory_path):
+            #     sub_dir_path = os.path.join(directory_path, sub_dir)
+            #     data_model.add_resource_directory(sub_dir_path, parent_directory=resource)
+
+        return directory_info
+
     def __init__(self,
                  path: Optional[str] = None,
                  helper_file: Optional[FileInfo] = None,
@@ -626,6 +684,31 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
             return FileInfo(resource_entry=new_resource,
                             data_model=self.data_model)
 
+    def add_all_contained_files(self):
+        for file in os.listdir(self.full_path):
+            full_filename = os.path.join(self.full_path, file)
+            if Path(full_filename).is_file():
+
+                if full_filename in (x.current_full_path for x in self.resource_entry.Children):
+                    continue
+                else:
+                    logger.info(f'Adding file: {full_filename} to resources')
+                    FileInfo.from_existing_file(full_filename, data_model=self.data_model)
+
+    def add_all_contained_directories(self):
+        for file in os.listdir(self.full_path):
+            full_filename = os.path.join(self.full_path, file)
+            if Path(full_filename).is_dir():
+                if full_filename in (x.current_full_path for x in self.resource_entry.Children):
+                    continue
+                else:
+                    logger.info(f'Adding directory: {full_filename} to resources')
+                    DirectoryInfo.from_existing_directory(full_filename, data_model=self.data_model)
+
+        for directory in self.sub_directories:
+            directory.add_all_contained_files()
+            directory.add_all_contained_directories()
+
     def add_tag(self, tag: SimTaxonomyEntry) -> None:
         add_tag_to_resource(self.resource_entry, tag)
 

{pysimultan-0.5.8 → pysimultan-0.5.9.1}/tests/test_files.py

@@ -1,4 +1,3 @@
-import io
 import os
 
 from PySimultan2.data_model import DataModel
@@ -97,12 +96,52 @@ def test_set_file():
     test_component = mapped_test_component_cls(name='test_component',
                                                file_value_2=file_info)
 
+    return mapper
+
+
+def test_add_resource_in_directory(mapper):
+
+    file_path = os.path.join(str(data_model.project.ProjectUnpackFolder), 'already_exising.txt')
+
+    with open(file_path, 'w') as f:
+        f.write('This is the content of the already existing file.')
+
+    file_info = FileInfo(file_path=file_path)
+    mapped_test_component_cls = mapper.get_mapped_class('TestComponent')
+    test_component = mapped_test_component_cls(name='test_component 2',
+                                               file_value_2=file_info)
+
+def test_add_resource_file():
+    file_path = os.path.join(str(data_model.project.ProjectUnpackFolder), 'already_exising_2.txt')
+
+    with open(file_path, 'w') as f:
+        f.write('This is the content of the already existing file 2.')
+
+    file = data_model.add_resource_file(file_path)
+    print(file)
+
+    file_path = os.path.join(str(data_model.project.ProjectUnpackFolder), 'already_exising_3.txt')
+
+    with open(file_path, 'w') as f:
+        f.write('This is the content of the already existing file 3.')
+
+    file_info = FileInfo.from_existing_file(file_path=file_path,
+                                            data_model=data_model)
+
+    mapped_test_component_cls = mapper.get_mapped_class('TestComponent')
+    test_component3 = mapped_test_component_cls(name='test_component 3',
+                                               file_value_2=file_info)
+
+
+
 
 if __name__ == '__main__':
     new_resource = test_create_resource()
     test_create_resource_from_string()
     test_add_resource_to_component(new_resource)
-    test_set_file()
+    mapper = test_set_file()
+    test_add_resource_in_directory(mapper)
+    test_add_resource_file()
     data_model.save()
 
 data_model.cleanup()

pysimultan-0.5.8/src/PySimultan2/__about__.py

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

pysimultan-0.5.8/tests/resources/test_file.yml

@@ -1 +0,0 @@
-ardgadfb