Myosotis-Researches 0.0.21__py3-none-any.whl → 0.0.23__py3-none-any.whl

myosotis_researches/CcGAN/utils/__init__.py

@@ -2,5 +2,6 @@ from .print_hdf5_structure import print_hdf5_structure
 from .concat_image_horizontal import concat_image_horizontal
 from .concat_image_vertical import concat_image_vertical
 from .make_h5 import make_h5
+from .install_datasets import install_datasets
 
-__all__ = ["print_hdf5_structure", "concat_image_horizontal", "concat_image_vertical", "make_h5"]
+__all__ = ["print_hdf5_structure", "concat_image_horizontal", "concat_image_vertical", "make_h5", "install_datasets"]

myosotis_researches/CcGAN/utils/install_datasets.py

@@ -1,15 +1,18 @@
 import gdown
+import getpass
 from importlib import resources
 import os
-import rarfile
+import subprocess
 
 # Paths
 datasets_dir = resources.files("myosotis_researches").joinpath("CcGAN", "datasets")
+if not os.path.exists(datasets_dir):
+    os.makedirs(datasets_dir, exist_ok=True)
 
 # File ID dictionary
 file_id_dict = {
-    "Ra": "1DJfpvXTX1x6Ldf4nZzqzlVsQSx9iXo9I",
-    "MNIST": "1ZmTSX_wl68nsQI0ImfhpIsPClW_QrK1T",
+    "Ra": "1CcXp7ga4Ebj7XeMA_fYH2RxTMOWvA0v5",
+    "MNIST": "1LCQmQEBAGBI7ouBEWvIAjGKZsKcYasoe",
 }
 
 
@@ -29,12 +32,12 @@ def install_datasets(datasets_name):
     gdown.download(url, zipped_dataset_path, quiet=False, use_cookies=False)
 
     # Unzip
-    with rarfile.RarFile(zipped_dataset_path) as rf:
-        if rf.needs_password():
-            unzip_password = input("Password: ")
-            rf.extractall(path=datasets_dir, pwd=unzip_password)
-        else:
-            rf.extractall(path=datasets_dir)
+    unzip_password = getpass.getpass("Password:")
+    cmd = ["unrar", "x", f"-p{unzip_password}", zipped_dataset_path, datasets_dir]
+    try:
+        subprocess.run(cmd, check=True)
+    except subprocess.CalledProcessError as e:
+        print(e)
 
     # Delete zipped datasets
     os.remove(zipped_dataset_path)

{myosotis_researches-0.0.21.dist-info → myosotis_researches-0.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Myosotis-Researches
-Version: 0.0.21
+Version: 0.0.23
 Summary: A repository for storing my progress of researches.
 Home-page: https://github.com/Zeyu-Xie/Myosotis-Researches
 Author: Zeyu Xie

{myosotis_researches-0.0.21.dist-info → myosotis_researches-0.0.23.dist-info}/RECORD

@@ -40,14 +40,14 @@ myosotis_researches/CcGAN/train_128_output_10/train_cgan.py,sha256=bYJbBskTpESfC
 myosotis_researches/CcGAN/train_128_output_10/train_cgan_concat.py,sha256=PYctY3IZiHGh4TshXx3mUZBf9su_8NuV_D8InkxKQZ4,8940
 myosotis_researches/CcGAN/train_128_output_10/train_net_for_label_embed.py,sha256=4j6r4_o4rXgAN4MdUQL-TXqZJpbhH7d9gWQR8YzBlXw,6976
 myosotis_researches/CcGAN/train_128_output_10/utils.py,sha256=B-V6ct4WDisVVCOLO0W7VIBL8StPVNJJTZZ2b2NkMFU,3766
-myosotis_researches/CcGAN/utils/__init__.py,sha256=Pu9COV4zcXHGXuczhObersyeshVChmlEtwqp8VLUDxw,300
+myosotis_researches/CcGAN/utils/__init__.py,sha256=lRNFmDmH34GK-Zc6YBdHzBVlMNUYnZdFZQAoo4jUUGg,367
 myosotis_researches/CcGAN/utils/concat_image_horizontal.py,sha256=e6WsfO9IiSoP8zkZNz7IGimPUASr9VvyJUJdF-d40iw,954
 myosotis_researches/CcGAN/utils/concat_image_vertical.py,sha256=97-SuE8ZWpaeBm_ed6MAEaUOvtpzlYq_X3yWt4OEUTY,951
-myosotis_researches/CcGAN/utils/install_datasets.py,sha256=V0Wd3ZZch_xB4XOEtvHS4afYPo7Xd8Js4I003R3V3hY,1033
+myosotis_researches/CcGAN/utils/install_datasets.py,sha256=1WAhrzaCsWqI6vbW0awyovU2nqAtJQAEfWOdIRPQ7Jo,1121
 myosotis_researches/CcGAN/utils/make_h5.py,sha256=Q5OW1JA35ormmsrlAJp6XdC6x0uJBRNjsE31wM3zBiI,1422
 myosotis_researches/CcGAN/utils/print_hdf5_structure.py,sha256=leaR8H3GhlX6EuIXDMh36xG2zBdV-XlJkaXBuoorl6I,320
-myosotis_researches-0.0.21.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-myosotis_researches-0.0.21.dist-info/METADATA,sha256=h0HhhIcRU51Y07g-lPAQCADiAo9604WYQ3cPIRlBSQc,765
-myosotis_researches-0.0.21.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-myosotis_researches-0.0.21.dist-info/top_level.txt,sha256=zxAiMn5eyZNJM28MewTAkgi_RZJMbfWbzVR-KF0LdZE,20
-myosotis_researches-0.0.21.dist-info/RECORD,,
+myosotis_researches-0.0.23.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+myosotis_researches-0.0.23.dist-info/METADATA,sha256=T9epn3swX3TD4jLZ4MgDdcqp18fZwnLzYM5OhDzDaBA,765
+myosotis_researches-0.0.23.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+myosotis_researches-0.0.23.dist-info/top_level.txt,sha256=zxAiMn5eyZNJM28MewTAkgi_RZJMbfWbzVR-KF0LdZE,20
+myosotis_researches-0.0.23.dist-info/RECORD,,