Extract unzip via subprocess

Signed-off-by: Tully Foote <[email protected]>

Author: tfoote

ibpc_py/src/ibpc/ibpc.py

@@ -1,25 +1,29 @@
 import argparse
+import hashlib
 import os
 import shlex
+import shutil
 import threading
+import subprocess
 
 from rocker.core import DockerImageGenerator
 from rocker.core import get_rocker_version
 from rocker.core import RockerExtensionManager
 from rocker.core import OPERATIONS_NON_INTERACTIVE
 
 from io import BytesIO
-from urllib.request import urlopen
+from urllib.request import urlretrieve
 import urllib.request
 from zipfile import ZipFile
+from contextlib import nullcontext
 
 
 def get_bop_template(modelname):
-    return f"https://huggingface.co/datasets/bop-benchmark/datasets/resolve/main/{modelname}/{modelname}"
+    return f"https://huggingface.co/datasets/bop-benchmark/datasets/resolve/main/{modelname}/"
 
 
 def get_ipd_template(modelname):
-    return f"https://huggingface.co/datasets/bop-benchmark/{modelname}/resolve/main/{modelname}"
+    return f"https://huggingface.co/datasets/bop-benchmark/{modelname}/resolve/main/"
 
 
 bop_suffixes = [
@@ -33,21 +37,91 @@ def get_ipd_template(modelname):
 ipd_suffixes.append("_val.zip")
 ipd_suffixes.append("_test_all.z01")
 
+lm_files = {
+    "lm_base.zip": 'a1d793837d4de0dbd33f04e8b04ce4403c909248c527b2d7d61ef5eac3ef2c39',
+    "lm_models.zip": 'cb5b5366ce620d41800c7941c2e770036c7c13c178514fa07e6a89fda5ff0e7f',
+    "lm_test_all.zip": '28e65e9530b94a87c35f33cba81e8f37bc4d59f95755573dea6e9ca0492f00fe',
+    "lm_train_pbr.zip": 'b7814cc0cd8b6f0d9dddff7b3ded2a189eacfd2c19fa10b3e332f022930551a9',
+    }
+
+ipd_files = {
+    "ipd_base.zip": 'c4943d90040df0737ac617c30a9b4e451a7fc94d96c03406376ce34e5a9724d1',
+    "ipd_models.zip": 'e7435057b48c66faf3a10353a7ae0bffd63ec6351a422d2c97d4ca4b7e6b797a',
+    "ipd_test_all.zip": 'e1b042f046d7d07f8c8811f7739fb68a25ad8958d1b58c5cbc925f98096eb6f9',
+    "ipd_train_pbr.zip": '6afde1861ce781adc33fcdb3c91335fa39c5e7208a0b20433deb21f92f3e9a94',
+    "ipd_val.zip": '50df37c370557a3cccc11b2e6d5f37f13783159ed29f4886e09c9703c1cad8de',
+    "ipd_test_all.z01": '25ce71feb7d9811db51772e44ebc981d57d9f10c91776707955ab1e616346cb3',
+    }
+
 available_datasets = {
-    "ipd": (get_ipd_template("ipd"), ipd_suffixes),
-    "lm": (get_bop_template("lm"), bop_suffixes),
+    "ipd": (get_ipd_template("ipd"), ipd_files),
+    "lm": (get_bop_template("lm"), lm_files),
 }
 
+def sha256_file(filename):
+    block_size = 65536
+    sha256 = hashlib.sha256()
+    with open(filename, 'rb') as fh:
+        while True:
+            data = fh.read(block_size)
+            if not data:
+                break
+            sha256.update(data)
+    return sha256.hexdigest()
+
 
 def fetch_dataset(dataset, output_path):
-    (url_base, suffixes) = available_datasets[dataset]
-    for suffix in suffixes:
+    (url_base, files) = available_datasets[dataset]
+    fetched_files = []
+    for suffix in files.keys():
+
+        # Sorted so that zip comes before z01
 
         url = url_base + suffix
+
+        
+        outfile = os.path.basename(url)
+        if os.path.exists(outfile):
+            print(f"File {outfile} already present checking hash")
+            computed_hash = sha256_file(outfile)
+            expected_hash = files[suffix]
+            if computed_hash == expected_hash:
+                print(f"File {outfile} detected with expected sha256 skipping download")
+                fetched_files.append(outfile)
+                continue
+            else:
+                print(f"File {outfile}'s hash {computed_hash} didn't match the expected hash {expected_hash}, downloading again.")
+
         print(f"Downloading from url: {url}")
-        with urlopen(url) as zipurlfile:
-            with ZipFile(BytesIO(zipurlfile.read())) as zfile:
-                zfile.extractall(output_path)
+
+        (filename, headers) = urlretrieve(url, outfile)
+        fetched_files.append(filename)
+
+    for filename in fetched_files:
+        # Append shard if found
+        if filename.endswith("01"):
+            # Let 7z find the other files zipfile can't handle file sharding "multiple disks"
+            fetched_files.remove(filename)
+
+            # Logic for combining files
+            #orig_filename = filename[:-2] + "ip"
+            #combined_filename = "combined_" + orig_filename
+            #with open(combined_filename,'wb') as zipfile:
+            #    with open(orig_filename,'rb') as fd:
+            #        print(f"Appending shard {orig_filename} to {combined_filename}")
+            #        shutil.copyfileobj(fd, zipfile)
+            #    with open(filename,'rb') as fd:
+            #        print(f"Appending shard {filename} to {combined_filename}")
+            #        shutil.copyfileobj(fd, zipfile)
+            #fetched_files.remove(orig_filename)
+            #fetched_files.remove(filename)
+            #fetched_files.append(combined_filename)
+
+    for filename in fetched_files:
+        print(f"Unzipping {filename}")
+        subprocess.check_call(['7z', 'x', '-y', filename, f"-o{output_path}"])
+        #with ZipFile(filename) as zfile:
+        #    zfile.extractall(output_path)
 
 
 def main():