PySimultan 0.6.0.8__py3-none-any.whl → 0.6.1__py3-none-any.whl

PySimultan2/CHANGELOG.md

@@ -1,5 +1,5 @@
-Version 0.6.0.7 (16.02.2024)
-- Fixed Asset creation and deletion bugs
+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

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.6.0.8'
+version = '0.6.1'

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)
@@ -685,40 +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:
 
-        # check if directory already exists
         if parent_directory is None:
-            full_path = os.path.join(self.project.ProjectUnpackFolder.FullPath, name)
+            if name.startswith(self.project.ProjectUnpackFolder.FullPath):
+                full_path = name
+            else:
+                full_path = os.path.join(self.project.ProjectUnpackFolder.FullPath, name)
         else:
-            full_path = os.path.join(parent_directory.FullPath, name)
-
-        def get_existing(full_file_path: str):
-            new_directory = self.project_data_manager.AssetManager.GetResource(DirectoryInfo(full_path))
-            if new_directory is None:
-                res = self.project_data_manager.AssetManager.CreateResourceDirIn(os.path.basename(full_path),
-                                                                                 DirectoryInfo(
-                                                                                     os.path.dirname(
-                                                                                         full_path)),
-                                                                                 '0')
-
-                new_directory = self.project_data_manager.AssetManager.GetResource(res.Item1)
-            return new_directory
-
-        if os.path.exists(full_path):
-            new_directory = get_existing(full_path)
-            return new_directory
+            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:
+            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))
 
         if parent_directory is None:
-            new_directory = self.project.CreateResourceDirIn(name, None, collision_name_format)
-        if parent_directory is not None:
-            new_directory = self.project.CreateResourceDirIn(name, parent_directory, collision_name_format)
-
-        return new_directory
+            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)

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

PySimultan2/files.py

@@ -301,12 +301,17 @@ class FileInfo(object, metaclass=MetaMock):
         data_model = kwargs.get('data_model', config.get_default_data_model())
 
         if target_dir is not None:
-            full_path = os.path.join(target_dir.full_path, filename)
+            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:
-            full_path = os.path.join(data_model.project.ProjectUnpackFolder, filename)
-
-
-
+            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

PySimultan2/utils.py

@@ -1375,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'):
@@ -1395,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.8.dist-info → pysimultan-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.6.0.8
+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.1.dist-info/RECORD

@@ -0,0 +1,76 @@
+PySimultan2/CHANGELOG.md,sha256=m2kQeo1c4OzqfWfSPo5h9a_MckVP9ujQcV522cWJeRw,1168
+PySimultan2/__about__.py,sha256=6dnIBU76aotxIqMySiQ6NBgICwIDVWir8GgeCS4OjOU,19
+PySimultan2/__init__.py,sha256=PGVR1uhY01dF5tHyad-znURUZ_LVB95vsjId2BT0aJM,3245
+PySimultan2/data_model.py,sha256=5E-AJfnXNJq-Y6srN7DfvCDwkZXqXQBDXTsFlQ2Zh6g,44104
+PySimultan2/default_types.py,sha256=giO0cd23fG-9vnC-fXtqnUo7Q3r1q3_howEnVnD7XlU,30360
+PySimultan2/files.py,sha256=mf4MC9UspmQvwbW7GKavwvFKICpKNRfRpDKsA4sZtUQ,33316
+PySimultan2/multi_values.py,sha256=ZFXlTLuZo32x7_7diYAp2XEjp5uwgHLgNOzN7v74-5I,13650
+PySimultan2/object_mapper.py,sha256=Vq4LsX5m6J1dsdlIC6V7sXEUGZYpkgPD6kwOdo5dLRI,19888
+PySimultan2/simultan_object.py,sha256=-3dTlkyoVdrXmSZgozz7fTHJnaxN63utYPXOXTCuEOY,20837
+PySimultan2/taxonomy_maps.py,sha256=hhgXhRXIPTD2briG_yYZssJ9musOnzs0LC4e8e78e40,10323
+PySimultan2/type_setter_lookup.py,sha256=PGa5_EtV7SM15w3uxy0fA3LiQ0TaS4Ys0LYR5zs8aNk,3748
+PySimultan2/utils.py,sha256=NzJabuewGd-UQG9YkvbivyhSqBcjMPArfRl-IzcKAZU,67097
+PySimultan2/geometry/__init__.py,sha256=nJolTD1i5J8qUkOQa-r3D20aq3Co3sN31Xc0n4wJpJo,248
+PySimultan2/geometry/geometry_base.py,sha256=TwABfQEsqxAIGLqwvqVXEV-GA5sYGBJSJm7e58QmNzM,24015
+PySimultan2/geometry/utils.py,sha256=J25YsK8sso_UL7xRusItQZvyjtvxdOsSPelBQYFABhY,8519
+PySimultan2/resources/AssimpNet.dll,sha256=x8uwMHPRmEH9fDQihfEQLUdblM1u7RP-CCnUjOpXcLo,205312
+PySimultan2/resources/AvalonDock.dll,sha256=9tCcw7cpaVq0bh1H2sfcxb8EWhySmgujPs89lAqIPZs,500224
+PySimultan2/resources/BruTile.dll,sha256=sJOMQaku5jxcbL7XEd9pehBopyFEHOZzaLyNZyD6u7U,203264
+PySimultan2/resources/ClosedXML.dll,sha256=dzkwJaBvIdou7SZSE5lsEART_jlnMMztEZu_jBuHp74,1198592
+PySimultan2/resources/ComponentBuilder.dll,sha256=38kTs312oyDDfX9z4JJyvlfbb7JxMrCEFe58zYnidcQ,2324992
+PySimultan2/resources/ComponentBuilder.dll.config,sha256=jP5s_8OMg9085DyGtrLZcguy8etqm4ra21KwDXq1sy0,3032
+PySimultan2/resources/ComponentBuilder.runtimeconfig.json,sha256=YBIGLYblUb1QapC3Td-VcI9HtfEQ_6rQssb-JbeODyA,458
+PySimultan2/resources/ComponentBuilder.xml,sha256=-P7kILmeX_v7ZCie38jMrceS5gX53h7q8ukIKNmgoyU,1044233
+PySimultan2/resources/ControlzEx.dll,sha256=S26xw5MnNiIoyiCmVFbFOmUx1yx_zAyXBdDSOSidZxQ,463160
+PySimultan2/resources/Cyotek.Drawing.BitmapFont.dll,sha256=JG8HbAq5s796e02jB9QklO2cOyKPtHmhY6vc7KUs0OQ,41800
+PySimultan2/resources/DocumentFormat.OpenXml.dll,sha256=JjiBI17BpHztipV39dQdXAjhHo6Ic0xRjijJJuBQLLo,6108592
+PySimultan2/resources/DotSpatial.Projections.dll,sha256=dK4oFLcpUK3i6CZ3qIcX5B0npYd-W4hHJz7RJvM77ho,1541632
+PySimultan2/resources/ExcelNumberFormat.dll,sha256=18Rbjk4QJ4MeL8jN-UH69R0opm_qz8qqc32nMmLntQc,30720
+PySimultan2/resources/Fluent.dll,sha256=9b7QKKj8-Ynhe4WqSVfiP82PkxYz_kI_GXYi_KQxrEU,2598400
+PySimultan2/resources/HelixToolkit.Core.Wpf.dll,sha256=EU2-CBh2SDNjwZEP2pOBJhLUf0lKpOL77dYH4fS3wZY,592384
+PySimultan2/resources/HelixToolkit.SharpDX.Core.Wpf.dll,sha256=KgLYD_QrOxwu90Zk59KLsquAGthP_B-FW0GyHEkyDk0,613888
+PySimultan2/resources/HelixToolkit.SharpDX.Core.dll,sha256=iKE8TEEAEX9FCg-6CipTCq79aiR79d6jep0rwMCAwgM,1733120
+PySimultan2/resources/HelixToolkit.dll,sha256=HjbeIX5qCQOm-2HhJCd7ZjCwGAeVoaAHo3SHV8_B4ak,6656
+PySimultan2/resources/MathNet.Numerics.dll,sha256=g7QaYI5DhAnWUg0BEk9S9XQJ4il5HA4HTjFazn2fQTQ,1600000
+PySimultan2/resources/Microsoft.AspNetCore.Authorization.dll,sha256=P7_HRwCqdk3q1MD7UtlAXMN_E8gZRdzme6ESGZsXHNk,49272
+PySimultan2/resources/Microsoft.AspNetCore.Metadata.dll,sha256=jddQwxkgfjmJ6vlXok-PbfnIquNDs6VHvspFEopiTAY,17016
+PySimultan2/resources/Microsoft.Extensions.DependencyInjection.Abstractions.dll,sha256=jrAm-30mcWoI54hsUTOr-RMOzHIq-zO8ZuRBVrBvCoo,43656
+PySimultan2/resources/Microsoft.Extensions.Logging.Abstractions.dll,sha256=7mzUlhcvGxpAVO4h_Tka7P_8IXF9ZsHkGt0fp5aufkU,63096
+PySimultan2/resources/Microsoft.Extensions.Options.dll,sha256=gcHJrSv1wTqvF9SyWTEKcbiShn4mkgfnm9-tRQr4OqY,60584
+PySimultan2/resources/Microsoft.Extensions.Primitives.dll,sha256=q4ruoDSCjV_QJY9ZkzV6uxvEvZUVrDbyUjU3SSh5SlE,41616
+PySimultan2/resources/Microsoft.WindowsAPICodePack.Shell.dll,sha256=VTVjKHwRDUz4rGoy8r3j4IP94wHDQky2NImHsqFhbHk,514048
+PySimultan2/resources/Microsoft.WindowsAPICodePack.dll,sha256=aB9FK5RWRh1onyayOe0YIuu2Qtqv7hq-HmZQH40Mk4s,103936
+PySimultan2/resources/Microsoft.Xaml.Behaviors.dll,sha256=j3gq16397qqTMYMGWqegvpOHq85gOOkSRV54UnsErco,145272
+PySimultan2/resources/Newtonsoft.Json.Bson.dll,sha256=tgbl3XemJCyh8d9xfrU9lQWuVpBDMLl1wI1PLb6MMxk,90624
+PySimultan2/resources/Newtonsoft.Json.dll,sha256=etsgJYQb32kqVnEuCK_nXhcwxx1keKj-1XWs1DJRpmI,639488
+PySimultan2/resources/Python.Runtime.dll,sha256=i8TGSK2uHgN4_JwFn8llwTNrhXtqU-l05M8-CdMIy7Q,438784
+PySimultan2/resources/SIMULTAN.Lang.dll,sha256=Z_vMisLt6CHABBO_FYcA9utI8n10kSqXy7tE5iFa8o0,2587136
+PySimultan2/resources/SIMULTAN.Lang.xml,sha256=5kUlwuT-UNog9Y2JjjSFdBW8b1s14Nf1B_YyQlrf7Vg,739070
+PySimultan2/resources/SIMULTAN.UI.dll,sha256=Iya297q6BCfLAHxLnJEoFi6h9-H54Dg0Ps6bbyDyOuQ,1245184
+PySimultan2/resources/SIMULTAN.UI.xml,sha256=NVUg3RiPzvUJk87fHnVya0BVdL3tECz8gg2GQZHOevs,836095
+PySimultan2/resources/SIMULTAN.dll,sha256=eNB8MyMrrqNk398r2q39Y3-L5eeymN4eShFFD_OmKcA,1771520
+PySimultan2/resources/SIMULTAN.xml,sha256=oRopamMm95ByupGN_8VzQmMlHA_AfFS2bFBZ1pPAlY0,1968806
+PySimultan2/resources/SharpDX.D3DCompiler.dll,sha256=qyDGhqpcMo0zkNAdSdyX9sxWRxGRZq6ce4FIBXvxXSI,57856
+PySimultan2/resources/SharpDX.DXGI.dll,sha256=GMTsibwN7s_JG8t-ofKaJpDpKIADw2bqAnAzdLS21zI,147968
+PySimultan2/resources/SharpDX.Direct2D1.dll,sha256=HkRyV1YspAeY05q0E4pkFy3Hrrkd96fr9SzlmVnDekc,495616
+PySimultan2/resources/SharpDX.Direct3D11.dll,sha256=XBwIVxhA-_S5haBjrGlXEwWWqIg5IKcXT7fFFoJt2rE,282624
+PySimultan2/resources/SharpDX.Direct3D9.dll,sha256=aXAe2nQzrAAQq6QWudnCRc14aUdw1LtrdUG4O6zkHVU,338944
+PySimultan2/resources/SharpDX.Mathematics.dll,sha256=ajtUzW3A6l7UwfVpZgpPacGrVHHP24QZmdSyZOHOThI,215552
+PySimultan2/resources/SharpDX.dll,sha256=UY1FparshMs36D7iz1jFA6tqJf67jEi1MxY0DJZ-hL0,275968
+PySimultan2/resources/Sprache.Calc.dll,sha256=QyBWSMEL5UXootOCTzYWlAkDgGcseeVgDaw_W7K32zc,22528
+PySimultan2/resources/Sprache.dll,sha256=4c4dDHP9ztxaBDpgWYBUhKKkzPl5eISQimpThGZl0t8,59904
+PySimultan2/resources/System.Collections.Immutable.dll,sha256=YkpsmK2tsFnupt75OgF4vW0fedXRXfvGwPKONArInxk,245920
+PySimultan2/resources/System.Data.OleDb.dll,sha256=-AAzdmyo01QNgD9qnUIewEImplJFVNDGUlqE17qmRYA,124024
+PySimultan2/resources/System.Net.Http.Formatting.dll,sha256=xQBIin4YpqDObdqwau_5dr8XQEq54hlxV4gBgNtUqbc,179672
+PySimultan2/resources/System.Reflection.Metadata.dll,sha256=Z_vYHE6IgOvBi3DLxLhfX-v6o01lTfD0B4oW6B8IsyA,475912
+PySimultan2/resources/System.Reflection.MetadataLoadContext.dll,sha256=P4PBRwAGWL27sNc754Wd28t_koJKBFYJ2FyolrD1xo0,242296
+PySimultan2/resources/XAMLMarkupExtensions.dll,sha256=Ck7FAAFHqSSwMtGJebfun-88OCEplWxY2YKMwlFaF84,36864
+PySimultan2/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PySimultan2/resources/assimp.dll,sha256=HwfDwXqoPDTFRyoQpA3qmgZoUdFtziJkV5fNtktEZEU,6081536
+PySimultan2/resources/componentmanager.user,sha256=hrzr1US4pqkFnLHXcvPkvrgGd7QvlxaV8mhS6fuikEs,760
+PySimultan2/resources/defaultsettings.xml,sha256=QCkKmhNMxwSvC-aYUUMhkCkXqRSrkuFt5s4FEI5x1wo,396
+PySimultan2/resources/setup.bat,sha256=fjvvYfVM6TalS-QTSiKAbAId5nTsk8kGGo06ba-wWaY,32
+pysimultan-0.6.1.dist-info/METADATA,sha256=rmVLXHOWpGN4dnbPTasxcmYddyMd2ZkmxBupk0j4aiE,6548
+pysimultan-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pysimultan-0.6.1.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
+pysimultan-0.6.1.dist-info/RECORD,,