Skip to content

Commit

Permalink
feat: add parameter "reasoning_effort" and Openai o3-mini (#13243)
Browse files Browse the repository at this point in the history
  • Loading branch information
k-zaku authored Feb 6, 2025
1 parent 5a685f7 commit 7203991
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 11 deletions.
10 changes: 5 additions & 5 deletions api/core/model_runtime/model_providers/openai/llm/llm.py
Original file line number Diff line number Diff line change
Expand Up @@ -619,9 +619,9 @@ def _chat_generate(
# clear illegal prompt messages
prompt_messages = self._clear_illegal_prompt_messages(model, prompt_messages)

# o1 compatibility
# o1, o3 compatibility
block_as_stream = False
if model.startswith("o1"):
if model.startswith(("o1", "o3")):
if "max_tokens" in model_parameters:
model_parameters["max_completion_tokens"] = model_parameters["max_tokens"]
del model_parameters["max_tokens"]
Expand Down Expand Up @@ -941,7 +941,7 @@ def _clear_illegal_prompt_messages(self, model: str, prompt_messages: list[Promp
]
)

if model.startswith("o1"):
if model.startswith(("o1", "o3")):
system_message_count = len([m for m in prompt_messages if isinstance(m, SystemPromptMessage)])
if system_message_count > 0:
new_prompt_messages = []
Expand Down Expand Up @@ -1053,7 +1053,7 @@ def _num_tokens_from_messages(
model = model.split(":")[1]

# Currently, we can use gpt4o to calculate chatgpt-4o-latest's token.
if model == "chatgpt-4o-latest" or model.startswith("o1"):
if model == "chatgpt-4o-latest" or model.startswith(("o1", "o3")):
model = "gpt-4o"

try:
Expand All @@ -1068,7 +1068,7 @@ def _num_tokens_from_messages(
tokens_per_message = 4
# if there's a name, the role is omitted
tokens_per_name = -1
elif model.startswith("gpt-3.5-turbo") or model.startswith("gpt-4") or model.startswith("o1"):
elif model.startswith("gpt-3.5-turbo") or model.startswith("gpt-4") or model.startswith(("o1", "o3")):
tokens_per_message = 3
tokens_per_name = 1
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@ parameter_rules:
default: 50000
min: 1
max: 50000
- name: reasoning_effort
label:
zh_Hans: 推理工作
en_US: reasoning_effort
type: string
help:
zh_Hans: 限制推理模型的推理工作
en_US: constrains effort on reasoning for reasoning models
required: false
options:
- low
- medium
- high
- name: response_format
label:
zh_Hans: 回复格式
Expand Down
13 changes: 13 additions & 0 deletions api/core/model_runtime/model_providers/openai/llm/o1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@ parameter_rules:
default: 50000
min: 1
max: 50000
- name: reasoning_effort
label:
zh_Hans: 推理工作
en_US: reasoning_effort
type: string
help:
zh_Hans: 限制推理模型的推理工作
en_US: constrains effort on reasoning for reasoning models
required: false
options:
- low
- medium
- high
- name: response_format
label:
zh_Hans: 回复格式
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@ parameter_rules:
default: 100000
min: 1
max: 100000
- name: reasoning_effort
label:
zh_Hans: 推理工作
en_US: reasoning_effort
type: string
help:
zh_Hans: 限制推理模型的推理工作
en_US: constrains effort on reasoning for reasoning models
required: false
options:
- low
- medium
- high
- name: response_format
label:
zh_Hans: 回复格式
Expand Down
13 changes: 13 additions & 0 deletions api/core/model_runtime/model_providers/openai/llm/o3-mini.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@ parameter_rules:
default: 100000
min: 1
max: 100000
- name: reasoning_effort
label:
zh_Hans: 推理工作
en_US: reasoning_effort
type: string
help:
zh_Hans: 限制推理模型的推理工作
en_US: constrains effort on reasoning for reasoning models
required: false
options:
- low
- medium
- high
- name: response_format
label:
zh_Hans: 回复格式
Expand Down
11 changes: 6 additions & 5 deletions api/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ nomic = "~3.1.2"
novita-client = "~0.5.7"
numpy = "~1.26.4"
oci = "~2.135.1"
openai = "~1.52.0"
openai = "~1.61.0"
openpyxl = "~3.1.5"
opik = "~1.3.4"
pandas = { version = "~2.2.2", extras = ["performance", "excel"] }
Expand Down

0 comments on commit 7203991

Please sign in to comment.