PySimultan 0.6.0.7__tar.gz → 0.6.1__tar.gz

{pysimultan-0.6.0.7 → pysimultan-0.6.1}/PKG-INFO

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

{pysimultan-0.6.0.7 → pysimultan-0.6.1}/src/PySimultan2/CHANGELOG.md

@@ -1,3 +1,6 @@
+Version 0.6.1 (24.02.2024)
+- Bugfixes in default_types and File/Directory handling
+
 Version 0.6.0.3 (23.01.2024)
 - Added sub_classes and super_classes to SimultanObject
 

pysimultan-0.6.1/src/PySimultan2/__about__.py

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

{pysimultan-0.6.0.7 → pysimultan-0.6.1}/src/PySimultan2/data_model.py

@@ -1,4 +1,5 @@
 import atexit
+import pathlib
 import os
 import shutil
 from uuid import uuid4
@@ -528,6 +529,17 @@ class DataModel:
             if isinstance(target_dir, SystemFileInfo):
                 target_dir = target_dir.FullPath
 
+            if target_dir.startswith(self.project.ProjectUnpackFolder.FullPath):
+                return self.project.AddEmptyResource(SystemFileInfo(os.path.join(target_dir, str(filename))))
+            else:
+                return self.project.AddEmptyResource(SystemFileInfo(os.path.join(
+                    self.project.ProjectUnpackFolder.FullPath,
+                    target_dir,
+                    str(filename))
+                )
+                )
+
+
             return self.project.AddEmptyResource(FileInfo(
                 os.path.join(target_dir, str(filename))
                                                           )
@@ -595,6 +607,9 @@ class DataModel:
 
             if not act_filename.startswith(self.project.ProjectUnpackFolder.FullPath) and target_dir is None:
                 target_dir_str = self.project.ProjectUnpackFolder.FullPath
+            elif act_filename.startswith(self.project.ProjectUnpackFolder.FullPath):
+                target_dir_str = ''
+
             elif target_dir is not None:
                 if isinstance(target_dir, ResourceDirectoryEntry):
                     target_dir_str = target_dir.CurrentFullPath
@@ -626,7 +641,7 @@ class DataModel:
             if target_dir is None:
                 resource = self.project.CopyResourceAsContainedFileEntry(filename,
                                                                          self.project.ProjectUnpackFolder,
-                                                                         '1')
+                                                                         '{0} ({1})')
             else:
                 if isinstance(target_dir, str):
                     target_dir = DirectoryInfo(target_dir)
@@ -655,6 +670,18 @@ class DataModel:
             logger.error(f'Error while adding resource {filename} to project {self.project_path}: {e}')
             raise e
 
+    def get_resource(self, key: Union[str, int, SystemFileInfo, DirectoryInfo]):
+
+        if isinstance(key, (int, SystemFileInfo, DirectoryInfo)):
+            return self.project_data_manager.AssetManager.GetResource(key)
+        elif isinstance(key, str):
+            if os.path.isfile(key):
+                return self.project_data_manager.AssetManager.GetResource(SystemFileInfo(key))
+            elif os.path.isdir(key):
+                return self.project_data_manager.AssetManager.GetResource(DirectoryInfo(key))
+            else:
+                return None
+
     def delete_resource(self, resource: Union[ResourceEntry, SystemFileInfo, ContainedResourceFileEntry]):
         """
         Delete a resource from the project and the project folder
@@ -673,18 +700,102 @@ class DataModel:
         self.get_file_infos.cache_clear()
         return success
 
+    def get_existing_resource_directory_entry(self,
+                                              full_path: str) -> ResourceDirectoryEntry:
+        return self.project_data_manager.AssetManager.GetResource(DirectoryInfo(full_path))
+
     def create_resource_directory(self,
                                   name: str,
-                                  parent_directory: DirectoryInfo=None,
+                                  parent_directory: Union[DirectoryInfo, str, pathlib.Path]=None,
+                                  create_parents: bool = True,
                                   collision_name_format: str = '{0} ({1})') -> ResourceEntry:
 
         if parent_directory is None:
-            new_directory = self.project.CreateResourceDirIn(name, None, collision_name_format)
+            if name.startswith(self.project.ProjectUnpackFolder.FullPath):
+                full_path = name
+            else:
+                full_path = os.path.join(self.project.ProjectUnpackFolder.FullPath, name)
+        else:
+            if isinstance(parent_directory, str):
+                if not parent_directory.startswith(self.project.ProjectUnpackFolder.FullPath):
+                    full_path = os.path.join(self.project.ProjectUnpackFolder.FullPath, parent_directory, name)
+                else:
+                    full_path = parent_directory
+            elif isinstance(parent_directory, DirectoryInfo):
+                full_path = os.path.join(parent_directory.FullPath, name)
+            elif isinstance(parent_directory, pathlib.Path):
+                full_path = os.path.join(parent_directory, name)
+
+
+        existing_resource_directory = self.get_existing_resource_directory_entry(str(full_path))
+        if existing_resource_directory is not None:
+            return existing_resource_directory
+
+        if str(pathlib.Path(full_path).parents[0]) == self.project.ProjectUnpackFolder.FullPath:
+            # create directory in ProjectUnpackFolder
+            resource_directory_entry = self.get_existing_resource_directory_entry(full_path)
+            if resource_directory_entry is not None:
+                return resource_directory_entry
+            else:
+                new_resource_entry = self.project.CreateResourceDirIn(
+                    str(
+                        pathlib.Path(full_path).relative_to(pathlib.Path(self.project.ProjectUnpackFolder.FullPath))
+                    ),
+                    None,
+                    collision_name_format)
+                if new_resource_entry not in self.project_data_manager.AssetManager.Resources:
+                    self.project_data_manager.AssetManager.AddResourceEntry(new_resource_entry)
+                return new_resource_entry
         else:
-            new_directory = self.project.CreateResourceDirIn(name, parent_directory, collision_name_format)
+            if parent_directory is None:
+                parent = None
+                for i in reversed(range(pathlib.Path(full_path).parents.__len__())):
+                    parent = pathlib.Path(full_path).parents[i]
+                    if str(parent) in self.project.ProjectUnpackFolder.FullPath:
+                        continue
+                    if not os.path.exists(parent):
+                        if create_parents:
+                            parent_directory = self.create_resource_directory(parent.name,
+                                                                        parent_directory=parent.parents[0],
+                                                                        create_parents=False)
+                        else:
+                            raise FileNotFoundError(f'Parent directory {parent} does not exist')
+                    else:
+                        parent_directory = self.get_existing_resource_directory_entry(str(parent))
 
-        return new_directory
+        if parent_directory is None:
+            new_resource_entry = self.project.CreateResourceDirIn(
+                str(
+                    pathlib.Path(full_path).relative_to(pathlib.Path(self.project.ProjectUnpackFolder.FullPath))
+                ),
+                parent_directory,
+                collision_name_format)
+            self.project_data_manager.AssetManager.AddResourceEntry(new_resource_entry)
+            return new_resource_entry
+        else:
+            if isinstance(parent_directory, pathlib.Path):
+                target = str(pathlib.Path(full_path).relative_to(parent_directory))
+                parent_directory_target = DirectoryInfo(str(parent_directory))
+            elif isinstance(parent_directory, str):
+                target = str(pathlib.Path(full_path).relative_to(pathlib.Path(parent_directory)))
+                parent_directory_target = DirectoryInfo(parent_directory)
+            elif isinstance(parent_directory, DirectoryInfo):
+                target = str(pathlib.Path(full_path).relative_to(pathlib.Path(parent_directory.CurrentFullPath)))
+                parent_directory_target = parent_directory
+            elif isinstance(parent_directory, ResourceDirectoryEntry):
+                target = str(pathlib.Path(full_path).relative_to(pathlib.Path(parent_directory.CurrentFullPath)))
+                parent_directory_target = DirectoryInfo(parent_directory.CurrentFullPath)
 
+            else:
+                raise ValueError(f'Parent directory {parent_directory} not found')
+
+            new_resource_entry = self.project.CreateResourceDirIn(
+                target,
+                parent_directory_target,
+                collision_name_format)
+            if new_resource_entry.manager is None:
+                self.project_data_manager.AssetManager.AddResourceEntry(new_resource_entry)
+            return new_resource_entry
 
     def add_table(self, table: SimMultiValueBigTable):
         self.project_data_manager.ValueManager.Add(table)

{pysimultan-0.6.0.7 → pysimultan-0.6.1}/src/PySimultan2/default_types.py

@@ -686,5 +686,22 @@ class ComponentDictionary(SimultanObject):
         }
         }
 
+    def get_raw_attr(self, attr: Optional[str] = None, text_or_key: Optional[str] = None):
+        if attr is not None:
+            content = self._taxonomy_map.get_content_by_property_name(attr)
+            if content is None:
+                content = Content(text_or_key=f'__dict_key__{attr}',
+                                  property_name=attr,
+                                  type=None,
+                                  unit=None,
+                                  documentation=f'Property {attr} in ComponentDictionary',
+                                  component_policy=self.component_policy)
+                self._taxonomy_map.add_content(content)
+
+            return get_component_taxonomy_entry(self._wrapped_obj, content.text_or_key)
+
+        if text_or_key is not None:
+            return get_component_taxonomy_entry(self._wrapped_obj, text_or_key)
+
 
 component_dict_map = ComponentDictionary._taxonomy_map

{pysimultan-0.6.0.7 → pysimultan-0.6.1}/src/PySimultan2/files.py

@@ -3,10 +3,12 @@ This module contains classes and functions to handle files and directories.
 """
 from __future__ import annotations
 from datetime import datetime
+import glob
 
 import contextlib
 import os
 import io
+import re
 import shutil
 import tempfile
 from typing import List, Union, Optional
@@ -124,6 +126,13 @@ def create_asset_from_string(filename: str,
     :param tag: Tag to be added to the asset.
     :return: ResourceFileEntry
     """
+
+    # check if file already exists
+    if target_dir is not None:
+        if isinstance(target_dir, DirectoryInfo):
+            target_dir = target_dir.full_path
+
+
     with tempdir() as dirpath:
         filepath = os.path.join(dirpath, filename)
         with open(filepath, 'w') as f:
@@ -290,11 +299,35 @@ class FileInfo(object, metaclass=MetaMock):
         """
 
         data_model = kwargs.get('data_model', config.get_default_data_model())
-        resource = create_asset_from_string(filename,
-                                            content,
-                                            target_dir=target_dir,
-                                            *args,
-                                            **kwargs)
+
+        if target_dir is not None:
+            if isinstance(target_dir, DirectoryInfo):
+                full_path = os.path.join(target_dir.full_path, filename)
+            elif isinstance(target_dir, ResourceDirectoryEntry):
+                full_path = os.path.join(target_dir.CurrentFullPath, filename)
+            elif isinstance(target_dir, str):
+                full_path = os.path.join(target_dir, filename)
+        else:
+            if not filename.startswith(str(data_model.project.ProjectUnpackFolder)):
+                full_path = os.path.join(str(data_model.project.ProjectUnpackFolder), filename)
+            else:
+                full_path = filename
+
+        if os.path.isfile(full_path):
+            # check if resource entry exists
+            resource = data_model.get_resource(full_path)
+            if resource is None:
+                resource = create_asset_from_string(filename,
+                                                    content,
+                                                    target_dir=target_dir,
+                                                    *args,
+                                                    **kwargs)
+        else:
+            resource = create_asset_from_string(filename,
+                                                content,
+                                                target_dir=target_dir,
+                                                *args,
+                                                **kwargs)
 
         file_info = cls(resource_entry=resource,
                         data_model=data_model)
@@ -332,6 +365,7 @@ class FileInfo(object, metaclass=MetaMock):
         :param kwargs:
         """
         # do custom stuff here
+        self.deleted = False
         self._resource_entry: Union[ResourceFileEntry, ContainedResourceFileEntry, None] = None
 
         if file_path is not None:
@@ -365,7 +399,7 @@ class FileInfo(object, metaclass=MetaMock):
 
     @property
     def resource_entry(self) -> Union[ResourceFileEntry, ContainedResourceFileEntry, None]:
-        if self._resource_entry is None:
+        if self._resource_entry is None and not self.deleted:
             if self.data_model is None:
                 logger.warning(f'No data model provided. Using default data model: {config.get_default_data_model().id}.')
                 self.data_model = config.get_default_data_model()
@@ -453,7 +487,10 @@ class FileInfo(object, metaclass=MetaMock):
         self.file_obj.close()
 
     def __repr__(self):
-        return f'FileInfo({self.file_path})'
+        if not self.deleted:
+            return f'FileInfo({self.file_path})'
+        else:
+            return f'FileInfo({self.file_path}) (deleted)'
 
     def move(self, new_directory_path: Union[str, DirectoryInfo]) -> FileInfo:
 
@@ -533,7 +570,11 @@ class FileInfo(object, metaclass=MetaMock):
                 del self._cls_instances[self.resource_entry.Key]
             self.data_model.delete_resource(self.resource_entry)
 
-        os.remove(self.file_path)
+        try:
+            os.remove(self.file_path)
+        except FileNotFoundError:
+            pass
+        self.deleted = True
 
     def to_json(self) -> dict:
 
@@ -613,6 +654,8 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
                  *args,
                  **kwargs):
 
+        self.deleted = False
+
         self._resource_entry: Optional[ResourceDirectoryEntry] = None
         self._helper_file: Optional[FileInfo] = None
         self.data_model: Optional[DataModel] = kwargs.get('data_model', None)
@@ -635,7 +678,7 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
 
     @property
     def helper_file(self) -> Optional[FileInfo]:
-        if self._helper_file is None or not isinstance(self._helper_file, FileInfo):
+        if (self._helper_file is None or not isinstance(self._helper_file, FileInfo)) and not self.deleted:
             self._helper_file = self.add_file('__dir_helper_file__')
 
         return self._helper_file
@@ -646,7 +689,7 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
 
     @property
     def resource_entry(self) -> Optional[ResourceDirectoryEntry]:
-        if self._resource_entry is None:
+        if self._resource_entry is None and not self.deleted:
             if self.data_model is None:
                 logger.warning(
                     f'No data model provided. Using default data model: {config.get_default_data_model().id}.')
@@ -795,5 +838,63 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
     def add_tag(self, tag: SimTaxonomyEntry) -> None:
         add_tag_to_resource(self.resource_entry, tag)
 
+    def delete(self):
+
+        for file in self.files:
+            file.delete()
+
+        # delete helper file
+        if self.helper_file is not None:
+            self.helper_file.delete()
+
+        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)
+
+        shutil.rmtree(self.full_path)
+        self.deleted = True
+
+    def delete_files(self,
+                     pattern: Optional[str] = None,
+                     recursive: bool = False) -> None:
+        """
+        Delete files by pattern.
+        :param pattern: Pattern to match files. Default is None. if None, all files are deleted.
+        :param recursive: If True, delete files recursively.
+        :return:
+        """
+
+        if pattern:
+            matching = glob.glob(self.full_path + f'/{pattern}', recursive=recursive)
+
+        for file in self.files:
+            if pattern is None or file.file_path in matching:
+                logger.debug(f'Deleting file: {file.filename}')
+                file.delete()
+
+        if recursive:
+            for sub_dir in self.sub_directories:
+                sub_dir.delete_files(pattern=pattern, recursive=recursive)
+
+    def delete_subdirectories(self,
+                              pattern: Optional[str] = None,
+                                recursive: bool = False) -> None:
+
+        """
+        Delete subdirectories by pattern.
+        :param pattern: Regex pattern to match subdirectories. Default is None. If None, all subdirectories are deleted.
+        :param recursive: If True, delete subdirectories recursively.
+        :return:
+        """
+
+        for sub_dir in self.sub_directories:
+            if pattern is None or re.match(pattern, sub_dir.relative_path):
+                logger.debug(f'Deleting subdirectory: {sub_dir.relative_path}')
+                sub_dir.delete()
+
     def __repr__(self):
-        return f'DirectoryInfo(key:{self.key}, hash: {hash(self)}; {self.full_path})'
+        if not self.deleted:
+            return f'DirectoryInfo(key:{self.key}, hash: {hash(self)}; {self.full_path})'
+        else:
+            return f'(Deleted) DirectoryInfo(key:{self.key}, hash: {hash(self)}; {self.full_path}) (deleted)'

{pysimultan-0.6.0.7 → pysimultan-0.6.1}/src/PySimultan2/utils.py

@@ -181,7 +181,7 @@ def get_or_create_taxonomy_entry(name: str,
         if key in taxonomy_entries.keys():
             return taxonomy_entries[key]
     if create:
-        new_sim_taxonomy_entry = SimTaxonomyEntry(key, name, description)
+        new_sim_taxonomy_entry = SimTaxonomyEntry(key, name, description, None)
         if sim_taxonomy is not None:
             sim_taxonomy.Entries.Add(new_sim_taxonomy_entry)
         return new_sim_taxonomy_entry
@@ -1132,7 +1132,9 @@ def set_property_to_sim_component(value: Union[SimComponent, SimultanObject, lis
         else:
             component._wrapped_obj.Components.RemoveItem(component_idx)
     if ref_component_idx is not None:
-        if wrapped_obj.Id.Equals(component._wrapped_obj.ReferencedComponents.Items[ref_component_idx].Target.Id):
+        if component._wrapped_obj.ReferencedComponents.Items[ref_component_idx].Target is None:
+            component._wrapped_obj.ReferencedComponents.RemoveItem(ref_component_idx)
+        elif wrapped_obj.Id.Equals(component._wrapped_obj.ReferencedComponents.Items[ref_component_idx].Target.Id):
             return
         else:
             component._wrapped_obj.ReferencedComponents.RemoveItem(ref_component_idx)
@@ -1373,7 +1375,7 @@ def set_property_to_dict(value: dict,
                 return
 
     if component_idx is not None:
-        component = component._wrapped_obj.Components.Items[component_idx].Component
+        sub_component = component._wrapped_obj.Components.Items[component_idx].Component
 
         if 'ComponentDictionary' in [x.Target.Key for x in component.Slots]:
             if not hasattr(component, '_object_mapper'):
@@ -1393,7 +1395,6 @@ def set_property_to_dict(value: dict,
             component_dict.update(value)
             return component_dict
         else:
-            component._data_model.remove_subcomponent(component)
             component._wrapped_obj.Components.RemoveItem(component_idx)
         component_idx = None
     if ref_component_idx is not None:

{pysimultan-0.6.0.7 → pysimultan-0.6.1}/tests/test_directory_and_files.py

@@ -19,6 +19,11 @@ def test_files_and_directory_creation():
     new_directory_info = DirectoryInfo(path='directory_info_dir',
                                        data_model=new_data_model)
 
+
+    new_directory_info = DirectoryInfo(path='not_existing_dir/directory_to_create',
+                                       data_model=new_data_model)
+
+
     print(new_data_model.file_directories)
 
     print(new_directory_info.resource_entry)
@@ -148,7 +153,12 @@ def test_load_component_with_directory():
     mapper.clear()
 
 
+def test_complex_file_and_directory_info():
+    pass
+
+
 if __name__ == '__main__':
-    # test_files_and_directory_creation()
+    test_files_and_directory_creation()
+    test_complex_file_and_directory_info()
     test_component_with_directory()
     test_load_component_with_directory()

pysimultan-0.6.0.7/src/PySimultan2/__about__.py

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