feat: support set system_prompt for theme air & berry

This commit is contained in:
JustSong
2024-11-10 15:09:02 +08:00
parent 6eb0770a89
commit 833fa7ad6f
3 changed files with 278 additions and 240 deletions

View File

@@ -43,6 +43,7 @@ const EditChannel = (props) => {
base_url: '', base_url: '',
other: '', other: '',
model_mapping: '', model_mapping: '',
system_prompt: '',
models: [], models: [],
auto_ban: 1, auto_ban: 1,
groups: ['default'] groups: ['default']
@@ -304,163 +305,163 @@ const EditChannel = (props) => {
width={isMobile() ? '100%' : 600} width={isMobile() ? '100%' : 600}
> >
<Spin spinning={loading}> <Spin spinning={loading}>
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>类型</Typography.Text> <Typography.Text strong>类型</Typography.Text>
</div> </div>
<Select <Select
name='type' name='type'
required required
optionList={CHANNEL_OPTIONS} optionList={CHANNEL_OPTIONS}
value={inputs.type} value={inputs.type}
onChange={value => handleInputChange('type', value)} onChange={value => handleInputChange('type', value)}
style={{width: '50%'}} style={{ width: '50%' }}
/> />
{ {
inputs.type === 3 && ( inputs.type === 3 && (
<> <>
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Banner type={"warning"} description={ <Banner type={"warning"} description={
<> <>
注意<strong>模型部署名称必须和模型名称保持一致</strong> One API 注意<strong>模型部署名称必须和模型名称保持一致</strong> One API
model model
参数替换为你的部署名称模型名称中的点会被剔除<a target='_blank' 参数替换为你的部署名称模型名称中的点会被剔除<a target='_blank'
href='https://github.com/songquanpeng/one-api/issues/133?notification_referrer_id=NT_kwDOAmJSYrM2NjIwMzI3NDgyOjM5OTk4MDUw#issuecomment-1571602271'>图片演示</a> href='https://github.com/songquanpeng/one-api/issues/133?notification_referrer_id=NT_kwDOAmJSYrM2NjIwMzI3NDgyOjM5OTk4MDUw#issuecomment-1571602271'>图片演示</a>
</> </>
}> }>
</Banner> </Banner>
</div> </div>
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>AZURE_OPENAI_ENDPOINT</Typography.Text> <Typography.Text strong>AZURE_OPENAI_ENDPOINT</Typography.Text>
</div> </div>
<Input <Input
label='AZURE_OPENAI_ENDPOINT' label='AZURE_OPENAI_ENDPOINT'
name='azure_base_url' name='azure_base_url'
placeholder={'请输入 AZURE_OPENAI_ENDPOINT例如https://docs-test-001.openai.azure.com'} placeholder={'请输入 AZURE_OPENAI_ENDPOINT例如https://docs-test-001.openai.azure.com'}
onChange={value => { onChange={value => {
handleInputChange('base_url', value) handleInputChange('base_url', value)
}} }}
value={inputs.base_url} value={inputs.base_url}
autoComplete='new-password' autoComplete='new-password'
/> />
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>默认 API 版本</Typography.Text> <Typography.Text strong>默认 API 版本</Typography.Text>
</div> </div>
<Input <Input
label='默认 API 版本' label='默认 API 版本'
name='azure_other' name='azure_other'
placeholder={'请输入默认 API 版本例如2024-03-01-preview该配置可以被实际的请求查询参数所覆盖'} placeholder={'请输入默认 API 版本例如2024-03-01-preview该配置可以被实际的请求查询参数所覆盖'}
onChange={value => { onChange={value => {
handleInputChange('other', value) handleInputChange('other', value)
}} }}
value={inputs.other} value={inputs.other}
autoComplete='new-password' autoComplete='new-password'
/> />
</> </>
) )
} }
{ {
inputs.type === 8 && ( inputs.type === 8 && (
<> <>
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>Base URL</Typography.Text> <Typography.Text strong>Base URL</Typography.Text>
</div> </div>
<Input <Input
name='base_url' name='base_url'
placeholder={'请输入自定义渠道的 Base URL'} placeholder={'请输入自定义渠道的 Base URL'}
onChange={value => { onChange={value => {
handleInputChange('base_url', value) handleInputChange('base_url', value)
}} }}
value={inputs.base_url} value={inputs.base_url}
autoComplete='new-password' autoComplete='new-password'
/> />
</> </>
) )
} }
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>名称</Typography.Text> <Typography.Text strong>名称</Typography.Text>
</div> </div>
<Input <Input
required required
name='name' name='name'
placeholder={'请为渠道命名'} placeholder={'请为渠道命名'}
onChange={value => { onChange={value => {
handleInputChange('name', value) handleInputChange('name', value)
}} }}
value={inputs.name} value={inputs.name}
autoComplete='new-password' autoComplete='new-password'
/> />
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>分组</Typography.Text> <Typography.Text strong>分组</Typography.Text>
</div> </div>
<Select <Select
placeholder={'请选择可以使用该渠道的分组'} placeholder={'请选择可以使用该渠道的分组'}
name='groups' name='groups'
required required
multiple multiple
selection selection
allowAdditions allowAdditions
additionLabel={'请在系统设置页面编辑分组倍率以添加新的分组:'} additionLabel={'请在系统设置页面编辑分组倍率以添加新的分组:'}
onChange={value => { onChange={value => {
handleInputChange('groups', value) handleInputChange('groups', value)
}} }}
value={inputs.groups} value={inputs.groups}
autoComplete='new-password' autoComplete='new-password'
optionList={groupOptions} optionList={groupOptions}
/> />
{ {
inputs.type === 18 && ( inputs.type === 18 && (
<> <>
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>模型版本</Typography.Text> <Typography.Text strong>模型版本</Typography.Text>
</div> </div>
<Input <Input
name='other' name='other'
placeholder={'请输入星火大模型版本注意是接口地址中的版本号例如v2.1'} placeholder={'请输入星火大模型版本注意是接口地址中的版本号例如v2.1'}
onChange={value => { onChange={value => {
handleInputChange('other', value) handleInputChange('other', value)
}} }}
value={inputs.other} value={inputs.other}
autoComplete='new-password' autoComplete='new-password'
/> />
</> </>
) )
} }
{ {
inputs.type === 21 && ( inputs.type === 21 && (
<> <>
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>知识库 ID</Typography.Text> <Typography.Text strong>知识库 ID</Typography.Text>
</div> </div>
<Input <Input
label='知识库 ID' label='知识库 ID'
name='other' name='other'
placeholder={'请输入知识库 ID例如123456'} placeholder={'请输入知识库 ID例如123456'}
onChange={value => { onChange={value => {
handleInputChange('other', value) handleInputChange('other', value)
}} }}
value={inputs.other} value={inputs.other}
autoComplete='new-password' autoComplete='new-password'
/> />
</> </>
) )
} }
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>模型</Typography.Text> <Typography.Text strong>模型</Typography.Text>
</div> </div>
<Select <Select
placeholder={'请选择该渠道所支持的模型'} placeholder={'请选择该渠道所支持的模型'}
name='models' name='models'
required required
multiple multiple
selection selection
onChange={value => { onChange={value => {
handleInputChange('models', value) handleInputChange('models', value)
}} }}
value={inputs.models} value={inputs.models}
autoComplete='new-password' autoComplete='new-password'
optionList={modelOptions} optionList={modelOptions}
/> />
<div style={{lineHeight: '40px', marginBottom: '12px'}}> <div style={{ lineHeight: '40px', marginBottom: '12px' }}>
<Space> <Space>
<Button type='primary' onClick={() => { <Button type='primary' onClick={() => {
handleInputChange('models', basicModels); handleInputChange('models', basicModels);
@@ -473,28 +474,41 @@ const EditChannel = (props) => {
}}>清除所有模型</Button> }}>清除所有模型</Button>
</Space> </Space>
<Input <Input
addonAfter={ addonAfter={
<Button type='primary' onClick={addCustomModel}>填入</Button> <Button type='primary' onClick={addCustomModel}>填入</Button>
} }
placeholder='输入自定义模型名称' placeholder='输入自定义模型名称'
value={customModel} value={customModel}
onChange={(value) => { onChange={(value) => {
setCustomModel(value.trim()); setCustomModel(value.trim());
}} }}
/> />
</div> </div>
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>模型重定向</Typography.Text> <Typography.Text strong>模型重定向</Typography.Text>
</div> </div>
<TextArea <TextArea
placeholder={`此项可选,用于修改请求体中的模型名称,为一个 JSON 字符串,键为请求中模型名称,值为要替换的模型名称,例如:\n${JSON.stringify(MODEL_MAPPING_EXAMPLE, null, 2)}`} placeholder={`此项可选,用于修改请求体中的模型名称,为一个 JSON 字符串,键为请求中模型名称,值为要替换的模型名称,例如:\n${JSON.stringify(MODEL_MAPPING_EXAMPLE, null, 2)}`}
name='model_mapping' name='model_mapping'
onChange={value => { onChange={value => {
handleInputChange('model_mapping', value) handleInputChange('model_mapping', value)
}} }}
autosize autosize
value={inputs.model_mapping} value={inputs.model_mapping}
autoComplete='new-password' autoComplete='new-password'
/>
<div style={{ marginTop: 10 }}>
<Typography.Text strong>系统提示词</Typography.Text>
</div>
<TextArea
placeholder={`此项可选,用于强制设置给定的系统提示词,请配合自定义模型 & 模型重定向使用,首先创建一个唯一的自定义模型名称并在上面填入,之后将该自定义模型重定向映射到该渠道一个原生支持的模型`}
name='system_prompt'
onChange={value => {
handleInputChange('system_prompt', value)
}}
autosize
value={inputs.system_prompt}
autoComplete='new-password'
/> />
<Typography.Text style={{ <Typography.Text style={{
color: 'rgba(var(--semi-blue-5), 1)', color: 'rgba(var(--semi-blue-5), 1)',
@@ -507,116 +521,116 @@ const EditChannel = (props) => {
}> }>
填入模板 填入模板
</Typography.Text> </Typography.Text>
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>密钥</Typography.Text> <Typography.Text strong>密钥</Typography.Text>
</div> </div>
{ {
batch ? batch ?
<TextArea <TextArea
label='密钥' label='密钥'
name='key' name='key'
required required
placeholder={'请输入密钥,一行一个'} placeholder={'请输入密钥,一行一个'}
onChange={value => { onChange={value => {
handleInputChange('key', value) handleInputChange('key', value)
}} }}
value={inputs.key} value={inputs.key}
style={{minHeight: 150, fontFamily: 'JetBrains Mono, Consolas'}} style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
autoComplete='new-password' autoComplete='new-password'
/> />
: :
<Input <Input
label='密钥' label='密钥'
name='key' name='key'
required required
placeholder={type2secretPrompt(inputs.type)} placeholder={type2secretPrompt(inputs.type)}
onChange={value => { onChange={value => {
handleInputChange('key', value) handleInputChange('key', value)
}} }}
value={inputs.key} value={inputs.key}
autoComplete='new-password' autoComplete='new-password'
/> />
} }
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>组织</Typography.Text> <Typography.Text strong>组织</Typography.Text>
</div> </div>
<Input <Input
label='组织,可选,不填则为默认组织' label='组织,可选,不填则为默认组织'
name='openai_organization' name='openai_organization'
placeholder='请输入组织org-xxx' placeholder='请输入组织org-xxx'
onChange={value => { onChange={value => {
handleInputChange('openai_organization', value) handleInputChange('openai_organization', value)
}} }}
value={inputs.openai_organization} value={inputs.openai_organization}
/> />
<div style={{marginTop: 10, display: 'flex'}}> <div style={{ marginTop: 10, display: 'flex' }}>
<Space> <Space>
<Checkbox <Checkbox
name='auto_ban' name='auto_ban'
checked={autoBan} checked={autoBan}
onChange={ onChange={
() => { () => {
setAutoBan(!autoBan); setAutoBan(!autoBan);
} }
} }
// onChange={handleInputChange} // onChange={handleInputChange}
/> />
<Typography.Text <Typography.Text
strong>是否自动禁用仅当自动禁用开启时有效关闭后不会自动禁用该渠道</Typography.Text> strong>是否自动禁用仅当自动禁用开启时有效关闭后不会自动禁用该渠道</Typography.Text>
</Space> </Space>
</div> </div>
{ {
!isEdit && ( !isEdit && (
<div style={{marginTop: 10, display: 'flex'}}> <div style={{ marginTop: 10, display: 'flex' }}>
<Space> <Space>
<Checkbox <Checkbox
checked={batch} checked={batch}
label='批量创建' label='批量创建'
name='batch' name='batch'
onChange={() => setBatch(!batch)} onChange={() => setBatch(!batch)}
/> />
<Typography.Text strong>批量创建</Typography.Text> <Typography.Text strong>批量创建</Typography.Text>
</Space> </Space>
</div>
)
}
{
inputs.type !== 3 && inputs.type !== 8 && inputs.type !== 22 && (
<>
<div style={{ marginTop: 10 }}>
<Typography.Text strong>代理</Typography.Text>
</div> </div>
) <Input
label='代理'
name='base_url'
placeholder={'此项可选,用于通过代理站来进行 API 调用'}
onChange={value => {
handleInputChange('base_url', value)
}}
value={inputs.base_url}
autoComplete='new-password'
/>
</>
)
} }
{ {
inputs.type !== 3 && inputs.type !== 8 && inputs.type !== 22 && ( inputs.type === 22 && (
<> <>
<div style={{marginTop: 10}}> <div style={{ marginTop: 10 }}>
<Typography.Text strong>代理</Typography.Text> <Typography.Text strong>私有部署地址</Typography.Text>
</div> </div>
<Input <Input
label='代理' name='base_url'
name='base_url' placeholder={'请输入私有部署地址格式为https://fastgpt.run/api/openapi'}
placeholder={'此项可选,用于通过代理站来进行 API 调用'} onChange={value => {
onChange={value => { handleInputChange('base_url', value)
handleInputChange('base_url', value) }}
}} value={inputs.base_url}
value={inputs.base_url} autoComplete='new-password'
autoComplete='new-password' />
/> </>
</> )
)
}
{
inputs.type === 22 && (
<>
<div style={{marginTop: 10}}>
<Typography.Text strong>私有部署地址</Typography.Text>
</div>
<Input
name='base_url'
placeholder={'请输入私有部署地址格式为https://fastgpt.run/api/openapi'}
onChange={value => {
handleInputChange('base_url', value)
}}
value={inputs.base_url}
autoComplete='new-password'
/>
</>
)
} }
</Spin> </Spin>

View File

@@ -595,6 +595,28 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
<FormHelperText id="helper-tex-channel-model_mapping-label"> {inputPrompt.model_mapping} </FormHelperText> <FormHelperText id="helper-tex-channel-model_mapping-label"> {inputPrompt.model_mapping} </FormHelperText>
)} )}
</FormControl> </FormControl>
<FormControl fullWidth error={Boolean(touched.system_prompt && errors.system_prompt)} sx={{ ...theme.typography.otherInput }}>
{/* <InputLabel htmlFor="channel-model_mapping-label">{inputLabel.model_mapping}</InputLabel> */}
<TextField
multiline
id="channel-system_prompt-label"
label={inputLabel.system_prompt}
value={values.system_prompt}
name="system_prompt"
onBlur={handleBlur}
onChange={handleChange}
aria-describedby="helper-text-channel-system_prompt-label"
minRows={5}
placeholder={inputPrompt.system_prompt}
/>
{touched.system_prompt && errors.system_prompt ? (
<FormHelperText error id="helper-tex-channel-system_prompt-label">
{errors.system_prompt}
</FormHelperText>
) : (
<FormHelperText id="helper-tex-channel-system_prompt-label"> {inputPrompt.system_prompt} </FormHelperText>
)}
</FormControl>
<DialogActions> <DialogActions>
<Button onClick={onCancel}>取消</Button> <Button onClick={onCancel}>取消</Button>
<Button disableElevation disabled={isSubmitting} type="submit" variant="contained" color="primary"> <Button disableElevation disabled={isSubmitting} type="submit" variant="contained" color="primary">

View File

@@ -18,6 +18,7 @@ const defaultConfig = {
other: '其他参数', other: '其他参数',
models: '模型', models: '模型',
model_mapping: '模型映射关系', model_mapping: '模型映射关系',
system_prompt: '系统提示词',
groups: '用户组', groups: '用户组',
config: null config: null
}, },
@@ -30,6 +31,7 @@ const defaultConfig = {
models: '请选择该渠道所支持的模型', models: '请选择该渠道所支持的模型',
model_mapping: model_mapping:
'请输入要修改的模型映射关系格式为api请求模型ID:实际转发给渠道的模型ID使用JSON数组表示例如{"gpt-3.5": "gpt-35"}', '请输入要修改的模型映射关系格式为api请求模型ID:实际转发给渠道的模型ID使用JSON数组表示例如{"gpt-3.5": "gpt-35"}',
system_prompt:"此项可选,用于强制设置给定的系统提示词,请配合自定义模型 & 模型重定向使用,首先创建一个唯一的自定义模型名称并在上面填入,之后将该自定义模型重定向映射到该渠道一个原生支持的模型此项可选,用于强制设置给定的系统提示词,请配合自定义模型 & 模型重定向使用,首先创建一个唯一的自定义模型名称并在上面填入,之后将该自定义模型重定向映射到该渠道一个原生支持的模型",
groups: '请选择该渠道所支持的用户组', groups: '请选择该渠道所支持的用户组',
config: null config: null
}, },