Merge remote-tracking branch 'github-pro/main' into feature/1.6-liujian

2026-06-04 10:13:53 +08:00 · 2025-03-12 17:32:31 +08:00
parent a7fee633b0 7005cb1e76
commit 358459f37a
23 changed files with 29 additions and 22 deletions
@@ -1,4 +1,4 @@
-model: claude-3-haiku@20240307
+model: google/claude-3-haiku@20240307
 label:
  en_US: Claude 3 Haiku
 model_type: llm
@@ -1,4 +1,4 @@
-model: claude-3-opus@20240229
+model: google/claude-3-opus@20240229
 label:
  en_US: Claude 3 Opus
 model_type: llm
@@ -1,4 +1,4 @@
-model: claude-3-sonnet@20240229
+model: google/claude-3-sonnet@20240229
 label:
  en_US: Claude 3 Sonnet
 model_type: llm
@@ -1,4 +1,4 @@
-model: claude-3-5-sonnet-v2@20241022
+model: google/claude-3-5-sonnet-v2@20241022
 label:
  en_US: Claude 3.5 Sonnet v2
 model_type: llm
@@ -1,4 +1,4 @@
-model: claude-3-5-sonnet@20240620
+model: google/claude-3-5-sonnet@20240620
 label:
  en_US: Claude 3.5 Sonnet
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-1.0-pro-vision-001
+model: google/gemini-1.0-pro-vision-001
 label:
  en_US: Gemini 1.0 Pro Vision
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-1.0-pro-002
+model: google/gemini-1.0-pro-002
 label:
  en_US: Gemini 1.0 Pro
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-1.5-flash-001
+model: google/gemini-1.5-flash-001
 label:
  en_US: Gemini 1.5 Flash 001
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-1.5-flash-002
+model: google/gemini-1.5-flash-002
 label:
  en_US: Gemini 1.5 Flash 002
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-1.5-pro-001
+model: google/gemini-1.5-pro-001
 label:
  en_US: Gemini 1.5 Pro 001
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-1.5-pro-002
+model: google/gemini-1.5-pro-002
 label:
  en_US: Gemini 1.5 Pro 002
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-2.0-flash-001
+model: google/gemini-2.0-flash-001
 label:
  en_US: Gemini 2.0 Flash 001
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-2.0-flash-exp
+model: google/gemini-2.0-flash-exp
 label:
  en_US: Gemini 2.0 Flash Exp
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-2.0-flash-lite-preview-02-05
+model: google/gemini-2.0-flash-lite-preview-02-05
 label:
  en_US: Gemini 2.0 Flash Lite Preview 0205
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-2.0-flash-thinking-exp-01-21
+model: google/gemini-2.0-flash-thinking-exp-01-21
 label:
  en_US: Gemini 2.0 Flash Thinking Exp 0121
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-2.0-pro-exp-02-05
+model: google/gemini-2.0-pro-exp-02-05
 label:
  en_US: Gemini 2.0 Pro Exp 0205
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-exp-1114
+model: google/gemini-exp-1114
 label:
  en_US: Gemini exp 1114
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-exp-1121
+model: google/gemini-exp-1121
 label:
  en_US: Gemini exp 1121
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-exp-1206
+model: google/gemini-exp-1206
 label:
  en_US: Gemini exp 1206
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-flash-experimental
+model: google/gemini-flash-experimental
 label:
  en_US: Gemini Flash Experimental
 model_type: llm
@@ -1,4 +1,4 @@
-model: gemini-pro-experimental
+model: google/gemini-pro-experimental
 label:
  en_US: Gemini Pro Experimental
 model_type: llm
@@ -41,4 +41,7 @@ provider_credential_schema:
      required: false
      placeholder:
        en_US: Enter your Google Cloud Service Account Key in base64 format
-address: https://api.openai.com
+address: https://api.openai.com
+model_config:
+  access_configuration_status: true
+  access_configuration_demo: "{\"vertex_service_account_key\": \"\", \"vertex_location\": \"\", \"vertex_project_id\": \"\"}"
@@ -97,6 +97,10 @@ func NewModel(data string, logo string) (IModel, error) {
 	params := make(ParamValidator, 0, len(cfg.ParameterRules))
 	defaultConfig := make(map[string]interface{})
 	for _, p := range cfg.ParameterRules {
+		if (p.Default == nil || p.Default == "" || p.Default == 0 || p.Default == false) && !p.Required {
+			defaultConfig[p.Name] = nil
+			continue
+		}
 		t := p.Type
 		if t == "" {
 			t = ParameterTypeStr