fix lint issues

objaverse_xl/github.py

@@ -59,7 +59,6 @@ import hashlib
 import json
 import multiprocessing
 import os
-
 import shutil
 import subprocess
 import tarfile

objaverse_xl/objaverse_v1.py

@@ -13,7 +13,7 @@ from tqdm import tqdm
 def load_annotations(
     uids: Optional[List[str]] = None,
     download_dir: str = "~/.objaverse",
-) -> List[Dict[str, Any]]:
+) -> Dict[str, Any]:
     """Load the full metadata of all objects in the dataset.
 
     Args:
@@ -23,8 +23,8 @@ def load_annotations(
             file systems supported by fsspec. Defaults to "~/.objaverse".
 
     Returns:
-        A list of dictionaries with the metadata for each object. The keys are the uids
-        and the values are the metadata for that object.
+        A dictionary of the metadata for each object. The keys are the uids and the
+        values are the metadata for that object.
     """
     # make the metadata dir if it doesn't exist
     metadata_path = os.path.join(download_dir, "hf-objaverse-v1", "metadata")
@@ -197,7 +197,7 @@ def load_objects(
         A dictionary mapping the object uid to the local path of where the object
         downloaded.
     """
-    uids = set(uids)
+    uids_set = set(uids)
     hf_object_paths = _load_object_paths(download_dir=download_dir)
 
     versioned_dirname = os.path.join(download_dir, "hf-objaverse-v1")
@@ -220,7 +220,7 @@ def load_objects(
 
     # add the existing downloaded uids to the return dict
     out = {}
-    already_downloaded_uids = uids.intersection(existing_uids)
+    already_downloaded_uids = uids_set.intersection(existing_uids)
     for uid in already_downloaded_uids:
         hf_object_path = hf_object_paths[uid]
         fs_abs_object_path = os.path.join(versioned_dirname, hf_object_path)
@@ -229,7 +229,7 @@ def load_objects(
     logger.info(f"Found {len(already_downloaded_uids)} objects already downloaded")
 
     # get the uids that need to be downloaded
-    remaining_uids = uids - existing_uids
+    remaining_uids = uids_set - existing_uids
     uids_to_download = []
     for uid in remaining_uids:
         if uid not in hf_object_paths:

objaverse_xl/thingiverse.py

@@ -2,7 +2,7 @@ import multiprocessing
 import os
 import time
 from multiprocessing import Pool
-from typing import Dict, List, Optional
+from typing import Any, Dict, List, Optional, Tuple
 
 import fsspec
 import pandas as pd
@@ -42,7 +42,7 @@ def _get_response_with_retries(
     return response
 
 
-def _download_item(item: Dict[str, str], download_dir: str) -> None:
+def _download_item(item: Dict[str, str], download_dir: str) -> Optional[str]:
     """Download the given item.
 
     Args:
@@ -79,7 +79,7 @@ def _download_item(item: Dict[str, str], download_dir: str) -> None:
     return file_path
 
 
-def _parallel_download_item(args) -> Optional[str]:
+def _parallel_download_item(args) -> Tuple[Any, Optional[str]]:
     item, download_dir = args
     download_path = _download_item(item=item, download_dir=download_dir)
     return item, download_path
@@ -111,9 +111,9 @@ def download_thingiverse_objects(
 
     # get the records of the specified fileIds
     df = load_annotations(download_dir=download_dir)
-    file_ids = set(file_ids)
     if file_ids is not None:
-        df = df[df["fileId"].isin(file_ids)]
+        file_ids_set = set(file_ids)
+        df = df[df["fileId"].isin(file_ids_set)]
     things_and_files = df.to_dict(orient="records")
 
     # create the download directory