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

PySimultan2/CHANGELOG.md

@@ -1,6 +1,13 @@
+Version 0.6.2 (28.03.2024)
+- Added extended functionality to ComponentDictionary
+- Bugfixing
+
 Version 0.6.1 (24.02.2024)
 - Bugfixes in default_types and File/Directory handling
 
+Version 0.6.0.7 (16.02.2024)
+- Fixed Asset creation and deletion bugs
+
 Version 0.6.0.3 (23.01.2024)
 - Added sub_classes and super_classes to SimultanObject
 

PySimultan2/__about__.py

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

PySimultan2/data_model.py

@@ -603,7 +603,7 @@ class DataModel:
             try:
                 act_filename = filename.replace('\\', os.sep)
             except TypeError:
-                act_filename = filename
+                act_filename = str(filename)
 
             if not act_filename.startswith(self.project.ProjectUnpackFolder.FullPath) and target_dir is None:
                 target_dir_str = self.project.ProjectUnpackFolder.FullPath

PySimultan2/default_types.py

@@ -520,11 +520,13 @@ class ComponentDictionary(SimultanObject):
 
     def __setitem__(self, key, value):
 
-        if key in self._dict:
-            del self._dict[key]
+        # if key in self._dict:
+        #     del self._dict[key]
 
         if key in self._taxonomy_map.content_dict.keys():
             content = self._taxonomy_map.content_dict[key]
+        elif '__dict_key__' + key in self._taxonomy_map.content_dict.keys():
+            content = self._taxonomy_map.content_dict['__dict_key__' + key]
         else:
             content = Content(text_or_key=f'__dict_key__{key}',
                               property_name=key,
@@ -574,7 +576,10 @@ class ComponentDictionary(SimultanObject):
 
     def __delitem__(self, key):
         self[key] = None
-        del self._dict[key]
+        try:
+            del self._dict[key]
+        except KeyError:
+            pass
 
     def items(self):
         if self._dict is None or not self._dict:

PySimultan2/files.py

@@ -307,6 +307,8 @@ class FileInfo(object, metaclass=MetaMock):
                 full_path = os.path.join(target_dir.CurrentFullPath, filename)
             elif isinstance(target_dir, str):
                 full_path = os.path.join(target_dir, filename)
+            else:
+                raise ValueError(f'Unsupported target_dir format')
         else:
             if not filename.startswith(str(data_model.project.ProjectUnpackFolder)):
                 full_path = os.path.join(str(data_model.project.ProjectUnpackFolder), filename)
@@ -614,6 +616,15 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
                                 add_sub_directories: bool = True,
                                 *args,
                                 **kwargs) -> DirectoryInfo:
+        """
+        Create a directory info object from an existing directory.
+        :param directory_path: the path to the directory
+        :param add_files:
+        :param add_sub_directories:
+        :param args:
+        :param kwargs:
+        :return:
+        """
 
         data_model = kwargs.get('data_model', config.get_default_data_model())
 
@@ -647,6 +658,33 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
 
         return directory_info
 
+    @classmethod
+    def from_existing_directory_copy(cls,
+                                     directory_path: str,
+                                     destination_path: str,
+                                     add_files: bool = True,
+                                     add_sub_directories: bool = True,
+                                     *args,
+                                     **kwargs) -> DirectoryInfo:
+
+        """
+        Create a directory info object from an existing directory which is copied to a directory in the project.
+        :param directory_path:
+        :param destination_path: the path to the directory (in the project)
+        :param add_files:
+        :param add_sub_directories:
+        :param args:
+        :param kwargs:
+        :return:
+        """
+
+        shutil.copytree(directory_path, destination_path)
+        return cls.from_existing_directory(destination_path,
+                                             add_files=add_files,
+                                             add_sub_directories=add_sub_directories,
+                                             *args,
+                                             **kwargs)
+
     def __init__(self,
                  path: Optional[str] = None,
                  helper_file: Optional[FileInfo] = None,
@@ -781,11 +819,7 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
 
     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=resource,
-                            data_model=self.data_model)
-        else:
-            return None
+        return resource
 
     def add_file(self,
                  filename: str,

PySimultan2/multi_values.py

@@ -129,7 +129,9 @@ def simultan_multi_value_big_table_to_pandas(field: SimMultiValueBigTable) -> pd
     return df
 
 
-def simultan_multi_value_field_3d_to_numpy(field: SimMultiValueField3D, assert_ordered=False) -> np.ndarray:
+def simultan_multi_value_field_3d_to_numpy(field: SimMultiValueField3D,
+                                           assert_ordered=False,
+                                           squeeze: bool = True) -> np.ndarray:
     """
     Convert a SimMultiValueField3D object to a numpy array.
     :param field:
@@ -150,7 +152,10 @@ def simultan_multi_value_field_3d_to_numpy(field: SimMultiValueField3D, assert_o
         for comb in product(range(len(field.XAxis)), range(len(field.YAxis)), range(len(field.ZAxis)), repeat=1):
             array[comb[0], comb[1], comb[2]] = field[comb[0], comb[1], comb[2]]
 
-    return np.squeeze(array)
+    if squeeze:
+        return np.squeeze(array)
+    else:
+        return array
 
 
 def add_field_to_data_model(field: SimMultiValueField3D, data_model: 'SimultanObject') -> SimMultiValueField3D:
@@ -288,3 +293,55 @@ def create_field_parameter(value: Union[SimMultiValueField3D, np.ndarray, DataFr
                                  )
 
     return param
+
+
+def add_row(field: SimMultiValueField3D,
+            dim: int = 0):
+
+    array = simultan_multi_value_field_3d_to_numpy(field, squeeze=False)
+
+    new_shape = list(array.shape)
+    if new_shape.__len__() - 1 < dim:
+        while new_shape.__len__() - 1 < dim:
+            new_shape.append(1)
+    new_shape[dim] += 1
+
+    # data = NetList[Double](Array[Double](array.astype(float).flatten(order='F')))
+
+    while field.XAxis.Count < new_shape[0]:
+        field.XAxis.Add(field.XAxis.Count+1)
+    while field.YAxis.Count < new_shape[1]:
+        field.YAxis.Add(field.YAxis.Count+1)
+    while field.ZAxis.Count < new_shape[2]:
+        field.ZAxis.Add(field.ZAxis.Count+1)
+
+    resized_array = np.resize(array, new_shape)
+
+    for i, j, k in zip(range(new_shape[0]), range(new_shape[1]), range(new_shape[2])):
+        field[i, j, k] = resized_array[i, j, k]
+
+    return field
+
+
+def resize(field: SimMultiValueField3D,
+           new_shape: list[int]) -> SimMultiValueField3D:
+    """
+    Resize a SimMultiValueField3D object to a new shape.
+    :param field: The SimMultiValueField3D object
+    :param new_shape: The new shape of the field, e.g. [10, 20, 30]
+    :return: SimMultiValueField3D
+    """
+    array = simultan_multi_value_field_3d_to_numpy(field, squeeze=False)
+    resized_array = np.resize(array, new_shape)
+
+    while field.XAxis.Count < resized_array.shape[0]:
+        field.XAxis.Add(field.XAxis.Count+1)
+    while field.YAxis.Count < resized_array.shape[1]:
+        field.YAxis.Add(field.YAxis.Count+1)
+    while field.ZAxis.Count < resized_array.shape[2]:
+        field.ZAxis.Add(field.ZAxis.Count+1)
+
+    for i, j, k in zip(range(new_shape[0]), range(new_shape[1]), range(new_shape[2])):
+        field[i, j, k] = resized_array[i, j, k]
+
+    return field