Compare commits
6 Commits
fix/github
...
chore/gemm
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
69f047ed62 | ||
|
|
ef90ecd812 | ||
|
|
50e56fe22f | ||
|
|
b5a12a1da6 | ||
|
|
70e749b53a | ||
|
|
784a4c7969 |
2
Makefile
2
Makefile
@@ -9,7 +9,7 @@ cleanup-tests:
|
|||||||
docker compose down
|
docker compose down
|
||||||
|
|
||||||
tests: prepare-tests
|
tests: prepare-tests
|
||||||
LOCALAGI_MODEL="arcee-agent" LOCALAI_API_URL="http://localhost:8081" LOCALAGI_API_URL="http://localhost:8080" $(GOCMD) run github.com/onsi/ginkgo/v2/ginkgo --fail-fast -v -r ./...
|
LOCALAGI_MODEL="gemma-3-12b-it-qat" LOCALAI_API_URL="http://localhost:8081" LOCALAGI_API_URL="http://localhost:8080" $(GOCMD) run github.com/onsi/ginkgo/v2/ginkgo --fail-fast -v -r ./...
|
||||||
|
|
||||||
run-nokb:
|
run-nokb:
|
||||||
$(MAKE) run KBDISABLEINDEX=true
|
$(MAKE) run KBDISABLEINDEX=true
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ LocalAGI supports multiple hardware configurations through Docker Compose profil
|
|||||||
- Supports text, multimodal, and image generation models
|
- Supports text, multimodal, and image generation models
|
||||||
- Run with: `docker compose -f docker-compose.nvidia.yaml up`
|
- Run with: `docker compose -f docker-compose.nvidia.yaml up`
|
||||||
- Default models:
|
- Default models:
|
||||||
- Text: `arcee-agent`
|
- Text: `gemma-3-12b-it-qat`
|
||||||
- Multimodal: `minicpm-v-2_6`
|
- Multimodal: `minicpm-v-2_6`
|
||||||
- Image: `sd-1.5-ggml`
|
- Image: `sd-1.5-ggml`
|
||||||
- Environment variables:
|
- Environment variables:
|
||||||
@@ -130,7 +130,7 @@ LocalAGI supports multiple hardware configurations through Docker Compose profil
|
|||||||
- Supports text, multimodal, and image generation models
|
- Supports text, multimodal, and image generation models
|
||||||
- Run with: `docker compose -f docker-compose.intel.yaml up`
|
- Run with: `docker compose -f docker-compose.intel.yaml up`
|
||||||
- Default models:
|
- Default models:
|
||||||
- Text: `arcee-agent`
|
- Text: `gemma-3-12b-it-qat`
|
||||||
- Multimodal: `minicpm-v-2_6`
|
- Multimodal: `minicpm-v-2_6`
|
||||||
- Image: `sd-1.5-ggml`
|
- Image: `sd-1.5-ggml`
|
||||||
- Environment variables:
|
- Environment variables:
|
||||||
@@ -161,7 +161,7 @@ docker compose -f docker-compose.intel.yaml up
|
|||||||
```
|
```
|
||||||
|
|
||||||
If no models are specified, it will use the defaults:
|
If no models are specified, it will use the defaults:
|
||||||
- Text model: `arcee-agent`
|
- Text model: `gemma-3-12b-it-qat`
|
||||||
- Multimodal model: `minicpm-v-2_6`
|
- Multimodal model: `minicpm-v-2_6`
|
||||||
- Image model: `sd-1.5-ggml`
|
- Image model: `sd-1.5-ggml`
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package action
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/mudler/LocalAGI/core/types"
|
"github.com/mudler/LocalAGI/core/types"
|
||||||
"github.com/sashabaranov/go-openai/jsonschema"
|
"github.com/sashabaranov/go-openai/jsonschema"
|
||||||
@@ -16,24 +15,6 @@ func NewState() *StateAction {
|
|||||||
|
|
||||||
type StateAction struct{}
|
type StateAction struct{}
|
||||||
|
|
||||||
// State is the structure
|
|
||||||
// that is used to keep track of the current state
|
|
||||||
// and the Agent's short memory that it can update
|
|
||||||
// Besides a long term memory that is accessible by the agent (With vector database),
|
|
||||||
// And a context memory (that is always powered by a vector database),
|
|
||||||
// this memory is the shorter one that the LLM keeps across conversation and across its
|
|
||||||
// reasoning process's and life time.
|
|
||||||
// TODO: A special action is then used to let the LLM itself update its memory
|
|
||||||
// periodically during self-processing, and the same action is ALSO exposed
|
|
||||||
// during the conversation to let the user put for example, a new goal to the agent.
|
|
||||||
type AgentInternalState struct {
|
|
||||||
NowDoing string `json:"doing_now"`
|
|
||||||
DoingNext string `json:"doing_next"`
|
|
||||||
DoneHistory []string `json:"done_history"`
|
|
||||||
Memories []string `json:"memories"`
|
|
||||||
Goal string `json:"goal"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *StateAction) Run(context.Context, types.ActionParams) (types.ActionResult, error) {
|
func (a *StateAction) Run(context.Context, types.ActionParams) (types.ActionResult, error) {
|
||||||
return types.ActionResult{Result: "internal state has been updated"}, nil
|
return types.ActionResult{Result: "internal state has been updated"}, nil
|
||||||
}
|
}
|
||||||
@@ -76,23 +57,3 @@ func (a *StateAction) Definition() types.ActionDefinition {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const fmtT = `=====================
|
|
||||||
NowDoing: %s
|
|
||||||
DoingNext: %s
|
|
||||||
Your current goal is: %s
|
|
||||||
You have done: %+v
|
|
||||||
You have a short memory with: %+v
|
|
||||||
=====================
|
|
||||||
`
|
|
||||||
|
|
||||||
func (c AgentInternalState) String() string {
|
|
||||||
return fmt.Sprintf(
|
|
||||||
fmtT,
|
|
||||||
c.NowDoing,
|
|
||||||
c.DoingNext,
|
|
||||||
c.Goal,
|
|
||||||
c.DoneHistory,
|
|
||||||
c.Memories,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ type decisionResult struct {
|
|||||||
|
|
||||||
// decision forces the agent to take one of the available actions
|
// decision forces the agent to take one of the available actions
|
||||||
func (a *Agent) decision(
|
func (a *Agent) decision(
|
||||||
ctx context.Context,
|
job *types.Job,
|
||||||
conversation []openai.ChatCompletionMessage,
|
conversation []openai.ChatCompletionMessage,
|
||||||
tools []openai.Tool, toolchoice string, maxRetries int) (*decisionResult, error) {
|
tools []openai.Tool, toolchoice string, maxRetries int) (*decisionResult, error) {
|
||||||
|
|
||||||
@@ -35,8 +35,6 @@ func (a *Agent) decision(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var lastErr error
|
|
||||||
for attempts := 0; attempts < maxRetries; attempts++ {
|
|
||||||
decision := openai.ChatCompletionRequest{
|
decision := openai.ChatCompletionRequest{
|
||||||
Model: a.options.LLMAPI.Model,
|
Model: a.options.LLMAPI.Model,
|
||||||
Messages: conversation,
|
Messages: conversation,
|
||||||
@@ -47,19 +45,53 @@ func (a *Agent) decision(
|
|||||||
decision.ToolChoice = *choice
|
decision.ToolChoice = *choice
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := a.client.CreateChatCompletion(ctx, decision)
|
var obs *types.Observable
|
||||||
|
if job.Obs != nil {
|
||||||
|
obs = a.observer.NewObservable()
|
||||||
|
obs.Name = "decision"
|
||||||
|
obs.ParentID = job.Obs.ID
|
||||||
|
obs.Icon = "brain"
|
||||||
|
obs.Creation = &types.Creation{
|
||||||
|
ChatCompletionRequest: &decision,
|
||||||
|
}
|
||||||
|
a.observer.Update(*obs)
|
||||||
|
}
|
||||||
|
|
||||||
|
var lastErr error
|
||||||
|
for attempts := 0; attempts < maxRetries; attempts++ {
|
||||||
|
resp, err := a.client.CreateChatCompletion(job.GetContext(), decision)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
lastErr = err
|
lastErr = err
|
||||||
xlog.Warn("Attempt to make a decision failed", "attempt", attempts+1, "error", err)
|
xlog.Warn("Attempt to make a decision failed", "attempt", attempts+1, "error", err)
|
||||||
|
|
||||||
|
if obs != nil {
|
||||||
|
obs.Progress = append(obs.Progress, types.Progress{
|
||||||
|
Error: err.Error(),
|
||||||
|
})
|
||||||
|
a.observer.Update(*obs)
|
||||||
|
}
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
jsonResp, _ := json.Marshal(resp)
|
jsonResp, _ := json.Marshal(resp)
|
||||||
xlog.Debug("Decision response", "response", string(jsonResp))
|
xlog.Debug("Decision response", "response", string(jsonResp))
|
||||||
|
|
||||||
|
if obs != nil {
|
||||||
|
obs.AddProgress(types.Progress{
|
||||||
|
ChatCompletionResponse: &resp,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
if len(resp.Choices) != 1 {
|
if len(resp.Choices) != 1 {
|
||||||
lastErr = fmt.Errorf("no choices: %d", len(resp.Choices))
|
lastErr = fmt.Errorf("no choices: %d", len(resp.Choices))
|
||||||
xlog.Warn("Attempt to make a decision failed", "attempt", attempts+1, "error", lastErr)
|
xlog.Warn("Attempt to make a decision failed", "attempt", attempts+1, "error", lastErr)
|
||||||
|
|
||||||
|
if obs != nil {
|
||||||
|
obs.Progress[len(obs.Progress)-1].Error = lastErr.Error()
|
||||||
|
a.observer.Update(*obs)
|
||||||
|
}
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,6 +100,12 @@ func (a *Agent) decision(
|
|||||||
if err := a.saveConversation(append(conversation, msg), "decision"); err != nil {
|
if err := a.saveConversation(append(conversation, msg), "decision"); err != nil {
|
||||||
xlog.Error("Error saving conversation", "error", err)
|
xlog.Error("Error saving conversation", "error", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if obs != nil {
|
||||||
|
obs.MakeLastProgressCompletion()
|
||||||
|
a.observer.Update(*obs)
|
||||||
|
}
|
||||||
|
|
||||||
return &decisionResult{message: msg.Content}, nil
|
return &decisionResult{message: msg.Content}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,6 +113,12 @@ func (a *Agent) decision(
|
|||||||
if err := params.Read(msg.ToolCalls[0].Function.Arguments); err != nil {
|
if err := params.Read(msg.ToolCalls[0].Function.Arguments); err != nil {
|
||||||
lastErr = err
|
lastErr = err
|
||||||
xlog.Warn("Attempt to parse action parameters failed", "attempt", attempts+1, "error", err)
|
xlog.Warn("Attempt to parse action parameters failed", "attempt", attempts+1, "error", err)
|
||||||
|
|
||||||
|
if obs != nil {
|
||||||
|
obs.Progress[len(obs.Progress)-1].Error = lastErr.Error()
|
||||||
|
a.observer.Update(*obs)
|
||||||
|
}
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,6 +126,11 @@ func (a *Agent) decision(
|
|||||||
xlog.Error("Error saving conversation", "error", err)
|
xlog.Error("Error saving conversation", "error", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if obs != nil {
|
||||||
|
obs.MakeLastProgressCompletion()
|
||||||
|
a.observer.Update(*obs)
|
||||||
|
}
|
||||||
|
|
||||||
return &decisionResult{actionParams: params, actioName: msg.ToolCalls[0].Function.Name, message: msg.Content}, nil
|
return &decisionResult{actionParams: params, actioName: msg.ToolCalls[0].Function.Name, message: msg.Content}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,7 +222,7 @@ func (m Messages) IsLastMessageFromRole(role string) bool {
|
|||||||
return m[len(m)-1].Role == role
|
return m[len(m)-1].Role == role
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Agent) generateParameters(ctx context.Context, pickTemplate string, act types.Action, c []openai.ChatCompletionMessage, reasoning string, maxAttempts int) (*decisionResult, error) {
|
func (a *Agent) generateParameters(job *types.Job, pickTemplate string, act types.Action, c []openai.ChatCompletionMessage, reasoning string, maxAttempts int) (*decisionResult, error) {
|
||||||
stateHUD, err := renderTemplate(pickTemplate, a.prepareHUD(), a.availableActions(), reasoning)
|
stateHUD, err := renderTemplate(pickTemplate, a.prepareHUD(), a.availableActions(), reasoning)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -201,7 +250,7 @@ func (a *Agent) generateParameters(ctx context.Context, pickTemplate string, act
|
|||||||
var attemptErr error
|
var attemptErr error
|
||||||
|
|
||||||
for attempts := 0; attempts < maxAttempts; attempts++ {
|
for attempts := 0; attempts < maxAttempts; attempts++ {
|
||||||
result, attemptErr = a.decision(ctx,
|
result, attemptErr = a.decision(job,
|
||||||
cc,
|
cc,
|
||||||
a.availableActions().ToTools(),
|
a.availableActions().ToTools(),
|
||||||
act.Definition().Name.String(),
|
act.Definition().Name.String(),
|
||||||
@@ -263,7 +312,7 @@ func (a *Agent) handlePlanning(ctx context.Context, job *types.Job, chosenAction
|
|||||||
subTaskAction := a.availableActions().Find(subtask.Action)
|
subTaskAction := a.availableActions().Find(subtask.Action)
|
||||||
subTaskReasoning := fmt.Sprintf("%s Overall goal is: %s", subtask.Reasoning, planResult.Goal)
|
subTaskReasoning := fmt.Sprintf("%s Overall goal is: %s", subtask.Reasoning, planResult.Goal)
|
||||||
|
|
||||||
params, err := a.generateParameters(ctx, pickTemplate, subTaskAction, conv, subTaskReasoning, maxRetries)
|
params, err := a.generateParameters(job, pickTemplate, subTaskAction, conv, subTaskReasoning, maxRetries)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
xlog.Error("error generating action's parameters", "error", err)
|
xlog.Error("error generating action's parameters", "error", err)
|
||||||
return conv, fmt.Errorf("error generating action's parameters: %w", err)
|
return conv, fmt.Errorf("error generating action's parameters: %w", err)
|
||||||
@@ -293,7 +342,7 @@ func (a *Agent) handlePlanning(ctx context.Context, job *types.Job, chosenAction
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := a.runAction(ctx, subTaskAction, actionParams)
|
result, err := a.runAction(job, subTaskAction, actionParams)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
xlog.Error("error running action", "error", err)
|
xlog.Error("error running action", "error", err)
|
||||||
return conv, fmt.Errorf("error running action: %w", err)
|
return conv, fmt.Errorf("error running action: %w", err)
|
||||||
@@ -378,7 +427,7 @@ func (a *Agent) prepareHUD() (promptHUD *PromptHUD) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// pickAction picks an action based on the conversation
|
// pickAction picks an action based on the conversation
|
||||||
func (a *Agent) pickAction(ctx context.Context, templ string, messages []openai.ChatCompletionMessage, maxRetries int) (types.Action, types.ActionParams, string, error) {
|
func (a *Agent) pickAction(job *types.Job, templ string, messages []openai.ChatCompletionMessage, maxRetries int) (types.Action, types.ActionParams, string, error) {
|
||||||
c := messages
|
c := messages
|
||||||
|
|
||||||
xlog.Debug("[pickAction] picking action starts", "messages", messages)
|
xlog.Debug("[pickAction] picking action starts", "messages", messages)
|
||||||
@@ -389,7 +438,7 @@ func (a *Agent) pickAction(ctx context.Context, templ string, messages []openai.
|
|||||||
xlog.Debug("not forcing reasoning")
|
xlog.Debug("not forcing reasoning")
|
||||||
// We also could avoid to use functions here and get just a reply from the LLM
|
// We also could avoid to use functions here and get just a reply from the LLM
|
||||||
// and then use the reply to get the action
|
// and then use the reply to get the action
|
||||||
thought, err := a.decision(ctx,
|
thought, err := a.decision(job,
|
||||||
messages,
|
messages,
|
||||||
a.availableActions().ToTools(),
|
a.availableActions().ToTools(),
|
||||||
"",
|
"",
|
||||||
@@ -431,7 +480,7 @@ func (a *Agent) pickAction(ctx context.Context, templ string, messages []openai.
|
|||||||
}, c...)
|
}, c...)
|
||||||
}
|
}
|
||||||
|
|
||||||
thought, err := a.decision(ctx,
|
thought, err := a.decision(job,
|
||||||
c,
|
c,
|
||||||
types.Actions{action.NewReasoning()}.ToTools(),
|
types.Actions{action.NewReasoning()}.ToTools(),
|
||||||
action.NewReasoning().Definition().Name.String(), maxRetries)
|
action.NewReasoning().Definition().Name.String(), maxRetries)
|
||||||
@@ -467,7 +516,7 @@ func (a *Agent) pickAction(ctx context.Context, templ string, messages []openai.
|
|||||||
// to avoid hallucinations
|
// to avoid hallucinations
|
||||||
|
|
||||||
// Extract an action
|
// Extract an action
|
||||||
params, err := a.decision(ctx,
|
params, err := a.decision(job,
|
||||||
append(c, openai.ChatCompletionMessage{
|
append(c, openai.ChatCompletionMessage{
|
||||||
Role: "system",
|
Role: "system",
|
||||||
Content: "Pick the relevant action given the following reasoning: " + originalReasoning,
|
Content: "Pick the relevant action given the following reasoning: " + originalReasoning,
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ type Agent struct {
|
|||||||
jobQueue chan *types.Job
|
jobQueue chan *types.Job
|
||||||
context *types.ActionContext
|
context *types.ActionContext
|
||||||
|
|
||||||
currentState *action.AgentInternalState
|
currentState *types.AgentInternalState
|
||||||
|
|
||||||
selfEvaluationInProgress bool
|
selfEvaluationInProgress bool
|
||||||
pause bool
|
pause bool
|
||||||
@@ -41,6 +41,8 @@ type Agent struct {
|
|||||||
|
|
||||||
subscriberMutex sync.Mutex
|
subscriberMutex sync.Mutex
|
||||||
newMessagesSubscribers []func(openai.ChatCompletionMessage)
|
newMessagesSubscribers []func(openai.ChatCompletionMessage)
|
||||||
|
|
||||||
|
observer Observer
|
||||||
}
|
}
|
||||||
|
|
||||||
type RAGDB interface {
|
type RAGDB interface {
|
||||||
@@ -69,12 +71,17 @@ func New(opts ...Option) (*Agent, error) {
|
|||||||
options: options,
|
options: options,
|
||||||
client: client,
|
client: client,
|
||||||
Character: options.character,
|
Character: options.character,
|
||||||
currentState: &action.AgentInternalState{},
|
currentState: &types.AgentInternalState{},
|
||||||
context: types.NewActionContext(ctx, cancel),
|
context: types.NewActionContext(ctx, cancel),
|
||||||
newConversations: make(chan openai.ChatCompletionMessage),
|
newConversations: make(chan openai.ChatCompletionMessage),
|
||||||
newMessagesSubscribers: options.newConversationsSubscribers,
|
newMessagesSubscribers: options.newConversationsSubscribers,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Initialize observer if provided
|
||||||
|
if options.observer != nil {
|
||||||
|
a.observer = options.observer
|
||||||
|
}
|
||||||
|
|
||||||
if a.options.statefile != "" {
|
if a.options.statefile != "" {
|
||||||
if _, err := os.Stat(a.options.statefile); err == nil {
|
if _, err := os.Stat(a.options.statefile); err == nil {
|
||||||
if err = a.LoadState(a.options.statefile); err != nil {
|
if err = a.LoadState(a.options.statefile); err != nil {
|
||||||
@@ -146,6 +153,14 @@ func (a *Agent) Ask(opts ...types.JobOption) *types.JobResult {
|
|||||||
xlog.Debug("Agent has finished being asked", "agent", a.Character.Name)
|
xlog.Debug("Agent has finished being asked", "agent", a.Character.Name)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
if a.observer != nil {
|
||||||
|
obs := a.observer.NewObservable()
|
||||||
|
obs.Name = "job"
|
||||||
|
obs.Icon = "plug"
|
||||||
|
a.observer.Update(*obs)
|
||||||
|
opts = append(opts, types.WithObservable(obs))
|
||||||
|
}
|
||||||
|
|
||||||
return a.Execute(types.NewJob(
|
return a.Execute(types.NewJob(
|
||||||
append(
|
append(
|
||||||
opts,
|
opts,
|
||||||
@@ -163,6 +178,20 @@ func (a *Agent) Execute(j *types.Job) *types.JobResult {
|
|||||||
xlog.Debug("Agent has finished", "agent", a.Character.Name)
|
xlog.Debug("Agent has finished", "agent", a.Character.Name)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
if j.Obs != nil {
|
||||||
|
j.Result.AddFinalizer(func(ccm []openai.ChatCompletionMessage) {
|
||||||
|
j.Obs.Completion = &types.Completion{
|
||||||
|
Conversation: ccm,
|
||||||
|
}
|
||||||
|
|
||||||
|
if j.Result.Error != nil {
|
||||||
|
j.Obs.Completion.Error = j.Result.Error.Error()
|
||||||
|
}
|
||||||
|
|
||||||
|
a.observer.Update(*j.Obs)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
a.Enqueue(j)
|
a.Enqueue(j)
|
||||||
return j.Result.WaitResult()
|
return j.Result.WaitResult()
|
||||||
}
|
}
|
||||||
@@ -237,34 +266,78 @@ func (a *Agent) Memory() RAGDB {
|
|||||||
return a.options.ragdb
|
return a.options.ragdb
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Agent) runAction(ctx context.Context, chosenAction types.Action, params types.ActionParams) (result types.ActionResult, err error) {
|
func (a *Agent) runAction(job *types.Job, chosenAction types.Action, params types.ActionParams) (result types.ActionResult, err error) {
|
||||||
|
var obs *types.Observable
|
||||||
|
if job.Obs != nil {
|
||||||
|
obs = a.observer.NewObservable()
|
||||||
|
obs.Name = "action"
|
||||||
|
obs.Icon = "bolt"
|
||||||
|
obs.ParentID = job.Obs.ID
|
||||||
|
obs.Creation = &types.Creation{
|
||||||
|
FunctionDefinition: chosenAction.Definition().ToFunctionDefinition(),
|
||||||
|
FunctionParams: params,
|
||||||
|
}
|
||||||
|
a.observer.Update(*obs)
|
||||||
|
}
|
||||||
|
|
||||||
|
xlog.Info("[runAction] Running action", "action", chosenAction.Definition().Name, "agent", a.Character.Name, "params", params.String())
|
||||||
|
|
||||||
for _, act := range a.availableActions() {
|
for _, act := range a.availableActions() {
|
||||||
if act.Definition().Name == chosenAction.Definition().Name {
|
if act.Definition().Name == chosenAction.Definition().Name {
|
||||||
res, err := act.Run(ctx, params)
|
res, err := act.Run(job.GetContext(), params)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if obs != nil {
|
||||||
|
obs.Completion = &types.Completion{
|
||||||
|
Error: err.Error(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return types.ActionResult{}, fmt.Errorf("error running action: %w", err)
|
return types.ActionResult{}, fmt.Errorf("error running action: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if obs != nil {
|
||||||
|
obs.Progress = append(obs.Progress, types.Progress{
|
||||||
|
ActionResult: res.Result,
|
||||||
|
})
|
||||||
|
a.observer.Update(*obs)
|
||||||
|
}
|
||||||
|
|
||||||
result = res
|
result = res
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
xlog.Info("[runAction] Running action", "action", chosenAction.Definition().Name, "agent", a.Character.Name, "params", params.String())
|
|
||||||
|
|
||||||
if chosenAction.Definition().Name.Is(action.StateActionName) {
|
if chosenAction.Definition().Name.Is(action.StateActionName) {
|
||||||
// We need to store the result in the state
|
// We need to store the result in the state
|
||||||
state := action.AgentInternalState{}
|
state := types.AgentInternalState{}
|
||||||
|
|
||||||
err = params.Unmarshal(&state)
|
err = params.Unmarshal(&state)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return types.ActionResult{}, fmt.Errorf("error unmarshalling state of the agent: %w", err)
|
werr := fmt.Errorf("error unmarshalling state of the agent: %w", err)
|
||||||
|
if obs != nil {
|
||||||
|
obs.Completion = &types.Completion{
|
||||||
|
Error: werr.Error(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return types.ActionResult{}, werr
|
||||||
}
|
}
|
||||||
// update the current state with the one we just got from the action
|
// update the current state with the one we just got from the action
|
||||||
a.currentState = &state
|
a.currentState = &state
|
||||||
|
if obs != nil {
|
||||||
|
obs.Progress = append(obs.Progress, types.Progress{
|
||||||
|
AgentState: &state,
|
||||||
|
})
|
||||||
|
a.observer.Update(*obs)
|
||||||
|
}
|
||||||
|
|
||||||
// update the state file
|
// update the state file
|
||||||
if a.options.statefile != "" {
|
if a.options.statefile != "" {
|
||||||
if err := a.SaveState(a.options.statefile); err != nil {
|
if err := a.SaveState(a.options.statefile); err != nil {
|
||||||
|
if obs != nil {
|
||||||
|
obs.Completion = &types.Completion{
|
||||||
|
Error: err.Error(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return types.ActionResult{}, err
|
return types.ActionResult{}, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -272,6 +345,11 @@ func (a *Agent) runAction(ctx context.Context, chosenAction types.Action, params
|
|||||||
|
|
||||||
xlog.Debug("[runAction] Action result", "action", chosenAction.Definition().Name, "params", params.String(), "result", result.Result)
|
xlog.Debug("[runAction] Action result", "action", chosenAction.Definition().Name, "params", params.String(), "result", result.Result)
|
||||||
|
|
||||||
|
if obs != nil {
|
||||||
|
obs.MakeLastProgressCompletion()
|
||||||
|
a.observer.Update(*obs)
|
||||||
|
}
|
||||||
|
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -468,7 +546,7 @@ func (a *Agent) consumeJob(job *types.Job, role string) {
|
|||||||
chosenAction = *action
|
chosenAction = *action
|
||||||
reasoning = reason
|
reasoning = reason
|
||||||
if params == nil {
|
if params == nil {
|
||||||
p, err := a.generateParameters(job.GetContext(), pickTemplate, chosenAction, conv, reasoning, maxRetries)
|
p, err := a.generateParameters(job, pickTemplate, chosenAction, conv, reasoning, maxRetries)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
xlog.Error("Error generating parameters, trying again", "error", err)
|
xlog.Error("Error generating parameters, trying again", "error", err)
|
||||||
// try again
|
// try again
|
||||||
@@ -483,7 +561,7 @@ func (a *Agent) consumeJob(job *types.Job, role string) {
|
|||||||
job.ResetNextAction()
|
job.ResetNextAction()
|
||||||
} else {
|
} else {
|
||||||
var err error
|
var err error
|
||||||
chosenAction, actionParams, reasoning, err = a.pickAction(job.GetContext(), pickTemplate, conv, maxRetries)
|
chosenAction, actionParams, reasoning, err = a.pickAction(job, pickTemplate, conv, maxRetries)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
xlog.Error("Error picking action", "error", err)
|
xlog.Error("Error picking action", "error", err)
|
||||||
job.Result.Finish(err)
|
job.Result.Finish(err)
|
||||||
@@ -557,7 +635,7 @@ func (a *Agent) consumeJob(job *types.Job, role string) {
|
|||||||
"reasoning", reasoning,
|
"reasoning", reasoning,
|
||||||
)
|
)
|
||||||
|
|
||||||
params, err := a.generateParameters(job.GetContext(), pickTemplate, chosenAction, conv, reasoning, maxRetries)
|
params, err := a.generateParameters(job, pickTemplate, chosenAction, conv, reasoning, maxRetries)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
xlog.Error("Error generating parameters, trying again", "error", err)
|
xlog.Error("Error generating parameters, trying again", "error", err)
|
||||||
// try again
|
// try again
|
||||||
@@ -652,7 +730,7 @@ func (a *Agent) consumeJob(job *types.Job, role string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !chosenAction.Definition().Name.Is(action.PlanActionName) {
|
if !chosenAction.Definition().Name.Is(action.PlanActionName) {
|
||||||
result, err := a.runAction(job.GetContext(), chosenAction, actionParams)
|
result, err := a.runAction(job, chosenAction, actionParams)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
//job.Result.Finish(fmt.Errorf("error running action: %w", err))
|
//job.Result.Finish(fmt.Errorf("error running action: %w", err))
|
||||||
//return
|
//return
|
||||||
@@ -677,7 +755,7 @@ func (a *Agent) consumeJob(job *types.Job, role string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// given the result, we can now re-evaluate the conversation
|
// given the result, we can now re-evaluate the conversation
|
||||||
followingAction, followingParams, reasoning, err := a.pickAction(job.GetContext(), reEvaluationTemplate, conv, maxRetries)
|
followingAction, followingParams, reasoning, err := a.pickAction(job, reEvaluationTemplate, conv, maxRetries)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
job.Result.Conversation = conv
|
job.Result.Conversation = conv
|
||||||
job.Result.Finish(fmt.Errorf("error picking action: %w", err))
|
job.Result.Finish(fmt.Errorf("error picking action: %w", err))
|
||||||
@@ -955,3 +1033,7 @@ func (a *Agent) loop(timer *time.Timer, job *types.Job) {
|
|||||||
xlog.Debug("Agent is consuming a job", "agent", a.Character.Name, "job", job)
|
xlog.Debug("Agent is consuming a job", "agent", a.Character.Name, "job", job)
|
||||||
a.consumeJob(job, UserRole)
|
a.consumeJob(job, UserRole)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *Agent) Observer() Observer {
|
||||||
|
return a.observer
|
||||||
|
}
|
||||||
|
|||||||
@@ -226,7 +226,10 @@ var _ = Describe("Agent test", func() {
|
|||||||
WithLLMAPIKey(apiKeyURL),
|
WithLLMAPIKey(apiKeyURL),
|
||||||
WithTimeout("10m"),
|
WithTimeout("10m"),
|
||||||
WithActions(
|
WithActions(
|
||||||
actions.NewSearch(map[string]string{}),
|
&TestAction{response: map[string]string{
|
||||||
|
"boston": testActionResult,
|
||||||
|
"milan": testActionResult2,
|
||||||
|
}},
|
||||||
),
|
),
|
||||||
EnablePlanning,
|
EnablePlanning,
|
||||||
EnableForceReasoning,
|
EnableForceReasoning,
|
||||||
@@ -238,18 +241,21 @@ var _ = Describe("Agent test", func() {
|
|||||||
defer agent.Stop()
|
defer agent.Stop()
|
||||||
|
|
||||||
result := agent.Ask(
|
result := agent.Ask(
|
||||||
types.WithText("Thoroughly plan a trip to San Francisco from Venice, Italy; check flight times, visa requirements and whether electrical items are allowed in cabin luggage."),
|
types.WithText("Use the plan tool to do two actions in sequence: search for the weather in boston and search for the weather in milan"),
|
||||||
)
|
)
|
||||||
Expect(len(result.State)).To(BeNumerically(">", 1))
|
Expect(len(result.State)).To(BeNumerically(">", 1))
|
||||||
|
|
||||||
actionsExecuted := []string{}
|
actionsExecuted := []string{}
|
||||||
|
actionResults := []string{}
|
||||||
for _, r := range result.State {
|
for _, r := range result.State {
|
||||||
xlog.Info(r.Result)
|
xlog.Info(r.Result)
|
||||||
actionsExecuted = append(actionsExecuted, r.Action.Definition().Name.String())
|
actionsExecuted = append(actionsExecuted, r.Action.Definition().Name.String())
|
||||||
|
actionResults = append(actionResults, r.ActionResult.Result)
|
||||||
}
|
}
|
||||||
Expect(actionsExecuted).To(ContainElement("search_internet"), fmt.Sprint(result))
|
Expect(actionsExecuted).To(ContainElement("get_weather"), fmt.Sprint(result))
|
||||||
Expect(actionsExecuted).To(ContainElement("plan"), fmt.Sprint(result))
|
Expect(actionsExecuted).To(ContainElement("plan"), fmt.Sprint(result))
|
||||||
|
Expect(actionResults).To(ContainElement(testActionResult), fmt.Sprint(result))
|
||||||
|
Expect(actionResults).To(ContainElement(testActionResult2), fmt.Sprint(result))
|
||||||
})
|
})
|
||||||
|
|
||||||
It("Can initiate conversations", func() {
|
It("Can initiate conversations", func() {
|
||||||
|
|||||||
87
core/agent/observer.go
Normal file
87
core/agent/observer.go
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
package agent
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
|
|
||||||
|
"github.com/mudler/LocalAGI/core/sse"
|
||||||
|
"github.com/mudler/LocalAGI/core/types"
|
||||||
|
"github.com/mudler/LocalAGI/pkg/xlog"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Observer interface {
|
||||||
|
NewObservable() *types.Observable
|
||||||
|
Update(types.Observable)
|
||||||
|
History() []types.Observable
|
||||||
|
}
|
||||||
|
|
||||||
|
type SSEObserver struct {
|
||||||
|
agent string
|
||||||
|
maxID int32
|
||||||
|
manager sse.Manager
|
||||||
|
|
||||||
|
mutex sync.Mutex
|
||||||
|
history []types.Observable
|
||||||
|
historyLast int
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewSSEObserver(agent string, manager sse.Manager) *SSEObserver {
|
||||||
|
return &SSEObserver{
|
||||||
|
agent: agent,
|
||||||
|
maxID: 1,
|
||||||
|
manager: manager,
|
||||||
|
history: make([]types.Observable, 100),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SSEObserver) NewObservable() *types.Observable {
|
||||||
|
id := atomic.AddInt32(&s.maxID, 1)
|
||||||
|
return &types.Observable{
|
||||||
|
ID: id - 1,
|
||||||
|
Agent: s.agent,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SSEObserver) Update(obs types.Observable) {
|
||||||
|
data, err := json.Marshal(obs)
|
||||||
|
if err != nil {
|
||||||
|
xlog.Error("Error marshaling observable", "error", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
msg := sse.NewMessage(string(data)).WithEvent("observable_update")
|
||||||
|
s.manager.Send(msg)
|
||||||
|
|
||||||
|
s.mutex.Lock()
|
||||||
|
defer s.mutex.Unlock()
|
||||||
|
|
||||||
|
for i, o := range s.history {
|
||||||
|
if o.ID == obs.ID {
|
||||||
|
s.history[i] = obs
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
s.history[s.historyLast] = obs
|
||||||
|
s.historyLast += 1
|
||||||
|
if s.historyLast >= len(s.history) {
|
||||||
|
s.historyLast = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SSEObserver) History() []types.Observable {
|
||||||
|
h := make([]types.Observable, 0, 20)
|
||||||
|
|
||||||
|
s.mutex.Lock()
|
||||||
|
defer s.mutex.Unlock()
|
||||||
|
|
||||||
|
for _, obs := range s.history {
|
||||||
|
if obs.ID == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
h = append(h, obs)
|
||||||
|
}
|
||||||
|
|
||||||
|
return h
|
||||||
|
}
|
||||||
@@ -53,6 +53,8 @@ type options struct {
|
|||||||
mcpServers []MCPServer
|
mcpServers []MCPServer
|
||||||
|
|
||||||
newConversationsSubscribers []func(openai.ChatCompletionMessage)
|
newConversationsSubscribers []func(openai.ChatCompletionMessage)
|
||||||
|
|
||||||
|
observer Observer
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o *options) SeparatedMultimodalModel() bool {
|
func (o *options) SeparatedMultimodalModel() bool {
|
||||||
@@ -336,3 +338,10 @@ func WithActions(actions ...types.Action) Option {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func WithObserver(observer Observer) Option {
|
||||||
|
return func(o *options) error {
|
||||||
|
o.observer = observer
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/mudler/LocalAGI/core/action"
|
"github.com/mudler/LocalAGI/core/types"
|
||||||
"github.com/sashabaranov/go-openai/jsonschema"
|
"github.com/sashabaranov/go-openai/jsonschema"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@ import (
|
|||||||
// in the prompts
|
// in the prompts
|
||||||
type PromptHUD struct {
|
type PromptHUD struct {
|
||||||
Character Character `json:"character"`
|
Character Character `json:"character"`
|
||||||
CurrentState action.AgentInternalState `json:"current_state"`
|
CurrentState types.AgentInternalState `json:"current_state"`
|
||||||
PermanentGoal string `json:"permanent_goal"`
|
PermanentGoal string `json:"permanent_goal"`
|
||||||
ShowCharacter bool `json:"show_character"`
|
ShowCharacter bool `json:"show_character"`
|
||||||
}
|
}
|
||||||
@@ -80,7 +80,7 @@ func Load(path string) (*Character, error) {
|
|||||||
return &c, nil
|
return &c, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Agent) State() action.AgentInternalState {
|
func (a *Agent) State() types.AgentInternalState {
|
||||||
return *a.currentState
|
return *a.currentState
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -407,6 +407,7 @@ func (a *AgentPool) startAgentWithConfig(name string, config *AgentConfig) error
|
|||||||
c.AgentResultCallback()(state)
|
c.AgentResultCallback()(state)
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
WithObserver(NewSSEObserver(name, manager)),
|
||||||
}
|
}
|
||||||
|
|
||||||
if config.HUD {
|
if config.HUD {
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ type Job struct {
|
|||||||
|
|
||||||
context context.Context
|
context context.Context
|
||||||
cancel context.CancelFunc
|
cancel context.CancelFunc
|
||||||
|
|
||||||
|
Obs *Observable
|
||||||
}
|
}
|
||||||
|
|
||||||
type ActionRequest struct {
|
type ActionRequest struct {
|
||||||
@@ -198,3 +200,9 @@ func (j *Job) Cancel() {
|
|||||||
func (j *Job) GetContext() context.Context {
|
func (j *Job) GetContext() context.Context {
|
||||||
return j.context
|
return j.context
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func WithObservable(obs *Observable) JobOption {
|
||||||
|
return func(j *Job) {
|
||||||
|
j.Obs = obs
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
61
core/types/observable.go
Normal file
61
core/types/observable.go
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
package types
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/mudler/LocalAGI/pkg/xlog"
|
||||||
|
"github.com/sashabaranov/go-openai"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Creation struct {
|
||||||
|
ChatCompletionRequest *openai.ChatCompletionRequest `json:"chat_completion_request,omitempty"`
|
||||||
|
FunctionDefinition *openai.FunctionDefinition `json:"function_definition,omitempty"`
|
||||||
|
FunctionParams ActionParams `json:"function_params,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Progress struct {
|
||||||
|
Error string `json:"error,omitempty"`
|
||||||
|
ChatCompletionResponse *openai.ChatCompletionResponse `json:"chat_completion_response,omitempty"`
|
||||||
|
ActionResult string `json:"action_result,omitempty"`
|
||||||
|
AgentState *AgentInternalState `json:"agent_state"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Completion struct {
|
||||||
|
Error string `json:"error,omitempty"`
|
||||||
|
ChatCompletionResponse *openai.ChatCompletionResponse `json:"chat_completion_response,omitempty"`
|
||||||
|
Conversation []openai.ChatCompletionMessage `json:"conversation,omitempty"`
|
||||||
|
ActionResult string `json:"action_result,omitempty"`
|
||||||
|
AgentState *AgentInternalState `json:"agent_state"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Observable struct {
|
||||||
|
ID int32 `json:"id"`
|
||||||
|
ParentID int32 `json:"parent_id,omitempty"`
|
||||||
|
Agent string `json:"agent"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Icon string `json:"icon"`
|
||||||
|
|
||||||
|
Creation *Creation `json:"creation,omitempty"`
|
||||||
|
Progress []Progress `json:"progress,omitempty"`
|
||||||
|
Completion *Completion `json:"completion,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *Observable) AddProgress(p Progress) {
|
||||||
|
if o.Progress == nil {
|
||||||
|
o.Progress = make([]Progress, 0)
|
||||||
|
}
|
||||||
|
o.Progress = append(o.Progress, p)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *Observable) MakeLastProgressCompletion() {
|
||||||
|
if len(o.Progress) == 0 {
|
||||||
|
xlog.Error("Observable completed without any progress", "id", o.ID, "name", o.Name)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
p := o.Progress[len(o.Progress)-1]
|
||||||
|
o.Progress = o.Progress[:len(o.Progress)-1]
|
||||||
|
o.Completion = &Completion{
|
||||||
|
Error: p.Error,
|
||||||
|
ChatCompletionResponse: p.ChatCompletionResponse,
|
||||||
|
ActionResult: p.ActionResult,
|
||||||
|
AgentState: p.AgentState,
|
||||||
|
}
|
||||||
|
}
|
||||||
41
core/types/state.go
Normal file
41
core/types/state.go
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
package types
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
|
// State is the structure
|
||||||
|
// that is used to keep track of the current state
|
||||||
|
// and the Agent's short memory that it can update
|
||||||
|
// Besides a long term memory that is accessible by the agent (With vector database),
|
||||||
|
// And a context memory (that is always powered by a vector database),
|
||||||
|
// this memory is the shorter one that the LLM keeps across conversation and across its
|
||||||
|
// reasoning process's and life time.
|
||||||
|
// TODO: A special action is then used to let the LLM itself update its memory
|
||||||
|
// periodically during self-processing, and the same action is ALSO exposed
|
||||||
|
// during the conversation to let the user put for example, a new goal to the agent.
|
||||||
|
type AgentInternalState struct {
|
||||||
|
NowDoing string `json:"doing_now"`
|
||||||
|
DoingNext string `json:"doing_next"`
|
||||||
|
DoneHistory []string `json:"done_history"`
|
||||||
|
Memories []string `json:"memories"`
|
||||||
|
Goal string `json:"goal"`
|
||||||
|
}
|
||||||
|
|
||||||
|
const fmtT = `=====================
|
||||||
|
NowDoing: %s
|
||||||
|
DoingNext: %s
|
||||||
|
Your current goal is: %s
|
||||||
|
You have done: %+v
|
||||||
|
You have a short memory with: %+v
|
||||||
|
=====================
|
||||||
|
`
|
||||||
|
|
||||||
|
func (c AgentInternalState) String() string {
|
||||||
|
return fmt.Sprintf(
|
||||||
|
fmtT,
|
||||||
|
c.NowDoing,
|
||||||
|
c.DoingNext,
|
||||||
|
c.Goal,
|
||||||
|
c.DoneHistory,
|
||||||
|
c.Memories,
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ services:
|
|||||||
# Image list (dockerhub): https://hub.docker.com/r/localai/localai
|
# Image list (dockerhub): https://hub.docker.com/r/localai/localai
|
||||||
image: localai/localai:master-ffmpeg-core
|
image: localai/localai:master-ffmpeg-core
|
||||||
command:
|
command:
|
||||||
- ${MODEL_NAME:-arcee-agent}
|
- ${MODEL_NAME:-gemma-3-12b-it-qat}
|
||||||
- ${MULTIMODAL_MODEL:-minicpm-v-2_6}
|
- ${MULTIMODAL_MODEL:-minicpm-v-2_6}
|
||||||
- ${IMAGE_MODEL:-sd-1.5-ggml}
|
- ${IMAGE_MODEL:-sd-1.5-ggml}
|
||||||
- granite-embedding-107m-multilingual
|
- granite-embedding-107m-multilingual
|
||||||
@@ -59,7 +59,7 @@ services:
|
|||||||
- 8080:3000
|
- 8080:3000
|
||||||
#image: quay.io/mudler/localagi:master
|
#image: quay.io/mudler/localagi:master
|
||||||
environment:
|
environment:
|
||||||
- LOCALAGI_MODEL=${MODEL_NAME:-arcee-agent}
|
- LOCALAGI_MODEL=${MODEL_NAME:-gemma-3-12b-it-qat}
|
||||||
- LOCALAGI_MULTIMODAL_MODEL=${MULTIMODAL_MODEL:-minicpm-v-2_6}
|
- LOCALAGI_MULTIMODAL_MODEL=${MULTIMODAL_MODEL:-minicpm-v-2_6}
|
||||||
- LOCALAGI_IMAGE_MODEL=${IMAGE_MODEL:-sd-1.5-ggml}
|
- LOCALAGI_IMAGE_MODEL=${IMAGE_MODEL:-sd-1.5-ggml}
|
||||||
- LOCALAGI_LLM_API_URL=http://localai:8080
|
- LOCALAGI_LLM_API_URL=http://localai:8080
|
||||||
|
|||||||
5
main.go
5
main.go
@@ -22,6 +22,7 @@ var withLogs = os.Getenv("LOCALAGI_ENABLE_CONVERSATIONS_LOGGING") == "true"
|
|||||||
var apiKeysEnv = os.Getenv("LOCALAGI_API_KEYS")
|
var apiKeysEnv = os.Getenv("LOCALAGI_API_KEYS")
|
||||||
var imageModel = os.Getenv("LOCALAGI_IMAGE_MODEL")
|
var imageModel = os.Getenv("LOCALAGI_IMAGE_MODEL")
|
||||||
var conversationDuration = os.Getenv("LOCALAGI_CONVERSATION_DURATION")
|
var conversationDuration = os.Getenv("LOCALAGI_CONVERSATION_DURATION")
|
||||||
|
var localOperatorBaseURL = os.Getenv("LOCALOPERATOR_BASE_URL")
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
if baseModel == "" {
|
if baseModel == "" {
|
||||||
@@ -61,7 +62,9 @@ func main() {
|
|||||||
apiKey,
|
apiKey,
|
||||||
stateDir,
|
stateDir,
|
||||||
localRAG,
|
localRAG,
|
||||||
services.Actions,
|
services.Actions(map[string]string{
|
||||||
|
"browser-agent-runner-base-url": localOperatorBaseURL,
|
||||||
|
}),
|
||||||
services.Connectors,
|
services.Connectors,
|
||||||
services.DynamicPrompts,
|
services.DynamicPrompts,
|
||||||
timeout,
|
timeout,
|
||||||
|
|||||||
70
pkg/localoperator/client.go
Normal file
70
pkg/localoperator/client.go
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Client represents a client for interacting with the LocalOperator API
|
||||||
|
type Client struct {
|
||||||
|
baseURL string
|
||||||
|
httpClient *http.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewClient creates a new API client
|
||||||
|
func NewClient(baseURL string) *Client {
|
||||||
|
return &Client{
|
||||||
|
baseURL: baseURL,
|
||||||
|
httpClient: &http.Client{},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// AgentRequest represents the request body for running an agent
|
||||||
|
type AgentRequest struct {
|
||||||
|
Goal string `json:"goal"`
|
||||||
|
MaxAttempts int `json:"max_attempts,omitempty"`
|
||||||
|
MaxNoActionAttempts int `json:"max_no_action_attempts,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// StateDescription represents a single state in the agent's history
|
||||||
|
type StateDescription struct {
|
||||||
|
CurrentURL string `json:"current_url"`
|
||||||
|
PageTitle string `json:"page_title"`
|
||||||
|
PageContentDescription string `json:"page_content_description"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// StateHistory represents the complete history of states during agent execution
|
||||||
|
type StateHistory struct {
|
||||||
|
States []StateDescription `json:"states"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// RunAgent sends a request to run an agent with the given goal
|
||||||
|
func (c *Client) RunBrowserAgent(req AgentRequest) (*StateHistory, error) {
|
||||||
|
body, err := json.Marshal(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to marshal request: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := c.httpClient.Post(
|
||||||
|
fmt.Sprintf("%s/api/browser/run", c.baseURL),
|
||||||
|
"application/json",
|
||||||
|
bytes.NewBuffer(body),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to send request: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
var state StateHistory
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&state); err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to decode response: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &state, nil
|
||||||
|
}
|
||||||
@@ -18,6 +18,7 @@ const (
|
|||||||
// Actions
|
// Actions
|
||||||
ActionSearch = "search"
|
ActionSearch = "search"
|
||||||
ActionCustom = "custom"
|
ActionCustom = "custom"
|
||||||
|
ActionBrowserAgentRunner = "browser-agent-runner"
|
||||||
ActionGithubIssueLabeler = "github-issue-labeler"
|
ActionGithubIssueLabeler = "github-issue-labeler"
|
||||||
ActionGithubIssueOpener = "github-issue-opener"
|
ActionGithubIssueOpener = "github-issue-opener"
|
||||||
ActionGithubIssueCloser = "github-issue-closer"
|
ActionGithubIssueCloser = "github-issue-closer"
|
||||||
@@ -52,6 +53,7 @@ var AvailableActions = []string{
|
|||||||
ActionGithubIssueSearcher,
|
ActionGithubIssueSearcher,
|
||||||
ActionGithubRepositoryGet,
|
ActionGithubRepositoryGet,
|
||||||
ActionGithubGetAllContent,
|
ActionGithubGetAllContent,
|
||||||
|
ActionBrowserAgentRunner,
|
||||||
ActionGithubRepositoryCreateOrUpdate,
|
ActionGithubRepositoryCreateOrUpdate,
|
||||||
ActionGithubIssueReader,
|
ActionGithubIssueReader,
|
||||||
ActionGithubIssueCommenter,
|
ActionGithubIssueCommenter,
|
||||||
@@ -71,7 +73,8 @@ var AvailableActions = []string{
|
|||||||
ActionShellcommand,
|
ActionShellcommand,
|
||||||
}
|
}
|
||||||
|
|
||||||
func Actions(a *state.AgentConfig) func(ctx context.Context, pool *state.AgentPool) []types.Action {
|
func Actions(actionsConfigs map[string]string) func(a *state.AgentConfig) func(ctx context.Context, pool *state.AgentPool) []types.Action {
|
||||||
|
return func(a *state.AgentConfig) func(ctx context.Context, pool *state.AgentPool) []types.Action {
|
||||||
return func(ctx context.Context, pool *state.AgentPool) []types.Action {
|
return func(ctx context.Context, pool *state.AgentPool) []types.Action {
|
||||||
allActions := []types.Action{}
|
allActions := []types.Action{}
|
||||||
|
|
||||||
@@ -84,7 +87,7 @@ func Actions(a *state.AgentConfig) func(ctx context.Context, pool *state.AgentPo
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
a, err := Action(a.Name, agentName, config, pool)
|
a, err := Action(a.Name, agentName, config, pool, actionsConfigs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -95,7 +98,9 @@ func Actions(a *state.AgentConfig) func(ctx context.Context, pool *state.AgentPo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func Action(name, agentName string, config map[string]string, pool *state.AgentPool) (types.Action, error) {
|
}
|
||||||
|
|
||||||
|
func Action(name, agentName string, config map[string]string, pool *state.AgentPool, actionsConfigs map[string]string) (types.Action, error) {
|
||||||
var a types.Action
|
var a types.Action
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
@@ -114,6 +119,8 @@ func Action(name, agentName string, config map[string]string, pool *state.AgentP
|
|||||||
a = actions.NewGithubIssueCloser(config)
|
a = actions.NewGithubIssueCloser(config)
|
||||||
case ActionGithubIssueSearcher:
|
case ActionGithubIssueSearcher:
|
||||||
a = actions.NewGithubIssueSearch(config)
|
a = actions.NewGithubIssueSearch(config)
|
||||||
|
case ActionBrowserAgentRunner:
|
||||||
|
a = actions.NewBrowserAgentRunner(config, actionsConfigs["browser-agent-runner-base-url"])
|
||||||
case ActionGithubIssueReader:
|
case ActionGithubIssueReader:
|
||||||
a = actions.NewGithubIssueReader(config)
|
a = actions.NewGithubIssueReader(config)
|
||||||
case ActionGithubPRReader:
|
case ActionGithubPRReader:
|
||||||
@@ -169,6 +176,11 @@ func ActionsConfigMeta() []config.FieldGroup {
|
|||||||
Label: "Search",
|
Label: "Search",
|
||||||
Fields: actions.SearchConfigMeta(),
|
Fields: actions.SearchConfigMeta(),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
Name: "browser-agent-runner",
|
||||||
|
Label: "Browser Agent Runner",
|
||||||
|
Fields: actions.BrowserAgentRunnerConfigMeta(),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
Name: "generate_image",
|
Name: "generate_image",
|
||||||
Label: "Generate Image",
|
Label: "Generate Image",
|
||||||
|
|||||||
116
services/actions/browseragentrunner.go
Normal file
116
services/actions/browseragentrunner.go
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
package actions
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/mudler/LocalAGI/core/types"
|
||||||
|
"github.com/mudler/LocalAGI/pkg/config"
|
||||||
|
api "github.com/mudler/LocalAGI/pkg/localoperator"
|
||||||
|
"github.com/sashabaranov/go-openai/jsonschema"
|
||||||
|
)
|
||||||
|
|
||||||
|
type BrowserAgentRunner struct {
|
||||||
|
baseURL, customActionName string
|
||||||
|
client *api.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewBrowserAgentRunner(config map[string]string, defaultURL string) *BrowserAgentRunner {
|
||||||
|
if config["baseURL"] == "" {
|
||||||
|
config["baseURL"] = defaultURL
|
||||||
|
}
|
||||||
|
|
||||||
|
client := api.NewClient(config["baseURL"])
|
||||||
|
|
||||||
|
return &BrowserAgentRunner{
|
||||||
|
client: client,
|
||||||
|
baseURL: config["baseURL"],
|
||||||
|
customActionName: config["customActionName"],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *BrowserAgentRunner) Run(ctx context.Context, params types.ActionParams) (types.ActionResult, error) {
|
||||||
|
result := api.AgentRequest{}
|
||||||
|
err := params.Unmarshal(&result)
|
||||||
|
if err != nil {
|
||||||
|
return types.ActionResult{}, fmt.Errorf("failed to unmarshal params: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
req := api.AgentRequest{
|
||||||
|
Goal: result.Goal,
|
||||||
|
MaxAttempts: result.MaxAttempts,
|
||||||
|
MaxNoActionAttempts: result.MaxNoActionAttempts,
|
||||||
|
}
|
||||||
|
|
||||||
|
stateHistory, err := b.client.RunBrowserAgent(req)
|
||||||
|
if err != nil {
|
||||||
|
return types.ActionResult{}, fmt.Errorf("failed to run browser agent: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Format the state history into a readable string
|
||||||
|
var historyStr string
|
||||||
|
// for i, state := range stateHistory.States {
|
||||||
|
// historyStr += fmt.Sprintf("State %d:\n", i+1)
|
||||||
|
// historyStr += fmt.Sprintf(" URL: %s\n", state.CurrentURL)
|
||||||
|
// historyStr += fmt.Sprintf(" Title: %s\n", state.PageTitle)
|
||||||
|
// historyStr += fmt.Sprintf(" Description: %s\n\n", state.PageContentDescription)
|
||||||
|
// }
|
||||||
|
|
||||||
|
historyStr += fmt.Sprintf(" URL: %s\n", stateHistory.States[len(stateHistory.States)-1].CurrentURL)
|
||||||
|
historyStr += fmt.Sprintf(" Title: %s\n", stateHistory.States[len(stateHistory.States)-1].PageTitle)
|
||||||
|
historyStr += fmt.Sprintf(" Description: %s\n\n", stateHistory.States[len(stateHistory.States)-1].PageContentDescription)
|
||||||
|
|
||||||
|
return types.ActionResult{
|
||||||
|
Result: fmt.Sprintf("Browser agent completed successfully. History:\n%s", historyStr),
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *BrowserAgentRunner) Definition() types.ActionDefinition {
|
||||||
|
actionName := "run_browser_agent"
|
||||||
|
if b.customActionName != "" {
|
||||||
|
actionName = b.customActionName
|
||||||
|
}
|
||||||
|
description := "Run a browser agent to achieve a specific goal, for example: 'Go to https://www.google.com and search for 'LocalAI', and tell me what's on the first page'"
|
||||||
|
return types.ActionDefinition{
|
||||||
|
Name: types.ActionDefinitionName(actionName),
|
||||||
|
Description: description,
|
||||||
|
Properties: map[string]jsonschema.Definition{
|
||||||
|
"goal": {
|
||||||
|
Type: jsonschema.String,
|
||||||
|
Description: "The goal for the browser agent to achieve",
|
||||||
|
},
|
||||||
|
"max_attempts": {
|
||||||
|
Type: jsonschema.Number,
|
||||||
|
Description: "Maximum number of attempts the agent can make (optional)",
|
||||||
|
},
|
||||||
|
"max_no_action_attempts": {
|
||||||
|
Type: jsonschema.Number,
|
||||||
|
Description: "Maximum number of attempts without taking an action (optional)",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Required: []string{"goal"},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *BrowserAgentRunner) Plannable() bool {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// BrowserAgentRunnerConfigMeta returns the metadata for Browser Agent Runner action configuration fields
|
||||||
|
func BrowserAgentRunnerConfigMeta() []config.Field {
|
||||||
|
return []config.Field{
|
||||||
|
{
|
||||||
|
Name: "baseURL",
|
||||||
|
Label: "Base URL",
|
||||||
|
Type: config.FieldTypeText,
|
||||||
|
Required: false,
|
||||||
|
HelpText: "Base URL of the LocalOperator API",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "customActionName",
|
||||||
|
Label: "Custom Action Name",
|
||||||
|
Type: config.FieldTypeText,
|
||||||
|
HelpText: "Custom name for this action",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,38 +18,49 @@ type GithubPRCreator struct {
|
|||||||
func NewGithubPRCreator(config map[string]string) *GithubPRCreator {
|
func NewGithubPRCreator(config map[string]string) *GithubPRCreator {
|
||||||
client := github.NewClient(nil).WithAuthToken(config["token"])
|
client := github.NewClient(nil).WithAuthToken(config["token"])
|
||||||
|
|
||||||
|
defaultBranch := config["defaultBranch"]
|
||||||
|
if defaultBranch == "" {
|
||||||
|
defaultBranch = "main" // Default to "main" if not specified
|
||||||
|
}
|
||||||
|
|
||||||
return &GithubPRCreator{
|
return &GithubPRCreator{
|
||||||
client: client,
|
client: client,
|
||||||
token: config["token"],
|
token: config["token"],
|
||||||
repository: config["repository"],
|
repository: config["repository"],
|
||||||
owner: config["owner"],
|
owner: config["owner"],
|
||||||
customActionName: config["customActionName"],
|
customActionName: config["customActionName"],
|
||||||
defaultBranch: config["defaultBranch"],
|
defaultBranch: defaultBranch,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GithubPRCreator) createOrUpdateBranch(ctx context.Context, branchName string) error {
|
func (g *GithubPRCreator) createOrUpdateBranch(ctx context.Context, branchName string, owner string, repository string) error {
|
||||||
// Get the latest commit SHA from the default branch
|
// Get the latest commit SHA from the default branch
|
||||||
ref, _, err := g.client.Git.GetRef(ctx, g.owner, g.repository, "refs/heads/"+g.defaultBranch)
|
ref, _, err := g.client.Git.GetRef(ctx, owner, repository, "refs/heads/"+g.defaultBranch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to get reference: %w", err)
|
return fmt.Errorf("failed to get reference for default branch %s: %w", g.defaultBranch, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try to get the branch if it exists
|
// Try to get the branch if it exists
|
||||||
_, resp, err := g.client.Git.GetRef(ctx, g.owner, g.repository, "refs/heads/"+branchName)
|
_, resp, err := g.client.Git.GetRef(ctx, owner, repository, "refs/heads/"+branchName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// If branch doesn't exist, create it
|
if resp == nil {
|
||||||
if resp != nil && resp.StatusCode == 404 {
|
return fmt.Errorf("failed to check branch existence: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// If branch doesn't exist (404), create it
|
||||||
|
if resp.StatusCode == 404 {
|
||||||
newRef := &github.Reference{
|
newRef := &github.Reference{
|
||||||
Ref: github.String("refs/heads/" + branchName),
|
Ref: github.String("refs/heads/" + branchName),
|
||||||
Object: &github.GitObject{SHA: ref.Object.SHA},
|
Object: &github.GitObject{SHA: ref.Object.SHA},
|
||||||
}
|
}
|
||||||
_, _, err = g.client.Git.CreateRef(ctx, g.owner, g.repository, newRef)
|
_, _, err = g.client.Git.CreateRef(ctx, owner, repository, newRef)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to create branch: %w", err)
|
return fmt.Errorf("failed to create branch: %w", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// For other errors, return the error
|
||||||
return fmt.Errorf("failed to check branch existence: %w", err)
|
return fmt.Errorf("failed to check branch existence: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,7 +69,7 @@ func (g *GithubPRCreator) createOrUpdateBranch(ctx context.Context, branchName s
|
|||||||
Ref: github.String("refs/heads/" + branchName),
|
Ref: github.String("refs/heads/" + branchName),
|
||||||
Object: &github.GitObject{SHA: ref.Object.SHA},
|
Object: &github.GitObject{SHA: ref.Object.SHA},
|
||||||
}
|
}
|
||||||
_, _, err = g.client.Git.UpdateRef(ctx, g.owner, g.repository, updateRef, true)
|
_, _, err = g.client.Git.UpdateRef(ctx, owner, repository, updateRef, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to update branch: %w", err)
|
return fmt.Errorf("failed to update branch: %w", err)
|
||||||
}
|
}
|
||||||
@@ -66,10 +77,10 @@ func (g *GithubPRCreator) createOrUpdateBranch(ctx context.Context, branchName s
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GithubPRCreator) createOrUpdateFile(ctx context.Context, branch string, filePath string, content string, message string) error {
|
func (g *GithubPRCreator) createOrUpdateFile(ctx context.Context, branch string, filePath string, content string, message string, owner string, repository string) error {
|
||||||
// Get the current file content if it exists
|
// Get the current file content if it exists
|
||||||
var sha *string
|
var sha *string
|
||||||
fileContent, _, _, err := g.client.Repositories.GetContents(ctx, g.owner, g.repository, filePath, &github.RepositoryContentGetOptions{
|
fileContent, _, _, err := g.client.Repositories.GetContents(ctx, owner, repository, filePath, &github.RepositoryContentGetOptions{
|
||||||
Ref: branch,
|
Ref: branch,
|
||||||
})
|
})
|
||||||
if err == nil && fileContent != nil {
|
if err == nil && fileContent != nil {
|
||||||
@@ -77,7 +88,7 @@ func (g *GithubPRCreator) createOrUpdateFile(ctx context.Context, branch string,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create or update the file
|
// Create or update the file
|
||||||
_, _, err = g.client.Repositories.CreateFile(ctx, g.owner, g.repository, filePath, &github.RepositoryContentFileOptions{
|
_, _, err = g.client.Repositories.CreateFile(ctx, owner, repository, filePath, &github.RepositoryContentFileOptions{
|
||||||
Message: &message,
|
Message: &message,
|
||||||
Content: []byte(content),
|
Content: []byte(content),
|
||||||
Branch: &branch,
|
Branch: &branch,
|
||||||
@@ -118,14 +129,14 @@ func (g *GithubPRCreator) Run(ctx context.Context, params types.ActionParams) (t
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create or update branch
|
// Create or update branch
|
||||||
err = g.createOrUpdateBranch(ctx, result.Branch)
|
err = g.createOrUpdateBranch(ctx, result.Branch, result.Owner, result.Repository)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return types.ActionResult{}, fmt.Errorf("failed to create/update branch: %w", err)
|
return types.ActionResult{}, fmt.Errorf("failed to create/update branch: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create or update files
|
// Create or update files
|
||||||
for _, file := range result.Files {
|
for _, file := range result.Files {
|
||||||
err = g.createOrUpdateFile(ctx, result.Branch, file.Path, file.Content, fmt.Sprintf("Update %s", file.Path))
|
err = g.createOrUpdateFile(ctx, result.Branch, file.Path, file.Content, fmt.Sprintf("Update %s", file.Path), result.Owner, result.Repository)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return types.ActionResult{}, fmt.Errorf("failed to update file %s: %w", file.Path, err)
|
return types.ActionResult{}, fmt.Errorf("failed to update file %s: %w", file.Path, err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,11 +28,11 @@ func NewGithubRepositoryGetAllContent(config map[string]string) *GithubRepositor
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GithubRepositoryGetAllContent) getContentRecursively(ctx context.Context, path string) (string, error) {
|
func (g *GithubRepositoryGetAllContent) getContentRecursively(ctx context.Context, path string, owner string, repository string) (string, error) {
|
||||||
var result strings.Builder
|
var result strings.Builder
|
||||||
|
|
||||||
// Get content at the current path
|
// Get content at the current path
|
||||||
_, directoryContent, _, err := g.client.Repositories.GetContents(ctx, g.owner, g.repository, path, nil)
|
_, directoryContent, _, err := g.client.Repositories.GetContents(ctx, owner, repository, path, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("error getting content at path %s: %w", path, err)
|
return "", fmt.Errorf("error getting content at path %s: %w", path, err)
|
||||||
}
|
}
|
||||||
@@ -41,14 +41,14 @@ func (g *GithubRepositoryGetAllContent) getContentRecursively(ctx context.Contex
|
|||||||
for _, item := range directoryContent {
|
for _, item := range directoryContent {
|
||||||
if item.GetType() == "dir" {
|
if item.GetType() == "dir" {
|
||||||
// Recursively get content for subdirectories
|
// Recursively get content for subdirectories
|
||||||
subContent, err := g.getContentRecursively(ctx, item.GetPath())
|
subContent, err := g.getContentRecursively(ctx, item.GetPath(), owner, repository)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
result.WriteString(subContent)
|
result.WriteString(subContent)
|
||||||
} else if item.GetType() == "file" {
|
} else if item.GetType() == "file" {
|
||||||
// Get file content
|
// Get file content
|
||||||
fileContent, _, _, err := g.client.Repositories.GetContents(ctx, g.owner, g.repository, item.GetPath(), nil)
|
fileContent, _, _, err := g.client.Repositories.GetContents(ctx, owner, repository, item.GetPath(), nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("error getting file content for %s: %w", item.GetPath(), err)
|
return "", fmt.Errorf("error getting file content for %s: %w", item.GetPath(), err)
|
||||||
}
|
}
|
||||||
@@ -89,7 +89,7 @@ func (g *GithubRepositoryGetAllContent) Run(ctx context.Context, params types.Ac
|
|||||||
result.Path = "."
|
result.Path = "."
|
||||||
}
|
}
|
||||||
|
|
||||||
content, err := g.getContentRecursively(ctx, result.Path)
|
content, err := g.getContentRecursively(ctx, result.Path, result.Owner, result.Repository)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return types.ActionResult{}, err
|
return types.ActionResult{}, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -370,7 +370,7 @@ func (a *App) Chat(pool *state.AgentPool) func(c *fiber.Ctx) error {
|
|||||||
xlog.Error("Error marshaling status message", "error", err)
|
xlog.Error("Error marshaling status message", "error", err)
|
||||||
} else {
|
} else {
|
||||||
manager.Send(
|
manager.Send(
|
||||||
sse.NewMessage(string(statusData)).WithEvent("json_status"))
|
sse.NewMessage(string(statusData)).WithEvent("json_message_status"))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Process the message asynchronously
|
// Process the message asynchronously
|
||||||
@@ -417,7 +417,7 @@ func (a *App) Chat(pool *state.AgentPool) func(c *fiber.Ctx) error {
|
|||||||
xlog.Error("Error marshaling completed status", "error", err)
|
xlog.Error("Error marshaling completed status", "error", err)
|
||||||
} else {
|
} else {
|
||||||
manager.Send(
|
manager.Send(
|
||||||
sse.NewMessage(string(completedData)).WithEvent("json_status"))
|
sse.NewMessage(string(completedData)).WithEvent("json_message_status"))
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
@@ -444,7 +444,7 @@ func (a *App) ExecuteAction(pool *state.AgentPool) func(c *fiber.Ctx) error {
|
|||||||
actionName := c.Params("name")
|
actionName := c.Params("name")
|
||||||
|
|
||||||
xlog.Debug("Executing action", "action", actionName, "config", payload.Config, "params", payload.Params)
|
xlog.Debug("Executing action", "action", actionName, "config", payload.Config, "params", payload.Params)
|
||||||
a, err := services.Action(actionName, "", payload.Config, pool)
|
a, err := services.Action(actionName, "", payload.Config, pool, map[string]string{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
xlog.Error("Error creating action", "error", err)
|
xlog.Error("Error creating action", "error", err)
|
||||||
return errorJSONMessage(c, err.Error())
|
return errorJSONMessage(c, err.Error())
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
"": {
|
"": {
|
||||||
"name": "react-ui",
|
"name": "react-ui",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"highlight.js": "^11.11.1",
|
||||||
"react": "^19.1.0",
|
"react": "^19.1.0",
|
||||||
"react-dom": "^19.1.0",
|
"react-dom": "^19.1.0",
|
||||||
},
|
},
|
||||||
@@ -300,6 +301,8 @@
|
|||||||
|
|
||||||
"has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
|
"has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
|
||||||
|
|
||||||
|
"highlight.js": ["highlight.js@11.11.1", "", {}, "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w=="],
|
||||||
|
|
||||||
"ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
|
"ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
|
||||||
|
|
||||||
"import-fresh": ["import-fresh@3.3.1", "", { "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" } }, "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ=="],
|
"import-fresh": ["import-fresh@3.3.1", "", { "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" } }, "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ=="],
|
||||||
|
|||||||
@@ -11,7 +11,8 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"react": "^19.1.0",
|
"react": "^19.1.0",
|
||||||
"react-dom": "^19.1.0"
|
"react-dom": "^19.1.0",
|
||||||
|
"highlight.js": "^11.11.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.24.0",
|
"@eslint/js": "^9.24.0",
|
||||||
|
|||||||
@@ -1,4 +1,17 @@
|
|||||||
/* Base styles */
|
/* Base styles */
|
||||||
|
pre.hljs {
|
||||||
|
background-color: var(--medium-bg);
|
||||||
|
padding: 1rem;
|
||||||
|
border-radius: 8px;
|
||||||
|
overflow-x: auto;
|
||||||
|
font-family: 'JetBrains Mono', monospace;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
code.json {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
:root {
|
:root {
|
||||||
--primary: #00ff95;
|
--primary: #00ff95;
|
||||||
--secondary: #ff00b1;
|
--secondary: #ff00b1;
|
||||||
@@ -1994,16 +2007,62 @@ select.form-control {
|
|||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.file-button:hover {
|
|
||||||
background: rgba(0, 255, 149, 0.8);
|
|
||||||
transform: translateY(-2px);
|
|
||||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
|
|
||||||
}
|
|
||||||
|
|
||||||
.file-button i {
|
.file-button i {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.card {
|
||||||
|
background: var(--medium-bg);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 15px;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card:hover {
|
||||||
|
transform: translateY(-2px);
|
||||||
|
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
|
||||||
|
background: var(--light-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.spinner {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
border: 2px solid var(--primary);
|
||||||
|
border-radius: 50%;
|
||||||
|
border-top-color: transparent;
|
||||||
|
animation: spin 1s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin {
|
||||||
|
0% { transform: rotate(0deg); }
|
||||||
|
100% { transform: rotate(360deg); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.expand-button {
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
color: var(--primary);
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 1.2em;
|
||||||
|
padding: 5px;
|
||||||
|
margin-left: 10px;
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.expand-button:hover {
|
||||||
|
color: var(--success);
|
||||||
|
transform: scale(1.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.expand-button:focus {
|
||||||
|
outline: none;
|
||||||
|
box-shadow: 0 0 0 2px var(--primary);
|
||||||
|
}
|
||||||
|
|
||||||
.selected-file-info {
|
.selected-file-info {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
|
|||||||
4
webui/react-ui/src/hooks/useSSE.js
vendored
4
webui/react-ui/src/hooks/useSSE.js
vendored
@@ -63,8 +63,8 @@ export function useSSE(agentName) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Handle 'json_status' event
|
// Handle 'json_message_status' event
|
||||||
eventSource.addEventListener('json_status', (event) => {
|
eventSource.addEventListener('json_message_status', (event) => {
|
||||||
try {
|
try {
|
||||||
const data = JSON.parse(event.data);
|
const data = JSON.parse(event.data);
|
||||||
const timestamp = data.timestamp || new Date().toISOString();
|
const timestamp = data.timestamp || new Date().toISOString();
|
||||||
|
|||||||
@@ -1,13 +1,22 @@
|
|||||||
import { useState, useEffect } from 'react';
|
import { useState, useEffect } from 'react';
|
||||||
import { useParams, Link } from 'react-router-dom';
|
import { useParams, Link } from 'react-router-dom';
|
||||||
|
import hljs from 'highlight.js/lib/core';
|
||||||
|
import json from 'highlight.js/lib/languages/json';
|
||||||
|
import 'highlight.js/styles/monokai.css';
|
||||||
|
|
||||||
|
hljs.registerLanguage('json', json);
|
||||||
|
|
||||||
function AgentStatus() {
|
function AgentStatus() {
|
||||||
|
const [showStatus, setShowStatus] = useState(true);
|
||||||
const { name } = useParams();
|
const { name } = useParams();
|
||||||
const [statusData, setStatusData] = useState(null);
|
const [statusData, setStatusData] = useState(null);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [error, setError] = useState(null);
|
const [error, setError] = useState(null);
|
||||||
const [_eventSource, setEventSource] = useState(null);
|
const [_eventSource, setEventSource] = useState(null);
|
||||||
const [liveUpdates, setLiveUpdates] = useState([]);
|
// Store all observables by id
|
||||||
|
const [observableMap, setObservableMap] = useState({});
|
||||||
|
const [observableTree, setObservableTree] = useState([]);
|
||||||
|
const [expandedCards, setExpandedCards] = useState(new Map());
|
||||||
|
|
||||||
// Update document title
|
// Update document title
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -39,17 +48,80 @@ function AgentStatus() {
|
|||||||
|
|
||||||
fetchStatusData();
|
fetchStatusData();
|
||||||
|
|
||||||
|
// Helper to build observable tree from map
|
||||||
|
function buildObservableTree(map) {
|
||||||
|
const nodes = Object.values(map);
|
||||||
|
const nodeMap = {};
|
||||||
|
nodes.forEach(node => { nodeMap[node.id] = { ...node, children: [] }; });
|
||||||
|
const roots = [];
|
||||||
|
nodes.forEach(node => {
|
||||||
|
if (!node.parent_id) {
|
||||||
|
roots.push(nodeMap[node.id]);
|
||||||
|
} else if (nodeMap[node.parent_id]) {
|
||||||
|
nodeMap[node.parent_id].children.push(nodeMap[node.id]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return roots;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch initial observable history
|
||||||
|
const fetchObservables = async () => {
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/agent/${name}/observables`);
|
||||||
|
if (!response.ok) return;
|
||||||
|
const data = await response.json();
|
||||||
|
if (Array.isArray(data.History)) {
|
||||||
|
const map = {};
|
||||||
|
data.History.forEach(obs => {
|
||||||
|
map[obs.id] = obs;
|
||||||
|
});
|
||||||
|
setObservableMap(map);
|
||||||
|
setObservableTree(buildObservableTree(map));
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
// Ignore errors for now
|
||||||
|
}
|
||||||
|
};
|
||||||
|
fetchObservables();
|
||||||
|
|
||||||
// Setup SSE connection for live updates
|
// Setup SSE connection for live updates
|
||||||
const sse = new EventSource(`/sse/${name}`);
|
const sse = new EventSource(`/sse/${name}`);
|
||||||
setEventSource(sse);
|
setEventSource(sse);
|
||||||
|
|
||||||
sse.addEventListener('status', (event) => {
|
sse.addEventListener('observable_update', (event) => {
|
||||||
try {
|
|
||||||
const data = JSON.parse(event.data);
|
const data = JSON.parse(event.data);
|
||||||
setLiveUpdates(prev => [data, ...prev.slice(0, 19)]); // Keep last 20 updates
|
console.log(data);
|
||||||
} catch (err) {
|
setObservableMap(prevMap => {
|
||||||
setLiveUpdates(prev => [event.data, ...prev.slice(0, 19)]);
|
const prev = prevMap[data.id] || {};
|
||||||
|
const updated = {
|
||||||
|
...prev,
|
||||||
|
...data,
|
||||||
|
creation: data.creation,
|
||||||
|
progress: data.progress,
|
||||||
|
completion: data.completion,
|
||||||
|
// children are always built client-side
|
||||||
|
};
|
||||||
|
const newMap = { ...prevMap, [data.id]: updated };
|
||||||
|
setObservableTree(buildObservableTree(newMap));
|
||||||
|
return newMap;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Listen for status events and append to statusData.History
|
||||||
|
sse.addEventListener('status', (event) => {
|
||||||
|
const status = event.data;
|
||||||
|
setStatusData(prev => {
|
||||||
|
// If prev is null, start a new object
|
||||||
|
if (!prev || typeof prev !== 'object') {
|
||||||
|
return { History: [status] };
|
||||||
}
|
}
|
||||||
|
// If History not present, add it
|
||||||
|
if (!Array.isArray(prev.History)) {
|
||||||
|
return { ...prev, History: [status] };
|
||||||
|
}
|
||||||
|
// Otherwise, append
|
||||||
|
return { ...prev, History: [...prev.History, status] };
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
sse.onerror = (err) => {
|
sse.onerror = (err) => {
|
||||||
@@ -83,8 +155,8 @@ function AgentStatus() {
|
|||||||
|
|
||||||
if (loading) {
|
if (loading) {
|
||||||
return (
|
return (
|
||||||
<div className="loading-container">
|
<div>
|
||||||
<div className="loader"></div>
|
<div></div>
|
||||||
<p>Loading agent status...</p>
|
<p>Loading agent status...</p>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -92,57 +164,200 @@ function AgentStatus() {
|
|||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
return (
|
return (
|
||||||
<div className="error-container">
|
<div>
|
||||||
<h2>Error</h2>
|
<h2>Error</h2>
|
||||||
<p>{error}</p>
|
<p>{error}</p>
|
||||||
<Link to="/agents" className="back-btn">
|
<Link to="/agents">
|
||||||
<i className="fas fa-arrow-left"></i> Back to Agents
|
<i className="fas fa-arrow-left"></i> Back to Agents
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Combine live updates with history
|
|
||||||
const allUpdates = [...liveUpdates, ...(statusData?.History || [])];
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="agent-status-container">
|
<div>
|
||||||
<header className="page-header">
|
<h1>Agent Status: {name}</h1>
|
||||||
<div className="header-content">
|
<div style={{ color: '#aaa', fontSize: 16, marginBottom: 18 }}>
|
||||||
<h1>
|
See what the agent is doing and thinking
|
||||||
<Link to="/agents" className="back-link">
|
|
||||||
<i className="fas fa-arrow-left"></i>
|
|
||||||
</Link>
|
|
||||||
Agent Status: {name}
|
|
||||||
</h1>
|
|
||||||
</div>
|
</div>
|
||||||
</header>
|
{error && (
|
||||||
|
<div>
|
||||||
|
{error}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{loading && <div>Loading...</div>}
|
||||||
|
{statusData && (
|
||||||
|
<div>
|
||||||
|
<div>
|
||||||
|
<div style={{ display: 'flex', alignItems: 'center', cursor: 'pointer', userSelect: 'none' }}
|
||||||
|
onClick={() => setShowStatus(prev => !prev)}>
|
||||||
|
<h2 style={{ margin: 0 }}>Current Status</h2>
|
||||||
|
<i
|
||||||
|
className={`fas fa-chevron-${showStatus ? 'up' : 'down'}`}
|
||||||
|
style={{ color: 'var(--primary)', marginLeft: 12 }}
|
||||||
|
title={showStatus ? 'Collapse' : 'Expand'}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div style={{ color: '#aaa', fontSize: 14, margin: '5px 0 10px 2px' }}>
|
||||||
|
Summary of the agent's thoughts and actions
|
||||||
|
</div>
|
||||||
|
{showStatus && (
|
||||||
|
<div style={{ marginTop: 10 }}>
|
||||||
|
{(Array.isArray(statusData?.History) && statusData.History.length === 0) && (
|
||||||
|
<div style={{ color: '#aaa' }}>No status history available.</div>
|
||||||
|
)}
|
||||||
|
{Array.isArray(statusData?.History) && statusData.History.map((item, idx) => (
|
||||||
|
<div key={idx} style={{
|
||||||
|
background: '#222',
|
||||||
|
border: '1px solid #444',
|
||||||
|
borderRadius: 8,
|
||||||
|
padding: '12px 16px',
|
||||||
|
marginBottom: 10,
|
||||||
|
whiteSpace: 'pre-line',
|
||||||
|
fontFamily: 'inherit',
|
||||||
|
fontSize: 15,
|
||||||
|
color: '#eee',
|
||||||
|
}}>
|
||||||
|
{/* Replace <br> tags with newlines, then render as pre-line */}
|
||||||
|
{typeof item === 'string'
|
||||||
|
? item.replace(/<br\s*\/?>/gi, '\n')
|
||||||
|
: JSON.stringify(item)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{observableTree.length > 0 && (
|
||||||
|
<div>
|
||||||
|
<h2>Observable Updates</h2>
|
||||||
|
<div style={{ color: '#aaa', fontSize: 14, margin: '5px 0 10px 2px' }}>
|
||||||
|
Drill down into what the agent is doing and thinking when activated by a connector
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
{observableTree.map((container, idx) => (
|
||||||
|
<div key={container.id || idx} className='card' style={{ marginBottom: '1em' }}>
|
||||||
|
<div>
|
||||||
|
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', cursor: 'pointer' }}
|
||||||
|
onClick={() => {
|
||||||
|
const newExpanded = !expandedCards.get(container.id);
|
||||||
|
setExpandedCards(new Map(expandedCards).set(container.id, newExpanded));
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}>
|
||||||
|
<i className={`fas fa-${container.icon || 'robot'}`} style={{ verticalAlign: '-0.125em' }}></i>
|
||||||
|
<span>
|
||||||
|
<span className='stat-label'>{container.name}</span>#<span className='stat-label'>{container.id}</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
|
||||||
|
<i
|
||||||
|
className={`fas fa-chevron-${expandedCards.get(container.id) ? 'up' : 'down'}`}
|
||||||
|
style={{ color: 'var(--primary)' }}
|
||||||
|
title='Toggle details'
|
||||||
|
/>
|
||||||
|
{!container.completion && (
|
||||||
|
<div className='spinner' />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style={{ display: expandedCards.get(container.id) ? 'block' : 'none' }}>
|
||||||
|
{container.children && container.children.length > 0 && (
|
||||||
|
|
||||||
<div className="chat-container bg-gray-800 shadow-lg rounded-lg">
|
<div style={{ marginLeft: '2em', marginTop: '1em' }}>
|
||||||
{/* Chat Messages */}
|
<h4>Nested Observables</h4>
|
||||||
<div className="chat-messages p-4">
|
{container.children.map(child => {
|
||||||
{allUpdates.length > 0 ? (
|
const childKey = `child-${child.id}`;
|
||||||
allUpdates.map((item, index) => (
|
const isExpanded = expandedCards.get(childKey);
|
||||||
<div key={index} className="status-item mb-4">
|
return (
|
||||||
<div className="bg-gray-700 p-4 rounded-lg">
|
<div key={`${container.id}-child-${child.id}`} className='card' style={{ background: '#222', marginBottom: '0.5em' }}>
|
||||||
<h2 className="text-sm font-semibold mb-2">Agent Action:</h2>
|
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', cursor: 'pointer' }}
|
||||||
<div className="status-details">
|
onClick={() => {
|
||||||
<div className="status-row">
|
const newExpanded = !expandedCards.get(childKey);
|
||||||
<span className="status-label">{index}</span>
|
setExpandedCards(new Map(expandedCards).set(childKey, newExpanded));
|
||||||
<span className="status-value">{formatValue(item)}</span>
|
}}
|
||||||
|
>
|
||||||
|
<div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}>
|
||||||
|
<i className={`fas fa-${child.icon || 'robot'}`} style={{ verticalAlign: '-0.125em' }}></i>
|
||||||
|
<span>
|
||||||
|
<span className='stat-label'>{child.name}</span>#<span className='stat-label'>{child.id}</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
|
||||||
|
<i
|
||||||
|
className={`fas fa-chevron-${isExpanded ? 'up' : 'down'}`}
|
||||||
|
style={{ color: 'var(--primary)' }}
|
||||||
|
title='Toggle details'
|
||||||
|
/>
|
||||||
|
{!child.completion && (
|
||||||
|
<div className='spinner' />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div style={{ display: isExpanded ? 'block' : 'none' }}>
|
||||||
|
{child.creation && (
|
||||||
|
<div>
|
||||||
|
<h5>Creation:</h5>
|
||||||
|
<pre className="hljs"><code>
|
||||||
|
<div dangerouslySetInnerHTML={{ __html: hljs.highlight(JSON.stringify(child.creation || {}, null, 2), { language: 'json' }).value }}></div>
|
||||||
|
</code></pre>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{child.progress && child.progress.length > 0 && (
|
||||||
|
<div>
|
||||||
|
<h5>Progress:</h5>
|
||||||
|
<pre className="hljs"><code>
|
||||||
|
<div dangerouslySetInnerHTML={{ __html: hljs.highlight(JSON.stringify(child.progress || {}, null, 2), { language: 'json' }).value }}></div>
|
||||||
|
</code></pre>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{child.completion && (
|
||||||
|
<div>
|
||||||
|
<h5>Completion:</h5>
|
||||||
|
<pre className="hljs"><code>
|
||||||
|
<div dangerouslySetInnerHTML={{ __html: hljs.highlight(JSON.stringify(child.completion || {}, null, 2), { language: 'json' }).value }}></div>
|
||||||
|
</code></pre>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
))
|
);
|
||||||
) : (
|
})}
|
||||||
<div className="no-status-data">
|
</div>
|
||||||
<p>No status data available for this agent.</p>
|
)}
|
||||||
|
{container.creation && (
|
||||||
|
<div>
|
||||||
|
<h4>Creation:</h4>
|
||||||
|
<pre className="hljs"><code>
|
||||||
|
<div dangerouslySetInnerHTML={{ __html: hljs.highlight(JSON.stringify(container.creation || {}, null, 2), { language: 'json' }).value }}></div>
|
||||||
|
</code></pre>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{container.progress && container.progress.length > 0 && (
|
||||||
|
<div>
|
||||||
|
<h4>Progress:</h4>
|
||||||
|
<pre className="hljs"><code>
|
||||||
|
<div dangerouslySetInnerHTML={{ __html: hljs.highlight(JSON.stringify(container.progress || {}, null, 2), { language: 'json' }).value }}></div>
|
||||||
|
</code></pre>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{container.completion && (
|
||||||
|
<div>
|
||||||
|
<h4>Completion:</h4>
|
||||||
|
<pre className="hljs"><code>
|
||||||
|
<div dangerouslySetInnerHTML={{ __html: hljs.highlight(JSON.stringify(container.completion || {}, null, 2), { language: 'json' }).value }}></div>
|
||||||
|
</code></pre>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -241,13 +241,14 @@ func (app *App) registerRoutes(pool *state.AgentPool, webapp *fiber.App) {
|
|||||||
|
|
||||||
entries := []string{}
|
entries := []string{}
|
||||||
for _, h := range Reverse(history.Results()) {
|
for _, h := range Reverse(history.Results()) {
|
||||||
entries = append(entries, fmt.Sprintf(
|
entries = append(entries, fmt.Sprintf(`Reasoning: %s
|
||||||
"Result: %v Action: %v Params: %v Reasoning: %v",
|
Action taken: %+v
|
||||||
h.Result,
|
Parameters: %+v
|
||||||
h.Action.Definition().Name,
|
Result: %s`,
|
||||||
h.Params,
|
|
||||||
h.Reasoning,
|
h.Reasoning,
|
||||||
))
|
h.ActionCurrentState.Action.Definition().Name,
|
||||||
|
h.ActionCurrentState.Params,
|
||||||
|
h.Result))
|
||||||
}
|
}
|
||||||
|
|
||||||
return c.JSON(fiber.Map{
|
return c.JSON(fiber.Map{
|
||||||
@@ -256,6 +257,21 @@ func (app *App) registerRoutes(pool *state.AgentPool, webapp *fiber.App) {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
webapp.Get("/api/agent/:name/observables", func(c *fiber.Ctx) error {
|
||||||
|
name := c.Params("name")
|
||||||
|
agent := pool.GetAgent(name)
|
||||||
|
if agent == nil {
|
||||||
|
return c.Status(fiber.StatusNotFound).JSON(fiber.Map{
|
||||||
|
"error": "Agent not found",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.JSON(fiber.Map{
|
||||||
|
"Name": name,
|
||||||
|
"History": agent.Observer().History(),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
webapp.Post("/settings/import", app.ImportAgent(pool))
|
webapp.Post("/settings/import", app.ImportAgent(pool))
|
||||||
webapp.Get("/settings/export/:name", app.ExportAgent(pool))
|
webapp.Get("/settings/export/:name", app.ExportAgent(pool))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user