PySimultan 0.5.4__tar.gz → 0.5.5__tar.gz

{pysimultan-0.5.4 → pysimultan-0.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.5.4
+Version: 0.5.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.5.5/src/PySimultan2/__about__.py

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

{pysimultan-0.5.4 → pysimultan-0.5.5}/src/PySimultan2/files.py

@@ -129,7 +129,7 @@ def create_asset_from_string(filename: str,
 
         if target_dir is not None:
             if isinstance(target_dir, DirectoryInfo):
-                target_dir = target_dir.current_full_path
+                target_dir = target_dir.full_path
 
             resource = data_model.add_resource(filepath,
                                                target_dir=target_dir)
@@ -324,6 +324,11 @@ class FileInfo(object, metaclass=MetaMock):
         except Exception as e:
             return None
 
+    @property
+    def directory(self) -> DirectoryInfo:
+        return DirectoryInfo(resource_entry=self.resource_entry.Parent,
+                             data_model=self.data_model)
+
     @property
     def resource_entry(self) -> Union[ResourceFileEntry, ContainedResourceFileEntry, None]:
         if self._resource_entry is None:
@@ -505,14 +510,18 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
 
     def __init__(self,
                  path: Optional[str] = None,
+                 helper_file: Optional[FileInfo] = None,
+                 resource_entry: Optional[ResourceDirectoryEntry] = None,
                  *args,
                  **kwargs):
 
         self._resource_entry: Optional[ResourceDirectoryEntry] = None
+        self._helper_file: Optional[FileInfo] = None
         self.data_model: Optional[DataModel] = kwargs.get('data_model', None)
         self.path: str = path
 
-        self.resource_entry = kwargs.get('resource_entry', None)
+        self.resource_entry = resource_entry
+        self.helper_file = helper_file
 
     @property
     def tags(self) -> List[SimTaxonomyEntry]:
@@ -526,6 +535,17 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
     def relative_path(self) -> str:
         return self.resource_entry.CurrentRelativePath
 
+    @property
+    def helper_file(self) -> Optional[FileInfo]:
+        if self._helper_file is None:
+            self._helper_file = self.add_file('__dir_helper_file__')
+
+        return self._helper_file
+
+    @helper_file.setter
+    def helper_file(self, value):
+        self._helper_file = value
+
     @property
     def resource_entry(self) -> Optional[ResourceDirectoryEntry]:
         if self._resource_entry is None:
@@ -578,7 +598,7 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
                                                                                                              (
                                                                                                              ResourceFileEntry,
                                                                                                              ContainedResourceFileEntry)
-                                                                                                             )
+                                                                                                             ) and entry.Name != '__dir_helper_file__'
                 ]
 
     @property
@@ -610,4 +630,4 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
         add_tag_to_resource(self.resource_entry, tag)
 
     def __repr__(self):
-        return f'DirectoryInfo(key:{self.key}, hash: {hash(self)}; {self.full_path};)'
+        return f'DirectoryInfo(key:{self.key}, hash: {hash(self)}; {self.full_path})'

{pysimultan-0.5.4 → pysimultan-0.5.5}/src/PySimultan2/utils.py

@@ -770,6 +770,13 @@ def get_resource_entry_value(obj: ResourceEntry,
                              data_model: DataModel = None,
                              object_mapper: PythonMapper = None) -> Union[FileInfo, DirectoryInfo]:
     if isinstance(obj, (ResourceFileEntry, ContainedResourceFileEntry, LinkedResourceFileEntry)):
+
+        if obj.Name == '__dir_helper_file__':
+            return DirectoryInfo(file_path=obj.Parent.CurrentFullPath,
+                                 resource_entry=obj.Parent,
+                                 helper_file=obj,
+                                 data_model=data_model)
+
         return FileInfo(file_path=obj.File.FullPath,
                         resource_entry=obj,
                         data_model=data_model)
@@ -1203,7 +1210,7 @@ def set_property_to_directory_info(value: DirectoryInfo,
         ref_asset_idx = None
 
     add_asset_to_component(component._wrapped_obj,
-                           value.resource_entry,
+                           value.helper_file.resource_entry,
                            '0',
                            tag=taxonomy_entry)
 

pysimultan-0.5.5/tests/test_directory_and_files.py

@@ -0,0 +1,154 @@
+import os
+from PySimultan2.src.PySimultan2 import DataModel, TaxonomyMap, Content, PythonMapper
+from PySimultan2.src.PySimultan2.files import FileInfo, DirectoryInfo
+
+
+project_dir = os.environ.get('PROJECT_DIR', '/simultan_projects')
+if not os.path.exists(project_dir):
+    os.makedirs(project_dir)
+
+
+def test_files_and_directory_creation():
+    new_data_model = DataModel.create_new_project(project_path=os.path.join(project_dir, 'test_dir_files.simultan'),
+                                                  user_name='admin',
+                                                  password='admin')
+
+    print(new_data_model.file_directories)
+
+
+    new_directory_info = DirectoryInfo(path='directory_info_dir',
+                                       data_model=new_data_model)
+
+    print(new_data_model.file_directories)
+
+    print(new_directory_info.resource_entry)
+    print(new_directory_info.parent)
+
+    new_file1 = new_directory_info.add_file('test_add_file.txt', 'This is a test file')
+    new_file2 = new_directory_info.add_file('test_add_file2.txt')
+
+    sub_directory_info = new_directory_info.add_sub_directory('sub_dir')
+    print(sub_directory_info.parent)
+
+    print(new_directory_info.sub_directories)
+
+
+    new_directory = new_data_model.create_resource_directory('test_dir')
+    new_directory2 = new_data_model.create_resource_directory('test_dir2')
+    new_directory4 = new_data_model.create_resource_directory('test_dir3')
+
+    new_data_model.add_empty_resource(filename=os.path.join(new_directory.CurrentFullPath, 'test_empty_file.txt'))
+
+    new_data_model.add_empty_resource(filename='test_empty_file2.txt',
+                                      target_dir=new_directory)
+
+    new_file_info0 = FileInfo.from_string(filename='test_file.txt',
+                                          content='This is a test file',
+                                          data_model=new_data_model)
+
+    new_file_info = FileInfo.from_string(filename='test_file.txt',
+                                         content='This is a test file',
+                                         target_dir=new_directory,
+                                         data_model=new_data_model)
+
+    new_file_info2 = FileInfo.from_string(filename='test_file2.txt',
+                                         content='This is a test file 2',
+                                         target_dir=new_directory2.current_full_path,
+                                         data_model=new_data_model)
+
+    # create just a file in the directory
+    with open(os.path.join(new_directory2.current_full_path, 'not_contained_test_file3.txt'), 'w') as f:
+        f.write('This is a test file 3')
+
+
+    new_data_model.save()
+    new_data_model.cleanup()
+
+
+def create_mapper():
+    mapper = PythonMapper()
+
+    class TestComponent(object):
+        def __init__(self, *args, **kwargs):
+            self.file = kwargs.get('file')
+            self.directory = kwargs.get('directory')
+            self.param_1 = kwargs.get('param_1')
+            self.param_2 = kwargs.get('param_2')
+
+    content0 = Content(text_or_key='file',  # text or key of the content/parameter/property
+                       property_name='file',  # name of the generated property
+                       type='file',  # type of the content/parameter/property
+                       unit=None,  # unit of the content/parameter/property
+                       documentation='file_value to test')
+
+    content1 = Content(text_or_key='directory',  # text or key of the content/parameter/property
+                       property_name='directory',  # name of the generated property
+                       type='file',  # type of the content/parameter/property
+                       unit=None,  # unit of the content/parameter/property
+                       documentation='file_value_2 to test')
+
+    content2 = Content(text_or_key='param_1',  # text or key of the content/parameter/property
+                       property_name='param_1',  # name of the generated property
+                       type=None,  # type of the content/parameter/property
+                       unit=None,  # unit of the content/parameter/property
+                       documentation='param_1 to test')
+
+    content3 = Content(text_or_key='param_2',  # text or key of the content/parameter/property
+                       property_name='param_2',  # name of the generated property
+                       type=None,  # type of the content/parameter/property
+                       unit=None,  # unit of the content/parameter/property
+                       documentation='param_2 to test')
+
+    test_component_map = TaxonomyMap(taxonomy_name='PySimultan',
+                                     taxonomy_key='Test',
+                                     taxonomy_entry_name='test_component',
+                                     taxonomy_entry_key='test_component',
+                                     content=[content0, content1, content2, content3],
+                                     )
+
+    mapper.register(test_component_map.taxonomy_entry_key, TestComponent, taxonomy_map=test_component_map)
+
+    return mapper
+
+
+def test_component_with_directory():
+
+    new_data_model = DataModel.create_new_project(project_path=os.path.join(project_dir, 'test_dir_component.simultan'),
+                                                  user_name='admin',
+                                                  password='admin')
+
+    mapper = create_mapper()
+    mapped_test_component_cls = mapper.get_mapped_class('test_component')
+
+    new_component = mapped_test_component_cls(file=FileInfo.from_string(filename='test_file.txt',
+                                                                                    content='This is a test file',
+                                                                                    data_model=new_data_model),
+                                                directory=DirectoryInfo(path='test_dir',
+                                                                        data_model=new_data_model),
+                                                param_1='param_1_value',
+                                                param_2=2)
+
+    print(new_component.directory)
+
+    new_data_model.save()
+    new_data_model.cleanup()
+    mapper.clear()
+
+
+def test_load_component_with_directory():
+    new_data_model = DataModel(project_path=os.path.join(project_dir, 'test_dir_component.simultan'))
+
+    mapper = create_mapper()
+    typed_data = new_data_model.get_typed_data(mapper=mapper)
+    mapped_test_component_cls = mapper.get_mapped_class('test_component')
+
+    assert isinstance(mapped_test_component_cls.cls_instances[0].directory,  DirectoryInfo)
+
+    new_data_model.cleanup()
+    mapper.clear()
+
+
+if __name__ == '__main__':
+    # test_files_and_directory_creation()
+    test_component_with_directory()
+    test_load_component_with_directory()

pysimultan-0.5.4/src/PySimultan2/__about__.py

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

pysimultan-0.5.4/tests/test_directory_and_files.py

@@ -1,63 +0,0 @@
-import os
-from PySimultan2.src.PySimultan2 import DataModel
-from PySimultan2.src.PySimultan2.files import FileInfo, DirectoryInfo
-
-
-project_dir = os.environ.get('PROJECT_DIR', '/simultan_projects')
-if not os.path.exists(project_dir):
-    os.makedirs(project_dir)
-
-new_data_model = DataModel.create_new_project(project_path=os.path.join(project_dir, 'test_dir_files.simultan'),
-                                              user_name='admin',
-                                              password='admin')
-
-print(new_data_model.file_directories)
-
-
-new_directory_info = DirectoryInfo(path='directory_info_dir',
-                                   data_model=new_data_model)
-
-print(new_data_model.file_directories)
-
-print(new_directory_info.resource_entry)
-print(new_directory_info.parent)
-
-new_file1 = new_directory_info.add_file('test_add_file.txt', 'This is a test file')
-new_file2 = new_directory_info.add_file('test_add_file2.txt')
-
-sub_directory_info = new_directory_info.add_sub_directory('sub_dir')
-print(sub_directory_info.parent)
-
-print(new_directory_info.sub_directories)
-
-
-new_directory = new_data_model.create_resource_directory('test_dir')
-new_directory2 = new_data_model.create_resource_directory('test_dir2')
-new_directory4 = new_data_model.create_resource_directory('test_dir3')
-
-new_data_model.add_empty_resource(filename=os.path.join(new_directory.CurrentFullPath, 'test_empty_file.txt'))
-
-new_data_model.add_empty_resource(filename='test_empty_file2.txt',
-                                  target_dir=new_directory)
-
-new_file_info0 = FileInfo.from_string(filename='test_file.txt',
-                                      content='This is a test file',
-                                      data_model=new_data_model)
-
-new_file_info = FileInfo.from_string(filename='test_file.txt',
-                                     content='This is a test file',
-                                     target_dir=new_directory,
-                                     data_model=new_data_model)
-
-new_file_info2 = FileInfo.from_string(filename='test_file2.txt',
-                                     content='This is a test file 2',
-                                     target_dir=new_directory2.current_full_path,
-                                     data_model=new_data_model)
-
-# create just a file in the directory
-with open(os.path.join(new_directory2.current_full_path, 'not_contained_test_file3.txt'), 'w') as f:
-    f.write('This is a test file 3')
-
-
-new_data_model.save()
-new_data_model.cleanup()