From db15e52238135b9595bbd344eadde81b8a1b25ff Mon Sep 17 00:00:00 2001
From: Yue Yang <38372825+YueYANG1996@users.noreply.github.com>
Date: Sun, 17 Mar 2024 11:50:11 -0400
Subject: [PATCH 1/2] update data downloading

---
 README.md        | 6 ++----
 main.py          | 3 +--
 modules/utils.py | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 896f01c..4490ec3 100644
--- a/README.md
+++ b/README.md
@@ -26,11 +26,9 @@ pip install --extra-index-url https://ai2thor-pypi.allenai.org ai2thor==0+6f165f
 ```
 
 ## Data
-Download the data from [here](https://drive.google.com/file/d/1MQbFbNfTz94x8Pxfkgbohz4l46O5e3G1/view?usp=sharing) and extract it to the `data/` folder, or use the following command:
+Download the data from [google drive](https://drive.google.com/file/d/1MQbFbNfTz94x8Pxfkgbohz4l46O5e3G1/view?usp=sharing) and extract it to the `data/` folder, or use the following command to download from S3:
 ```
-FILE_ID=1MQbFbNfTz94x8Pxfkgbohz4l46O5e3G1
-CONFIRM=$(curl -sc /tmp/gcookie "https://drive.google.com/uc?export=download&id=${FILE_ID}" | grep -o 'confirm=[^&]*' | sed 's/confirm=//')
-wget --load-cookies /tmp/gcookie "https://drive.google.com/uc?export=download&confirm=${CONFIRM}&id=${FILE_ID}" -O data.zip && rm -rf /tmp/gcookie
+wget https://holodeck-ai2.s3.amazonaws.com/data.zip
 unzip data.zip
 ```
 
diff --git a/main.py b/main.py
index 5819e06..0766521 100644
--- a/main.py
+++ b/main.py
@@ -31,7 +31,6 @@ def generate_single_scene(args):
         use_milp=ast.literal_eval(args.use_milp),
         random_selection=ast.literal_eval(args.random_selection)
     )
-    print(f"Could not generate scene from {args.query}.")
 
 
 def generate_multi_scenes(args):
@@ -98,4 +97,4 @@ def generate_variants(args):
         generate_multi_scenes(args)
     
     elif args.mode == "generate_variants":
-        generate_variants(args)
+        generate_variants(args)
\ No newline at end of file
diff --git a/modules/utils.py b/modules/utils.py
index 106d1ad..5840ec4 100644
--- a/modules/utils.py
+++ b/modules/utils.py
@@ -358,8 +358,8 @@ def add_line_breaks(text, max_line_length):
 
 if __name__ == "__main__":
     parser = ArgumentParser()
-    parser.add_argument("--mode", help = "Mode to run (top_down_frame, top_down_video, room_image).", default = "top_down_frame")
-    parser.add_argument("--objaverse_asset_dir", help = "Directory to load assets from.", default = "./objaverse/processed_2023_09_23_combine_scale")
+    parser.add_argument("--mode", help = "Mode to run (top_down_frame, room_video, room_image).", default = "top_down_frame")
+    parser.add_argument("--objaverse_asset_dir", help = "Directory to load assets from.", default = "./data/objaverse_holodeck/09_23_combine_scale/processed_2023_09_23_combine_scale")
     parser.add_argument("--scene", help = "Scene to load.", default = "data/scenes/a_living_room/a_living_room.json")
 
     args = parser.parse_args()

From 156f8e1077ba5811bbe613f9d65b8f66c48f2346 Mon Sep 17 00:00:00 2001
From: Yue Yang <38372825+YueYANG1996@users.noreply.github.com>
Date: Fri, 12 Apr 2024 09:53:06 -0400
Subject: [PATCH 2/2] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 4490ec3..7a64e92 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@
 ## Requirements
 Holodeck is based on [AI2-THOR](https://ai2thor.allenai.org/ithor/documentation/#requirements), and we currently support macOS 10.9+ or Ubuntu 14.04+.
 
+**New Feature**: To add ANY new assets to AI2-THOR, please check the [objathor repo](https://github.com/allenai/objathor)!
+
 **Note:** To yield better layouts, use `DFS` as the solver. If you pull the repo before `12/28/2023`, you must set the [argument](https://github.com/allenai/Holodeck/blob/386b0a868def29175436dc3b1ed85b6309eb3cad/main.py#L78) `--use_milp` to `False` to use `DFS`.
 
 ## Installation