Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: long-horizon with LLMs #135

Open
wants to merge 460 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
460 commits
Select commit Hold shift + click to select a range
96ba8e8
rerun cleanup
hello-fazil Sep 20, 2024
f0cc726
remove robot frames vis and fix xyt goal vis
hello-fazil Sep 20, 2024
efa588e
Fix typo
hello-fazil Sep 20, 2024
875c713
Add missing docstrings
hello-fazil Sep 20, 2024
aaebf76
Merge branch 'fazil/rerun_robot_mesh' into fazil/dinobot
hello-fazil Sep 20, 2024
e538469
wip
hello-fazil Sep 20, 2024
8514128
wip
hello-fazil Sep 20, 2024
dfbe95c
wip
hello-fazil Sep 20, 2024
b99cebb
Ik to bottle neck working
hello-fazil Sep 20, 2024
e618ba7
Add fk method to urdf visualizer
hello-fazil Sep 20, 2024
562a0ca
Add comments
hello-fazil Sep 20, 2024
73b9c39
Add docstrings
hello-fazil Sep 20, 2024
d1f71ef
Merge branch 'fazil/rerun_robot_mesh' into fazil/dinobot
hello-fazil Sep 20, 2024
88789a8
Merge branch 'main' into peiqi
hello-cpaxton Sep 20, 2024
e2af362
Added rerun logging
hello-fazil Sep 21, 2024
a7e03f3
more dinobot viz fixes
hello-fazil Sep 21, 2024
83fb51b
Add custom end effector IK solution
hello-fazil Sep 21, 2024
3aafdc6
Servo to bottleneck working
hello-fazil Sep 21, 2024
0e674e5
Add debug var
hello-fazil Sep 21, 2024
7333da3
Data recording and replay working
hello-fazil Sep 21, 2024
a840a38
Instruction clean up
hello-fazil Sep 21, 2024
524d436
update
peiqi-liu Sep 23, 2024
030a077
Merge branch 'peiqi' of https://github.com/peiqi-liu/stretch_ai into …
peiqi-liu Sep 23, 2024
768b14e
Merge pull request #1 from peiqi-liu/zhanqiu
peiqi-liu Sep 23, 2024
b3e640f
Merge branch 'main' into peiqi
hello-cpaxton Sep 23, 2024
37639fa
Run pre-commit hooks and fix formatting; many errors remain
hello-cpaxton Sep 23, 2024
15b4fc2
Run pre-commit hooks and fix formatting; many errors remain
hello-cpaxton Sep 23, 2024
91ae6fe
Fix llm server issues
hello-cpaxton Sep 23, 2024
d61d11e
update and fix readme spelling issues
hello-cpaxton Sep 23, 2024
6b86cf2
Merge branch 'peiqi' of github.com:peiqi-liu/stretch_ai into peiqi
hello-cpaxton Sep 23, 2024
e9a626f
Merge branch 'main' of github.com:hello-robot/stretch_ai into fazil/d…
hello-cpaxton Sep 23, 2024
e571645
change path for debugging
hello-cpaxton Sep 23, 2024
ff48b9a
updates to ovmm app
hello-cpaxton Sep 23, 2024
df531a0
add a docker
hello-cpaxton Sep 23, 2024
898b6fb
Merge branch 'main' of github.com:hello-robot/stretch_ai into cpaxton…
hello-cpaxton Sep 23, 2024
bd400ba
Merge branch 'main' into peiqi
hello-cpaxton Sep 23, 2024
a50129a
rate no longer supported
hello-cpaxton Sep 23, 2024
0c6c3e9
updating stuff here
hello-cpaxton Sep 23, 2024
4d44be3
update rerun
hello-cpaxton Sep 23, 2024
0707f4c
colorized point clouds in rerun
hello-cpaxton Sep 23, 2024
2268149
update
grail-stretch Sep 23, 2024
de40adf
update
grail-stretch Sep 23, 2024
e0a3a28
Update robocasa
hello-cpaxton Sep 24, 2024
1a161dd
Add docker startup script
hello-cpaxton Sep 24, 2024
b0208a8
tweaks to exploration; better collision avoidance etc
hello-cpaxton Sep 24, 2024
d22f6b7
can we defect negative obstacles
hello-cpaxton Sep 24, 2024
8874941
add obstacles tracking negative heights
hello-cpaxton Sep 24, 2024
1ca16af
fix various issues with robot code
hello-cpaxton Sep 25, 2024
5f4e340
update code to fix various linter errors
hello-cpaxton Sep 25, 2024
c7e7d71
add read dobbe format code
hello-cpaxton Sep 25, 2024
8986484
parsing dataset
hello-cpaxton Sep 25, 2024
d8c84c5
update read
hello-cpaxton Sep 25, 2024
4f7fd74
update information
hello-cpaxton Sep 25, 2024
eed3e4c
update read format
hello-cpaxton Sep 25, 2024
9fe4254
preparing for merge
peiqi-liu Sep 25, 2024
17acecd
Add Peiqi's Dynav code
hello-cpaxton Sep 26, 2024
3044670
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Sep 26, 2024
354bf15
update
hello-cpaxton Sep 26, 2024
ae00d76
add a script to copy the URDF over
hello-cpaxton Sep 26, 2024
9e109f9
updates to urdf
hello-cpaxton Sep 26, 2024
e051a39
remove static flags
hello-cpaxton Sep 26, 2024
36bbb4e
remove "static"
hello-cpaxton Sep 26, 2024
7820459
Update code to make sure rerun works etc
hello-cpaxton Sep 26, 2024
a8a19af
adding some things
hello-cpaxton Sep 26, 2024
dc47258
Fixing typing issues
hello-cpaxton Sep 26, 2024
71f21d6
update
hello-cpaxton Sep 26, 2024
bbe7d6f
fixing type checker issue
hello-cpaxton Sep 27, 2024
85f4992
Update base
hello-cpaxton Sep 27, 2024
56c0a97
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Sep 27, 2024
955815d
Update molmo documentation
hello-cpaxton Sep 27, 2024
9a02054
Update molmo docs
hello-cpaxton Sep 27, 2024
81c9223
update base
hello-cpaxton Sep 27, 2024
a1de434
Update one for base
hello-cpaxton Sep 27, 2024
45fe321
Update molmo client
hello-cpaxton Sep 27, 2024
3710590
Update
hello-cpaxton Sep 27, 2024
147d552
update
hello-cpaxton Sep 27, 2024
7def043
Merge pull request #127 from hello-robot/feature/dynav
hello-cpaxton Sep 30, 2024
71c94c8
various fixes
hello-cpaxton Sep 30, 2024
06d860f
Trying to add some utilities to mujoco server
hello-cpaxton Sep 30, 2024
dabc9db
Update robocasa gen
hello-cpaxton Sep 30, 2024
2ff9fc7
Fixing geometry so the robot starts at (0,0,0)
hello-cpaxton Sep 30, 2024
d57d67e
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Sep 30, 2024
628431f
Update
hello-cpaxton Sep 30, 2024
43336ed
updates to codebase
hello-cpaxton Sep 30, 2024
2aea007
update here
hello-cpaxton Sep 30, 2024
b4a4d31
Update dobbe format code
hello-cpaxton Sep 30, 2024
949672e
update format errors
hello-cpaxton Sep 30, 2024
833b22e
update format
hello-cpaxton Sep 30, 2024
3cbe328
fix conflicts
peiqi-liu Oct 1, 2024
537ee46
Merge branch 'feature/long-horizon-with-llms' of https://github.com/h…
peiqi-liu Oct 1, 2024
373b5b5
update
hello-cpaxton Oct 1, 2024
4a220bf
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Oct 1, 2024
1521651
installing scripts for robocasa
hello-cpaxton Oct 1, 2024
1b1b630
update error
hello-cpaxton Oct 1, 2024
15662a5
add some status messages
hello-cpaxton Oct 1, 2024
40b39e0
updates
hello-cpaxton Oct 1, 2024
77ff6f9
update constants and configurations
hello-cpaxton Oct 1, 2024
16913df
Update
hello-cpaxton Oct 1, 2024
6188288
Updates
hello-cpaxton Oct 1, 2024
b55dd7f
adding some processing for commands
hello-cpaxton Oct 1, 2024
1a0976d
update
hello-cpaxton Oct 1, 2024
0fb9aa2
disable web browser start
hello-cpaxton Oct 1, 2024
b9da19c
add executor script to process thigns
hello-cpaxton Oct 1, 2024
6f8aff4
rerun update
peiqi-liu Oct 1, 2024
d243357
Merge branch 'feature/long-horizon-with-llms' of https://github.com/h…
peiqi-liu Oct 1, 2024
df5e510
add robot task executor
hello-cpaxton Oct 1, 2024
e137f8d
fix rerun bug
peiqi-liu Oct 1, 2024
15440c7
add comments
peiqi-liu Oct 2, 2024
1c9f712
tweaking motion configuration
hello-cpaxton Oct 2, 2024
6db5bc9
add some extra information about invalid starts
hello-cpaxton Oct 2, 2024
2b2d3e4
cleanup some bad code
hello-cpaxton Oct 2, 2024
2cd7054
Merge pull request #131 from hello-robot/feature/dynamem
hello-cpaxton Oct 2, 2024
3408da3
setting up pickup executor for handling more complex queries and things
hello-cpaxton Oct 2, 2024
d5471f1
Merge branch 'main' of github.com:hello-robot/stretch_ai into feature…
hello-cpaxton Oct 2, 2024
9b0fa0f
rerun bug fix
hello-cpaxton Oct 3, 2024
3824c95
increase max number of displayed points
hello-cpaxton Oct 3, 2024
70d3acd
clean up UI elements
hello-cpaxton Oct 3, 2024
8678f9d
UI improvements
hello-cpaxton Oct 3, 2024
778b210
pad more around the obstacles when exploring and moving
hello-cpaxton Oct 3, 2024
5ff56da
Updating some configuration variables; exploring through gaps at hoem
hello-cpaxton Oct 3, 2024
8429e6e
use history to go home at end
hello-cpaxton Oct 3, 2024
fcba85a
mprove tuning a little bit
hello-cpaxton Oct 3, 2024
6dc7132
Merge branch 'main' of github.com:hello-robot/stretch_ai into feature…
hello-cpaxton Oct 3, 2024
2321f65
update code and change server to stop
hello-cpaxton Oct 3, 2024
0f00aaa
temporarily increase the sleeps since it is taking a long time to do
hello-cpaxton Oct 3, 2024
8241262
commentary
hello-cpaxton Oct 3, 2024
5ebcaa8
updates to controller config
hello-cpaxton Oct 3, 2024
3699fa7
updates
hello-cpaxton Oct 3, 2024
b7d0c59
update
hello-cpaxton Oct 3, 2024
34e46c3
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Oct 3, 2024
3b50e5b
update
hello-cpaxton Oct 3, 2024
cc028d9
add radius code as a placeholder
hello-cpaxton Oct 3, 2024
dd0ffa4
Updates
hello-cpaxton Oct 3, 2024
16cff1b
update logger
hello-cpaxton Oct 3, 2024
a6d5969
update code to do emotes and stuff like that
hello-cpaxton Oct 3, 2024
a008483
doing some simple tasks
hello-cpaxton Oct 3, 2024
4617a10
Update file to allow loading a previously-explored map
hello-cpaxton Oct 4, 2024
5695f3c
Updating AI agent code to parse through the dialogue tree
hello-cpaxton Oct 4, 2024
a756a6e
updating prompt to make sure that we can handle some more actions
hello-cpaxton Oct 4, 2024
cb451bf
update
hello-cpaxton Oct 4, 2024
dfaefa9
cleaning up prompting and trying to make the prompt a bit shorter.
hello-cpaxton Oct 4, 2024
b28f4df
shorten text
hello-cpaxton Oct 4, 2024
ba0efd4
Update
hello-cpaxton Oct 4, 2024
5c27d42
Reverting prompt
hello-cpaxton Oct 4, 2024
26f7e36
Prompting tweaks
hello-cpaxton Oct 4, 2024
f375626
Merge branch 'main' of github.com:hello-robot/stretch_ai into feature…
hello-cpaxton Oct 4, 2024
d3b3755
add a new failure case for the dialogue agent
hello-cpaxton Oct 4, 2024
c0bddba
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Oct 4, 2024
cefdc04
done runnning robot agent
hello-cpaxton Oct 4, 2024
bbb217f
disable double-send
hello-cpaxton Oct 4, 2024
fe088bd
cleaner handling for resending all the actions
hello-cpaxton Oct 4, 2024
a8a3608
Cleaning up the language processing, so that tts stops saying "quote" on
hello-cpaxton Oct 4, 2024
bb5f22e
update sayable
hello-cpaxton Oct 4, 2024
e198c75
have the robot talk more
hello-cpaxton Oct 4, 2024
b2bbbec
make some more little changes
hello-cpaxton Oct 4, 2024
dd908b8
update logger for zmq client
hello-cpaxton Oct 4, 2024
1f58c6c
head motions faster
hello-cpaxton Oct 4, 2024
e868e84
some tweaks to the grasping code
hello-cpaxton Oct 4, 2024
0e0313b
waiting for arm
hello-cpaxton Oct 4, 2024
79f751e
increase acceptable place distance
hello-cpaxton Oct 4, 2024
1f85526
update things
hello-cpaxton Oct 4, 2024
e3930cb
force resend on navigation actions
hello-cpaxton Oct 4, 2024
65674ce
update
hello-cpaxton Oct 4, 2024
6728afc
update
hello-cpaxton Oct 4, 2024
395a349
add dynav readme
hello-cpaxton Oct 4, 2024
e3b7666
fixes and improvements for pythonic commands
hello-cpaxton Oct 4, 2024
fa13d06
Updates to this
hello-cpaxton Oct 4, 2024
fad90e9
reduce logger outputs from instance memory
hello-cpaxton Oct 4, 2024
5449a26
Updates to the grasping code to make sure it works properly again
hello-cpaxton Oct 4, 2024
67402e3
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Oct 4, 2024
d4dc67e
Try grasping something
hello-cpaxton Oct 4, 2024
22d9381
update
hello-cpaxton Oct 4, 2024
971cfb6
updates
hello-cpaxton Oct 4, 2024
0cd8f04
Some code cleanup
hello-cpaxton Oct 4, 2024
f1d9f3b
cleanup
hello-cpaxton Oct 4, 2024
3d57413
adding setup for handling oscillations
hello-cpaxton Oct 4, 2024
1732f84
remove pytorch3d and pytorch geometric - bad dependencies
hello-cpaxton Oct 7, 2024
47cc945
Merge branch 'main' of github.com:hello-robot/stretch_ai into feature…
hello-cpaxton Oct 7, 2024
2b17fd1
Add a comment
hello-cpaxton Oct 7, 2024
e781f05
updates
hello-cpaxton Oct 7, 2024
d439b02
updating comments
hello-cpaxton Oct 7, 2024
0555145
Merge branch 'main' of github.com:hello-robot/stretch_ai into feature…
hello-cpaxton Oct 7, 2024
c53d235
Fix type issues
hello-cpaxton Oct 7, 2024
f81e936
more code cleanup and fix failing thigns
hello-cpaxton Oct 7, 2024
6a41a87
Fix visualizer
hello-cpaxton Oct 8, 2024
b8ef24e
updates to grasping code
hello-cpaxton Oct 8, 2024
2ddc9a8
switch modes
hello-cpaxton Oct 8, 2024
faa8c70
cleaning up and trying to make sure modes are working better
hello-cpaxton Oct 8, 2024
594f628
cleaning up some code
hello-cpaxton Oct 8, 2024
37f9a63
Better thread handling and cleanup at the end
hello-cpaxton Oct 8, 2024
f8478bb
remove unnecessary code
hello-cpaxton Oct 8, 2024
f0c53b0
update
hello-cpaxton Oct 8, 2024
c7f7077
publsh observations
hello-cpaxton Oct 8, 2024
bf12ace
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Oct 8, 2024
40a954c
updating code
hello-cpaxton Oct 8, 2024
47463fe
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Oct 8, 2024
7d3b7b7
more code docs changes
hello-cpaxton Oct 8, 2024
08d2328
making sure robot is not moving at all
hello-cpaxton Oct 8, 2024
8662eca
still issues with movement (especially the head)
hello-cpaxton Oct 8, 2024
e589733
get rid of the head rotations
hello-cpaxton Oct 8, 2024
bc6eb19
updates
hello-cpaxton Oct 9, 2024
3d2f86f
updates - less terminal spam
hello-cpaxton Oct 9, 2024
1a17e80
debug logs
hello-cpaxton Oct 9, 2024
61168e3
remove head speed xyt check
hello-cpaxton Oct 9, 2024
12f6799
update robot
hello-cpaxton Oct 9, 2024
afaae02
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Oct 9, 2024
df543a4
lower mapping threshold again
hello-cpaxton Oct 9, 2024
24ec404
modify waiting code to make it a bit more clear the robot has stopped
hello-cpaxton Oct 9, 2024
90c02e2
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Oct 9, 2024
0a2723b
update code and memory - try to make sure that it works properly
hello-cpaxton Oct 9, 2024
310fb61
expand documentation
hello-cpaxton Oct 9, 2024
b0c7da3
update
hello-cpaxton Oct 9, 2024
9b315e0
improve documentation
hello-cpaxton Oct 9, 2024
c96fa08
Update to use the default saved memory wherever possible
hello-cpaxton Oct 9, 2024
23ec459
Add speak and pickup tasks
atharva-18 Oct 7, 2024
eed46a4
Replace conditional checks with operations
atharva-18 Oct 7, 2024
45fcb09
Actually run the task
atharva-18 Oct 9, 2024
fe04309
add documentation
hello-cpaxton Oct 9, 2024
f2f462d
update data
hello-cpaxton Oct 9, 2024
b3e7f8d
renaming some things and cleaning up the interfaces
hello-cpaxton Oct 9, 2024
191177f
Merge branch 'feature/long-horizon-with-llms' of github.com:hello-rob…
hello-cpaxton Oct 9, 2024
629e0ff
sending the action
hello-cpaxton Oct 9, 2024
8f85e56
updates
hello-cpaxton Oct 9, 2024
e0b3b3d
update
hello-cpaxton Oct 10, 2024
c361078
fix names
hello-cpaxton Oct 10, 2024
b80e1f8
add a rotation behavior if we are exploring
hello-cpaxton Oct 10, 2024
fbcf472
some more exploration tuning
hello-cpaxton Oct 10, 2024
4065465
updates to motion planning config
hello-cpaxton Oct 10, 2024
0fc1f0b
trying to improve recovery code
hello-cpaxton Oct 10, 2024
8dd0e82
update graspign
hello-cpaxton Oct 10, 2024
03bdb93
updates to the robot agent
hello-cpaxton Oct 10, 2024
4a9a943
update agent code
hello-cpaxton Oct 10, 2024
55e1717
update agent
hello-cpaxton Oct 10, 2024
360c297
disable realtime + make sure it works with realtime maps
hello-cpaxton Oct 10, 2024
34bdc60
realtime updates
hello-cpaxton Oct 10, 2024
fd50eff
updates to files and demos and apps
hello-cpaxton Oct 10, 2024
4230765
realtime updates parameters
hello-cpaxton Oct 10, 2024
2ce45a0
debug without AI
hello-cpaxton Oct 10, 2024
f26f35a
update
hello-cpaxton Oct 10, 2024
a2b0951
break if used without llm agent
hello-cpaxton Oct 10, 2024
61da5d2
Pass in commands and args
atharva-18 Oct 10, 2024
a3ac659
update
hello-cpaxton Oct 10, 2024
62cdedf
add pickup
hello-cpaxton Oct 10, 2024
9690722
update pickup executor
hello-cpaxton Oct 10, 2024
a5ad447
update zmq client
hello-cpaxton Oct 10, 2024
9428169
fixes
hello-cpaxton Oct 10, 2024
b50c13e
update
hello-cpaxton Oct 10, 2024
8532365
update
hello-cpaxton Oct 10, 2024
924a199
update
hello-cpaxton Oct 10, 2024
9051fe0
updates to robot agent
hello-cpaxton Oct 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .codespell-ignore-words.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
empy
crate
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,6 @@ data/
log/

# install folder
install/
install/

debug*/
10 changes: 10 additions & 0 deletions docs/apps.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,13 @@ You can add the `--reset` flag to make it go back to the start position. The def
```
python -m stretch.app.pickup --reset
```

## Experimental

### VLM Planning

This is an experimental app that uses the voxel map to plan a path to a goal. It is not yet fully functional.

```bash
python -m stretch.app.vlm_planning
```
2 changes: 2 additions & 0 deletions docs/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

This is a guide to setting up a Docker container for running the Stretch software. This is useful for running the software on a computer that doesn't have the correct dependencies installed, or for running the software in a controlled environment.

Hello Robot has a set of scripts for [building robot-side docker images](https://github.com/hello-robot/stretch_docker), which can be conconsidered separately. Here, we will go through what docker is, why we use it, and how to set it up on your client side to run AI code.

## What is Docker and Why Would I Use It?

Docker is a tool that allows you to run software in a container. A container is a lightweight, standalone, executable package of software that includes everything needed to run the software, including the code, runtime, system tools, libraries, and settings. Containers are isolated from each other and from the host system, so they are a great way to run software in a controlled environment.
Expand Down
49 changes: 49 additions & 0 deletions docs/simulation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Robocasa Installation

You can install Robocasa by following the instructions below, or you can try the [install script](scripts/install_robocasa.sh).

## Install Robosuite

```bash
git clone https://github.com/ARISE-Initiative/robosuite -b robocasa_v0.1
cd robosuite
pip install -e .
```

## Install Robocasa

```bash
cd ..
git clone https://github.com/robocasa/robocasa
cd robocasa
pip install -e .
```

## Install Stretch Mujoco

```bash
cd ..
git clone git@github.com:hello-robot/stretch_mujoco.git
cd stretch_mujoco
pip install -e .
```

## Download assets

```bash
python robocasa/scripts/download_kitchen_assets.py # Caution: Assets to be downloaded are around 5GB.
python robocasa/scripts/setup_macros.py # Set up system variables.
```

## Run Robocasa

In one terminal start the server:

```bash
python -m stretch.simulation.mujoco_server --use-robocasa
```

In another run an app, like mapping:

```bash
```
19 changes: 0 additions & 19 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ VERSION=`python $script_dir/src/stretch/version.py`
CPU_ONLY="false"
NO_REMOVE="false"
NO_SUBMODULES="false"
INSTALL_PYTORCH3D="false"
INSTALL_TORCH_GEOMETRIC="false"
MAMBA=mamba
NO_VERSION="false"
# Two cases: -y for yes, --cpu for cpu only
Expand Down Expand Up @@ -41,10 +39,6 @@ do
NO_SUBMODULES="true"
shift
;;
--torch-geometric)
INSTALL_TORCH_GEOMETRIC="true"
shift
;;
--no-version)
NO_VERSION="true"
shift
Expand Down Expand Up @@ -157,19 +151,6 @@ echo "---------------------------------------------"
echo "---- INSTALLING STRETCH AI DEPENDENCIES ----"
echo "Will be installed via pip into env: $ENV_NAME"

# This is no longer necessary but might be useful for some checks
if [ "$INSTALL_PYTORCH3D" == "true" ]; then
echo "Installing pytorch3d from source"
pip install "git+https://github.com/facebookresearch/pytorch3d.git@stable"
fi

if [ "$INSTALL_TORCH_GEOMETRIC" == "true" ]; then
echo "Installing torch-geometric"
# If not using cpu only, install the following
# It is important to use --no-cache-dir to avoid issues different versions of pytorch and cuda
pip install torch_cluster torch_scatter torch_geometric -f https://pytorch-geometric.com/whl/torch-${PYTORCH_VERSION}+${CUDA_VERSION_NODOT}.html --no-cache-dir
fi

pip install -e ./src[dev]

echo ""
Expand Down
49 changes: 49 additions & 0 deletions scripts/copy_calibrated_stretch_urdf.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/bin/bash

# Default user
USER="hello-robot"

# Parse command line arguments
while [[ $# -gt 0 ]]; do
case $1 in
--robot_ip)
ROBOT_IP="$2"
shift 2
;;
--user)
USER="$2"
shift 2
;;
*)
echo "Unknown option: $1"
exit 1
;;
esac
done

# If ROBOT_IP is not set, try to load it from the file
if [ -z "$ROBOT_IP" ]; then
if [ -f ~/.stretch/robot_ip.txt ]; then
ROBOT_IP=$(cat ~/.stretch/robot_ip.txt)
else
echo "Error: Robot IP not provided and ~/.stretch/robot_ip.txt does not exist."
exit 1
fi
fi

# Check if ROBOT_IP is set
if [ -z "$ROBOT_IP" ]; then
echo "Error: Robot IP is not set."
exit 1
fi

# Run the scp command
scp "$USER@$ROBOT_IP:~/ament_ws/src/stretch_ros2/stretch_description/urdf/stretch.urdf" $HOME/.stretch/stretch.urdf

# Check if the scp command was successful
if [ $? -eq 0 ]; then
echo "File successfully copied."
else
echo "Error: Failed to copy the file."
exit 1
fi
92 changes: 92 additions & 0 deletions scripts/install_robocasa.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
#!/bin/bash

set -e

# Initialize variables
yes_flag=false
conda_env=""

# Parse command-line options
while getopts ":y" opt; do
case ${opt} in
y )
yes_flag=true
;;
\? )
echo "Invalid option: $OPTARG" 1>&2
exit 1
;;
esac
done

# Check if running in a conda/mamba environment
if [[ -n $CONDA_DEFAULT_ENV ]]; then
conda_env=$CONDA_DEFAULT_ENV
elif [[ -n $MAMBA_ROOT_PREFIX ]]; then
conda_env=$(basename "$MAMBA_ROOT_PREFIX")
else
echo "Error: No conda/mamba environment detected. Please activate an environment before running this script."
exit 1
fi

echo "Using conda/mamba environment: $conda_env"

# Function to ask for confirmation
confirm() {
if [ "$yes_flag" = true ]; then
return 0
fi
read -r -p "${1:-Are you sure?} [y/N] " response
case "$response" in
[yY][eE][sS]|[yY])
true
;;
*)
false
;;
esac
}

if confirm "Do you want to install Robosuite and Robocasa?"; then
# Install Robosuite
git clone https://github.com/ARISE-Initiative/robosuite -b robocasa_v0.1
cd robosuite
pip install -e .
cd ..

# Install Robocasa
git clone https://github.com/robocasa/robocasa
cd robocasa
pip install -e .
cd ..
else
echo "Skipping Robosuite and Robocasa installation"
# Quit
exit 1
fi

# Download assets
python robocasa/scripts/download_kitchen_assets.py

# Setup macros
if confirm "Do you want to set up system variables and macros for Robocasa?"; then
python robocasa/scripts/setup_macros.py
fi

# Clone, cd, and install stretch_mujoco repository
if git clone git@github.com:hello-robot/stretch_mujoco.git; then
echo "Successfully cloned stretch_mujoco repository"
cd stretch_mujoco
if pip install -e .; then
echo "Successfully installed stretch_mujoco"
else
echo "Failed to install stretch_mujoco"
exit 1
fi
cd ..
else
echo "Failed to clone stretch_mujoco repository"
exit 1
fi

echo "Installation complete!"
Empty file modified scripts/run_stretch_ai_ros2_bridge_server.sh
100755 → 100644
Empty file.
1 change: 1 addition & 0 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"pyusb",
"schema",
"overrides",
"wget",
# From openai
"openai",
"openai-clip",
Expand Down
12 changes: 12 additions & 0 deletions src/stretch/agent/manipulation/dinobot.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@
# license information maybe found below, if so.

import glob
import sys

import click
import matplotlib.pyplot as plt
import numpy as np
import torch

# sys.path.append("/home/hello-robot/repos/dino-vit-features")
sys.path.append("/home/cpaxton/src/dino-vit-features")
import sys

# Install this DINO repo to extract correspondences: https://github.com/ShirAmir/dino-vit-features
from correspondences import draw_correspondences, find_correspondences
from PIL import Image
Expand Down Expand Up @@ -61,6 +66,8 @@ def load_demo(path_to_demo_folder):
demo_deltas.append(delta)

# pull out the first frame in the videos for the bottleneck images
# rgb_bn = Image.open("ee_rgb_0.jpg")
# depth_bn = Image.open("ee_rgb_1.jpg")
rgb_bn = Image.open("bottleneck_rgb.png")
depth_bn = Image.open("bottleneck_depth.png")

Expand Down Expand Up @@ -138,6 +145,7 @@ def extract_3d_coordinates(points, xyz):
x, y = point
points_3d.append([x, y, depths[i]])

breakpoint()
return np.array(points_3d)


Expand Down Expand Up @@ -233,3 +241,7 @@ def main(robot_ip, local, path_to_demo_folder):

# Start the demo
dinobot_demo(robot, path_to_demo_folder)


if __name__ == "__main__":
main()
Loading
Loading