Started making question/ask for agents work standalone

Author: frikky

ai.go

@@ -316,8 +316,9 @@ func DecryptKMS(ctx context.Context, auth AppAuthenticationStorage, key, authori
 		req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", authorization))
 	}
 
+	// Proper timeout
 	client := &http.Client{
-		Timeout: time.Second * 60,
+		Timeout: time.Second * 300,
 	}
 	resp, err := client.Do(req)
 	if err != nil {
@@ -692,7 +693,9 @@ func RunSelfCorrectingRequest(action Action, status int, additionalInfo, outputB
 
 	// Check if the amount of {} in inputBody is the same
 	if strings.Count(inputBody, "{") != strings.Count(inputBody, "}") {
-		log.Printf("[ERROR] Input body has mismatched curly braces. Fixing it. InputBody: %s", inputBody)
+		if debug { 
+			log.Printf("[ERROR] Debug: Input body has mismatched curly braces ({*%d vs }*%d). Fixing it. InputBody pre-fix: %s", strings.Count(inputBody, "{"), strings.Count(inputBody, "}"), inputBody)
+		}
 
 		// FIXME: Doesn't take into account key vs value, as it shouldn't change the value.
 		if strings.Count(inputBody, "{") > strings.Count(inputBody, "}") {
@@ -4940,7 +4943,7 @@ func workerPool(jobs <-chan openai.ToolCall, results chan<- AtomicOutput, wg *sy
 		req.Header.Set("Authorization", "Bearer "+user.ApiKey)
 
 		client := &http.Client{
-			Timeout: time.Second * 60,
+			Timeout: time.Second * 300,
 		}
 		resp, err := client.Do(req)
 		if err != nil {
@@ -6338,8 +6341,9 @@ func HandleAiAgentExecutionStart(execution WorkflowExecution, startNode Action)
 	// Metadata = org-specific context
 	// This e.g. makes "me" mean "users in my org" and such
 	metadata := ""
+
 	if len(execution.Workflow.UpdatedBy) > 0 {
-		metadata += fmt.Sprintf("Current person: %s\n", execution.Workflow.UpdatedBy)
+		metadata += fmt.Sprintf("Current user: %s\n", execution.Workflow.UpdatedBy)
 	}
 
 	if len(execution.Workflow.OrgId) == 0 && len(execution.ExecutionOrg) > 0 {
@@ -7317,6 +7321,9 @@ func GenerateSingulWorkflows(resp http.ResponseWriter, request *http.Request) {
 }
 
 // This can also be overridden by passing in a custom OpenAI ChatCompletion request
+// FIXME: We need some kind of failover for this so that the request 
+// doesn't go from Backend directly, but instead from app. This makes it
+// more versatile in general, and able to run from Onprem -> Local model
 func RunAiQuery(systemMessage, userMessage string, incomingRequest ...openai.ChatCompletionRequest) (string, error) {
 	cnt := 0
 	maxTokens := 5000

shared.go

@@ -19654,11 +19654,13 @@ func PrepareSingleAction(ctx context.Context, user User, appId string, body []by
 
 					OrgId: user.ActiveOrg.Id,
 					Owner: user.Username,
+					UpdatedBy: user.Username,
 					Start: action.ID,
 				},
 				Type: "AGENT",
 				Start: action.ID,
 				Status: "EXECUTING",
+				WorkflowId: workflowId,
 				ExecutionId: workflowId,
 				ExecutionOrg: user.ActiveOrg.Id,
 				StartedAt: int64(time.Now().Unix()),
@@ -19842,7 +19844,7 @@ func PrepareSingleAction(ctx context.Context, user User, appId string, body []by
 
 		if len(action.AuthenticationId) > 0 {
 			if debug { 
-				log.Printf("[INFO][%s] Found auth ID for single action: %s", workflowExecution.ExecutionId, action.AuthenticationId)
+				log.Printf("[DEBUG][%s] Found auth ID for single action: %s", workflowExecution.ExecutionId, action.AuthenticationId)
 			}
 
 			// FIXME: How do we decide what fields to replace?
@@ -23153,6 +23155,22 @@ func PrepareWorkflowExecution(ctx context.Context, workflow Workflow, request *h
 				}
 			}
 
+			agentic := false
+			if len(start) == 0 && request != nil {
+				decisionId, decisionIdOk := request.URL.Query()["decision_id"]
+				if decisionIdOk {
+					log.Printf("[INFO][%s] Got decisionId %s inside Agentic decision", oldExecution.ExecutionId, decisionId[0])
+
+					agentic = true
+					if len(workflow.Actions) == 1 {
+						start = append(start, workflow.Actions[0].ID)
+						oldExecution.Results[0].Status = "WAITING"
+					} else {
+						log.Printf("[ERROR] No Agentic Start node found for workflow %s during workflow continuation. Decision ID: %s", workflow.ID, decisionId[0])
+					}
+				}
+			}
+
 			if len(start) == 0 {
 				log.Printf("[ERROR] No start node found for workflow %s during workflow continuation", workflow.ID)
 				return workflowExecution, ExecInfo{}, fmt.Sprintf("No start node found for workflow continuation %s", workflow.ID), errors.New("No start node found for workflow continuation")
@@ -23164,7 +23182,7 @@ func PrepareWorkflowExecution(ctx context.Context, workflow Workflow, request *h
 			for _, result := range oldExecution.Results {
 				if result.Action.ID == start[0] {
 					if result.Status == "ABORTED" {
-						log.Printf("[INFO] Found aborted result: %s (%s)", result.Action.Label, result.Action.ID)
+						log.Printf("[INFO][%s] Found aborted result: %s (%s)", oldExecution.ExecutionId, result.Action.Label, result.Action.ID)
 						if oldExecution.Status != "ABORTED" {
 							log.Printf("[INFO] Aborting execution %s as it should have already been aborted in the past", oldExecution.ExecutionId)
 							oldExecution.Status = "ABORTED"
@@ -23176,7 +23194,11 @@ func PrepareWorkflowExecution(ctx context.Context, workflow Workflow, request *h
 					}
 				}
 
-				if result.Status == "WAITING" {
+				if agentic {
+					log.Printf("[INFO][%s] Should fix the decision by injecting the values and continuing to the next step! :3", oldExecution.ExecutionId)
+					//os.Exit(3)
+
+				} else if result.Status == "WAITING" && !agentic {
 					log.Printf("[INFO][%s] Found relevant User Input result: %s (%s)", result.ExecutionId, result.Action.Label, result.Action.ID)
 
 					var userinputResp UserInputResponse

structs.go

@@ -260,6 +260,9 @@ type WorkflowAppActionParameter struct {
 type Valuereplace struct {
 	Key   string `json:"key" datastore:"key" yaml:"key"`
 	Value string `json:"value" datastore:"value,noindex" yaml:"value"`
+
+	// Used for e.g. user input storage
+	Answer string `json:"details,omitempty" datastore:"details,noindex" yaml:"details,omitempty"`
 }
 
 type WorkflowAppAction struct {