diff --git a/agentverse/llms/openai.py b/agentverse/llms/openai.py index 881ec3f7..11b17f02 100644 --- a/agentverse/llms/openai.py +++ b/agentverse/llms/openai.py @@ -41,7 +41,7 @@ AZURE_API_BASE = os.environ.get("AZURE_OPENAI_API_BASE") VLLM_BASE_URL = os.environ.get("VLLM_BASE_URL") VLLM_API_KEY = os.environ.get("VLLM_API_KEY", "EMPTY") - + if not OPENAI_API_KEY and not AZURE_API_KEY: logger.warn( "OpenAI API key is not set. Please set an environment variable OPENAI_API_KEY or " @@ -49,7 +49,9 @@ ) elif OPENAI_API_KEY: DEFAULT_CLIENT = OpenAI(api_key=OPENAI_API_KEY, base_url=OPENAI_BASE_URL) - DEFAULT_CLIENT_ASYNC = AsyncOpenAI(api_key=OPENAI_API_KEY, base_url=OPENAI_BASE_URL) + DEFAULT_CLIENT_ASYNC = AsyncOpenAI( + api_key=OPENAI_API_KEY, base_url=OPENAI_BASE_URL + ) api_key = OPENAI_API_KEY base_url = OPENAI_BASE_URL elif AZURE_API_KEY: @@ -232,12 +234,11 @@ def generate_response( try: # Execute function call if functions != []: - async with async_openai_client: - response = openai_client.chat.completions.create( - messages=messages, - functions=functions, - **self.args.dict(), - ) + response = openai_client.chat.completions.create( + messages=messages, + functions=functions, + **self.args.dict(), + ) logger.log_prompt( [ @@ -276,11 +277,10 @@ def generate_response( ) else: - async with async_openai_client: - response = openai_client.chat.completions.create( - messages=messages, - **self.args.dict(), - ) + response = openai_client.chat.completions.create( + messages=messages, + **self.args.dict(), + ) logger.log_prompt( [ { diff --git a/requirements.txt b/requirements.txt index 4c4575e6..be80b602 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ fastapi==0.95.1 uvicorn py3langid setuptools-scm -openai==1.5.0 +openai==1.1.0 opencv-python==4.8.0.76 gradio httpx[socks]==0.25.0