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

Author: 0x0elliot

app_upload/stitcher.go

@@ -42,7 +42,7 @@ var appSearchIndex = "appsearch"
 
 // CONFIGURE APP LOCATIONS TO USE
 // ALSO REQUIRES ACCESS TO UPLOAD TO CLOUD
-var appbasefile = "/Users/frikky/git/shuffle/backend/app_sdk/app_base.py"
+var appbasefile = "/Users/frikky/git/app_sdk/shuffle_sdk/shuffle_sdk.py"
 var appfolder = "/Users/frikky/git/python-apps"
 var baseUrl = ""
 var apikey = ""

kms.go

@@ -1307,7 +1307,7 @@ func AutofixAppLabels(app WorkflowApp, label string) WorkflowApp {
 	// fml, there is no consistency to casing + underscores, so we keep the new
 	//label = strings.ReplaceAll(strings.Title(strings.ToLower(label)), "_", " ")
 
-	log.Printf("[INFO] Running app fix for label '%s' for app %s (%s) with %d actions", label, app.Name, app.ID, len(app.Actions))
+	log.Printf("[INFO][AI] Running app fix for label '%s' for app %s (%s) with %d actions", label, app.Name, app.ID, len(app.Actions))
 
 	// Just a reset, as Other doesn't really achieve anything directly
 	if len(app.Categories) > 0 && app.Categories[0] == "Other" {

shared.go

@@ -18053,7 +18053,7 @@ func PrepareSingleAction(ctx context.Context, user User, fileId string, body []b
 		newParams = append(newParams, param)
 	}
 
-	log.Printf("URL %#v", originalUrl)
+	//log.Printf("URL %#v", originalUrl)
 
 	action.Parameters = newParams
 
@@ -18108,6 +18108,13 @@ func PrepareSingleAction(ctx context.Context, user User, fileId string, body []b
 
 	workflowExecution, _, errString, err := PrepareWorkflowExecution(ctx, workflow, badRequest, 10)
 	if err != nil || len(errString) > 0 {
+
+		// FIXME: Handle other error returns as well?
+		if strings.Contains(errString, "App Auth ID") {
+			log.Printf("[DEBUG] Bad auth ID provided for single action: %s", errString)
+			return workflowExecution, errors.New("The authentication ID provided is invalid. Please try another.")
+		}
+
 		log.Printf("[ERROR] Failed preparing single execution (%s): %s", workflowExecution.ExecutionId, err)
 	}
 
@@ -25027,8 +25034,8 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
 	categories := GetAllAppCategories()
 
 	value.Category = strings.ToLower(value.Category)
-	value.Label = strings.ReplaceAll(strings.ToLower(value.Label), " ", "_")
-	value.AppName = strings.ReplaceAll(strings.ToLower(value.AppName), " ", "_")
+	value.Label = strings.ReplaceAll(strings.ToLower(strings.TrimSpace(value.Label)), " ", "_")
+	value.AppName = strings.ReplaceAll(strings.ToLower(strings.TrimSpace(value.AppName)), " ", "_")
 
 	if value.AppName == "email" {
 		value.Category = "email"
@@ -25143,14 +25150,17 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
 
 	//RunAiQuery(systemMessage, userMessage)
 
+	partialMatch := true 
 	availableLabels := []string{}
+
+	matchName := strings.ReplaceAll(strings.ToLower(strings.TrimSpace(value.AppName)), " ", "_")
 	for _, app := range newapps {
 		if app.Name == "" || len(app.Categories) == 0 {
 			continue
 		}
 
 		// If we HAVE an app as a category already
-		if len(value.AppName) == 0 {
+		if len(matchName) == 0 {
 			availableLabels = []string{}
 			if len(app.Categories) == 0 {
 				continue
@@ -25195,22 +25205,33 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
 			}
 
 		} else {
+			appName := strings.TrimSpace(strings.ReplaceAll(strings.ToLower(app.Name), " ", "_"))
+
 			// If we DONT have a category app already
-			if app.ID == value.AppName || strings.ReplaceAll(strings.ToLower(app.Name), " ", "_") == value.AppName {
-				//log.Printf("[DEBUG] Found app - checking label: %s vs %s (%s)", app.Name, value.AppName, app.ID)
-				selectedAction, selectedCategory, availableLabels = GetActionFromLabel(ctx, selectedApp, value.Label, true)
+			if app.ID == matchName || appName == matchName {
+				selectedApp = app
+				log.Printf("[DEBUG] Found app - checking label: %s vs %s (%s)", app.Name, value.AppName, app.ID)
+				//selectedAction, selectedCategory, availableLabels = GetActionFromLabel(ctx, selectedApp, value.Label, true)
+				selectedAction, selectedCategory, availableLabels = GetActionFromLabel(ctx, app, value.Label, true)
+				partialMatch = false 
 
 				break
 
-			} else if selectedApp.ID == "" && len(value.AppName) > 0 && (strings.Contains(strings.ToLower(app.Name), strings.ToLower(value.AppName)) || strings.Contains(strings.ToLower(value.AppName), strings.ToLower(app.Name))) {
+			// Finds a random match, but doesn't break in case it finds exact
+			} else if selectedApp.ID == "" && len(matchName) > 0 && (strings.Contains(appName, matchName) || strings.Contains(matchName, appName)) {
 				selectedApp = app
 
-				log.Printf("[WARNING] Set selected app to partial match %s (%s) for input %s", selectedApp.Name, selectedApp.ID, value.AppName)
-				selectedAction, selectedCategory, availableLabels = GetActionFromLabel(ctx, selectedApp, value.Label, true)
+				log.Printf("[WARNING] Set selected app to PARTIAL match %s (%s) for input %s", selectedApp.Name, selectedApp.ID, value.AppName)
+				selectedAction, selectedCategory, availableLabels = GetActionFromLabel(ctx, app, value.Label, true)
+
+				partialMatch = true
 			}
 		}
 	}
 
+	// In case we wanna use this to get good matches
+	_ = partialMatch
+
 	if len(selectedApp.ID) == 0 {
 		log.Printf("[WARNING] Couldn't find app with ID or name '%s' active in org %s (%s)", value.AppName, user.ActiveOrg.Name, user.ActiveOrg.Id)
 		failed := true
@@ -25293,6 +25314,7 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
 	}
 
 	if strings.Contains(strings.ToLower(strings.Join(selectedApp.ReferenceInfo.Triggers, ",")), "webhook") {
+		log.Printf("[INFO] App %s (%s) has a webhook trigger as default. Setting available labels to Webhook", selectedApp.Name, selectedApp.ID)
 		availableLabels = append(availableLabels, "Webhook")
 
 		if len(selectedAction.Name) == 0 {
@@ -25840,6 +25862,7 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
 
 	client := GetExternalClient(baseUrl)
 
+
 	selectedAction.AppName = selectedApp.Name
 	selectedAction.AppID = selectedApp.ID
 	selectedAction.AppVersion = selectedApp.AppVersion
@@ -26013,6 +26036,7 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
 
 		//streamUrl = "http://localhost:5002"
 		conversationUrl := fmt.Sprintf("%s/api/v1/conversation", baseUrl)
+		log.Printf("[DEBUG][AI] Sending single conversation execution to %s", conversationUrl)
 
 		// Check if "execution_id" & "authorization" queries exist
 		if len(request.Header.Get("Authorization")) == 0 && len(request.URL.Query().Get("execution_id")) > 0 && len(request.URL.Query().Get("authorization")) > 0 {
@@ -26152,6 +26176,7 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
 		// The app run url to use. Default delete is false
 		shouldDelete := "false"
 		apprunUrl := fmt.Sprintf("%s/api/v1/apps/%s/run?delete=%s", baseUrl, secondAction.AppID, shouldDelete)
+
 		if len(request.Header.Get("Authorization")) == 0 && len(request.URL.Query().Get("execution_id")) > 0 && len(request.URL.Query().Get("authorization")) > 0 {
 			apprunUrl = fmt.Sprintf("%s&execution_id=%s&authorization=%s", apprunUrl, request.URL.Query().Get("execution_id"), request.URL.Query().Get("authorization"))
 
@@ -26173,6 +26198,8 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
 
 		// Runs attempts up to X times
 		maxAttempts := 7
+
+		log.Printf("[DEBUG][AI] Sending single API run execution to %s", apprunUrl)
 		for i := 0; i < maxAttempts; i++ {
 
 			// Sends back how many translations happened
@@ -26214,6 +26241,7 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
 				return
 			}
 
+
 			// Ensures frontend has something to debug if things go wrong
 			for key, value := range newresp.Header {
 				if strings.HasSuffix(strings.ToLower(key), "-url") {
@@ -26236,14 +26264,27 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
 				return
 			}
 
+			// Parse success struct
+			successStruct := ResultChecker{}
+			json.Unmarshal(apprunBody, &successStruct)
+
+			httpOutput, marshalledBody, httpParseErr := FindHttpBody(apprunBody)
+			//log.Printf("\n\nGOT RESPONSE (%d): %s. STATUS: %d\n\n",  newresp.StatusCode, string(apprunBody), httpOutput.Status)
+			if successStruct.Success == false && len(successStruct.Reason) > 0 && httpOutput.Status == 0 && strings.Contains(strings.ReplaceAll(string(apprunBody), " ", ""), `"success":false`){
+				log.Printf("[WARNING][AI] Failed running app %s (%s). Contact support. Reason: %s", selectedAction.Name, selectedAction.AppID, successStruct.Reason)
+
+				resp.WriteHeader(400)
+				resp.Write(apprunBody)
+				return
+			}
+
 			// Input value to get raw output instead of translated
 			if value.SkipOutputTranslation {
 				resp.WriteHeader(202)
 				resp.Write(apprunBody)
 				return
 			}
 
-			httpOutput, marshalledBody, httpParseErr := FindHttpBody(apprunBody)
 			parsedTranslation := SchemalessOutput{
 				Success: false,
 				Action:  value.Label,
@@ -26821,6 +26862,7 @@ func GetActionFromLabel(ctx context.Context, app WorkflowApp, label string, fixL
 
 	categories := GetAllAppCategories()
 	lowercaseLabel := strings.ReplaceAll(strings.ToLower(label), " ", "_")
+	exactMatch := false
 	for _, action := range app.Actions {
 		if len(action.CategoryLabel) == 0 {
 			//log.Printf("%s: %#v\n", action.Name, action.CategoryLabel)
@@ -26829,15 +26871,18 @@ func GetActionFromLabel(ctx context.Context, app WorkflowApp, label string, fixL
 
 		//log.Printf("FOUND LABELS: %s -> %#v\n", action.Name, action.CategoryLabel)
 
-		for labelIndex, _ := range action.CategoryLabel {
-			if strings.ReplaceAll(strings.ToLower(action.CategoryLabel[labelIndex]), " ", "_") == "no_label" {
+		for _, label := range action.CategoryLabel {
+			newLabel := strings.ReplaceAll(strings.ToLower(label), " ", "_")
+			if newLabel == "no_label" {
 				continue
 			}
 
-			availableLabels = append(availableLabels, action.CategoryLabel[labelIndex])
-			actionCategory := strings.ReplaceAll(strings.ToLower(action.CategoryLabel[labelIndex]), " ", "_")
+			// To ensure we have both normal + parsed label
+			availableLabels = append(availableLabels, newLabel)
+			availableLabels = append(availableLabels, label)
 
-			if actionCategory == lowercaseLabel || strings.HasPrefix(actionCategory, lowercaseLabel) {
+			if newLabel == lowercaseLabel || strings.HasPrefix(newLabel, lowercaseLabel) {
+				//log.Printf("[DEBUG] Found action for label '%s' in app %s (%s): %s", label, app.Name, app.ID, action.Name)
 				selectedAction = action
 
 				for _, category := range categories {
@@ -26846,13 +26891,20 @@ func GetActionFromLabel(ctx context.Context, app WorkflowApp, label string, fixL
 						break
 					}
 				}
+
+				if newLabel == lowercaseLabel {
+					exactMatch = true 
+					break
+				}
 			}
 		}
-	}
 
-	//log.Printf("\n\n[DEBUG] SELECTED: %#v\n\n", selectedAction)
+		if len(selectedAction.ID) > 0 && exactMatch {
+			break
+		}
+	}
 
-	// FIXME: If selectedAction isn't chosen, then we need to try to discover it in the app
+	// Decides if we are to autocomplete the app if labels are not found 
 	if len(selectedAction.ID) == 0 {
 		if fixLabels == true {
 			//log.Printf("\n\n[DEBUG] Action not found in app %s (%s) for label '%s'. Autodiscovering and updating the app!!!\n\n", app.Name, app.ID, label)