Beta133

applogic/yuanqi.go

@@ -192,7 +192,8 @@ func (app *App) ChatHandlerYuanQi(w http.ResponseWriter, r *http.Request) {
 	}
 
 	apiURL := config.GetYuanqiApiPath(promptstr)
-	token := config.GetYuanqiToken(promptstr)
+
+	assistantID, token := config.GetYuanqiConf(promptstr)
 	fmtf.Printf("YuanQi上下文history:%v\n", history)
 
 	// 构建请求到yuanqi API的请求体
@@ -226,7 +227,7 @@ func (app *App) ChatHandlerYuanQi(w http.ResponseWriter, r *http.Request) {
 
 	// 创建请求数据结构体
 	requestBody = structs.RequestDataYuanQi{
-		AssistantID: config.GetYuanqiAssistantID(promptstr),
+		AssistantID: assistantID,
 		UserID:      useridstr,
 		Stream:      config.GetuseSse(promptstr),
 		ChatType:    config.GetYuanqiChatType(promptstr),

config/config.go

@@ -2881,74 +2881,122 @@ func getTemperatureHunyuanInternal(options ...string) float64 {
 	return value
 }
 
-// 获取助手ID
-func GetYuanqiAssistantID(options ...string) string {
-	mu.Lock()
-	defer mu.Unlock()
-	return getYuanqiAssistantIDInternal(options...)
-}
+// // 获取助手ID
+// func GetYuanqiAssistantID(options ...string) string {
+// 	mu.Lock()
+// 	defer mu.Unlock()
+// 	return getYuanqiAssistantIDInternal(options...)
+// }
 
-func getYuanqiAssistantIDInternal(options ...string) string {
-	if len(options) == 0 || options[0] == "" {
-		if instance != nil {
-			return instance.Settings.YuanqiAssistantID
-		}
-		return "" // 默认值或错误处理
-	}
+// func getYuanqiAssistantIDInternal(options ...string) string {
+// 	if len(options) == 0 || options[0] == "" {
+// 		if instance != nil {
+// 			return instance.Settings.YuanqiAssistantID
+// 		}
+// 		return "" // 默认值或错误处理
+// 	}
 
-	basename := options[0]
-	assistantIDInterface, err := prompt.GetSettingFromFilename(basename, "YuanqiAssistantID")
-	if err != nil {
-		log.Println("Error retrieving YuanqiAssistantID:", err)
-		return getYuanqiAssistantIDInternal() // 递归调用内部函数，不传递任何参数
-	}
+// 	basename := options[0]
+// 	assistantIDInterface, err := prompt.GetSettingFromFilename(basename, "YuanqiAssistantID")
+// 	if err != nil {
+// 		log.Println("Error retrieving YuanqiAssistantID:", err)
+// 		return getYuanqiAssistantIDInternal() // 递归调用内部函数，不传递任何参数
+// 	}
 
-	assistantID, ok := assistantIDInterface.(string)
-	if !ok { // 检查类型断言是否失败
-		log.Println("Type assertion failed for YuanqiAssistantID, fetching default")
-		return getYuanqiAssistantIDInternal() // 递归调用内部函数，不传递任何参数
-	}
+// 	assistantID, ok := assistantIDInterface.(string)
+// 	if !ok { // 检查类型断言是否失败
+// 		log.Println("Type assertion failed for YuanqiAssistantID, fetching default")
+// 		return getYuanqiAssistantIDInternal() // 递归调用内部函数，不传递任何参数
+// 	}
 
-	if assistantID == "" {
-		return getYuanqiAssistantIDInternal() // 递归调用内部函数，不传递任何参数
-	}
+// 	if assistantID == "" {
+// 		return getYuanqiAssistantIDInternal() // 递归调用内部函数，不传递任何参数
+// 	}
 
-	return assistantID
-}
+// 	return assistantID
+// }
+
+// // 获取Token
+// func GetYuanqiToken(options ...string) string {
+// 	mu.Lock()
+// 	defer mu.Unlock()
+// 	return getYuanqiTokenInternal(options...)
+// }
+
+// func getYuanqiTokenInternal(options ...string) string {
+// 	if len(options) == 0 || options[0] == "" {
+// 		if instance != nil {
+// 			return instance.Settings.YuanqiToken
+// 		}
+// 		return "" // 默认值或错误处理
+// 	}
+
+// 	basename := options[0]
+// 	YuanqiTokenInterface, err := prompt.GetSettingFromFilename(basename, "YuanqiToken")
+// 	if err != nil {
+// 		log.Println("Error retrieving YuanqiToken:", err)
+// 		return getYuanqiTokenInternal() // 递归调用内部函数，不传递任何参数
+// 	}
+
+// 	YuanqiToken, ok := YuanqiTokenInterface.(string)
+// 	if !ok { // 检查类型断言是否失败
+// 		log.Println("Type assertion failed for YuanqiToken, fetching default")
+// 		return getYuanqiTokenInternal() // 递归调用内部函数，不传递任何参数
+// 	}
 
-// 获取Token
-func GetYuanqiToken(options ...string) string {
+// 	if YuanqiToken == "" {
+// 		return getYuanqiTokenInternal() // 递归调用内部函数，不传递任何参数
+// 	}
+
+// 	return YuanqiToken
+// }
+
+// GetYuanqiConf return conf.YuanqiAssistantID, conf.YuanqiToken
+func GetYuanqiConf(options ...string) (string, string) {
 	mu.Lock()
 	defer mu.Unlock()
-	return getYuanqiTokenInternal(options...)
+	return getYuanqiConfInternal(options...)
 }
 
-func getYuanqiTokenInternal(options ...string) string {
-	if len(options) == 0 || options[0] == "" {
-		if instance != nil {
-			return instance.Settings.YuanqiToken
+// getYuanqiConfInternal 内部递归函数，处理配置获取逻辑
+func getYuanqiConfInternal(options ...string) (string, string) {
+	// 从instance中读取配置数组
+	if instance != nil && len(instance.Settings.Yuanqiconfs) > 0 {
+		if len(options) == 0 || options[0] == "" {
+			// 从instance全局变量中随机选择一个配置
+			index := rand.Intn(len(instance.Settings.Yuanqiconfs))
+			conf := instance.Settings.Yuanqiconfs[index]
+			return conf.YuanqiAssistantID, conf.YuanqiToken
 		}
-		return "" // 默认值或错误处理
+	} else {
+		log.Println("No configurations available in instance or default behavior")
+		return "", "" // 默认值或错误处理
 	}
 
+	// 使用prompt包从指定的文件名中获取配置
 	basename := options[0]
-	YuanqiTokenInterface, err := prompt.GetSettingFromFilename(basename, "YuanqiToken")
+	confInterface, err := prompt.GetSettingFromFilename(basename, "Yuanqiconfs")
 	if err != nil {
-		log.Println("Error retrieving YuanqiToken:", err)
-		return getYuanqiTokenInternal() // 递归调用内部函数，不传递任何参数
+		log.Printf("Error retrieving settings from file: %s, error: %v", basename, err)
+		return getYuanqiConfInternal() // 递归调用内部函数，不传递任何参数
 	}
 
-	YuanqiToken, ok := YuanqiTokenInterface.(string)
-	if !ok { // 检查类型断言是否失败
-		log.Println("Type assertion failed for YuanqiToken, fetching default")
-		return getYuanqiTokenInternal() // 递归调用内部函数，不传递任何参数
+	// 断言获取的interface{}为[]YuanqiConf
+	confs, ok := confInterface.([]structs.YuanqiConf)
+	if !ok {
+		log.Println("Type assertion failed for YuanqiConfs, attempting default behavior")
+		return getYuanqiConfInternal() // 递归调用内部函数，尝试默认配置
 	}
 
-	if YuanqiToken == "" {
-		return getYuanqiTokenInternal() // 递归调用内部函数，不传递任何参数
+	if len(confs) == 0 {
+		log.Println("No configurations found in file:", basename)
+		return getYuanqiConfInternal() // 递归调用内部函数，尝试默认配置
 	}
 
-	return YuanqiToken
+	// 随机选择一个配置返回
+	index := rand.Intn(len(confs))
+	conf := confs[index]
+	return conf.YuanqiAssistantID, conf.YuanqiToken
 }
 
 // 获取助手版本

structs/struct.go

@@ -395,13 +395,12 @@ type Settings struct {
 	GlmToolChoice  string   `yaml:"glmToolChoice"`  // 工具选择策略
 	GlmUserID      string   `yaml:"glmUserID"`      // 用户ID
 
-	YuanqiApiPath     string  `yaml:"yuanqiApiPath"`     // 元器api地址
-	YuanqiAssistantID string  `yaml:"yuanqiAssistantID"` // 助手ID
-	YuanqiVersion     float64 `yaml:"yuanqiVersion"`     // 助手版本, 仅对内部开放
-	YuanqiUserID      string  `yaml:"yuanqiUserID"`      // 用户ID，调用者业务侧的用户ID，会影响智能体的数据统计，建议按实际情况填写
-	YuanqiStream      bool    `yaml:"yuanqiStream"`      // 是否启用流式返回，默认为false
-	YuanqiChatType    string  `yaml:"yuanqiChatType"`    // 聊天类型，默认为published，preview时使用草稿态智能体，仅对内部开放
-	YuanqiToken       string  `yaml:"yuanqiToken"`       // Token
+	YuanqiApiPath  string       `yaml:"yuanqiApiPath"`  // 元器api地址
+	Yuanqiconfs    []YuanqiConf `yaml:"yuanqiConfs"`    // 元器api配置 支持多个
+	YuanqiVersion  float64      `yaml:"yuanqiVersion"`  // 助手版本, 仅对内部开放
+	YuanqiUserID   string       `yaml:"yuanqiUserID"`   // 用户ID，调用者业务侧的用户ID，会影响智能体的数据统计，建议按实际情况填写
+	YuanqiStream   bool         `yaml:"yuanqiStream"`   // 是否启用流式返回，默认为false
+	YuanqiChatType string       `yaml:"yuanqiChatType"` // 聊天类型，默认为published，preview时使用草稿态智能体，仅对内部开放
 
 	WSServerToken string `yaml:"wsServerToken"`
 	WSPath        string `yaml:"wsPath"`
@@ -424,6 +423,12 @@ type Settings struct {
 	PromptCoverA          []string `yaml:"promptCoverA"` //暂时用不上 待实现
 }
 
+type YuanqiConf struct {
+	YuanqiAssistantID string `yaml:"yuanqiAssistantID"` // 助手ID
+	YuanqiToken       string `yaml:"yuanqiToken"`       // Token
+	YuanqiName        string `yaml:"yuanqiName"`        // 名字
+}
+
 type MetaEvent struct {
 	PostType      string `json:"post_type"`
 	MetaEventType string `json:"meta_event_type"`

template/config_template.go

@@ -187,9 +187,15 @@ settings:
 
   # Yuanqi 助手配置文件，确保按业务需求配置。
   yuanqiApiPath: "https://open.hunyuan.tencent.com/openapi/v1/agent/chat/completions"
-  yuanqiAssistantID: ""         # 助手ID，唯一标识您的助手实例
-  yuanqiToken: ""               # 元器Token
   yuanqiChatType: "published"   # 聊天类型，默认为published，支持preview模式下使用草稿态智能体
+  yuanqiConfs:
+  - yuanqiAssistantID: "123"
+    yuanqiToken: "123"
+    yuanqiName: "123"
+  - yuanqiAssistantID: "123"
+    uanqiToken: "123"
+    yuanqiName: "123"
+
 `
 
 const Logo = `