fix openai api base bug

agentverse/llms/openai.py

@@ -5,7 +5,7 @@ import os
 import numpy as np
 from aiohttp import ClientSession
 from typing import Dict, List, Optional, Union
-from tenacity import retry, stop_after_attempt, wait_exponential
+from tenacity import retry, stop_after_attempt, wait_exponential, RetryCallState
 
 from pydantic import BaseModel, Field
 
@@ -37,15 +37,20 @@ else:
         openai.api_version = "2023-05-15"
         is_openai_available = True
     else:
-        logging.warning(
-            "OpenAI API key is not set. Please set the environment variable OPENAI_API_KEY"
-        )
+        logging.warning("OpenAI API key is not set. Please set the environment variable OPENAI_API_KEY")
         is_openai_available = False
 
 
+def log_retry(retry_state: RetryCallState):
+    exception = retry_state.outcome.exception()
+    logger.warn(
+        f"Retrying {retry_state.fn}\nAttempt: {retry_state.attempt_number}\nException: {exception.__class__.__name__} {exception}",
+    )
+
+
 class OpenAIChatArgs(BaseModelArgs):
     model: str = Field(default="gpt-3.5-turbo")
-    deployment_id: str = Field(default="")
+    deployment_id: Optional[str] = Field(default=None)
     max_tokens: int = Field(default=2048)
     temperature: float = Field(default=1.0)
     top_p: int = Field(default=1)
@@ -117,6 +122,7 @@ class OpenAIChat(BaseChatModel):
         stop=stop_after_attempt(20),
         wait=wait_exponential(multiplier=1, min=4, max=10),
         reraise=True,
+        before_sleep=log_retry
     )
     def generate_response(
         self,
@@ -139,13 +145,9 @@ class OpenAIChat(BaseChatModel):
                     self.collect_metrics(response)
                     return LLMResult(
                         content=response["choices"][0]["message"].get("content", ""),
-                        function_name=response["choices"][0]["message"][
-                            "function_call"
-                        ]["name"],
+                        function_name=response["choices"][0]["message"]["function_call"]["name"],
                         function_arguments=ast.literal_eval(
-                            response["choices"][0]["message"]["function_call"][
-                                "arguments"
-                            ]
+                            response["choices"][0]["message"]["function_call"]["arguments"]
                         ),
                         send_tokens=response["usage"]["prompt_tokens"],
                         recv_tokens=response["usage"]["completion_tokens"],
@@ -179,6 +181,7 @@ class OpenAIChat(BaseChatModel):
         stop=stop_after_attempt(20),
         wait=wait_exponential(multiplier=1, min=4, max=10),
         reraise=True,
+        before_sleep=log_retry,
     )
     async def agenerate_response(
         self,
@@ -200,9 +203,7 @@ class OpenAIChat(BaseChatModel):
                         **self.args.dict(),
                     )
                 if response["choices"][0]["message"].get("function_call") is not None:
-                    function_name = response["choices"][0]["message"]["function_call"][
-                        "name"
-                    ]
+                    function_name = response["choices"][0]["message"]["function_call"]["name"]
                     valid_function = False
                     if function_name.startswith("function."):
                         function_name = function_name.replace("function.", "")
@@ -220,27 +221,15 @@ class OpenAIChat(BaseChatModel):
                             f"The returned function name {function_name} is not in the list of valid functions."
                         )
                     try:
-                        arguments = ast.literal_eval(
-                            response["choices"][0]["message"]["function_call"][
-                                "arguments"
-                            ]
-                        )
+                        arguments = ast.literal_eval(response["choices"][0]["message"]["function_call"]["arguments"])
                     except:
                         try:
                             arguments = ast.literal_eval(
-                                JsonRepair(
-                                    response["choices"][0]["message"]["function_call"][
-                                        "arguments"
-                                    ]
-                                ).repair()
+                                JsonRepair(response["choices"][0]["message"]["function_call"]["arguments"]).repair()
                             )
                         except:
-                            logger.warn(
-                                "The returned argument in function call is not valid json. Retrying..."
-                            )
-                            raise ValueError(
-                                "The returned argument in function call is not valid json."
-                            )
+                            logger.warn("The returned argument in function call is not valid json. Retrying...")
+                            raise ValueError("The returned argument in function call is not valid json.")
                     self.collect_metrics(response)
                     return LLMResult(
                         function_name=function_name,
@@ -276,9 +265,7 @@ class OpenAIChat(BaseChatModel):
         except (OpenAIError, KeyboardInterrupt, json.decoder.JSONDecodeError) as error:
             raise
 
-    def construct_messages(
-        self, prepend_prompt: str, history: List[dict], append_prompt: str
-    ):
+    def construct_messages(self, prepend_prompt: str, history: List[dict], append_prompt: str):
         messages = []
         if prepend_prompt != "":
             messages.append({"role": "system", "content": prepend_prompt})
@@ -332,13 +319,11 @@ def get_embedding(text: str, attempts=3) -> np.array:
     try:
         text = text.replace("\n", " ")
         if openai.api_type == "azure":
-            embedding = openai.Embedding.create(
-                input=[text], deployment_id="text-embedding-ada-002"
-            )["data"][0]["embedding"]
+            embedding = openai.Embedding.create(input=[text], deployment_id="text-embedding-ada-002")["data"][0][
+                "embedding"
+            ]
         else:
-            embedding = openai.Embedding.create(
-                input=[text], model="text-embedding-ada-002"
-            )["data"][0]["embedding"]
+            embedding = openai.Embedding.create(input=[text], model="text-embedding-ada-002")["data"][0]["embedding"]
         return tuple(embedding)
     except Exception as e:
         attempts += 1

app.py

@@ -335,7 +335,6 @@ class GUI:
         """
 
         # data = self.backend.next_data()
-
         return_message = self.backend.next()
 
         data = self.return_format(return_message)