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

Merge with upstream vlm changes #287

Merged
merged 21 commits into from
May 21, 2024
Merged

Commits on Apr 30, 2024

  1. Prune operators with low data in grammar search (Learning-and-Intelli…

    …gent-Systems#1634)
    
    * lots of changes with noise-based learning!
    
    * Just keep low-datastore operator pruning in cluster and intersect.
    
    * Clean up code.
    
    * Add test and clean up code.
    
    * Fix rebase issues in settings.py
    
    ---------
    
    Co-authored-by: Nishanth Kumar <nishanth.kumar20@gmail.com>
    ashayathalye and NishanthJKumar authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    373e1a1 View commit details
    Browse the repository at this point in the history
  2. Enable saving an image sequence of each demonstration (Learning-and-I…

    …ntelligent-Systems#1629)
    
    * Initial commit.
    
    * Add test.
    
    * Change name of image directory setting.
    
    * Add test.
    
    * Fix test.
    ashayathalye authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    ef903bd View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Configuration menu
    Copy the full SHA
    766a9b3 View commit details
    Browse the repository at this point in the history
  2. fix segmentation error with predicate invention from txt files or img…

    … demos (Learning-and-Intelligent-Systems#1635)
    
    * good to go!
    
    * yapf + linting
    
    * ashay comments!
    NishanthJKumar authored May 1, 2024
    Configuration menu
    Copy the full SHA
    0875aa0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    252fa5d View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Configuration menu
    Copy the full SHA
    b411dc9 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. make better documentation to prevent terrible, no-good kitchen breaki…

    …ng (Learning-and-Intelligent-Systems#1642)
    
    * that was such a small fix for such a long rabbit hole rip
    
    * revert
    
    * yapf
    
    * prevent weird yapf error
    NishanthJKumar authored May 7, 2024
    Configuration menu
    Copy the full SHA
    3fc4371 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Test-time VLM Predicate evaluation (Learning-and-Intelligent-Systems#…

    …1643)
    
    * init implementation seemingly works in kitchen!
    
    * tom suggestion
    
    * should be good to go!
    
    * tom feedback
    NishanthJKumar authored May 8, 2024
    Configuration menu
    Copy the full SHA
    9c8c5ec View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Enable using CogMan to create demonstrations (Learning-and-Intelligen…

    …t-Systems#1645)
    
    * might be gtg??
    
    * fix checks
    
    * tom feedback
    NishanthJKumar authored May 9, 2024
    Configuration menu
    Copy the full SHA
    d0174e0 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. End to end vlm pred invention (Learning-and-Intelligent-Systems#1646)

    * progress; but next steps need to be figured out
    
    * plumbing done, but doesn't really work?
    
    * kitchen works!
    
    * good to go!
    
    * good to go!
    
    * works now!
    NishanthJKumar authored May 13, 2024
    Configuration menu
    Copy the full SHA
    aa2bc67 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Add openai vlm (Learning-and-Intelligent-Systems#1639)

    * add OpenAI VLM based on the existing interface; manual merge from BDAI predicators
    
    * add test VLM predicate image
    
    * formatting
    
    * add a small test as other vlm/llm
    
    * move the example usage to test file
    
    * update requirement, tenacity
    
    * auto reformat
    
    * fix
    
    * update
    
    * fix
    
    * fix test
    
    * fix
    
    * update openai version
    
    * done!
    
    * weird flush cache issue
    
    ---------
    
    Co-authored-by: Nishanth Kumar <NishanthJKumar@users.noreply.github.com>
    Co-authored-by: Nishanth Kumar <nishanth.kumar20@gmail.com>
    3 people authored May 14, 2024
    Configuration menu
    Copy the full SHA
    9813bc8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    65a03b4 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Configuration menu
    Copy the full SHA
    138e67c View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. save states and use known predicates in vlm pipeline (Learning-and-In…

    …telligent-Systems#1649)
    
    * [wip] save states and use known predicates in vlm pipeline
    
    * test fixes
    
    * actually save
    
    * fix
    
    * laziness
    
    * push a bunch of fixes
    
    * fixes txt issue
    
    * all bugs fixed!
    
    * fix mypy
    
    * gtg!
    
    ---------
    
    Co-authored-by: Nishanth Kumar <nishanth.kumar20@gmail.com>
    tomsilver and NishanthJKumar authored May 20, 2024
    Configuration menu
    Copy the full SHA
    c3d41b4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    276a3ce View commit details
    Browse the repository at this point in the history
  3. Implements general interface for specifying 'debug grammar' predicate…

    …s for environments (Learning-and-Intelligent-Systems#1652)
    
    * good to go i think?
    
    * good to go!
    
    * revert gitignore change
    NishanthJKumar authored May 20, 2024
    Configuration menu
    Copy the full SHA
    8cd5c8b View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Configuration menu
    Copy the full SHA
    d06c832 View commit details
    Browse the repository at this point in the history
  2. Create BurgerEnv to showcase geometric + VLM predicate invention (Lea…

    …rning-and-Intelligent-Systems#1650)
    
    * Initial commit.
    
    * Add rendering and human data collection.
    
    * Add patty and make rendering change after patty is cooked.
    
    * Reset hidden state properly and use images for more of the objects.
    
    * Start adding other items.
    
    * Add grill and cutting board.
    
    * Add facing predicate.
    
    * Add picking and placing.
    
    * Fix zorder stuff when picking and placing.
    
    * Add turning.
    
    * Improve rendering when stacking items.
    
    * Change interaction rules so you can only interact when item is on the appropriate station.
    
    * Add more predicates.
    
    * Fix goal and add some predicates.
    
    * Fix if statement syntax.
    
    * Start implementing nsrts and options.
    
    * Progress.
    
    * Progress.
    
    * More progres...
    
    * Get simple oracle pick option/nsrt/goal working.
    
    * Fix type check for unary free for all classifier to work with hierarchiy of types.
    
    * Start adding a place operator, but stop and instead pivot to first adding a dedicated move operator.
    
    * Progress towards adding a move skill.
    
    * Update move policy to use run_heuristic_search properly.
    
    * Get move skill working properly.
    
    * Get pick, place, move working. About to add cook.
    
    * Add cook.
    
    * Make slight changes to oracle to enable longer demo.
    
    * Fix up oracle nsrts and options.
    
    * Change goal to something that works so that Nishanth can run it and see it working.
    
    * Get a manual plan to work using oracle nsrts/options.
    
    * Get rid of using manual plan.
    
    * Add more NSRTs to cut down on the number of skeletons -- but one skeleton still takes a long time to find.
    
    * Progress towards cleaning up code and refactoring a bit.
    
    * Improve code and comments towards a PR.
    
    * Run autoformatter.
    
    * Get everything except coverage tests to pass.
    
    * Create test.
    
    * Add test.
    
    * Restore file.
    
    * Fix test.
    
    * Add to tests.
    
    * Update tests.
    
    * Fix tests.
    
    * Remove prints.
    
    * yapf
    
    * Clean up.
    
    * Deal with comments.
    
    * Change names.
    
    * Fix.
    
    * yapf
    
    * Add missing test file after name change.
    ashayathalye authored May 21, 2024
    Configuration menu
    Copy the full SHA
    415c55c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5a171c7 View commit details
    Browse the repository at this point in the history
  4. isort

    nkumar-bdai committed May 21, 2024
    Configuration menu
    Copy the full SHA
    0156987 View commit details
    Browse the repository at this point in the history
  5. update codeowners

    nkumar-bdai committed May 21, 2024
    Configuration menu
    Copy the full SHA
    f21e776 View commit details
    Browse the repository at this point in the history