phoenix/litellm-mirror
0
0
Fork 1
mirror of https://github.com/BerriAI/litellm.git synced 2025-04-27 19:54:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(openai.py): using openai sdk for completion calls

Browse source
This commit is contained in:
Krrish Dholakia 2023-11-15 20:25:27 -08:00
parent 6aef9d2db3
commit a80c5841b2
2 changed files with 49 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

30
litellm/llms/openai.py
View file

@ -1,11 +1,11 @@
from typing import Optional, Union from typing import Optional, Union
import types, time import types, time, json
import httpx import httpx
from .base import BaseLLM from .base import BaseLLM
from litellm.utils import ModelResponse, Choices, Message, CustomStreamWrapper, convert_to_model_response_object, Usage from litellm.utils import ModelResponse, Choices, Message, CustomStreamWrapper, convert_to_model_response_object, Usage
from typing import Callable, Optional from typing import Callable, Optional
import aiohttp, requests import aiohttp, requests
import litellm import litellm, openai
class OpenAIError(Exception): class OpenAIError(Exception):
def __init__(self, status_code, message, request: Optional[httpx.Request]=None, response: Optional[httpx.Response]=None): def __init__(self, status_code, message, request: Optional[httpx.Request]=None, response: Optional[httpx.Response]=None):
@ -224,17 +224,23 @@ class OpenAIChatCompletion(BaseLLM):
elif optional_params.get("stream", False): elif optional_params.get("stream", False):
return self.streaming(logging_obj=logging_obj, api_base=api_base, data=data, headers=headers, model_response=model_response, model=model) return self.streaming(logging_obj=logging_obj, api_base=api_base, data=data, headers=headers, model_response=model_response, model=model)
else: else:
response = requests.post( if model in litellm.models_by_provider["openai"]:
url=api_base, if api_key:
json=data, openai.api_key = api_key
headers=headers, response = openai.chat.completions.create(**data)
timeout=600 # Set a 10-minute timeout for both connection and read return convert_to_model_response_object(response_object=json.loads(response.model_dump_json()), model_response_object=model_response)
) else:
if response.status_code != 200: response = requests.post(
raise OpenAIError(status_code=response.status_code, message=response.text) url=api_base,
json=data,
headers=headers,
timeout=600 # Set a 10-minute timeout for both connection and read
)
if response.status_code != 200:
raise OpenAIError(status_code=response.status_code, message=response.text)
## RESPONSE OBJECT ## RESPONSE OBJECT
return convert_to_model_response_object(response_object=response.json(), model_response_object=model_response) return convert_to_model_response_object(response_object=response.json(), model_response_object=model_response)
except Exception as e: except Exception as e:
if "Conversation roles must alternate user/assistant" in str(e) or "user and assistant roles should be alternating" in str(e): if "Conversation roles must alternate user/assistant" in str(e) or "user and assistant roles should be alternating" in str(e):
# reformat messages to ensure user/assistant are alternating, if there's either 2 consecutive 'user' messages or 2 consecutive 'assistant' message, add a blank 'user' or 'assistant' message to ensure compatibility # reformat messages to ensure user/assistant are alternating, if there's either 2 consecutive 'user' messages or 2 consecutive 'assistant' message, add a blank 'user' or 'assistant' message to ensure compatibility

133
litellm/tests/test_completion.py
View file

@ -438,7 +438,6 @@ def test_completion_openai_with_optional_params():
messages=messages, messages=messages,
temperature=0.5, temperature=0.5,
top_p=0.1, top_p=0.1,
user="ishaan_dev@berri.ai",
) )
# Add any assertions here to check the response # Add any assertions here to check the response
print(response) print(response)
@ -447,11 +446,12 @@ def test_completion_openai_with_optional_params():
except Exception as e: except Exception as e:
pytest.fail(f"Error occurred: {e}") pytest.fail(f"Error occurred: {e}")
test_completion_openai_with_optional_params() # test_completion_openai_with_optional_params()
def test_completion_openai_litellm_key(): def test_completion_openai_litellm_key():
try: try:
litellm.set_verbose = False litellm.set_verbose = True
litellm.num_retries = 0
litellm.api_key = os.environ['OPENAI_API_KEY'] litellm.api_key = os.environ['OPENAI_API_KEY']
# ensure key is set to None in .env and in openai.api_key # ensure key is set to None in .env and in openai.api_key
@ -481,7 +481,7 @@ def test_completion_openai_litellm_key():
except Exception as e: except Exception as e:
pytest.fail(f"Error occurred: {e}") pytest.fail(f"Error occurred: {e}")
# test_completion_openai_litellm_key() test_completion_openai_litellm_key()
def test_completion_openrouter1(): def test_completion_openrouter1():
try: try:
@ -496,33 +496,6 @@ def test_completion_openrouter1():
pytest.fail(f"Error occurred: {e}") pytest.fail(f"Error occurred: {e}")
# test_completion_openrouter1() # test_completion_openrouter1()
def test_completion_openrouter2():
try:
print("testing openrouter/gpt-3.5-turbo")
response = completion(
model="openrouter/gpt-3.5-turbo",
messages=messages,
max_tokens=5,
)
# Add any assertions here to check the response
print(response)
except Exception as e:
pytest.fail(f"Error occurred: {e}")
# test_completion_openrouter2()
def test_completion_openrouter3():
try:
response = completion(
model="openrouter/mistralai/mistral-7b-instruct",
messages=messages,
max_tokens=5,
)
# Add any assertions here to check the response
print(response)
except Exception as e:
pytest.fail(f"Error occurred: {e}")
# test_completion_openrouter3()
def test_completion_hf_model_no_provider(): def test_completion_hf_model_no_provider():
try: try:
response = completion( response = completion(
@ -538,77 +511,33 @@ def test_completion_hf_model_no_provider():
# test_completion_hf_model_no_provider() # test_completion_hf_model_no_provider()
def test_completion_hf_model_no_provider_2(): # def test_completion_openai_azure_with_functions():
try: # function1 = [
response = completion( # {
model="meta-llama/Llama-2-70b-chat-hf", # "name": "get_current_weather",
messages=messages, # "description": "Get the current weather in a given location",
max_tokens=5, # "parameters": {
) # "type": "object",
# Add any assertions here to check the response # "properties": {
pytest.fail(f"Error occurred: {e}") # "location": {
except Exception as e: # "type": "string",
pass # "description": "The city and state, e.g. San Francisco, CA",
# },
# test_completion_hf_model_no_provider_2() # "unit": {"type": "string", "enum": ["celsius", "fahrenheit"]},
# },
def test_completion_openai_with_more_optional_params(): # "required": ["location"],
try: # },
response = completion( # }
model="gpt-3.5-turbo", # ]
messages=messages, # try:
temperature=0.5, # messages = [{"role": "user", "content": "What is the weather like in Boston?"}]
top_p=0.1, # response = completion(
n=2, # model="azure/chatgpt-functioncalling", messages=messages, functions=function1
max_tokens=150, # )
presence_penalty=0.5, # # Add any assertions here to check the response
frequency_penalty=-0.5, # print(response)
logit_bias={123: 5}, # except Exception as e:
user="ishaan_dev@berri.ai", # pytest.fail(f"Error occurred: {e}")
)
# Add any assertions here to check the response
print(response)
response_str = response["choices"][0]["message"]["content"]
response_str_2 = response.choices[0].message.content
print(response["choices"][0]["message"]["content"])
print(response.choices[0].message.content)
if type(response_str) != str:
pytest.fail(f"Error occurred: {e}")
if type(response_str_2) != str:
pytest.fail(f"Error occurred: {e}")
except Timeout as e:
pass
except Exception as e:
pytest.fail(f"Error occurred: {e}")
# test_completion_openai_with_more_optional_params()
def test_completion_openai_azure_with_functions():
function1 = [
{
"name": "get_current_weather",
"description": "Get the current weather in a given location",
"parameters": {
"type": "object",
"properties": {
"location": {
"type": "string",
"description": "The city and state, e.g. San Francisco, CA",
},
"unit": {"type": "string", "enum": ["celsius", "fahrenheit"]},
},
"required": ["location"],
},
}
]
try:
messages = [{"role": "user", "content": "What is the weather like in Boston?"}]
response = completion(
model="azure/chatgpt-functioncalling", messages=messages, functions=function1
)
# Add any assertions here to check the response
print(response)
except Exception as e:
pytest.fail(f"Error occurred: {e}")
# test_completion_openai_azure_with_functions() # test_completion_openai_azure_with_functions()