fix: 修复升级go-openai版本之后azure不可用的问题 (#275)

eryajf · Jul 8, 2023 · 08f46f3 · 08f46f3
1 parent 35842e3
commit 08f46f3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pkg/chatgpt/chatgpt.go b/pkg/chatgpt/chatgpt.go
@@ -39,9 +39,12 @@ func New(userId string) *ChatGPT {
 	if public.Config.AzureOn {
 		config = openai.DefaultAzureConfig(
 			public.Config.AzureOpenAIToken,
-			"https://"+public.Config.AzureResourceName+".openai."+
-				"azure.com/",
+			"https://"+public.Config.AzureResourceName+".openai.azure.com",
 		)
+		config.APIVersion = public.Config.AzureApiVersion
+		config.AzureModelMapperFunc = func(model string) string {
+			return public.Config.AzureDeploymentName
+		}
 	} else {
 		if public.Config.HttpProxy != "" {
 			config.HTTPClient.Transport = &http.Transport{

diff --git a/pkg/dingbot/dingbot.go b/pkg/dingbot/dingbot.go
@@ -97,10 +97,10 @@ func (r ReceiveMsg) ReplyToDingtalk(msgType, msg string) (statuscode int, err er
 	case string(TEXT):
 		msgtmp = &TextMessage{Text: &Text{Content: msg}, MsgType: TEXT, At: &At{AtUserIds: []string{atUser}}}
 	case string(MARKDOWN):
-		if atUser != "" {
+		if atUser != "" && r.ConversationType != "1" {
 			msg = fmt.Sprintf("%s\n\n@%s", msg, atUser)
 		}
-		msgtmp = &MarkDownMessage{MsgType: MARKDOWN, At: &At{AtUserIds: []string{atUser}}, MarkDown: &MarkDown{Title: "Markdown Type", Text: msg}}
+		msgtmp = &MarkDownMessage{MsgType: MARKDOWN, At: &At{AtUserIds: []string{atUser}}, MarkDown: &MarkDown{Title: "Markdown Msg", Text: msg}}
 	default:
 		msgtmp = &TextMessage{Text: &Text{Content: msg}, MsgType: TEXT, At: &At{AtUserIds: []string{atUser}}}
 	}