JohnCosta27/Haystack
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix(types): agent processing stuff

Browse Source
This commit is contained in:
John Costa
2025-04-09 12:12:09 +01:00
parent e065492dd4
commit d36dec8d60
6 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/agents/client/chat.go
View File

@ -73,7 +73,7 @@ type ChatAiMessage struct {
Role string `json:"role"` Role string `json:"role"`
ToolCalls *[]ToolCall `json:"tool_calls,omitempty"` ToolCalls *[]ToolCall `json:"tool_calls,omitempty"`
MessageContent `json:"content"` Content string `json:"content"`
} }
func (m ChatAiMessage) IsResponse() bool { func (m ChatAiMessage) IsResponse() bool {

1
backend/agents/client/client.go
View File

@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"io" "io"
"log" "log"
"net/http" "net/http"

15
backend/agents/event_location_agent.go
View File

@ -161,16 +161,15 @@ func (agent EventLocationAgent) GetLocations(userId uuid.UUID, imageId uuid.UUID
ResponseFormat: client.ResponseFormat{ ResponseFormat: client.ResponseFormat{
Type: "text", Type: "text",
}, },
Chat: client.Chat{
Messages: make([]client.ChatMessage, 0),
},
} }
err = request.AddSystem(eventLocationPrompt) request.Chat.AddSystem(eventLocationPrompt)
if err != nil { request.Chat.AddImage(imageName, imageData)
return err
}
request.AddImage(imageName, imageData) _, err = agent.client.Request(&request.Chat)
_, err = agent.client.Request(&request)
if err != nil { if err != nil {
return err return err
} }
@ -180,7 +179,7 @@ func (agent EventLocationAgent) GetLocations(userId uuid.UUID, imageId uuid.UUID
UserId: userId, UserId: userId,
} }
return agent.client.Process(toolHandlerInfo, request) return agent.client.Process(toolHandlerInfo, &request.Chat)
} }
func NewLocationEventAgent(locationModel models.LocationModel, eventModel models.EventModel, contactModel models.ContactModel) (EventLocationAgent, error) { func NewLocationEventAgent(locationModel models.LocationModel, eventModel models.EventModel, contactModel models.ContactModel) (EventLocationAgent, error) {

12
backend/agents/note_agent.go
View File

@ -32,15 +32,15 @@ func (agent NoteAgent) GetNotes(userId uuid.UUID, imageId uuid.UUID, imageName s
ResponseFormat: client.ResponseFormat{ ResponseFormat: client.ResponseFormat{
Type: "text", Type: "text",
}, },
Chat: client.Chat{
Messages: make([]client.ChatMessage, 0),
},
} }
err := request.AddSystem(noteAgentPrompt) request.Chat.AddSystem(noteAgentPrompt)
if err != nil { request.Chat.AddImage(imageName, imageData)
return err
}
request.AddImage(imageName, imageData) resp, err := agent.client.Request(&request.Chat)
resp, err := agent.client.Request(&request)
if err != nil { if err != nil {
return err return err
} }

15
backend/agents/orchestrator.go
View File

@ -101,15 +101,16 @@ func (agent OrchestratorAgent) Orchestrate(userId uuid.UUID, imageId uuid.UUID,
}, },
ToolChoice: &toolChoice, ToolChoice: &toolChoice,
Tools: &tools, Tools: &tools,
Chat: client.Chat{
Messages: make([]client.ChatMessage, 0),
},
} }
err = request.AddSystem(orchestratorPrompt) request.Chat.AddSystem(orchestratorPrompt)
if err != nil { request.Chat.AddImage(imageName, imageData)
return err
}
request.AddImage(imageName, imageData) _, err = agent.client.Request(&request.Chat)
_, err = agent.client.Request(&request)
if err != nil { if err != nil {
return err return err
} }
@ -119,7 +120,7 @@ func (agent OrchestratorAgent) Orchestrate(userId uuid.UUID, imageId uuid.UUID,
UserId: userId, UserId: userId,
} }
return agent.client.Process(toolHandlerInfo, request) return agent.client.Process(toolHandlerInfo, &request.Chat)
} }
func NewOrchestratorAgent(eventLocationAgent EventLocationAgent, noteAgent NoteAgent, imageName string, imageData []byte) (OrchestratorAgent, error) { func NewOrchestratorAgent(eventLocationAgent EventLocationAgent, noteAgent NoteAgent, imageName string, imageData []byte) (OrchestratorAgent, error) {

4
backend/main.go
View File

@ -25,10 +25,10 @@ import (
) )
type TestAiClient struct { type TestAiClient struct {
ImageInfo client.ImageInfo ImageInfo client.ImageMessageContent
} }
func (client TestAiClient) GetImageInfo(imageName string, imageData []byte) (client.ImageInfo, error) { func (client TestAiClient) GetImageInfo(imageName string, imageData []byte) (client.ImageMessageContent, error) {
return client.ImageInfo, nil return client.ImageInfo, nil
} }