Skip to content

[pull] main from abetlen:main #118

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

Merged
pull merged 1 commit into from
Jun 8, 2026
+17 −3
Merged

[pull] main from abetlen:main #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions examples/server/configs/gpt-oss-120b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"tool_calls": {
"type": "array",
"x-regex-iterator": "(<\\|start\\|>assistant to=functions\\.\\w+<\\|channel\\|>commentary json<\\|message\\|>.*?<\\|call\\|>)",
"x-regex-iterator": "(<\\|start\\|>assistant<\\|channel\\|>commentary to=functions\\.\\w+ <\\|constrain\\|>json<\\|message\\|>.*?<\\|call\\|>)",
"items": {
"type": "object",
"properties": {
Expand All @@ -54,11 +54,11 @@
"properties": {
"name": {
"type": "string",
"x-regex": "^<\\|start\\|>assistant to=functions\\.(\\w+)<\\|channel\\|>commentary json<\\|message\\|>"
"x-regex": "^<\\|start\\|>assistant<\\|channel\\|>commentary to=functions\\.(\\w+) <\\|constrain\\|>json<\\|message\\|>"
},
"arguments": {
"type": "object",
"x-regex": "^<\\|start\\|>assistant to=functions\\.\\w+<\\|channel\\|>commentary json<\\|message\\|>(.*?)<\\|call\\|>$",
"x-regex": "^<\\|start\\|>assistant<\\|channel\\|>commentary to=functions\\.\\w+ <\\|constrain\\|>json<\\|message\\|>(.*?)<\\|call\\|>$",
"x-parser": "json",
"additionalProperties": true
}
Expand Down Expand Up @@ -410,7 +410,21 @@
"\n",
"{#- Generation prompt #}\n",
"{%- if add_generation_prompt -%}\n",
"{%- set forced_tool_name = none %}\n",
"{%- if tool_choice is mapping %}\n",
" {%- if tool_choice.function is defined and tool_choice.function.name is defined %}\n",
" {%- set forced_tool_name = tool_choice.function.name %}\n",
" {%- elif tool_choice.name is defined %}\n",
" {%- set forced_tool_name = tool_choice.name %}\n",
" {%- endif %}\n",
"{%- elif function_call is mapping and function_call.name is defined %}\n",
" {%- set forced_tool_name = function_call.name %}\n",
"{%- endif %}\n",
"{%- if forced_tool_name %}\n",
"{{- \"<|start|>assistant<|channel|>commentary to=functions.\" + forced_tool_name + \" <|constrain|>json<|message|>\" }}\n",
"{%- else %}\n",
"<|start|>assistant\n",
"{%- endif %}\n",
"{%- endif -%}"
]
}
Expand Down
Loading