From 826e4324f1811b4ec99a63a0a6160cca781b8040 Mon Sep 17 00:00:00 2001
From: soulteary <soulteary@gmail.com>
Date: Wed, 27 Dec 2023 17:40:51 +0800
Subject: [PATCH] fix: fix openai migrate autofix code

---
 agentverse/llms/openai.py | 52 +++++++++++++++------------------------
 requirements.txt          |  2 +-
 2 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/agentverse/llms/openai.py b/agentverse/llms/openai.py
index d9156c14..d5e59ee7 100644
--- a/agentverse/llms/openai.py
+++ b/agentverse/llms/openai.py
@@ -17,39 +17,25 @@
 from .base import BaseChatModel, BaseCompletionModel, BaseModelArgs
 from .utils.jsonrepair import JsonRepair
 
-try:
-    from openai import AzureOpenAI, AsyncAzureOpenAI
-    
-    client = AzureOpenAI(api_key=os.environ.get("OPENAI_API_KEY"),
-    api_key=os.environ.get("AZURE_OPENAI_API_KEY"),
-    azure_endpoint=os.environ.get("AZURE_OPENAI_API_BASE"),
-    api_version="2023-05-15",
-    azure_endpoint="http://localhost:5000/v1",
-    api_key="EMPTY")
-    aclient = AsyncAzureOpenAI(api_key=os.environ.get("OPENAI_API_KEY"),
-    api_key=os.environ.get("AZURE_OPENAI_API_KEY"),
-    azure_endpoint=os.environ.get("AZURE_OPENAI_API_BASE"),
-    api_version="2023-05-15",
-    azure_endpoint="http://localhost:5000/v1",
-    api_key="EMPTY")
-    from openai.error import OpenAIError
-except ImportError:
-    is_openai_available = False
-    logger.warn("openai package is not installed")
+import openai
+
+# openai.proxy = os.environ.get("http_proxy")
+# if openai.proxy is None:
+#     openai.proxy = os.environ.get("HTTP_PROXY")
+if os.environ.get("OPENAI_API_KEY") != None:
+    openai.api_key = os.environ.get("OPENAI_API_KEY")
+    is_openai_available = True
+elif os.environ.get("AZURE_OPENAI_API_KEY") != None:
+    openai.api_type = "azure"
+    openai.api_key = os.environ.get("AZURE_OPENAI_API_KEY")
+    openai.api_base = os.environ.get("AZURE_OPENAI_API_BASE")
+    openai.api_version = "2023-05-15"
+    is_openai_available = True
 else:
-    # openai.proxy = os.environ.get("http_proxy")
-    # if openai.proxy is None:
-    #     openai.proxy = os.environ.get("HTTP_PROXY")
-    if os.environ.get("OPENAI_API_KEY") != None:
-        is_openai_available = True
-    elif os.environ.get("AZURE_OPENAI_API_KEY") != None:
-        is_openai_available = True
-    else:
-        logger.warn(
-            "OpenAI API key is not set. Please set the environment variable OPENAI_API_KEY"
-        )
-        is_openai_available = False
-
+    logger.warn(
+        "OpenAI API key is not set. Please set the environment variable OPENAI_API_KEY"
+    )
+    is_openai_available = False
 
 class OpenAIChatArgs(BaseModelArgs):
     model: str = Field(default="gpt-3.5-turbo")
@@ -120,6 +106,8 @@ def __init__(self, max_retry: int = 3, **kwargs):
         if len(kwargs) > 0:
             logger.warn(f"Unused arguments: {kwargs}")
         if args["model"] in LOCAL_LLMS:
+            openai.api_base = "http://localhost:5000/v1"
+            openai.api_key = "EMPTY"
         super().__init__(args=args, max_retry=max_retry)
 
     @classmethod
diff --git a/requirements.txt b/requirements.txt
index afdfbb9e..120faa74 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ astunparse
 langchain==0.0.157
 scikit-learn
 pydantic==1.10.7
-typing-extensions==4.5.0
+typing-extensions==4.9.0
 typing-inspect==0.8.0
 colorlog
 rapidfuzz