Myosotis-Researches 0.0.22__tar.gz → 0.0.24__tar.gz

{myosotis_researches-0.0.22 → myosotis_researches-0.0.24/Myosotis_Researches.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Myosotis-Researches
-Version: 0.0.22
+Version: 0.0.24
 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.22 → myosotis_researches-0.0.24}/Myosotis_Researches.egg-info/SOURCES.txt

@@ -8,6 +8,8 @@ Myosotis_Researches.egg-info/dependency_links.txt
 Myosotis_Researches.egg-info/top_level.txt
 myosotis_researches/__init__.py
 myosotis_researches/CcGAN/__init__.py
+myosotis_researches/CcGAN/internal/__init__.py
+myosotis_researches/CcGAN/internal/install_datasets.py
 myosotis_researches/CcGAN/models_128/CcGAN_SAGAN.py
 myosotis_researches/CcGAN/models_128/ResNet_class_eval.py
 myosotis_researches/CcGAN/models_128/ResNet_embed.py

{myosotis_researches-0.0.22/Myosotis_Researches.egg-info → myosotis_researches-0.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Myosotis-Researches
-Version: 0.0.22
+Version: 0.0.24
 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.24/myosotis_researches/CcGAN/internal/__init__.py

@@ -0,0 +1,3 @@
+from .install_datasets import install_datasets
+
+__all__ = ["install_datasets"]

{myosotis_researches-0.0.22/myosotis_researches/CcGAN/utils → myosotis_researches-0.0.24/myosotis_researches/CcGAN/internal}/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.22 → myosotis_researches-0.0.24}/myosotis_researches/CcGAN/utils/__init__.py

@@ -2,6 +2,5 @@ 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", "install_datasets"]
+__all__ = ["print_hdf5_structure", "concat_image_horizontal", "concat_image_vertical", "make_h5"]

myosotis_researches-0.0.24/myosotis_researches/CcGAN/utils/install_datasets.py

@@ -0,0 +1,46 @@
+import gdown
+import getpass
+from importlib import resources
+import os
+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": "1CcXp7ga4Ebj7XeMA_fYH2RxTMOWvA0v5",
+    "MNIST": "1LCQmQEBAGBI7ouBEWvIAjGKZsKcYasoe",
+}
+
+
+# Function
+def install_datasets(datasets_name):
+
+    # Path
+    zipped_dataset_path = os.path.join(datasets_dir, f"{datasets_name}_datasets.rar")
+
+    # File ID
+    file_id = file_id_dict[datasets_name]
+
+    # URL
+    url = f"https://drive.google.com/uc?id={file_id}"
+
+    # Download
+    gdown.download(url, zipped_dataset_path, quiet=False, use_cookies=False)
+
+    # Unzip
+    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)
+
+
+__all__ = ["install_datasets"]

{myosotis_researches-0.0.22 → myosotis_researches-0.0.24}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="Myosotis-Researches",
-    version="0.0.22",
+    version="0.0.24",
     description="A repository for storing my progress of researches.",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",