1
0
mirror of https://github.com/fumiama/deepinfra.git synced 2026-06-22 13:03:15 +08:00

fix(model): still use string in norm prompt

This commit is contained in:
源文雨
2025-09-24 01:01:56 +08:00
parent e9e3b55ebc
commit 8c92983b13

View File

@@ -128,26 +128,30 @@ func (opai *OpenAI) System(prompt string) Protocol {
return opai return opai
} }
func (opai *OpenAI) User(prompt ...Content) Protocol { func (opai *OpenAI) normal(role string, prompt ...Content) Protocol {
raw, err := json.Marshal(&prompt) var (
raw json.RawMessage
err error
)
if len(prompt) == 1 && prompt[0].Type == ContentTypeText {
raw, err = json.Marshal(&prompt[0].Text)
} else {
raw, err = json.Marshal(&prompt)
}
if err != nil { if err != nil {
panic(err) panic(err)
} }
opai.Messages = append(opai.Messages, OpenAIMessage{ opai.Messages = append(opai.Messages, OpenAIMessage{
Role: "user", Role: role,
Content: raw, Content: raw,
}) })
return opai return opai
} }
func (opai *OpenAI) Assistant(prompt ...Content) Protocol { func (opai *OpenAI) User(prompt ...Content) Protocol {
raw, err := json.Marshal(&prompt) return opai.normal("user", prompt...)
if err != nil { }
panic(err)
} func (opai *OpenAI) Assistant(prompt ...Content) Protocol {
opai.Messages = append(opai.Messages, OpenAIMessage{ return opai.normal("assistant", prompt...)
Role: "assistant",
Content: raw,
})
return opai
} }