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

Author: 0x0elliot

ai.go

@@ -1341,7 +1341,7 @@ func FixContentOutput(contentOutput string) string {
 	contentOutput = strings.Trim(contentOutput, "\t")
 
 	// Fix issues with newlines in keys. Replace with raw newlines
-	contentOutput = strings.ReplaceAll(contentOutput, "\\n", "\n")
+	//contentOutput = strings.ReplaceAll(contentOutput, "\\n", "\n")
 
 	// Attempts to balance it automatically
 	contentOutput = balanceJSONLikeString(contentOutput)

db-connector.go

@@ -17540,6 +17540,9 @@ func InitOpensearchIndexes() {
 		GetESIndexPrefix("shuffle_logs"),
 		GetESIndexPrefix("environments"),
 		GetESIndexPrefix("org_statistics"),
+		GetESIndexPrefix("workflowapp"),
+		GetESIndexPrefix("workflow"),
+		GetESIndexPrefix("workflow_revisions"),
 	}
 
 	customConfig := os.Getenv("OPENSEARCH_INDEX_CONFIG")

shared.go

@@ -15128,6 +15128,13 @@ func HandleLogin(resp http.ResponseWriter, request *http.Request) {
 			Expiration: expiration.Unix(),
 		})
 
+		// Singul handler
+		if project.Environment == "cloud" {
+			newCookie.Name = "__session"
+			newCookie.Domain = ".singul.io"
+			http.SetCookie(resp, newCookie)
+		}
+
 		loginData = fmt.Sprintf(`{"success": true, "cookies": [{"key": "session_token", "value": "%s", "expiration": %d}], "region_url": "%s"}`, userdata.Session, expiration.Unix(), regionUrl)
 		newData, err := json.Marshal(returnValue)
 		if err == nil {
@@ -15185,6 +15192,13 @@ func HandleLogin(resp http.ResponseWriter, request *http.Request) {
 			Expiration: expiration.Unix(),
 		})
 
+		// Singul handler
+		if project.Environment == "cloud" {
+			newCookie.Name = "__session"
+			newCookie.Domain = ".singul.io"
+			http.SetCookie(resp, newCookie)
+		}
+
 		err = SetUser(ctx, &userdata, true)
 		if err != nil {
 			log.Printf("[ERROR] Failed updating user when setting session: %s", err)
@@ -24785,6 +24799,10 @@ func PrepareWorkflowExecution(ctx context.Context, workflow Workflow, request *h
 					}
 
 				}
+
+				// Special weird mistake cases in apps without newlines
+				param.Value = strings.ReplaceAll(param.Value, "application/jsonContent-Type", "application/json\nContent-Type")
+				param.Value = strings.ReplaceAll(param.Value, "application/jsonAccept", "application/json\nAccept")
 			}
 
 			if param.Name == "queries" {

stats.go

@@ -891,7 +891,7 @@ func IncrementCache(ctx context.Context, orgId, dataType string, amount ...int)
 		return
 	}
 
-	if len(orgId) != 36 {
+	if len(orgId) != 36 && orgId != "public" {
 		log.Printf("[ERROR] Increment Stats with bad OrgId '%s' for type '%s'", orgId, dataType)
 		return
 	}

structs.go

@@ -136,9 +136,9 @@ type AtomicOutput struct {
 	ThreadId   string `json:"thread_id"`              // Thread the assistant ran
 	RunId      string `json:"run_id"`                 // Run ID for the thread
 	ToolCallID string `json:"tool_call_id,omitempty"` // Result inside the run
-	
-	ResponseId string `json:"response_id,omitempty"`  // Response ID
-	ConversationId string `json:"conversation_id,omitempty"`  // Conversation ID 
+
+	ResponseId     string `json:"response_id,omitempty"`     // Response ID
+	ConversationId string `json:"conversation_id,omitempty"` // Conversation ID
 }
 
 type ExecutionRequestWrapper struct {
@@ -1666,8 +1666,8 @@ type Notification struct {
 	Ignored     bool   `json:"ignored" datastore:"ignored"`
 	ExecutionId string `json:"execution_id" datastore:"execution_id"`
 
-	Severity	string	`json:"severity" datastore:"severity"`
-	Origin		string	`json:"origin" datastore:"origin"`
+	Severity string `json:"severity" datastore:"severity"`
+	Origin   string `json:"origin" datastore:"origin"`
 }
 
 type NotificationCached struct {
@@ -3999,12 +3999,12 @@ type SchemalessOutput struct {
 	Status  int    `json:"status,omitempty"`
 	URL     string `json:"url,omitempty"`
 
-	// Optional
-	RawResponse interface{} `json:"raw_response,omitempty"`
+	// JSON output. Or not? What if it's a list?
+	Output interface{} `json:"output,omitempty"`
 
-	// JSON output. What if it's a list?
-	//Output map[string]interface{} `json:"output"`
-	Output interface{} `json:"output"`
+	// Optional. Used for error handling.
+	RawResponse interface{} `json:"raw_response,omitempty"`
+	Retries int    `json:"retries,omitempty"`
 }
 
 type CategoryActionFieldOverride struct {
@@ -4804,4 +4804,4 @@ type StreamData struct {
 	Type  string `json:"type"` // "chunk", "done", "error"
 	Chunk string `json:"chunk,omitempty"`
 	Data  string `json:"data,omitempty"` // For the final ID or error
-}
+}