Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set GPT 4o as default and add O3 mini #3899

Merged
merged 3 commits into from
Feb 5, 2025
Merged

Set GPT 4o as default and add O3 mini #3899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5843c8
quick update to models
pablonyx Feb 5, 2025
ed284ae
add reqs
pablonyx Feb 5, 2025
b786e30
update version
pablonyx Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions backend/onyx/llm/chat_llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,11 @@ def _completion(
# For now, we don't support parallel tool calls
# NOTE: we can't pass this in if tools are not specified
# or else OpenAI throws an error
**({"parallel_tool_calls": False} if tools else {}),
**(
{"parallel_tool_calls": False}
if tools and self.config.model_name != "o3-mini"
else {}
), # TODO: remove once LITELLM has patched
**(
{"response_format": structured_response_format}
if structured_response_format
Expand Down Expand Up @@ -469,9 +473,7 @@ def _stream_implementation(
if LOG_DANSWER_MODEL_INTERACTIONS:
self.log_model_configs()

if (
DISABLE_LITELLM_STREAMING or self.config.model_name == "o1-2024-12-17"
): # TODO: remove once litellm supports streaming
if DISABLE_LITELLM_STREAMING:
yield self.invoke(prompt, tools, tool_choice, structured_response_format)
return

Expand Down
3 changes: 2 additions & 1 deletion backend/onyx/llm/llm_provider_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class WellKnownLLMProviderDescriptor(BaseModel):

OPENAI_PROVIDER_NAME = "openai"
OPEN_AI_MODEL_NAMES = [
"o3-mini",
"o1-mini",
"o1-preview",
"o1-2024-12-17",
Expand Down Expand Up @@ -91,7 +92,7 @@ def fetch_available_well_known_llms() -> list[WellKnownLLMProviderDescriptor]:
api_version_required=False,
custom_config_keys=[],
llm_names=fetch_models_for_provider(OPENAI_PROVIDER_NAME),
default_model="gpt-4",
default_model="gpt-4o",
default_fast_model="gpt-4o-mini",
),
WellKnownLLMProviderDescriptor(
Expand Down
4 changes: 2 additions & 2 deletions backend/requirements/default.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ langchainhub==0.1.21
langgraph==0.2.59
langgraph-checkpoint==2.0.5
langgraph-sdk==0.1.44
litellm==1.55.4
litellm==1.60.2
lxml==5.3.0
lxml_html_clean==0.2.2
llama-index==0.9.45
Expand All @@ -46,7 +46,7 @@ msal==1.28.0
nltk==3.8.1
Office365-REST-Python-Client==2.5.9
oauthlib==3.2.2
openai==1.55.3
openai==1.61.0
openpyxl==3.1.2
playwright==1.41.2
psutil==5.9.5
Expand Down
4 changes: 2 additions & 2 deletions backend/requirements/model_server.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cohere==5.6.1
fastapi==0.109.2
google-cloud-aiplatform==1.58.0
numpy==1.26.4
openai==1.55.3
openai==1.61.0
pydantic==2.8.2
retry==0.9.2
safetensors==0.4.2
Expand All @@ -12,5 +12,5 @@ torch==2.2.0
transformers==4.39.2
uvicorn==0.21.1
voyageai==0.2.3
litellm==1.55.4
litellm==1.60.2
sentry-sdk[fastapi,celery,starlette]==2.14.0
12 changes: 10 additions & 2 deletions web/src/lib/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,9 +643,10 @@ export const useUserGroups = (): {

const MODEL_DISPLAY_NAMES: { [key: string]: string } = {
// OpenAI models
"o3-mini": "O3 Mini",
"o1-mini": "O1 Mini",
"o1-preview": "O1 Preview",
"o1-2024-12-17": "O1",
o1: "O1",
"gpt-4": "GPT 4",
"gpt-4o": "GPT 4o",
"gpt-4o-2024-08-06": "GPT 4o (Structured Outputs)",
Expand Down Expand Up @@ -747,7 +748,14 @@ export function getDisplayNameForModel(modelName: string): string {
}

export const defaultModelsByProvider: { [name: string]: string[] } = {
openai: ["gpt-4", "gpt-4o", "gpt-4o-mini", "o1-mini", "o1-preview"],
openai: [
"gpt-4",
"gpt-4o",
"gpt-4o-mini",
"o3-mini",
"o1-mini",
"o1-preview",
],
bedrock: [
"meta.llama3-1-70b-instruct-v1:0",
"meta.llama3-1-8b-instruct-v1:0",
Expand Down
Loading