Merge pull request #122 from trickest/fix/get-workflow-status

Fix retrieval of stopped workflow runs in JSON format
trickest · Jul 26, 2024 · 7f0bb4a · 7f0bb4a
2 parents 3016fad + 18a2ca3
commit 7f0bb4a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cmd/execute/watch.go b/cmd/execute/watch.go
@@ -115,7 +115,7 @@ func WatchRun(runID uuid.UUID, downloadPath string, nodesToDownload map[string]o
 			return
 		}
 
-		if run.Status == "COMPLETED" || run.Status == "STOPPED" || run.Status == "FAILED" {
+		if run.Status == "COMPLETED" || run.Status == "STOPPED" || run.Status == "STOPPING" || run.Status == "FAILED" {
 			if downloadPath == "" {
 				downloadPath = run.SpaceName
 				if run.ProjectName != "" {

diff --git a/cmd/get/get.go b/cmd/get/get.go
@@ -58,7 +58,7 @@ var GetCmd = &cobra.Command{
 			run := execute.GetRunByID(runUUID)
 			runs = []types.Run{*run}
 		}
-		if len(runs) > 0 && (runs[0].Status == "RUNNING" || runs[0].Status == "COMPLETED") {
+		if len(runs) > 0 {
 			run := runs[0]
 			if run.Status == "COMPLETED" && run.CompletedDate.IsZero() {
 				run.Status = "RUNNING"

diff --git a/cmd/output/output.go b/cmd/output/output.go
@@ -163,7 +163,7 @@ func init() {
 }
 
 func DownloadRunOutput(run *types.Run, nodes map[string]NodeInfo, files []string, destinationPath string) {
-	if run.Status != "COMPLETED" && run.Status != "STOPPED" && run.Status != "FAILED" {
+	if run.Status != "COMPLETED" && run.Status != "STOPPED" && run.Status != "STOPPING" && run.Status != "FAILED" {
 		fmt.Println("The workflow run hasn't been completed yet!")
 		fmt.Println("Run ID: " + run.ID.String() + "   Status: " + run.Status)
 		return