performance refactor (exists -> glob)

objaverse_xl/smithsonian.py

@@ -47,9 +47,11 @@ def load_smithsonian_metadata(download_dir: str = "~/.objaverse") -> pd.DataFram
     return df
 
 
-def download_smithsonian_object(url: str, download_dir: str = "~/.objaverse") -> str:
+def _download_smithsonian_object(url: str, download_dir: str = "~/.objaverse") -> str:
     """Downloads a Smithsonian Object from a URL.
 
+    Overwrites the file if it already exists and assumes this was previous checked.
+
     Args:
         url (str): URL to download the Smithsonian Object from.
         download_dir (str, optional): Directory to download the Smithsonian Object to.
@@ -62,24 +64,22 @@ def download_smithsonian_object(url: str, download_dir: str = "~/.objaverse") ->
 
     filename = os.path.join(download_dir, "smithsonian", "objects", f"{uid}.glb")
     fs, path = fsspec.core.url_to_fs(filename)
-    fs.makedirs(os.path.dirname(path), exist_ok=True)
 
-    if not fs.exists(path):
-        response = requests.get(url)
+    response = requests.get(url)
 
-        # check if the path is valid
-        if response.status_code == 404:
-            logger.warning(f"404 for {url}")
-            return None
+    # check if the path is valid
+    if response.status_code == 404:
+        logger.warning(f"404 for {url}")
+        return None
 
-        # write to tmp path so that we don't have a partial file
-        tmp_path = f"{path}.tmp"
-        with fs.open(tmp_path, "wb") as file:
-            for chunk in response.iter_content(chunk_size=8192):
-                file.write(chunk)
+    # write to tmp path so that we don't have a partial file
+    tmp_path = f"{path}.tmp"
+    with fs.open(tmp_path, "wb") as file:
+        for chunk in response.iter_content(chunk_size=8192):
+            file.write(chunk)
 
-        # rename to final path
-        fs.rename(tmp_path, path)
+    # rename to final path
+    fs.rename(tmp_path, path)
 
     return filename
 
@@ -111,21 +111,49 @@ def download_smithsonian_objects(
         df = load_smithsonian_metadata(download_dir=download_dir)
         urls = df["url"].tolist()
 
-    logger.info(f"Downloading {len(urls)} Smithsonian Objects with {processes=}")
+    # filename = os.path.join(download_dir, "smithsonian", "objects", f"{uid}.glb")
+    objects_dir = os.path.join(download_dir, "smithsonian", "objects")
+    fs, path = fsspec.core.url_to_fs(objects_dir)
+    fs.makedirs(path, exist_ok=True)
+
+    # get the existing glb files
+    existing_glb_files = fs.glob(os.path.join(objects_dir, "*.glb"), refresh=True)
+    existing_uids = [os.path.basename(file).split(".")[0] for file in existing_glb_files]
+
+    # find the urls that need to be downloaded
+    out = []
+    urls_to_download = set([])
+    already_downloaded_urls = set([])
+    for url in urls:
+        uid = get_uid_from_str(url)
+        if uid not in existing_uids:
+            urls_to_download.add(url)
+        else:
+            already_downloaded_urls.add(url)
+        out.append({"download_path": os.path.join(objects_dir, f"{uid}.glb"), "url": url})
+
+    logger.info(f"Found {len(already_downloaded_urls)} Smithsonian Objects already downloaded")
+    logger.info(f"Downloading {len(urls_to_download)} Smithsonian Objects with {processes=}")
+
+    if len(urls_to_download) == 0:
+        return out
+
     with Pool(processes=processes) as pool:
         results = list(
             tqdm(
                 pool.imap_unordered(
-                    partial(download_smithsonian_object, download_dir=download_dir),
-                    urls,
+                    partial(_download_smithsonian_object, download_dir=download_dir),
+                    urls_to_download
                 ),
-                total=len(urls),
+                total=len(urls_to_download),
                 desc="Downloading Smithsonian Objects",
             )
         )
-    out = [
+
+    out.extend([
         {"download_path": download_path, "url": url}
         for download_path, url in zip(results, urls)
         if download_path is not None
-    ]
+    ])
+
     return out