Fix: card edit

This commit is contained in:
Grail Finder
2025-02-16 13:43:42 +03:00
parent 58d632ed19
commit 3ae71d81c4
2 changed files with 12 additions and 4 deletions

4
llm.go
View File

@@ -44,7 +44,6 @@ func (lcp LlamaCPPeer) FormMsg(msg, role string, resume bool) (io.Reader, error)
}
}
if cfg.ToolUse && !resume {
// prompt += "\n" + cfg.ToolRole + ":\n" + toolSysMsg
// add to chat body
chatBody.Messages = append(chatBody.Messages, models.RoleMsg{Role: cfg.ToolRole, Content: toolSysMsg})
}
@@ -63,7 +62,8 @@ func (lcp LlamaCPPeer) FormMsg(msg, role string, resume bool) (io.Reader, error)
if cfg.ThinkUse && !cfg.ToolUse {
prompt += "<think>"
}
logger.Info("checking prompt for llamacpp", "tool_use", cfg.ToolUse, "msg", msg, "resume", resume, "prompt", prompt)
logger.Debug("checking prompt for /completion", "tool_use", cfg.ToolUse,
"msg", msg, "resume", resume, "prompt", prompt)
payload := models.NewLCPReq(prompt, cfg, defaultLCPProps)
data, err := json.Marshal(payload)
if err != nil {

View File

@@ -112,15 +112,23 @@ func makeChatTable(chatMap map[string]models.Chat) *tview.Table {
if err := notifyUser("error", "no such card: "+agentName); err != nil {
logger.Warn("failed ot notify", "error", err)
}
return
}
if chatBody.Messages[0].Role != "system" || chatBody.Messages[1].Role != agentName {
if err := notifyUser("error", "unexpected chat structure; card: "+agentName); err != nil {
logger.Warn("failed ot notify", "error", err)
}
return
}
// change sys_prompt + first msg
cc.SysPrompt = chatBody.Messages[0].Content
cc.FirstMsg = chatBody.Messages[1].Content
if err := pngmeta.WriteToPng(cc.ToSpec(cfg.UserRole), cc.FilePath, cc.FilePath); err != nil {
logger.Error("failed to write charcard",
"error", err)
}
// pages.RemovePage(historyPage)
return
default:
// pages.RemovePage(historyPage)
return
}
})