ipyvasp 1.0.1__py2.py3-none-any.whl → 1.0.2__py2.py3-none-any.whl

ipyvasp/_lattice.py

@@ -232,7 +232,7 @@ def periodic_table(selection=None):
     return ax
 
 
-def write_poscar(poscar_data, outfile=None, selective_dynamics=None, overwrite=False, comment="", scale=None):
+def write_poscar(poscar_data, outfile=None, selective_dynamics=None, overwrite=False, comment="", scale=None, system=None):
     """Writes POSCAR data to a file or returns string
 
     Parameters
@@ -248,13 +248,15 @@ def write_poscar(poscar_data, outfile=None, selective_dynamics=None, overwrite=F
         Add comment, previous comment will be there too.
     scale: float
         Scale factor for the basis vectors. Default is provided by loaded data.
+    system: str
+        System name to be used in POSCAR file instead of the one in `poscar_data.SYSTEM`.
 
 
     .. note::
         POSCAR is only written in direct format even if it was loaded from cartesian format.
     """
     _comment = poscar_data.metadata.comment + comment
-    out_str = f"{poscar_data.SYSTEM}  # " + (_comment or "Created by ipyvasp")
+    out_str = f"{system or poscar_data.SYSTEM}  # " + (_comment or "Created by ipyvasp")
 
     if scale is None:
         scale = poscar_data.metadata.scale
@@ -2296,10 +2298,6 @@ def set_boundary(poscar_data, a = [0,1], b = [0,1], c = [0,1]):
     del upos
     return serializer.PoscarData(data)
 
-    
-
-
-
 
 def rotate_poscar(poscar_data, angle_deg, axis_vec):
     """Rotate a given POSCAR.
@@ -2412,7 +2410,7 @@ def convert_poscar(poscar_data, atoms_mapping, basis_factor):
                 type(basis_factor)
             )
         )
-
+    poscar_data["SYSTEM"] = "".join(poscar_data["types"].keys())  # Update system name
     return serializer.PoscarData(poscar_data)  # Return new POSCAR
 
 
@@ -2431,7 +2429,7 @@ def transform_poscar(poscar_data, transformation, fill_factor=2, tol=1e-2):
 
 
     .. note::
-        This function keeps underlying lattice same.
+        This function keeps underlying lattice same. To apply strain, use `deform` function instead.
     """
     if callable(transformation):
         new_basis = np.array(transformation(*poscar_data.basis))  # mostly a tuple
@@ -2546,11 +2544,11 @@ def add_atoms(poscar_data, name, positions):
     data = poscar_data.to_dict()  # Copy data to avoid modifying original
     data["types"] = unique  # Update unique dictionary
     data["positions"] = new_pos  # Update positions
-    data["SYSTEM"] = f'{data["SYSTEM"]}+{name}'  # Update SYSTEM
     data["metadata"][
         "comment"
     ] = f'{data["metadata"]["comment"]} + Added {name!r}'  # Update comment
 
+    data["SYSTEM"] = "".join(data["types"].keys())  # Update system name
     return serializer.PoscarData(data)  # Return new POSCAR
 
 
@@ -2593,7 +2591,7 @@ def sort_poscar(poscar_data, new_order):
         for i, k in enumerate(data["types"].keys())
         if len(data["types"][k]) != 0
     }
-
+    data["SYSTEM"] = "".join(data["types"].keys())  # Update system name
     return serializer.PoscarData(data)
 
 def remove_atoms(poscar_data, func, fillby=None):
@@ -2650,7 +2648,7 @@ def remove_atoms(poscar_data, func, fillby=None):
         for i, k in enumerate(new_types.keys())
         if len(new_types[k]) != 0
     }
-
+    data["SYSTEM"] = "".join(data["types"].keys())  # Update system name
     return serializer.PoscarData(data)  # Return new POSCAR
 
 

ipyvasp/_version.py

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.0.2"

ipyvasp/core/plot_toolkit.py

@@ -15,7 +15,7 @@ from matplotlib.patches import FancyArrowPatch
 from cycler import cycler
 
 from IPython import get_ipython
-from IPython.display import HTML, set_matplotlib_formats
+from IPython.display import HTML
 import PIL  # For text image.
 
 import plotly.graph_objects as go
@@ -25,15 +25,19 @@ from einteract import patched_plotly
 from .spatial_toolkit import to_R3, rotation
 from ..utils import _sig_kwargs
 
+try:
+    from IPython.display import set_matplotlib_formats # old style in < py3.9
+except ImportError:
+    from matplotlib_inline.backend_inline import set_matplotlib_formats
 
 def global_matplotlib_settings(rcParams={}, display_format="svg"):
     "Set global matplotlib settings for notebook."
-    # show SVG in notebook
-    if shell := get_ipython():
-        shell_name = shell.__class__.__name__
-        if shell_name in ("ZMQInteractiveShell", "Shell"):  # Shell for colab.
-            set_matplotlib_formats(display_format)
-
+    # Set display format only if the backend is the default inline backend.
+    # This avoids interfering with other backends like 'ipympl' which are
+    # required for interactive plotting.
+    if get_ipython() and "inline" in mpl.get_backend():
+        set_matplotlib_formats(display_format)
+        
     # Gloabal settings matplotlib with some defaults
     rcParams = {
         "axes.linewidth": 0.4,
@@ -891,7 +895,7 @@ def plt2text(
     if plt_fig == None:
         plt_fig = plt.gcf()
     plot_bytes = BytesIO()
-    plt.savefig(plot_bytes, format="png", dpi=600)
+    plt_fig.savefig(plot_bytes, format="png", dpi=600)
     img = PIL.Image.open(plot_bytes)
     # crop
     if crop:
@@ -952,9 +956,9 @@ def plt2html(plt_fig=None, transparent=True):
     if plt_fig is None:
         plt_fig = plt.gcf()
     plot_bytes = BytesIO()
-    plt.savefig(plot_bytes, format="svg", transparent=transparent)
+    plt_fig.savefig(plot_bytes, format="svg", transparent=transparent)
 
-    _ = plt.clf()  # Clear other display
+    plt.close(plt_fig)  # Close to avoid auto display in notebook
     return HTML("<svg" + plot_bytes.getvalue().decode("utf-8").split("<svg")[1])
 
 

{ipyvasp-1.0.1.dist-info → ipyvasp-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipyvasp
-Version: 1.0.1
+Version: 1.0.2
 Summary: A processing tool for VASP DFT input/output processing in Jupyter Notebook.
 Home-page: https://github.com/massgh/ipyvasp
 Author: Abdul Saboor
@@ -28,7 +28,7 @@ Requires-Dist: einteract
 Requires-Dist: sympy
 Provides-Extra: extra
 Requires-Dist: jupyterlab>=3.5.2; extra == "extra"
-Requires-Dist: ipython>=8.7; extra == "extra"
+Requires-Dist: ipython>=9.0; extra == "extra"
 Requires-Dist: ase>=3.22.1; extra == "extra"
 Requires-Dist: nglview>=3.0.4; extra == "extra"
 

{ipyvasp-1.0.1.dist-info → ipyvasp-1.0.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
 ipyvasp/__init__.py,sha256=pzTqeKuf6sN2GQmaexmMgG677ggT3sxIFyQDXq_2whU,1422
 ipyvasp/__main__.py,sha256=eJV1TZSiT8mC_VqAeksNnBI2I8mKMiPkEIlwikbtOjI,216
 ipyvasp/_enplots.py,sha256=gJ7S9WBmrxvDEbmoccDRaJG01kpx9oNlRf7mozigbgY,37872
-ipyvasp/_lattice.py,sha256=YVUgI4ne0qAZCTwjFoITAv34KcRMoHotpAeNuAx-dW8,105935
-ipyvasp/_version.py,sha256=j9q3lYMZra0QrErNnn9E5GNXxWLOlDgeOkmX8oXa7ro,23
+ipyvasp/_lattice.py,sha256=-RQzY7jjNOT5xltXzLkJLf3ZIspKk3jktGVwAaew8ao,106340
+ipyvasp/_version.py,sha256=LZTFaiDdXahAtu6Prb5WEPk4QX_pfMd7zDoNQSzcGsI,23
 ipyvasp/bsdos.py,sha256=omEiQrdbyZDI0Vd39bktzEyw2Il_w9rFsmYR_jEF-Xk,32180
 ipyvasp/cli.py,sha256=aWFEVhNmnW8eSOp5uh95JaDwLQ9K9nlCQcbnOSuhWgw,6844
 ipyvasp/evals_dataframe.py,sha256=KWbkvQJSyXeTSG6LJGcZKs0s5-tor5uPee2P8FJd7vs,20759
@@ -14,12 +14,12 @@ ipyvasp/utils.py,sha256=1eVDhYzK3dr0AC_CouWrU3xIhbVJu7AABscV-qi_vAA,18000
 ipyvasp/widgets.py,sha256=JcLKjn_Wbi5VXgNOB-SB30dD_-dPTslaKFpJwGgr0Mg,53319
 ipyvasp/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ipyvasp/core/parser.py,sha256=i1lMlfVPEA0-UFDz9lQnlVlMnVFBkEHBsqYPF3ez_2I,39805
-ipyvasp/core/plot_toolkit.py,sha256=XUB8VYBjv81WowafgLEyHELmzQn-PT36KwLJZKXIx_c,36304
+ipyvasp/core/plot_toolkit.py,sha256=Pz5ZBsInM3Y2tmNxKPGEkX6pg81BDptcTIK7b3upbVg,36560
 ipyvasp/core/serializer.py,sha256=aEc7K5jVga8gxm9Tt2OgBw8wnsmWZGtODBnwRJ_5sf0,38423
 ipyvasp/core/spatial_toolkit.py,sha256=dXowREhiFzBvvr5f_bApzFhf8IzjH2E2Ix90oCBUetY,14885
-ipyvasp-1.0.1.dist-info/LICENSE,sha256=F3SO5RiAZOMfmMGf1KOuk2g_c4ObvuBJhd9iBLDgXoQ,1263
-ipyvasp-1.0.1.dist-info/METADATA,sha256=n2ix06x91IihFM--xF5l9914VZIsbg_CO4PahbgVJlY,3220
-ipyvasp-1.0.1.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-ipyvasp-1.0.1.dist-info/entry_points.txt,sha256=aU-gGjQG2Q8XfxDlNc_8__cwfp8WG2K5ZgFPInTm2jg,45
-ipyvasp-1.0.1.dist-info/top_level.txt,sha256=ftziWlMWu_1VpDP1sRTFrkfBnWxAi393HYDVu4wRhUk,8
-ipyvasp-1.0.1.dist-info/RECORD,,
+ipyvasp-1.0.2.dist-info/LICENSE,sha256=F3SO5RiAZOMfmMGf1KOuk2g_c4ObvuBJhd9iBLDgXoQ,1263
+ipyvasp-1.0.2.dist-info/METADATA,sha256=l336yZiQA8J7QQvW3afAJnDyUcL8I1bhkY6FSG4jJ5c,3220
+ipyvasp-1.0.2.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+ipyvasp-1.0.2.dist-info/entry_points.txt,sha256=aU-gGjQG2Q8XfxDlNc_8__cwfp8WG2K5ZgFPInTm2jg,45
+ipyvasp-1.0.2.dist-info/top_level.txt,sha256=ftziWlMWu_1VpDP1sRTFrkfBnWxAi393HYDVu4wRhUk,8
+ipyvasp-1.0.2.dist-info/RECORD,,