1
0
mirror of https://github.com/fumiama/deepinfra.git synced 2026-06-06 09:10:33 +08:00

fix(model): still use string in system prompt

This commit is contained in:
源文雨
2025-09-24 00:43:09 +08:00
parent 8757564fe7
commit e9e3b55ebc
5 changed files with 7 additions and 7 deletions

View File

@@ -63,7 +63,7 @@ func (l *Log[T]) Add(grp int64, item T, isbot bool) {
func (l *Log[T]) Modelize(p model.Protocol, grp int64, sysp string, isusersystem bool) deepinfra.Model {
m := p
if sysp != "" && !isusersystem {
m.System(model.NewContentText(sysp))
m.System(sysp)
}
l.mu.RLock()
defer l.mu.RUnlock()

View File

@@ -22,7 +22,7 @@ type Requester interface {
}
type MessageBuilder[T any] interface {
System(prompt ...Content) T
System(prompt string) T
User(prompt ...Content) T
Assistant(prompt ...Content) T
}

View File

@@ -166,9 +166,9 @@ func (cs Contents) ToGenAIParts() []GenAIPart {
return ps
}
func (opai *GenAI) System(prompt ...Content) Protocol {
func (opai *GenAI) System(prompt string) Protocol {
opai.SystemInstruction = &GenAIContent{
Parts: Contents(prompt).ToGenAIParts(),
Parts: []GenAIPart{{Text: prompt}},
}
return opai
}

View File

@@ -77,11 +77,11 @@ func (ollm *OLLaMA) OutputRaw() Contents {
return Contents{NewContentText(ollm.Message.Content)}
}
func (ollm *OLLaMA) System(prompt ...Content) Protocol {
func (ollm *OLLaMA) System(prompt string) Protocol {
ollm.Messages = make([]OLLaMAMessage, 1, 8)
ollm.Messages[0] = OLLaMAMessage{
Role: "system",
Content: prompt[0].Text,
Content: prompt,
}
return ollm
}

View File

@@ -115,7 +115,7 @@ func (opai *OpenAI) OutputRaw() Contents {
return nil
}
func (opai *OpenAI) System(prompt ...Content) Protocol {
func (opai *OpenAI) System(prompt string) Protocol {
opai.Messages = make([]OpenAIMessage, 1, 8)
raw, err := json.Marshal(&prompt)
if err != nil {