Merge remote-tracking branch 'my-hf/main'

README.md

@@ -8,6 +8,7 @@ sdk_version: 3.3.1
 app_file: app.py
 pinned: false
 license: apache-2.0
+duplicated_from: jackyliang42/code-as-policies
 ---
 
 # Code as Policies Tabletop Manipulation Interactive Demo
@@ -20,12 +21,12 @@ Below is an interactive demo for the simulated tabletop manipulation domain, see
 
 ## Preparations
 1. Obtain an [OpenAI API Key](https://openai.com/blog/openai-api/)
-2. Gain Codex access by [joining the waitlist](https://openai.com/blog/openai-codex/) 
+2. Gain Codex access by [joining the waitlist](https://openai.com/blog/openai-codex/)
 
 Once you have Codex access you can use code-davinci-002. Using the GPT-3 model (text-dainvci-002) is also ok, but performance won't be as good (there will be more code logic errors).
 
-## Usage 
-1. Fill in the API Key, model name, and how many blocks and bowls to be spawned in the environment. 
+## Usage
+1. Fill in the API Key, model name, and how many blocks and bowls to be spawned in the environment.
 2. Click Setup/Reset Simulation
 3. Based on the new randomly sampled object names, input an instruction and click Run Instruction. If successful, this will render a video and update the simulation environment visualization.
 
@@ -38,7 +39,7 @@ You can run instructions in sequence and refer back to previous instructions (e.
 * Language-based reasoning (e.g. put the forest-colored block on the ocean-colored bowl).
 * Simple Q&A (e.g. how many blocks are to the left of the blue bowl?)
 
-## Example Instructions 
+## Example Instructions
 Note object names may need to be changed depending the sampled object names.
 * put the sun-colored block on the bowl closest to it
 * stack the blocks on the bottom most bowl

app.py

@@ -123,7 +123,6 @@ class DemoRunner:
 def setup(api_key, model_name, n_blocks, n_bowls):
     if not api_key:
         return 'Please enter your OpenAI API key!', None, None
-
     if n_blocks + n_bowls == 0:
         return 'Please select at least one object!', None, None
 

lmp.py

@@ -141,7 +141,6 @@ class LMPFGen:
             other_vars = {}
         gvars = merge_dicts([self._fixed_vars, self._variable_vars, other_vars])
         lvars = {}
-
         exec_safe(f_src, gvars, lvars)
 
         f = lvars[f_name]
@@ -245,7 +244,6 @@ def exec_safe(code_str, gvars=None, lvars=None):
     banned_phrases = ['import', '__']
     for phrase in banned_phrases:
         assert phrase not in code_str
-
     if gvars is None:
         gvars = {}
     if lvars is None:

md_logger.py

@@ -22,4 +22,4 @@ class MarkdownLogger:
     def get_messages(self):
         m = self._messages
         self._messages = []
-        return m
+        return m

requirements.txt

@@ -8,5 +8,9 @@ pybullet
 imageio==2.4.1
 imageio-ffmpeg
 moviepy
+<<<<<<< HEAD
 omegaconf
-gradio
+gradio
+=======
+omegaconf
+>>>>>>> my-hf/main