Merge branch 'main' of github.com:Shuffle/shuffle-shared

Author: 0x0elliot

ai.go

@@ -43,7 +43,6 @@ import (
 var standalone bool
 
 // var model = "gpt-5-mini"
-var maxTokens = 5000
 var model = "gpt-5-mini"
 //var model = "gpt-5.2-codex"
 
@@ -52,7 +51,7 @@ var assistantId = os.Getenv("OPENAI_ASSISTANT_ID")
 var docsVectorStoreID = os.Getenv("OPENAI_DOCS_VS_ID")
 var assistantModel = model
 
-var aiMaxTokens = 1024 // Default for on-prem
+var aiMaxTokens = 4096 // Controllable with AI_MAX_TOKENS env
 var aiReasoningEffort = ""
 
 func init() {
@@ -61,7 +60,11 @@ func init() {
 			aiMaxTokens = t
 		}
 	}
-	aiReasoningEffort = os.Getenv("AI_REASONING_EFFORT")
+
+	reasoningEffort := os.Getenv("AI_REASONING_EFFORT")
+	if reasoningEffort == "minimal" || reasoningEffort == "low" || reasoningEffort == "medium" || reasoningEffort == "high" { 
+		aiReasoningEffort = reasoningEffort
+	}
 }
 
 // Provide an incident triage and response plan for the reported incident finding. Make a short list of actions to perform in the following format: [{"title": "Title of the task", "category": "triage/containment/recovery/communication/documentation", "completed": false, "createdBy": "ai-agent@shuffler.io"}]. ONLY output as JSON array and nothing more. After the list is made, add these to the metadata.extensions.custom_attributes.tasks[] in the next action.
@@ -866,7 +869,7 @@ Input JSON Payload (ensure VALID JSON):
 				Content: inputData,
 			},
 		},
-		MaxCompletionTokens: maxTokens,
+		MaxCompletionTokens: aiMaxTokens,
 		Temperature:         0,
 		ReasoningEffort:     "low",
 	}
@@ -2002,7 +2005,7 @@ Do not add explanations, comments, or extra formatting. Only return valid JSON.`
 					Content: userMessage,
 				},
 			},
-			MaxCompletionTokens: maxTokens,
+			MaxCompletionTokens: aiMaxTokens,
 			Temperature:         0,
 			ReasoningEffort:     "medium",
 		}
@@ -2203,6 +2206,21 @@ Do not add explanations, comments, or extra formatting. Only return valid JSON.`
 }
 
 func GetActionAIResponse(ctx context.Context, resp http.ResponseWriter, user User, org Org, outputFormat string, input QueryInput) ([]byte, error) {
+	if len(org.Id) == 0 { 
+		if len(input.OrgId) > 0 && user.ActiveOrg.Id == "" {
+			user.ActiveOrg.Id = input.OrgId
+		}
+
+		if len(user.ActiveOrg.Id) > 0 { 
+			newOrg, err := GetOrg(ctx, user.ActiveOrg.Id)
+			if err != nil {
+				log.Printf("[ERROR] Failed to load orgid '%s' in ai response check", user.ActiveOrg.Id)
+			} else {
+				org = *newOrg
+			}
+		}
+	}
+
 	standalone := false
 	standaloneEnv := os.Getenv("STANDALONE")
 	if standaloneEnv == "true" {
@@ -2212,7 +2230,9 @@ func GetActionAIResponse(ctx context.Context, resp http.ResponseWriter, user Use
 	respBody := []byte{}
 	if project.Environment == "cloud" && !user.SupportAccess {
 		//if org.SyncFeatures.ShuffleGPT.Active && org.SyncFeatures.ShuffleGPT.Usage < org.SyncFeatures.ShuffleGPT.Limit {
-		if org.SyncFeatures.ShuffleGPT.Usage < 100 {
+
+		// Most should never reach this 
+		if org.SyncFeatures.ShuffleGPT.Usage < 1000 {
 			log.Printf("[AUDIT] Org %#v (%s) has access to the auto feature. Allowing user %s to use it", org.Name, org.Id, user.Username)
 			org.SyncFeatures.ShuffleGPT.Usage += 1
 
@@ -3757,7 +3777,7 @@ func findActionByInput(inputQuery, actionLabel string, foundApp WorkflowApp) (st
 	return contentOutput, nil
 }
 
-// Context aware parameter mapping
+// Context aware parameter mapping per org-app-action
 func getSelectedAppParameters(ctx context.Context, user User, selectedAction WorkflowAppAction, foundApp WorkflowApp, appname, category, outputFormat string, httpOutput HTTPWrapper, input QueryInput) (WorkflowAppAction, error) {
 
 	inputQuery := input.Query
@@ -3985,7 +4005,7 @@ func getSelectedAppParameters(ctx context.Context, user User, selectedAction Wor
 			} else {
 				// Since we are trying to fill them in anyway :)
 				if len(sampleBody) == 0 {
-					log.Printf("[INFO] No matching body found for app %s with action %s. Err: %s", appname, selectedAction.Name, err)
+					log.Printf("[INFO] No matching body found for app %s with action %s. Err: %s. Body: '%s'", appname, selectedAction.Name, err, outputBody)
 					sampleBody = formattedFields
 				}
 			}
@@ -8875,7 +8895,7 @@ func RunAiQuery(systemMessage, userMessage string, incomingRequest ...openai.Cha
 	chatCompletion := openai.ChatCompletionRequest{
 		Model:     model,
 		Messages:  []openai.ChatCompletionMessage{},
-		MaxTokens: maxTokens,
+		MaxTokens: aiMaxTokens,
 
 		// Move towards determinism
 		Temperature: 0,
@@ -8991,7 +9011,7 @@ func RunAiQuery(systemMessage, userMessage string, incomingRequest ...openai.Cha
 
 			if strings.Contains(err.Error(), "not supported MaxTokens") {
 				chatCompletion.MaxTokens = 0
-				chatCompletion.MaxCompletionTokens = maxTokens
+				chatCompletion.MaxCompletionTokens = aiMaxTokens
 				continue
 			} else if strings.Contains(err.Error(), "does not exist") {
 				if len(fallbackModel) == 0 {
@@ -10268,7 +10288,7 @@ No other formats are allowed. Just structured steps.
 Produce a minimal, correct, atomic plan for turning vague security workflows into structured actions. Do not overthink. Follow the format exactly, Including the headings.
 `, categoryString)
 
-	maxTokens := 5000
+	aiMaxTokens := 5000
 	var contentOutput string
 	var err error
 
@@ -10303,7 +10323,7 @@ Produce a minimal, correct, atomic plan for turning vague security workflows int
 
 		if model == "o4-mini" || model == "gpt-5-mini" {
 			chatCompletion.MaxTokens = 0
-			chatCompletion.MaxCompletionTokens = maxTokens
+			chatCompletion.MaxCompletionTokens = aiMaxTokens
 		}
 
 		contentOutput, err = RunAiQuery("", "", chatCompletion)

cloudSync.go

@@ -1380,150 +1380,6 @@ func CreateFs(basepath, pathname string) (billy.Filesystem, error) {
 	return fs, err
 }
 
-func loadAppConfigFromMain(fileId string) {
-	// Send request to /api/v1/apps/{fileId}/config
-	// Parse out the config and add it to the database
-	ctx := context.Background()
-
-	app, err := GetApp(ctx, fileId, User{}, false)
-	if err == nil && len(app.Name) > 0 && len(app.ID) > 0 {
-		log.Printf("[INFO] Found app %s (%s) for config loading. Running cross-region DOWNLOAD shuffler.io->local if it's generated==false (python). Actions: %d. Generated: %t", app.Name, app.ID, len(app.Actions), app.Generated)
-		//if len(app.Actions) > 0 {
-		//	return
-		//}
-
-		// Python apps can't be distributed this easily (sadly)
-		if !app.Generated {
-			return
-		}
-	}
-
-	app.ID = fileId
-
-	backendHost := fmt.Sprintf("https://shuffler.io")
-	appApi := fmt.Sprintf("%s/api/v1/apps/%s/config", backendHost, fileId)
-	client := &http.Client{}
-	req, err := http.NewRequest(
-		"GET",
-		appApi,
-		nil,
-	)
-
-	if err != nil {
-		log.Printf("[ERROR] Failed creating request for app config: %s", err)
-		return
-	}
-
-	resp, err := client.Do(req)
-	if err != nil {
-		log.Printf("[ERROR] Failed getting app config: %s", err)
-		return
-	}
-
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		log.Printf("[ERROR] Failed reading app config: %s", err)
-		return
-	}
-
-	if resp.StatusCode != 200 {
-		log.Printf("[ERROR] Failed getting app config for ID %s: %d. Body: %s", fileId, resp.StatusCode, string(body))
-		return
-	}
-
-	newApp := AppParser{}
-	err = json.Unmarshal(body, &newApp)
-	if err != nil {
-		log.Printf("[ERROR] Failed unmarshaling app config: %s", err)
-		return
-	}
-
-	//log.Printf("[INFO] Got app config: %s", string(body))
-	if !newApp.Success {
-		log.Printf("[ERROR] No success in app config for id %s", fileId)
-		return
-	}
-
-	if len(newApp.App) == 0 {
-		log.Printf("[ERROR] No app found for id %s", app.ID)
-	} else {
-
-		err = json.Unmarshal(newApp.App, &app)
-		if err != nil {
-			log.Printf("[ERROR] Failed unmarshaling app for id %s: %s", app.ID, err)
-			return
-		}
-
-		err = SetWorkflowAppDatastore(ctx, *app, app.ID)
-		if err != nil {
-			log.Printf("[ERROR] Failed saving app for id %s: %s", app.ID, err)
-		}
-	}
-
-	if len(newApp.OpenAPI) == 0 {
-		log.Printf("[ERROR] No openapi found for id %s", app.ID)
-	} else {
-		// Save the data to the database with the ParsedOpenApi struct
-		parsedOpenApi := ParsedOpenApi{}
-		err = json.Unmarshal(newApp.OpenAPI, &parsedOpenApi)
-		if err != nil {
-			log.Printf("[ERROR] Failed unmarshaling openapi for id %s: %s", app.ID, err)
-			return
-		}
-
-		err = SetOpenApiDatastore(ctx, parsedOpenApi.ID, parsedOpenApi)
-		if err != nil {
-			log.Printf("[ERROR] Failed saving openapi for id %s: %s", app.ID, err)
-		}
-
-		// FIXME: Send it to get built as well as cloud function
-		// What is the function for this? Maybe just send localhost/api/ request?
-		// Run verify openapi here (?)
-
-		baseurl := "http://localhost:5002"
-		if os.Getenv("BASE_URL") != "" {
-			baseurl = os.Getenv("BASE_URL")
-		}
-
-		if os.Getenv("SHUFFLE_CLOUDRUN_URL") != "" {
-			baseurl = os.Getenv("SHUFFLE_CLOUDRUN_URL")
-		}
-
-		fullUrl := fmt.Sprintf("%s/api/v1/verify_swagger", baseurl)
-		req, err := http.NewRequest(
-			"POST",
-			fullUrl,
-			bytes.NewBuffer(newApp.OpenAPI),
-		)
-
-		if err != nil {
-			log.Printf("[ERROR] Failed creating request for openapi verification: %s", err)
-			return
-		}
-
-		req.Header.Set("Content-Type", "application/json")
-		resp, err := client.Do(req)
-		if err != nil {
-			log.Printf("[ERROR] Failed verifying openapi: %s", err)
-			return
-		}
-
-		defer resp.Body.Close()
-		if resp.StatusCode != 200 {
-			log.Printf("[ERROR] Failed building openapi for ID %s: %d", fileId, resp.StatusCode)
-			return
-		}
-
-		body, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			log.Printf("[ERROR] Failed reading openapi verification: %s", err)
-			return
-		}
-
-		log.Printf("[INFO] OpenAPI build: %s", string(body))
-	}
-}
 
 // Also deactivates. It's a toggle for off and on.
 func ActivateWorkflowApp(resp http.ResponseWriter, request *http.Request) {
@@ -1578,7 +1434,7 @@ func ActivateWorkflowApp(resp http.ResponseWriter, request *http.Request) {
 
 	// Additional: Superfluous response(s)
 	if project.Environment == "cloud" && gceProject != "shuffler" {
-		go loadAppConfigFromMain(appId)
+		go LoadAppConfigFromMain(appId, false)
 	}
 
 	// This is a special case where auth was handled in another region, and activation is done anyway