From 3c23ff2403124753314cc960635930d9b1134760 Mon Sep 17 00:00:00 2001 From: Grail Finder Date: Fri, 8 Aug 2025 09:43:00 +0300 Subject: Feat: openai type func call for llamacpp --- llm.go | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'llm.go') diff --git a/llm.go b/llm.go index 6d1cdbf..060e90c 100644 --- a/llm.go +++ b/llm.go @@ -151,26 +151,18 @@ func (op OpenAIer) ParseChunk(data []byte) (string, bool, error) { func (op OpenAIer) FormMsg(msg, role string, resume bool) (io.Reader, error) { logger.Debug("formmsg openaier", "link", cfg.CurrentAPI) - 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}) - } if msg != "" { // otherwise let the bot continue newMsg := models.RoleMsg{Role: role, Content: msg} chatBody.Messages = append(chatBody.Messages, newMsg) - // if rag - if cfg.RAGEnabled { - ragResp, err := chatRagUse(newMsg.Content) - if err != nil { - logger.Error("failed to form a rag msg", "error", err) - return nil, err - } - ragMsg := models.RoleMsg{Role: cfg.ToolRole, Content: ragResp} - chatBody.Messages = append(chatBody.Messages, ragMsg) - } } - data, err := json.Marshal(chatBody) + req := models.OpenAIReq{ + ChatBody: chatBody, + Tools: nil, + } + if cfg.ToolUse && !resume { + req.Tools = baseTools // set tools to use + } + data, err := json.Marshal(req) if err != nil { logger.Error("failed to form a msg", "error", err) return nil, err -- cgit v1.2.3