Skip to content

Commit 607eae3

Browse files
ssongliussongliu
authored
chore: Modify model account prompt information (#11815)
1 parent 66428c0 commit 607eae3

17 files changed

Lines changed: 186 additions & 237 deletions

File tree

‎agent/app/dto/agents.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ type ProviderModelInfo struct {
103103
}
104104

105105
type ProviderInfo struct {
106+
Sort uint `json:"-"`
106107
Provider string `json:"provider"`
107108
BaseURL string `json:"baseUrl"`
108109
Models []ProviderModelInfo `json:"models"`

‎agent/app/service/agents.go‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"fmt"
99
"net/http"
1010
"path"
11+
"sort"
1112
"strconv"
1213
"strings"
1314
"time"
@@ -205,11 +206,15 @@ func (a AgentService) GetProviders() ([]dto.ProviderInfo, error) {
205206
providers := make([]dto.ProviderInfo, 0, len(definitions))
206207
for key, def := range definitions {
207208
providers = append(providers, dto.ProviderInfo{
209+
Sort: def.Sort,
208210
Provider: key,
209211
BaseURL: def.BaseURL,
210212
Models: def.Models,
211213
})
212214
}
215+
sort.Slice(providers, func(i, j int) bool {
216+
return providers[i].Sort < providers[j].Sort
217+
})
213218
return providers, nil
214219
}
215220

@@ -673,13 +678,29 @@ func providerEnvKey(provider string) string {
673678
}
674679

675680
type providerDefinition struct {
681+
Sort uint
676682
BaseURL string
677683
Models []dto.ProviderModelInfo
678684
}
679685

680686
func providerDefinitions() map[string]providerDefinition {
681687
return map[string]providerDefinition{
688+
"ollama": {
689+
Sort: 1,
690+
BaseURL: "",
691+
Models: []dto.ProviderModelInfo{},
692+
},
693+
"deepseek": {
694+
Sort: 2,
695+
BaseURL: "https://api.deepseek.com/v1",
696+
Models: []dto.ProviderModelInfo{
697+
{ID: "deepseek/deepseek-chat", Name: "DeepSeek Chat"},
698+
{ID: "deepseek/deepseek-reasoner", Name: "DeepSeek Reasoner"},
699+
{ID: "deepseek/deepseek-r1:1.5b", Name: "DeepSeek R1 1.5B"},
700+
},
701+
},
682702
"openai": {
703+
Sort: 3,
683704
BaseURL: "https://api.openai.com/v1",
684705
Models: []dto.ProviderModelInfo{
685706
{ID: "openai/codex-mini-latest", Name: "Codex Mini"},
@@ -691,6 +712,7 @@ func providerDefinitions() map[string]providerDefinition {
691712
},
692713
},
693714
"anthropic": {
715+
Sort: 4,
694716
BaseURL: "https://api.anthropic.com",
695717
Models: []dto.ProviderModelInfo{
696718
{ID: "anthropic/claude-3-haiku-20240307", Name: "Claude 3 Haiku"},
@@ -701,6 +723,7 @@ func providerDefinitions() map[string]providerDefinition {
701723
},
702724
},
703725
"gemini": {
726+
Sort: 5,
704727
BaseURL: "https://generativelanguage.googleapis.com",
705728
Models: []dto.ProviderModelInfo{
706729
{ID: "google/gemini-1.5-flash", Name: "Gemini 1.5 Flash"},
@@ -712,23 +735,12 @@ func providerDefinitions() map[string]providerDefinition {
712735
},
713736
},
714737
"minimax": {
738+
Sort: 6,
715739
BaseURL: "https://api.minimax.chat/v1",
716740
Models: []dto.ProviderModelInfo{
717741
{ID: "minimax/Minimax-M2.1", Name: "Minimax M2.1"},
718742
},
719743
},
720-
"deepseek": {
721-
BaseURL: "https://api.deepseek.com/v1",
722-
Models: []dto.ProviderModelInfo{
723-
{ID: "deepseek/deepseek-chat", Name: "DeepSeek Chat"},
724-
{ID: "deepseek/deepseek-reasoner", Name: "DeepSeek Reasoner"},
725-
{ID: "deepseek/deepseek-r1:1.5b", Name: "DeepSeek R1 1.5B"},
726-
},
727-
},
728-
"ollama": {
729-
BaseURL: "",
730-
Models: []dto.ProviderModelInfo{},
731-
},
732744
}
733745
}
734746

‎core/init/migration/helper/menu.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ func LoadMenus() string {
1414
item := []dto.ShowMenu{
1515
{ID: "1", Disabled: true, Title: "menu.home", IsShow: true, Label: "Home-Menu", Path: "/", Sort: 100},
1616
{ID: "2", Disabled: true, Title: "menu.apps", IsShow: true, Label: "App-Menu", Path: "/apps/all", Sort: 200},
17-
{ID: "3", Disabled: false, Title: "menu.aiTools", IsShow: true, Label: "AI-Menu", Path: "/ai/model", Sort: 400,
17+
{ID: "3", Disabled: false, Title: "menu.aiTools", IsShow: true, Label: "AI-Menu", Path: "/ai/model", Sort: 300,
1818
Children: []dto.ShowMenu{
1919
{ID: "44", Disabled: false, Title: "aiTools.agents.agents", IsShow: true, Label: "Agents", Path: "/ai/agents/agent", Sort: 50},
2020
{ID: "41", Disabled: false, Title: "aiTools.model.model", IsShow: true, Label: "OllamaModel", Path: "/ai/model", Sort: 100},
2121
{ID: "42", Disabled: false, Title: "menu.mcp", IsShow: true, Label: "MCPServer", Path: "/ai/mcp", Sort: 200},
2222
{ID: "43", Disabled: false, Title: "aiTools.gpu.gpu", IsShow: true, Label: "GPU", Path: "/ai/gpu", Sort: 300},
2323
}},
24-
{ID: "4", Disabled: false, Title: "menu.website", IsShow: true, Label: "Website-Menu", Path: "/websites", Sort: 300,
24+
{ID: "4", Disabled: false, Title: "menu.website", IsShow: true, Label: "Website-Menu", Path: "/websites", Sort: 400,
2525
Children: []dto.ShowMenu{
2626
{ID: "31", Disabled: false, Title: "menu.website", IsShow: true, Label: "Website", Path: "/websites", Sort: 100},
2727
{ID: "32", Disabled: false, Title: "menu.ssl", IsShow: true, Label: "SSL", Path: "/websites/ssl", Sort: 200},

‎frontend/src/lang/modules/en.ts‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -680,25 +680,19 @@ const message = {
680680
agents: 'Agents',
681681
agent: 'Agent',
682682
createAgent: 'Create Agent',
683-
createModel: 'Create Model',
684-
agentList: 'Agent List',
685-
modelList: 'Model List',
686-
account: 'Account',
687-
accountName: 'Account Name',
688-
accountList: 'Account List',
689-
createAccount: 'Create Account',
690-
noAccountHint: 'Choose an existing account or add a new one.',
691-
accountCount: '{0} accounts',
683+
createModelAccount: 'Create model account',
684+
account: 'Model Account',
685+
noAccountHint: 'Choose an existing model account or add a new one.',
686+
accountCount: '{0} model accounts',
692687
syncAgents: 'Sync related agents',
693-
syncAgentsHelper: 'Update openclaw.json for agents using this account',
688+
syncAgentsHelper: 'Update openclaw.json for agents using this model account',
694689
appVersion: 'App Version',
695690
webuiPort: 'WebUI Port',
696691
bridgePort: 'Bridge Port',
697692
provider: 'Provider',
698693
apiKey: 'API Key',
699694
baseUrl: 'Base URL',
700695
token: 'Token',
701-
modelName: 'Model Name',
702696
manualModel: 'Manual input',
703697
verified: 'Verified',
704698
},

‎frontend/src/lang/modules/es-es.ts‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -673,30 +673,24 @@ const message = {
673673
},
674674
aiTools: {
675675
agents: {
676-
agents: 'Agents',
677-
agent: 'Agent',
678-
createAgent: 'Create Agent',
679-
createModel: 'Create Model',
680-
agentList: 'Agent List',
681-
modelList: 'Model List',
682-
account: 'Account',
683-
accountName: 'Account Name',
684-
accountList: 'Account List',
685-
createAccount: 'Create Account',
686-
noAccountHint: 'Selecciona una cuenta existente o agrega una nueva.',
687-
accountCount: '{0} cuentas',
688-
syncAgents: 'Sync related agents',
689-
syncAgentsHelper: 'Update openclaw.json for agents using this account',
690-
appVersion: 'App Version',
691-
webuiPort: 'WebUI Port',
692-
bridgePort: 'Bridge Port',
693-
provider: 'Provider',
694-
apiKey: 'API Key',
695-
baseUrl: 'Base URL',
676+
agents: 'Agentes',
677+
agent: 'Agente',
678+
createAgent: 'Crear agente',
679+
createModelAccount: 'Crear cuenta de modelo',
680+
account: 'Cuenta de modelo',
681+
noAccountHint: 'Selecciona una cuenta de modelo existente o agrega una nueva.',
682+
accountCount: '{0} cuentas de modelo',
683+
syncAgents: 'Sincronizar agentes vinculados',
684+
syncAgentsHelper: 'Actualiza openclaw.json para los agentes que usan esta cuenta de modelo',
685+
appVersion: 'Versión de la app',
686+
webuiPort: 'Puerto WebUI',
687+
bridgePort: 'Puerto Bridge',
688+
provider: 'Proveedor de modelos',
689+
apiKey: 'Clave API',
690+
baseUrl: 'URL base',
696691
token: 'Token',
697-
modelName: 'Model Name',
698-
manualModel: 'Manual input',
699-
verified: 'Verified',
692+
manualModel: 'Entrada manual de modelo',
693+
verified: 'Verificado',
700694
},
701695
model: {
702696
model: 'Modelo',

‎frontend/src/lang/modules/ja.ts‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -662,30 +662,24 @@ const message = {
662662
},
663663
aiTools: {
664664
agents: {
665-
agents: 'Agents',
666-
agent: 'Agent',
667-
createAgent: 'Create Agent',
668-
createModel: 'Create Model',
669-
agentList: 'Agent List',
670-
modelList: 'Model List',
671-
account: 'Account',
672-
accountName: 'Account Name',
673-
accountList: 'Account List',
674-
createAccount: 'Create Account',
675-
noAccountHint: '既存のアカウントを選択するか、新規に追加してください。',
676-
accountCount: 'アカウント {0} 件',
677-
syncAgents: 'Sync related agents',
678-
syncAgentsHelper: 'Update openclaw.json for agents using this account',
679-
appVersion: 'App Version',
680-
webuiPort: 'WebUI Port',
681-
bridgePort: 'Bridge Port',
682-
provider: 'Provider',
683-
apiKey: 'API Key',
684-
baseUrl: 'Base URL',
685-
token: 'Token',
686-
modelName: 'Model Name',
687-
manualModel: 'Manual input',
688-
verified: 'Verified',
665+
agents: 'エージェント',
666+
agent: 'エージェント',
667+
createAgent: 'エージェントを作成',
668+
createModelAccount: 'モデルアカウントを作成',
669+
account: 'モデルアカウント',
670+
noAccountHint: '既存のモデルアカウントを選択するか、新規に追加してください。',
671+
accountCount: 'モデルアカウント {0} 件',
672+
syncAgents: '関連エージェントを同期',
673+
syncAgentsHelper: 'このモデルアカウントを使用するエージェントの openclaw.json を更新',
674+
appVersion: 'アプリバージョン',
675+
webuiPort: 'WebUI ポート',
676+
bridgePort: 'Bridge ポート',
677+
provider: 'モデルプロバイダー',
678+
apiKey: 'API キー',
679+
baseUrl: 'ベースURL',
680+
token: 'トークン',
681+
manualModel: '手動入力',
682+
verified: '検証済み',
689683
},
690684
model: {
691685
model: 'モデル',

‎frontend/src/lang/modules/ko.ts‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -659,30 +659,24 @@ const message = {
659659
},
660660
aiTools: {
661661
agents: {
662-
agents: 'Agents',
663-
agent: 'Agent',
664-
createAgent: 'Create Agent',
665-
createModel: 'Create Model',
666-
agentList: 'Agent List',
667-
modelList: 'Model List',
668-
account: 'Account',
669-
accountName: 'Account Name',
670-
accountList: 'Account List',
671-
createAccount: 'Create Account',
672-
noAccountHint: '기존 계정을 선택하거나 새로 추가하세요.',
673-
accountCount: '계정 {0}개',
674-
syncAgents: 'Sync related agents',
675-
syncAgentsHelper: 'Update openclaw.json for agents using this account',
676-
appVersion: 'App Version',
677-
webuiPort: 'WebUI Port',
678-
bridgePort: 'Bridge Port',
679-
provider: 'Provider',
680-
apiKey: 'API Key',
681-
baseUrl: 'Base URL',
682-
token: 'Token',
683-
modelName: 'Model Name',
684-
manualModel: 'Manual input',
685-
verified: 'Verified',
662+
agents: '에이전트',
663+
agent: '에이전트',
664+
createAgent: '에이전트 생성',
665+
createModelAccount: '모델 계정 생성',
666+
account: '모델 계정',
667+
noAccountHint: '기존 모델 계정을 선택하거나 새로 추가하세요.',
668+
accountCount: '모델 계정 {0}개',
669+
syncAgents: '관련 에이전트 동기화',
670+
syncAgentsHelper: '이 모델 계정을 사용하는 에이전트의 openclaw.json 업데이트',
671+
appVersion: '앱 버전',
672+
webuiPort: 'WebUI 포트',
673+
bridgePort: 'Bridge 포트',
674+
provider: '모델 제공자',
675+
apiKey: 'API 키',
676+
baseUrl: '기본 URL',
677+
token: '토큰',
678+
manualModel: '수동 입력',
679+
verified: '검증됨',
686680
},
687681
model: {
688682
model: '모델',

‎frontend/src/lang/modules/ms.ts‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -674,30 +674,24 @@ const message = {
674674
},
675675
aiTools: {
676676
agents: {
677-
agents: 'Agents',
678-
agent: 'Agent',
679-
createAgent: 'Create Agent',
680-
createModel: 'Create Model',
681-
agentList: 'Agent List',
682-
modelList: 'Model List',
683-
account: 'Account',
684-
accountName: 'Account Name',
685-
accountList: 'Account List',
686-
createAccount: 'Create Account',
687-
noAccountHint: 'Pilih akaun sedia ada atau tambah yang baharu.',
688-
accountCount: 'Akaun {0}',
689-
syncAgents: 'Sync related agents',
690-
syncAgentsHelper: 'Update openclaw.json for agents using this account',
691-
appVersion: 'App Version',
692-
webuiPort: 'WebUI Port',
693-
bridgePort: 'Bridge Port',
694-
provider: 'Provider',
695-
apiKey: 'API Key',
696-
baseUrl: 'Base URL',
677+
agents: 'Agen',
678+
agent: 'Agen',
679+
createAgent: 'Cipta agen',
680+
createModelAccount: 'Cipta akaun model',
681+
account: 'Akaun model',
682+
noAccountHint: 'Pilih akaun model sedia ada atau tambah yang baharu.',
683+
accountCount: 'Akaun model {0}',
684+
syncAgents: 'Segerakkan agen berkaitan',
685+
syncAgentsHelper: 'Kemas kini openclaw.json untuk agen yang menggunakan akaun model ini',
686+
appVersion: 'Versi aplikasi',
687+
webuiPort: 'Port WebUI',
688+
bridgePort: 'Port Bridge',
689+
provider: 'Penyedia model',
690+
apiKey: 'Kunci API',
691+
baseUrl: 'URL asas',
697692
token: 'Token',
698-
modelName: 'Model Name',
699-
manualModel: 'Manual input',
700-
verified: 'Verified',
693+
manualModel: 'Input manual',
694+
verified: 'Disahkan',
701695
},
702696
model: {
703697
model: 'Model',

‎frontend/src/lang/modules/pt-br.ts‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -671,30 +671,24 @@ const message = {
671671
},
672672
aiTools: {
673673
agents: {
674-
agents: 'Agents',
675-
agent: 'Agent',
676-
createAgent: 'Create Agent',
677-
createModel: 'Create Model',
678-
agentList: 'Agent List',
679-
modelList: 'Model List',
680-
account: 'Account',
681-
accountName: 'Account Name',
682-
accountList: 'Account List',
683-
createAccount: 'Create Account',
684-
noAccountHint: 'Selecione uma conta existente ou adicione uma nova.',
685-
accountCount: '{0} contas',
686-
syncAgents: 'Sync related agents',
687-
syncAgentsHelper: 'Update openclaw.json for agents using this account',
688-
appVersion: 'App Version',
689-
webuiPort: 'WebUI Port',
690-
bridgePort: 'Bridge Port',
691-
provider: 'Provider',
692-
apiKey: 'API Key',
693-
baseUrl: 'Base URL',
674+
agents: 'Agentes',
675+
agent: 'Agente',
676+
createAgent: 'Criar agente',
677+
createModelAccount: 'Criar conta de modelo',
678+
account: 'Conta de modelo',
679+
noAccountHint: 'Selecione uma conta de modelo existente ou adicione uma nova.',
680+
accountCount: '{0} contas de modelo',
681+
syncAgents: 'Sincronizar agentes vinculados',
682+
syncAgentsHelper: 'Atualize o openclaw.json para agentes que usam esta conta de modelo',
683+
appVersion: 'Versão do app',
684+
webuiPort: 'Porta WebUI',
685+
bridgePort: 'Porta Bridge',
686+
provider: 'Provedor de modelos',
687+
apiKey: 'Chave API',
688+
baseUrl: 'URL base',
694689
token: 'Token',
695-
modelName: 'Model Name',
696-
manualModel: 'Manual input',
697-
verified: 'Verified',
690+
manualModel: 'Entrada manual',
691+
verified: 'Verificado',
698692
},
699693
model: {
700694
model: 'Modelo',

0 commit comments

Comments
 (0)