chore: simplify model yaml (#308)

This commit is contained in:
N3ko 2025-07-31 12:15:55 +08:00 committed by GitHub
parent 397912fccf
commit 977f2c423a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
24 changed files with 37 additions and 156 deletions

View File

@ -106,7 +106,7 @@ func modelDo2To(model *modelmgr.Model, locale i18n.Locale) (*developer_api.Model
PriceOut: 0,
SystemPromptLimit: nil,
},
ModelName: mm.Name,
ModelName: model.Name,
ModelClassName: mm.Protocol.TOModelClass().String(),
IsOffline: mm.Status != modelmgr.StatusInUse,
ModelParams: mps,

View File

@ -259,7 +259,7 @@ func toModelDetail(m *modelmgr.Model) *playground.ModelDetail {
return &playground.ModelDetail{
Name: ptr.Of(m.Name),
ModelName: ptr.Of(m.Meta.Name),
ModelName: ptr.Of(m.Name),
ModelID: ptr.Of(m.ID),
ModelFamily: ptr.Of(int64(mm.Protocol.TOModelClass())),
ModelIconURL: ptr.Of(m.IconURL),

View File

@ -90,7 +90,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: Doubao
protocol: ark
capability:
function_call: true
@ -107,10 +106,10 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -118,16 +117,10 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -66,7 +66,6 @@ default_parameters:
zh: 生成多样性
en: Generation diversity
meta:
name: doubao-1.5-lite
protocol: ark
capability:
function_call: true
@ -82,10 +81,10 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -93,16 +92,10 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -66,7 +66,6 @@ default_parameters:
zh: 生成多样性
en: Generation diversity
meta:
name: doubao-1.5-pro-256k
protocol: ark
capability:
function_call: true
@ -82,10 +81,10 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -93,16 +92,11 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -66,7 +66,6 @@ default_parameters:
zh: 生成多样性
en: Generation diversity
meta:
name: doubao-1.5-pro-32k
protocol: ark
capability:
function_call: true
@ -82,10 +81,10 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -93,16 +92,11 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -88,7 +88,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: doubao-1.5-thinking-pro
protocol: ark
capability:
function_call: true
@ -105,10 +104,10 @@ meta:
reasoning: true
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -116,16 +115,11 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -88,7 +88,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: doubao-1.5-thinking-vision-pro
protocol: ark
capability:
function_call: true
@ -106,10 +105,10 @@ meta:
reasoning: true
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -117,16 +116,11 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -88,7 +88,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: doubao-1.5-vision-lite
protocol: ark
capability:
function_call: false
@ -105,10 +104,10 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -116,16 +115,11 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -88,7 +88,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: doubao-1.5-vision-pro
protocol: ark
capability:
function_call: true
@ -106,10 +105,10 @@ meta:
reasoning: true
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -117,16 +116,11 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -88,7 +88,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: doubao-seed-1.6-flash
protocol: ark
capability:
function_call: true
@ -106,10 +105,10 @@ meta:
reasoning: true
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -117,16 +116,11 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -88,7 +88,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: doubao-seed-1.6-thinking
protocol: ark
capability:
function_call: true
@ -106,10 +105,10 @@ meta:
reasoning: true
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -117,16 +116,11 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -88,7 +88,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: doubao-seed-1.6
protocol: ark
capability:
function_call: true
@ -106,10 +105,10 @@ meta:
reasoning: true
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -117,16 +116,11 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -66,7 +66,6 @@ default_parameters:
zh: 生成多样性
en: Generation diversity
meta:
name: deepseek-r1-ve
protocol: ark
capability:
function_call: true
@ -82,10 +81,10 @@ meta:
reasoning: true
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -93,16 +92,11 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -66,7 +66,6 @@ default_parameters:
zh: 生成多样性
en: Generation diversity
meta:
name: deepseek-v3-ve
protocol: ark
capability:
function_call: true
@ -82,10 +81,10 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: ""
base_url: "https://ark.cn-beijing.volces.com/api/v3/"
api_key: ""
timeout: 0s
model: ""
model: "" # model_id / endpoint_id
temperature: 0.1
frequency_penalty: 0
presence_penalty: 0
@ -93,16 +92,11 @@ meta:
top_p: 0.7
top_k: 0
stop: []
openai: null
claude: null
ark:
region: ""
access_key: ""
secret_key: ""
retry_times: null
custom_header: {}
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -128,7 +128,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: test_model
protocol: test_protocol
capability:
function_call: true
@ -150,7 +149,7 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: https://localhost:1234/chat/completion
base_url: https://localhost:1234/v1
api_key: qweasdzxc
timeout: 10s
model: model_name
@ -164,7 +163,7 @@ meta:
- bye
enable_thinking: false
openai:
by_azure: true
by_azure: false
api_version: "2024-10-21"
response_format:
type: text

View File

@ -47,7 +47,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: Claude-3.5-Sonnet
protocol: claude
capability:
function_call: true
@ -64,7 +63,7 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: ""
base_url: "https://api.anthropic.com/v1/"
api_key: ""
timeout: 0s
model: ""
@ -75,16 +74,11 @@ meta:
top_p: 1
top_k: 0
stop: []
openai: null
claude:
by_bedrock: false
access_key: ""
secret_access_key: ""
session_token: ""
region: ""
ark: null
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -69,7 +69,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: DeepSeek-V3
protocol: deepseek
capability:
function_call: false
@ -85,7 +84,7 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: ""
base_url: "https://api.deepseek.com"
api_key: ""
timeout: 0s
model: ""
@ -96,12 +95,7 @@ meta:
top_p: 1
top_k: 0
stop: []
openai: null
claude: null
ark: null
deepseek:
response_format_type: text
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -88,7 +88,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: Gemini-2.5-Flash
protocol: gemini
capability:
function_call: true
@ -107,7 +106,7 @@ meta:
reasoning: true
prefill_response: true
conn_config:
base_url: ""
base_url: "https://generativelanguage.googleapis.com/"
api_key: ""
timeout: 0s
model: gemini-2.5-flash
@ -118,11 +117,6 @@ meta:
top_p: 1
top_k: 0
stop: []
openai: null
claude: null
ark: null
deepseek: null
qwen: null
gemini:
backend: 0
project: ""

View File

@ -47,7 +47,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: Gemma-3
protocol: ollama
capability:
function_call: true
@ -63,7 +62,7 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: ""
base_url: "http://host.docker.internal:11434"
api_key: ""
timeout: 0s
model: ""
@ -74,11 +73,5 @@ meta:
top_p: 0.95
top_k: 20
stop: []
openai: null
claude: null
ark: null
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -128,7 +128,6 @@ default_parameters:
zh: 输入及输出设置
en: Input and output settings
meta:
name: GPT-4o
protocol: openai
capability:
function_call: true
@ -145,7 +144,7 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: ""
base_url: "https://api.openai.com/v1"
api_key: ""
timeout: 0s
model: ""
@ -162,10 +161,5 @@ meta:
response_format:
type: text
jsonschema: null
claude: null
ark: null
deepseek: null
qwen: null
gemini: null
custom: {}
status: 0

View File

@ -66,7 +66,6 @@ default_parameters:
zh: 生成多样性
en: Generation diversity
meta:
name: Qwen3-32B
protocol: qwen
capability:
function_call: true
@ -82,7 +81,7 @@ meta:
reasoning: false
prefill_response: false
conn_config:
base_url: ""
base_url: "https://dashscope.aliyuncs.com/compatible-mode/v1"
api_key: ""
timeout: 0s
model: ""
@ -93,14 +92,9 @@ meta:
top_p: 1
top_k: 0
stop: []
openai: null
claude: null
ark: null
deepseek: null
qwen:
response_format:
type: text
jsonschema: null
gemini: null
custom: {}
status: 0

View File

@ -163,7 +163,7 @@ func BuildAgent(ctx context.Context, conf *Config) (r *AgentRunner, err error) {
isReActAgent = true
requireCheckpoint = true
if modelInfo.Meta.Capability != nil && !modelInfo.Meta.Capability.FunctionCall {
return nil, fmt.Errorf("model %v does not support function call", modelInfo.Meta.Name)
return nil, fmt.Errorf("model %v does not support function call", modelInfo.Name)
}
}

View File

@ -123,7 +123,6 @@ func (p *Parameter) GetString(tp DefaultType) (string, error) {
}
type ModelMeta struct {
Name string `yaml:"name"`
Protocol chatmodel.Protocol `yaml:"protocol"` // 模型通信协议
Capability *Capability `yaml:"capability"` // 模型能力
ConnConfig *chatmodel.Config `yaml:"conn_config"` // 模型连接配置