Fix: Add proper onedrive sync status to api

Signed-off-by: Daishan Peng <[email protected]>

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,8 +6,10 @@ import (
 	"errors"
 	"fmt"
 	"path/filepath"
+	"time"
 
 	"github.com/acorn-io/baaah/pkg/apply"
+	"github.com/acorn-io/baaah/pkg/log"
 	"github.com/acorn-io/baaah/pkg/router"
 	"github.com/acorn-io/baaah/pkg/uncached"
 	"github.com/gptscript-ai/otto/apiclient/types"
@@ -180,11 +182,51 @@ func (u *UploadHandler) RunUpload(req router.Request, _ router.Response) error {
 		return err
 	}
 
+	ctx, cancel := context.WithCancel(context.Background())
+
 	go func() {
 		// Don't care about the events here, but we need to pull them out
 		r.Wait()
+		cancel()
 	}()
 
+	go func(ctx context.Context) {
+
+		ticker := time.NewTicker(5 * time.Second)
+		defer ticker.Stop()
+
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case <-ticker.C:
+				file, err := u.workspaceClient.OpenFile(req.Ctx, thread.Spec.WorkspaceID, ".metadata.json")
+				if err != nil {
+					log.Errorf("failed to open metadata file: %v", err)
+					continue
+				}
+				defer file.Close()
+
+				var output map[string]v1.OneDriveLinksConnectorStatus
+				if err = json.NewDecoder(file).Decode(&output); err != nil {
+					log.Errorf("failed to decode metadata file: %v", err)
+					continue
+				}
+				if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+					if err := req.Get(oneDriveLinks, oneDriveLinks.Namespace, oneDriveLinks.Name); err != nil {
+						return err
+					}
+					oneDriveLinks.Status.Status = output["output"].Status
+					oneDriveLinks.Status.Error = output["output"].Error
+					return req.Client.Status().Update(req.Ctx, oneDriveLinks)
+				}); err != nil {
+					log.Errorf("failed to update OneDriveLinks status: %v", err)
+				}
+			}
+		}
+
+	}(ctx)
+
 	oneDriveLinks.Status.RunName = r.Run.Name
 	oneDriveLinks.Status.LastReSyncStarted = metav1.Now()
 	return nil

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

@@ -47,14 +47,15 @@ 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"`
+	AuthURL           string             `json:"authUrl,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"`