Fix: Add proper onedrive sync status to api

apiclient/types/onedrive.go

@@ -7,7 +7,7 @@ type OneDriveLinks struct {
 	SharedLinks []string  `json:"sharedLinks,omitempty"`
 	ThreadID    string    `json:"threadID,omitempty"`
 	RunID       string    `json:"runID,omitempty"`
-	Status      string    `json:"output,omitempty"`
+	Status      string    `json:"status,omitempty"`
 	Error       string    `json:"error,omitempty"`
 	Folders     FolderSet `json:"folders,omitempty"`
 }

pkg/controller/handlers/uploads/onedrive.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"path/filepath"
+	"time"
 
 	"github.com/acorn-io/baaah/pkg/apply"
 	"github.com/acorn-io/baaah/pkg/router"
@@ -202,11 +203,34 @@ func (u *UploadHandler) HandleUploadRun(req router.Request, resp router.Response
 
 	var run v1.Run
 	if err := req.Get(&run, oneDriveLinks.Namespace, oneDriveLinks.Status.RunName); apierrors.IsNotFound(err) {
-		// Might not be in the cache yet.
 		return nil
-	} else if err != nil || !run.Status.State.IsTerminal() {
+	} else if err != nil {
 		return err
 	}
+	if !run.Status.State.IsTerminal() {
+		var thread v1.Thread
+		if err := req.Get(&thread, oneDriveLinks.Namespace, oneDriveLinks.Status.ThreadName); apierrors.IsNotFound(err) {
+			// Might not be in the cache yet.
+			return nil
+		} else if err != nil {
+			return err
+		}
+
+		file, err := u.workspaceClient.OpenFile(req.Ctx, thread.Spec.WorkspaceID, ".metadata.json")
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+
+		var output map[string]v1.OneDriveLinksConnectorStatus
+		if err = json.NewDecoder(file).Decode(&output); err != nil {
+			return err
+		}
+		oneDriveLinks.Status.Status = output["output"].Status
+		oneDriveLinks.Status.Error = output["output"].Error
+		resp.RetryAfter(5 * time.Second)
+		return nil
+	}
 
 	var thread v1.Thread
 	if err := req.Get(&thread, oneDriveLinks.Namespace, oneDriveLinks.Status.ThreadName); err != nil {

pkg/storage/apis/otto.gptscript.ai/v1/upload.go

@@ -47,14 +47,14 @@ type OnedriveLinksStatus struct {
 	Conditions        []metav1.Condition `json:"conditions,omitempty"`
 	ThreadName        string             `json:"threadName,omitempty"`
 	RunName           string             `json:"runName,omitempty"`
-	Status            string             `json:"output,omitempty"`
+	Status            string             `json:"status,omitempty"`
 	Error             string             `json:"error,omitempty"`
 	Folders           types.FolderSet    `json:"folders,omitempty"`
 	LastReSyncStarted metav1.Time        `json:"lastReSyncStarted,omitempty"`
 }
 
 type OneDriveLinksConnectorStatus struct {
-	Status  string                       `json:"output,omitempty"`
+	Status  string                       `json:"status,omitempty"`
 	Error   string                       `json:"error,omitempty"`
 	Files   map[string]types.FileDetails `json:"files,omitempty"`
 	Folders types.FolderSet              `json:"folders,omitempty"`