Fix: try to remove proxy

app.py

@@ -67,7 +67,7 @@ class DemoRunner:
 
         return lmp_planner
 
-    def setup(self, api_key, n_blocks, n_bowls, proxy, cfg_choice):
+    def setup(self, api_key, n_blocks, n_bowls, cfg_choice):
         openai.api_key = api_key
 
         # self._env = PickPlaceEnv(render=True, high_res=True, high_frame_rate=False)
@@ -112,18 +112,14 @@ class DemoRunner:
         return self._md_logger.get_log(), None, video_file_name
 
 
-def setup(api_key, n_blocks, n_bowls, proxy_addr, cfg_choice):
+def setup(api_key, n_blocks, n_bowls, cfg_choice):
+    
     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
 
-    if proxy_addr is not None and "http://" in proxy_addr:
-        openai.proxy = proxy_addr
-    elif proxy_addr is not None:
-        openai.proxy = f"http://{proxy_addr}"
-
     # ip_status, ip_info = get_geoip(openai.proxy)
     # if ip_status == -1:
     #     return ip_info, None, None
@@ -141,7 +137,7 @@ def setup(api_key, n_blocks, n_bowls, proxy_addr, cfg_choice):
 
     demo_runner = DemoRunner(cfg_file)
 
-    info, img = demo_runner.setup(api_key, n_blocks, n_bowls, proxy_addr, cfg_choice)
+    info, img = demo_runner.setup(api_key, n_blocks, n_bowls, cfg_choice)
     return info, img, demo_runner
 
 
@@ -166,7 +162,7 @@ if __name__ == '__main__':
             with gr.Column():
                 with gr.Column():
                     inp_api_key = gr.Textbox(label='OpenAI API Key (this is not stored anywhere)', lines=1)
-                    inp_proxy_addr = gr.Textbox(label='Your local proxy address', lines=1)
+                    # inp_proxy_addr = gr.Textbox(label='Your local proxy address', lines=1)
                     inp_cfg = gr.Dropdown(label='Configuration', choices=['voxposer', 'agibot'])
                 with gr.Row():
                     inp_n_blocks = gr.Slider(label='Number of Blocks', minimum=0, maximum=4, value=3, step=1)
@@ -187,7 +183,7 @@ if __name__ == '__main__':
 
         btn_setup.click(
             setup,
-            inputs=[inp_api_key, inp_n_blocks, inp_n_bowls, inp_proxy_addr, inp_cfg],
+            inputs=[inp_api_key, inp_n_blocks, inp_n_bowls, inp_cfg],
             outputs=[info_setup, img_setup, state]
         )
         btn_run.click(

lmp.py

@@ -57,7 +57,7 @@ class LMP:
             temperature=self._cfg['temperature'],
             model=self._cfg['model'],
             max_tokens=self._cfg['max_tokens'],
-            proxy=openai.proxy,
+            # proxy=openai.proxy,
         )
         code_str = response.json()["choices"][0]["message"]['content']
 
@@ -114,7 +114,7 @@ class LMPFGen:
             temperature=self._cfg['temperature'],
             model=self._cfg['model'],
             max_tokens=self._cfg['max_tokens'],
-            proxy=openai.proxy,
+            # proxy=openai.proxy,
         )
         f_src = response.json()["choices"][0]["message"]['content']
 

utils.py

@@ -70,7 +70,7 @@ def get_geoip(proxy=None):
         return 1, text
 
 
-@retry(wait=wait_random_exponential(multiplier=1, max=20), stop=stop_after_attempt(5))
+@retry(wait=wait_random_exponential(multiplier=1, max=3), stop=stop_after_attempt(5))
 def chat_completion_request(
     messages,
     functions=None,
@@ -91,18 +91,18 @@ def chat_completion_request(
         json_data.update({"function_call": function_call})
     if kwargs is not None:
         json_data.update(kwargs)
-    with retrieve_proxy(proxy):
-        try:
-            response = requests.post(
-                "https://api.openai.com/v1/chat/completions",
-                headers=headers,
-                json=json_data,
-            )
-            return response
-        except Exception as e:
-            print("Unable to generate ChatCompletion response")
-            print(f"Exception: {e}")
-            return e
+    # with retrieve_proxy(proxy):
+    try:
+        response = requests.post(
+            "https://api.openai.com/v1/chat/completions",
+            headers=headers,
+            json=json_data,
+        )
+        return response
+    except Exception as e:
+        print("Unable to generate ChatCompletion response")
+        print(f"Exception: {e}")
+        return e
 
 
 def generate_messages(prompt):