Skip to content

Fully autonomous AI Agents system capable of performing complex penetration testing tasks

Merge branch 'feature/next-release' into codex/issue-300-custom-prompts

Dmitry Ng19b63c5b45f0
diff --cc backend/pkg/controller/assistant.go
index d5aed0a9,360321ff..d32b0aee
--- a/backend/pkg/controller/assistant.go
+++ b/backend/pkg/controller/assistant.go
@@@ -70,13 -73,8 +73,14 @@@ type newAssistantWorkerCtx struct
type assistantWorkerCtx struct {
userID int64
flowID int64
+ fw FlowWorker
+ // prompter is an optional reusable prompter for the user. When non-nil,
+ // LoadAssistantWorker uses it instead of issuing another GetUserPrompts
+ // query and merging defaults. LoadFlowWorker sets this so a flow load
+ // with multiple assistants only pays the DB+merge cost once.
+ prompter templates.Prompter
+
flowWorkerCtx
}
@@@ -160,11 -158,8 +164,11 @@@ func NewAssistantWorker(ctx context.Con
return nil, wrapErrorEndSpan(ctx, assistantSpan, "failed to create flow assistant log worker", err)
}
- prompter := templates.NewDefaultPrompter() // TODO: change to flow prompter by userID from DB
+ prompter, err := newUserPrompter(ctx, awc.db, awc.userID)
+ if err != nil {
+ return nil, wrapErrorEndSpan(ctx, assistantSpan, "failed to build user prompter", err)
+ }
- executor, err := tools.NewFlowToolsExecutor(awc.db, awc.cfg, awc.docker, awc.functions, awc.flowID)
+ executor, err := tools.NewFlowToolsExecutor(awc.db, awc.cfg, awc.docker, awc.functions, awc.userID, awc.flowID)
if err != nil {
return nil, wrapErrorEndSpan(ctx, assistantSpan, "failed to create flow tools executor", err)
}
@@@ -328,14 -327,8 +336,14 @@@ func LoadAssistantWorker
return nil, wrapErrorEndSpan(ctx, assistantSpan, "failed to create flow assistant log worker", err)
}
- prompter := templates.NewDefaultPrompter() // TODO: change to flow prompter by userID from DB
+ prompter := awc.prompter
+ if prompter == nil {
+ prompter, err = newUserPrompter(ctx, awc.db, awc.userID)
+ if err != nil {
+ return nil, wrapErrorEndSpan(ctx, assistantSpan, "failed to build user prompter", err)
+ }
+ }
- executor, err := tools.NewFlowToolsExecutor(awc.db, awc.cfg, awc.docker, functions, awc.flowID)
+ executor, err := tools.NewFlowToolsExecutor(awc.db, awc.cfg, awc.docker, functions, awc.userID, awc.flowID)
if err != nil {
return nil, wrapErrorEndSpan(ctx, assistantSpan, "failed to create flow tools executor", err)
}
diff --cc backend/pkg/controller/flow.go
index 7cbc0476,d7f96554..5035af39
--- a/backend/pkg/controller/flow.go
+++ b/backend/pkg/controller/flow.go
@@@ -19,8 -23,11 +23,10 @@@ import
"pentagi/pkg/providers"
"pentagi/pkg/providers/pconfig"
"pentagi/pkg/providers/provider"
+ "pentagi/pkg/resources"
- "pentagi/pkg/templates"
"pentagi/pkg/tools"
+ dockercontainer "github.com/docker/docker/api/types/container"
"github.com/sirupsen/logrus"
)
@@@ -165,11 -181,8 +180,11 @@@ func NewFlowWorker
flowSpan := observation.Span(langfuse.WithSpanName("prepare flow worker"))
ctx, _ = flowSpan.Observation(ctx)
- prompter := templates.NewDefaultPrompter() // TODO: change to flow prompter by userID from DB
+ prompter, err := newUserPrompter(ctx, fwc.db, fwc.userID)
+ if err != nil {
+ return nil, wrapErrorEndSpan(ctx, flowSpan, "failed to build user prompter", err)
+ }
- executor, err := tools.NewFlowToolsExecutor(fwc.db, fwc.cfg, fwc.docker, fwc.functions, flow.ID)
+ executor, err := tools.NewFlowToolsExecutor(fwc.db, fwc.cfg, fwc.docker, fwc.functions, fwc.userID, flow.ID)
if err != nil {
return nil, wrapErrorEndSpan(ctx, flowSpan, "failed to create flow tools executor", err)
}
@@@ -334,11 -352,8 +354,11 @@@ func LoadFlowWorker(ctx context.Context
return nil, wrapErrorEndSpan(ctx, flowSpan, "failed to unmarshal functions", err)
}
- prompter := templates.NewDefaultPrompter() // TODO: change to flow prompter by userID from DB
+ prompter, err := newUserPrompter(ctx, fwc.db, flow.UserID)
+ if err != nil {
+ return nil, wrapErrorEndSpan(ctx, flowSpan, "failed to build user prompter", err)
+ }
- executor, err := tools.NewFlowToolsExecutor(fwc.db, fwc.cfg, fwc.docker, functions, flow.ID)
+ executor, err := tools.NewFlowToolsExecutor(fwc.db, fwc.cfg, fwc.docker, functions, flow.UserID, flow.ID)
if err != nil {
return nil, wrapErrorEndSpan(ctx, flowSpan, "failed to create flow tools executor", err)
}
@@@ -425,7 -445,7 +450,8 @@@
awc := assistantWorkerCtx{
userID: flow.UserID,
flowID: flow.ID,
+ prompter: prompter,
+ fw: fw,
flowWorkerCtx: fwc,
}
for _, assistant := range assistants {