ipyvasp 0.9.4__py2.py3-none-any.whl → 0.9.5__py2.py3-none-any.whl

ipyvasp/_version.py

@@ -1 +1 @@
-__version__ = "0.9.4"
+__version__ = "0.9.5"

ipyvasp/widgets.py

@@ -106,12 +106,14 @@ class Files:
     Parameters
     ----------
     path_or_files : str, current directory by default or list of files or an instance of Files.
-    glob : str, glob pattern, '*' by default. Not used if files supplied above.
+    glob : str, glob pattern, '*' by default. '**' is used for recursive glob. Not used if files supplied above.
     exclude : str, regular expression pattern to exclude files.
     files_only : bool, if True, returns only files.
     dirs_only : bool, if True, returns only directories.
 
     Use methods on return such as `summarize`, `with_name`, `filtered`, `interact` and others.
+
+    >>> Files(root_1, glob_1,...).add(root_2, glob_2,...) # Fully flexible to chain
     """
     def __init__(self, path_or_files = '.', glob = '*', exclude = None,files_only = False, dirs_only=False):
         if isinstance(path_or_files, Files):
@@ -123,8 +125,7 @@ class Files:
 
         files = []
         if isinstance(path_or_files,(str, Path)):
-            path = Path(path_or_files)
-            files = [p for p in path.glob(glob)]
+            files = Path(path_or_files).glob(glob)
         else:
             others = []
             for item in path_or_files:
@@ -142,23 +143,30 @@ class Files:
                 print(f"Skipping paths that do not exist: {list(set(others))}")
                 
         if exclude:
-            files = [p for p in files if not re.search(exclude, str(p))]
+            files = (p for p in files if not re.search(exclude, str(p)))
         if files_only:
-            files = [p for p in files if p.is_file()]
+            files = (p for p in files if p.is_file())
         if dirs_only:
-            files = [p for p in files if p.is_dir()]
+            files = (p for p in files if p.is_dir())
             
         self._files =  tuple(sorted(files))
 
+    def __str__(self):
+        return '\n'.join(str(f) for f in self._files)
+
     def __repr__(self):
         if not self: return "Files()"
-        return "Files(\n" + ',\n'.join(f'  {f!r}' for f in self._files) + "\n)"
+        show = ',\n'.join(f'  {f!r}' for f in self._files)
+        return f"Files(\n{show}\n) {len(self._files)} items"
 
     def __getitem__(self, index): return self._files[index]
     def __iter__(self): return self._files.__iter__()
     def __len__(self): return len(self._files)
     def __bool__(self): return bool(self._files)
 
+    def __add__(self, other):
+        raise NotImplementedError("Use self.add method instead!")
+
     def map(self,func):
         "Map files to a function!"
         return map(func, self._files)
@@ -199,15 +207,30 @@ class Files:
         
         return self.with_name('POSCAR').summarize(info, tags=tags)
 
-    def update(self, path_or_files, glob = '*',**kwargs):
-        "Update files inplace with similar parameters as initialization. Useful for widgets such as BandsWidget to preserve their state while files swapping."
-        self._files = self.__class__(path_or_files, glob = glob, **kwargs)
+    def update(self, path_or_files, glob = '*', cleanup = True, exclude=None,**kwargs):
+        """Update files inplace with similar parameters as initialization. If `cleanup=False`, older files are kept too.
+        Useful for widgets such as BandsWidget to preserve their state while using `widget.files.update`."""
+        old = () if cleanup else self._files
+        self._files = self._unique(old, self.__class__(path_or_files, glob = glob, exclude=exclude,**kwargs)._files)
+        
         if (dd := getattr(self, '_dd', None)): # update dropdown
             old = dd.value
             dd.options = self._files
             if old in dd.options:
                 dd.value = old
     
+    def add(self, path_or_files, glob = '*', exclude=None, **kwargs):
+        """Add more files or with a diffrent glob on top of exitsing files. Returns same instance.
+        Useful to add multiple globbed files into a single chained call.
+
+        >>> Files(root_1, glob_1,...).add(root_2, glob_2,...) # Fully flexible 
+        """
+        self._files = self._unique(self._files, self.__class__(path_or_files, glob = glob, exclude=exclude,**kwargs)._files)
+        return self
+    
+    def _unique(self, *files_tuples):
+        return tuple(np.unique(np.hstack(files_tuples)))
+    
     def interactive(self, func, *args,
         free_widgets=None,
         options={"manual": False},
@@ -320,16 +343,10 @@ class Files:
         ]  # add hr to separate other controls
 
         out.children = [
-            HBox(
-                [  # reset children to include new widgets
-                    VBox(
-                        children=[dd, VBox(others)]
-                    ),  # other widgets in box to make scrollable independent file selection
-                    VBox(
-                        children=[output, *args, info]
-                    ),  # output in box to make scrollable,
-                ],
-                layout=Layout(height=height, max_height=height),
+            HBox([  # reset children to include new widgets
+                VBox([dd, VBox(others)]),  # other widgets in box to make scrollable independent file selection
+                VBox([Box([output]), *args, info]),  # output in box to make scrollable,
+                ],layout=Layout(height=height, max_height=height),
             ).add_class("files-interact")
         ]  # important for every widget separately
         return out

{ipyvasp-0.9.4.dist-info → ipyvasp-0.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipyvasp
-Version: 0.9.4
+Version: 0.9.5
 Summary: A processing tool for VASP DFT input/output processing in Jupyter Notebook.
 Home-page: https://github.com/massgh/ipyvasp
 Author: Abdul Saboor

{ipyvasp-0.9.4.dist-info → ipyvasp-0.9.5.dist-info}/RECORD

@@ -2,7 +2,7 @@ ipyvasp/__init__.py,sha256=rlorju9arMtHw1QRYPljday-PyZWJdSCxg4lw3g6t0Q,1409
 ipyvasp/__main__.py,sha256=eJV1TZSiT8mC_VqAeksNnBI2I8mKMiPkEIlwikbtOjI,216
 ipyvasp/_enplots.py,sha256=D38paN8zqZgluNAwmCwcocd7-_h_T0HTGolI1eBkDes,37484
 ipyvasp/_lattice.py,sha256=GxG0C4lwVGvBYIy3jwR1kahWR7L6kJlqjIiQGgESjcM,104135
-ipyvasp/_version.py,sha256=iPcoATf7BiWjSu-KocRdM5zFTR4wx4ktCHlGGpvdc1M,23
+ipyvasp/_version.py,sha256=UvB3IZAWAs7vV6H9dpZvZPryrSNIyF5_bowVS4_YGFA,23
 ipyvasp/bsdos.py,sha256=1rG68S-dLEYveIWGK7r8CRa7Qqlqno0l1ncfo2ocihk,30424
 ipyvasp/cli.py,sha256=aWFEVhNmnW8eSOp5uh95JaDwLQ9K9nlCQcbnOSuhWgw,6844
 ipyvasp/evals_dataframe.py,sha256=-sqxK7LPV6sYDO_XXmZ80FznOaXTkVdbqJKKvTUtMak,20637
@@ -11,15 +11,15 @@ ipyvasp/misc.py,sha256=SZJ_ePUR2-HEKYTEpDHVRVE7zpIQVTCjiuw0BCC9UTU,2349
 ipyvasp/potential.py,sha256=tzA73c5lkp6ahLSJchMrU043-QWaOV0nIOUA7VMmfKQ,11408
 ipyvasp/surface.py,sha256=MjE5oB0wW6Pca_C-xu8rN6OMH7lUEeNPNyM7Kz_Im-8,23766
 ipyvasp/utils.py,sha256=rVyD5SkO_Y7ok5W-fJeQys9X8pLLbDK7VOgbAbcE4WU,14227
-ipyvasp/widgets.py,sha256=iWkH7PbzZFPUZ2LrSRLafTPxXfiRfNFG5Ddaq3Wd_BU,45655
+ipyvasp/widgets.py,sha256=hwCviQn5NmxFz15DTS2nKKJ0kdBq8taGude46KNDOtU,46605
 ipyvasp/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ipyvasp/core/parser.py,sha256=C3CaZsJbPME_ttYlYy4DXeOdL7dnkXs-cHRwFZL6bio,38058
 ipyvasp/core/plot_toolkit.py,sha256=3RoPsND5gPssBSfS5H4TjoZ2Qz7B97vpxeKadc2cRRs,36046
 ipyvasp/core/serializer.py,sha256=XpqnfVGsUXiN2CuVRPyqsSVouxRBO-UH6AnsHnPYvZY,36729
 ipyvasp/core/spatial_toolkit.py,sha256=8DBYTiBFWJ7OBKuvOPw7UoEVCyNjJhSW0OcudjYZvAw,14748
-ipyvasp-0.9.4.dist-info/LICENSE,sha256=F3SO5RiAZOMfmMGf1KOuk2g_c4ObvuBJhd9iBLDgXoQ,1263
-ipyvasp-0.9.4.dist-info/METADATA,sha256=PvaEna3-zdOpEQhg5_iD9ECRt7N4nqI5aPluv6-VJ9M,2420
-ipyvasp-0.9.4.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-ipyvasp-0.9.4.dist-info/entry_points.txt,sha256=C7m0Sjmr14wFjflCkWXLzr5N6-cQj8uJC9n82mUtzt8,44
-ipyvasp-0.9.4.dist-info/top_level.txt,sha256=ftziWlMWu_1VpDP1sRTFrkfBnWxAi393HYDVu4wRhUk,8
-ipyvasp-0.9.4.dist-info/RECORD,,
+ipyvasp-0.9.5.dist-info/LICENSE,sha256=F3SO5RiAZOMfmMGf1KOuk2g_c4ObvuBJhd9iBLDgXoQ,1263
+ipyvasp-0.9.5.dist-info/METADATA,sha256=Vfq6b9vA2i5LjHBcUTb8KkXkkCK3jldhXPNUm27MvsQ,2420
+ipyvasp-0.9.5.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+ipyvasp-0.9.5.dist-info/entry_points.txt,sha256=C7m0Sjmr14wFjflCkWXLzr5N6-cQj8uJC9n82mUtzt8,44
+ipyvasp-0.9.5.dist-info/top_level.txt,sha256=ftziWlMWu_1VpDP1sRTFrkfBnWxAi393HYDVu4wRhUk,8
+ipyvasp-0.9.5.dist-info/RECORD,,