From 82331c08334aecf49bd1f7791f77ff9dbaa2f0b1 Mon Sep 17 00:00:00 2001 From: John Costa Date: Thu, 17 Apr 2025 10:48:30 +0100 Subject: [PATCH] fix: using correct eventAgent instead of orchestrator bug + better logging --- backend/agents/event_agent.go | 1 + backend/agents/orchestrator.go | 2 +- backend/events.go | 13 +++++-------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/backend/agents/event_agent.go b/backend/agents/event_agent.go index 609f1f0..712690d 100644 --- a/backend/agents/event_agent.go +++ b/backend/agents/event_agent.go @@ -178,6 +178,7 @@ func NewEventAgent(log *log.Logger, eventsModel models.EventModel, locationAgent agentClient.ToolHandler.AddTool("getEventLocationId", func(info client.ToolHandlerInfo, args string, call client.ToolCall) (any, error) { query := "Can you get me the ID of the location present in this image?" + locationAgent.Log = log.With("Locations 📍", true) locationAgent.RunAgent(locationPrompt, locationTools, "finish", &query, info.UserId, info.ImageId, info.ImageName, *info.Image) return locationAgent.Reply, nil diff --git a/backend/agents/orchestrator.go b/backend/agents/orchestrator.go index 3b090bb..d3e072e 100644 --- a/backend/agents/orchestrator.go +++ b/backend/agents/orchestrator.go @@ -144,7 +144,7 @@ func NewOrchestratorAgent(log *log.Logger, noteAgent NoteAgent, contactAgent cli }) agent.ToolHandler.AddTool("eventAgent", func(info client.ToolHandlerInfo, args string, call client.ToolCall) (any, error) { - go agent.RunAgent(eventPrompt, eventTools, "finish", nil, info.UserId, info.ImageId, imageName, imageData) + go eventAgent.RunAgent(eventPrompt, eventTools, "finish", nil, info.UserId, info.ImageId, imageName, imageData) return Status{ Ok: true, diff --git a/backend/events.go b/backend/events.go index b06174d..367cdd1 100644 --- a/backend/events.go +++ b/backend/events.go @@ -3,7 +3,6 @@ package main import ( "context" "database/sql" - "fmt" "os" "screenmark/screenmark/agents" "screenmark/screenmark/models" @@ -37,6 +36,7 @@ func ListenNewImageEvents(db *sql.DB, eventManager *EventManager) { contactModel := models.NewContactModel(db) databaseEventLog := createLogger("Database Events 🤖") + databaseEventLog.SetLevel(log.DebugLevel) err := listener.Listen("new_image") if err != nil { @@ -76,12 +76,12 @@ func ListenNewImageEvents(db *sql.DB, eventManager *EventManager) { image, err := imageModel.GetToProcessWithData(ctx, imageId) if err != nil { - log.Error("Failed to GetToProcessWithData", "error", err) + databaseEventLog.Error("Failed to GetToProcessWithData", "error", err) return } if err := imageModel.StartProcessing(ctx, image.ID); err != nil { - log.Error("Failed to FinishProcessing", "error", err) + databaseEventLog.Error("Failed to FinishProcessing", "error", err) return } @@ -92,13 +92,13 @@ func ListenNewImageEvents(db *sql.DB, eventManager *EventManager) { err = orchestrator.RunAgent(agents.OrchestratorPrompt, agents.OrchestratorTools, "noAction", nil, image.UserID, image.ImageID, image.Image.ImageName, image.Image.Image) if err != nil { - log.Error("Orchestrator failed", "error", "err") + databaseEventLog.Error("Orchestrator failed", "error", err) return } _, err = imageModel.FinishProcessing(ctx, image.ID) if err != nil { - log.Error("Failed to finish processing", "ImageID", imageId) + databaseEventLog.Error("Failed to finish processing", "ImageID", imageId) return } @@ -137,9 +137,6 @@ func ListenProcessingImageStatus(db *sql.DB, eventManager *EventManager) { stringUuid := data.Extra[0:36] status := data.Extra[36:] - fmt.Printf("UUID: %s\n", stringUuid) - fmt.Printf("Receiving :s\n", data.Extra) - imageListener, exists := eventManager.listeners[stringUuid] if !exists { continue