Skip to content

Commit d381e4d

Browse files
ahnafafahnafaf
committed
Add functions to OpenAI-o3 model (builds on PR chatboxai#1818)
Implemented support for custom functions in the OpenAI O3 model settings. This feature extends the work done in PR chatboxai#1818, adding UI components for adding and editing functions, as well as integrating with API calls.
1 parent 3e66d04 commit d381e4d

File tree

9 files changed

+12908
-70
lines changed

9 files changed

+12908
-70
lines changed

‎package-lock.json

+748
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎release/app/yarn.lock

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
3+
4+

‎src/renderer/components/AddFunction.tsx

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// AddFunction.tsx
2+
import React, { useState } from 'react'
3+
import { Button, TextField, Typography, Box, List, ListItem, IconButton } from '@mui/material'
4+
import DeleteIcon from '@mui/icons-material/Delete'
5+
import { useTranslation } from 'react-i18next'
6+
7+
export interface AddFunctionType {
8+
name: string;
9+
description: string;
10+
}
11+
12+
export interface Props {
13+
functions: AddFunctionType[]
14+
onFunctionsChange: (functions: AddFunctionType[]) => void
15+
}
16+
17+
18+
export default function AddFunction(props: Props) {
19+
const { t } = useTranslation()
20+
const [newFunctionName, setNewFunctionName] = useState('')
21+
const [newFunctionDescription, setNewFunctionDescription] = useState('')
22+
23+
const handleAddFunction = () => {
24+
if (newFunctionName && newFunctionDescription) {
25+
const newFunction: AddFunctionType = {
26+
name: newFunctionName,
27+
description: newFunctionDescription,
28+
}
29+
props.onFunctionsChange([...props.functions, newFunction])
30+
setNewFunctionName('')
31+
setNewFunctionDescription('')
32+
}
33+
}
34+
35+
const handleRemoveFunction = (index: number) => {
36+
const updatedFunctions = props.functions.filter((_, i) => i !== index)
37+
props.onFunctionsChange(updatedFunctions)
38+
}
39+
40+
return (
41+
<Box sx={{ mt: 2 }}>
42+
<Typography variant="subtitle1" gutterBottom>
43+
{t('Functions')}
44+
</Typography>
45+
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
46+
<TextField
47+
label={t('Function Name')}
48+
value={newFunctionName}
49+
onChange={(e) => setNewFunctionName(e.target.value)}
50+
fullWidth
51+
size="small"
52+
/>
53+
<TextField
54+
label={t('Function Description')}
55+
value={newFunctionDescription}
56+
onChange={(e) => setNewFunctionDescription(e.target.value)}
57+
fullWidth
58+
size="small"
59+
multiline
60+
rows={2}
61+
/>
62+
<Button variant="contained" onClick={handleAddFunction} disabled={!newFunctionName || !newFunctionDescription}>
63+
{t('Add Function')}
64+
</Button>
65+
</Box>
66+
<List>
67+
{props.functions.map((func, index) => (
68+
<ListItem key={index} secondaryAction={
69+
<IconButton edge="end" aria-label="delete" onClick={() => handleRemoveFunction(index)}>
70+
<DeleteIcon />
71+
</IconButton>
72+
}>
73+
<Typography>
74+
<strong>{func.name}</strong>: {func.description}
75+
</Typography>
76+
</ListItem>
77+
))}
78+
</List>
79+
</Box>
80+
)
81+
}

‎src/renderer/components/OpenAIFunctionAddition.tsx

Whitespace-only changes.

‎src/renderer/packages/models/openai.ts

+41
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,46 @@ export default class OpenAI extends Base {
129129
}
130130

131131

132+
133+
async callChatCompletionWithFunctions(
134+
rawMessages: Message[],
135+
functions: any[], // array of function definitions
136+
signal?: AbortSignal,
137+
onResultChange?: onResultChange
138+
): Promise<string> {
139+
// Determine the effective model
140+
const model = this.options.model === 'custom-model'
141+
? this.options.openaiCustomModel || ''
142+
: this.options.model;
143+
144+
// Check if the model supports functions
145+
if (!model.startsWith('o3')) {
146+
throw new Error('Function calling is only supported by models starting with o3');
147+
}
148+
149+
// Inject metadata to system prompt
150+
rawMessages = injectModelSystemPrompt(model, rawMessages);
151+
152+
// Choose the proper message format
153+
const messages = await populateGPTMessage(rawMessages);
154+
155+
// Build the payload
156+
const payload: Record<string, any> = {
157+
model,
158+
messages,
159+
functions,
160+
temperature: this.options.temperature,
161+
top_p: this.options.topP,
162+
};
163+
164+
// Add reasoning_effort
165+
payload.reasoning_effort = this.options.openaiReasoningEffort;
166+
167+
// Make the non-streaming API call
168+
return this.requestChatCompletionsNotStream(payload, signal, onResultChange);
169+
}
170+
171+
132172
getHeaders() {
133173
const headers: Record<string, string> = {
134174
Authorization: `Bearer ${this.options.openaiKey}`,
@@ -332,3 +372,4 @@ export interface OpenAIMessage {
332372
content: string
333373
name?: string
334374
}
375+

‎src/renderer/pages/SettingDialog/ModelSettingTab.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@ import OpenAISetting from './OpenAISetting'
44
import ChatboxAISetting from './ChatboxAISetting'
55
import AIProviderSelect from '../../components/AIProviderSelect'
66
import { OllamaHostInput, OllamaModelSelect } from './OllamaSetting'
7-
import { LMStudioHostInput, LMStudioModelSelect } from './LMStudioSetting'
7+
import { LMStudioHostInput, LMStudioModelSelect } from './LMStudioSetting'
88
import SiliconFlowSetting from './SiliconFlowSetting'
99
import MaxContextMessageCountSlider from '@/components/MaxContextMessageCountSlider'
1010
import TemperatureSlider from '@/components/TemperatureSlider'
1111
import ClaudeSetting from './ClaudeSetting'
12+
import AddFunction, { AddFunctionType } from '../../components/AddFunction'
1213

1314
interface ModelConfigProps {
1415
settingsEdit: ModelSettings
1516
setSettingsEdit: (settings: ModelSettings) => void
1617
}
1718

19+
1820
export default function ModelSettingTab(props: ModelConfigProps) {
1921
const { settingsEdit, setSettingsEdit } = props
2022
return (
@@ -25,7 +27,10 @@ export default function ModelSettingTab(props: ModelConfigProps) {
2527
/>
2628
<Divider sx={{ marginTop: '10px', marginBottom: '24px' }} />
2729
{settingsEdit.aiProvider === ModelProvider.OpenAI && (
28-
<OpenAISetting settingsEdit={settingsEdit} setSettingsEdit={setSettingsEdit} />
30+
<OpenAISetting
31+
settingsEdit={settingsEdit}
32+
setSettingsEdit={(settings: ModelSettings) => setSettingsEdit(settings)}
33+
/>
2934
)}
3035
{settingsEdit.aiProvider === ModelProvider.ChatboxAI && (
3136
<ChatboxAISetting settingsEdit={settingsEdit} setSettingsEdit={setSettingsEdit} />

‎src/renderer/pages/SettingDialog/OpenAISetting.tsx

+75-67
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import PasswordTextField from '../../components/PasswordTextField'
99
import MaxContextMessageCountSlider from '../../components/MaxContextMessageCountSlider'
1010
import OpenAIModelSelect from '../../components/OpenAIModelSelect'
1111
import TextFieldReset from '@/components/TextFieldReset'
12+
import AddFunction, { AddFunctionType } from '../../components/AddFunction'
1213

1314
interface ModelConfigProps {
1415
settingsEdit: ModelSettings
@@ -22,77 +23,84 @@ export default function OpenAISetting(props: ModelConfigProps) {
2223
const isReasoningModel = model?.startsWith('o') &&
2324
!model?.startsWith('o1-preview') &&
2425
!model?.startsWith('o1-mini');
25-
26-
return (
27-
<Box>
28-
<PasswordTextField
29-
label={t('api key')}
30-
value={settingsEdit.openaiKey}
31-
setValue={(value) => {
32-
setSettingsEdit({ ...settingsEdit, openaiKey: value })
26+
const isFunctionCallingSupported = model?.startsWith('o3');
27+
return (
28+
<Box>
29+
<PasswordTextField
30+
label={t('api key')}
31+
value={settingsEdit.openaiKey}
32+
setValue={(value) => {
33+
setSettingsEdit({ ...settingsEdit, openaiKey: value })
34+
}}
35+
placeholder="sk-xxxxxxxxxxxxxxxxxxxxxxxx"
36+
/>
37+
<>
38+
<TextFieldReset
39+
margin="dense"
40+
label={t('api host')}
41+
type="text"
42+
fullWidth
43+
variant="outlined"
44+
value={settingsEdit.apiHost}
45+
placeholder="https://api.openai.com"
46+
defaultValue='https://api.openai.com'
47+
onValueChange={(value) => {
48+
value = value.trim()
49+
if (value.length > 4 && !value.startsWith('http')) {
50+
value = 'https://' + value
51+
}
52+
setSettingsEdit({ ...settingsEdit, apiHost: value })
3353
}}
34-
placeholder="sk-xxxxxxxxxxxxxxxxxxxxxxxx"
3554
/>
36-
<>
37-
<TextFieldReset
38-
margin="dense"
39-
label={t('api host')}
40-
type="text"
41-
fullWidth
42-
variant="outlined"
43-
value={settingsEdit.apiHost}
44-
placeholder="https://api.openai.com"
45-
defaultValue='https://api.openai.com'
46-
onValueChange={(value) => {
47-
value = value.trim()
48-
if (value.length > 4 && !value.startsWith('http')) {
49-
value = 'https://' + value
50-
}
51-
setSettingsEdit({ ...settingsEdit, apiHost: value })
52-
}}
55+
</>
56+
<Accordion>
57+
<AccordionSummary aria-controls="panel1a-content">
58+
<Typography>
59+
{t('model')} & {t('token')}{' '}
60+
</Typography>
61+
</AccordionSummary>
62+
<AccordionDetails>
63+
<OpenAIModelSelect
64+
model={settingsEdit.model}
65+
openaiCustomModel={settingsEdit.openaiCustomModel}
66+
onChange={(model, openaiCustomModel) =>
67+
setSettingsEdit({ ...settingsEdit, model, openaiCustomModel })
68+
}
5369
/>
54-
</>
55-
<Accordion>
56-
<AccordionSummary aria-controls="panel1a-content">
57-
<Typography>
58-
{t('model')} & {t('token')}{' '}
59-
</Typography>
60-
</AccordionSummary>
61-
<AccordionDetails>
62-
<OpenAIModelSelect
63-
model={settingsEdit.model}
64-
openaiCustomModel={settingsEdit.openaiCustomModel}
65-
onChange={(model, openaiCustomModel) =>
66-
setSettingsEdit({ ...settingsEdit, model, openaiCustomModel })
67-
}
70+
71+
{isReasoningModel && (
72+
<ReasoningEffortSelect
73+
value={settingsEdit.openaiReasoningEffort}
74+
onChange={(value) => setSettingsEdit({ ...settingsEdit, openaiReasoningEffort: value })}
6875
/>
76+
)}
6977

70-
{isReasoningModel && (
71-
<ReasoningEffortSelect
72-
value={settingsEdit.openaiReasoningEffort}
73-
onChange={(value) => setSettingsEdit({ ...settingsEdit, openaiReasoningEffort: value })}
78+
{!model?.startsWith('o') && (
79+
<>
80+
<TemperatureSlider
81+
value={settingsEdit.temperature}
82+
onChange={(value) => setSettingsEdit({ ...settingsEdit, temperature: value })}
7483
/>
75-
)}
84+
<TopPSlider
85+
topP={settingsEdit.topP}
86+
setTopP={(v) => setSettingsEdit({ ...settingsEdit, topP: v })}
87+
/>
88+
</>
89+
)}
90+
91+
<MaxContextMessageCountSlider
92+
value={settingsEdit.openaiMaxContextMessageCount}
93+
onChange={(v) => setSettingsEdit({ ...settingsEdit, openaiMaxContextMessageCount: v })}
94+
/>
7695

77-
{!model?.startsWith('o') && (
78-
<>
79-
<TemperatureSlider
80-
value={settingsEdit.temperature}
81-
onChange={(value) => setSettingsEdit({ ...settingsEdit, temperature: value })}
82-
/>
83-
<TopPSlider
84-
topP={settingsEdit.topP}
85-
setTopP={(v) => setSettingsEdit({ ...settingsEdit, topP: v })}
86-
/>
87-
</>
88-
)}
89-
90-
<MaxContextMessageCountSlider
91-
value={settingsEdit.openaiMaxContextMessageCount}
92-
onChange={(v) => setSettingsEdit({ ...settingsEdit, openaiMaxContextMessageCount: v })}
93-
/>
94-
</AccordionDetails>
95-
</Accordion>
96-
</Box>
97-
)
98-
}
96+
{model?.startsWith('o3') && (
97+
<AddFunction
98+
functions={settingsEdit.functions || []}
99+
onFunctionsChange={(functions: AddFunctionType[]) => setSettingsEdit({ ...settingsEdit, functions })}
100+
/>
101+
)}
102+
</AccordionDetails>
103+
</Accordion>
104+
</Box>
105+
)
106+
}

‎src/shared/types.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { v4 as uuidv4 } from 'uuid'
22
import { Model } from '../renderer/packages/models/openai'
33
import * as siliconflow from '../renderer/packages/models/siliconflow'
44
import { ClaudeModel } from '../renderer/packages/models/claude'
5+
import { AddFunctionType } from '../renderer/components/AddFunction'
56

67
export const MessageRoleEnum = {
78
System: 'system',
@@ -79,7 +80,7 @@ export interface ModelSettings {
7980
apiHost: string
8081
model: Model | 'custom-model'
8182
openaiCustomModel?: string
82-
83+
functions?: AddFunctionType[]
8384
//LMStudio
8485
lmStudioHost: string
8586
lmStudioModel: string

0 commit comments

Comments
 (0)