Refactor web build process and update documentation

- Removed Node.js build artifacts from .gitignore and adjusted Makefile to reflect changes in web UI build process, now using server-rendered Go templates instead of React. - Updated README to clarify the new web UI architecture and output formats, emphasizing the removal of the Node.js build step. - Added a command to set the number of frames per render task in manager configuration, enhancing user control over rendering settings. - Improved Gitea workflow by removing unnecessary npm install step, streamlining the CI process.
2026-03-12 19:44:40 -05:00
parent d3c5ee0dba
commit 2deb47e5ad
78 changed files with 3895 additions and 12499 deletions
--- a/internal/runner/tasks/render.go
+++ b/internal/runner/tasks/render.go
@@ -27,9 +27,19 @@ func NewRenderProcessor() *RenderProcessor {

 // Process executes a render task.
 func (p *RenderProcessor) Process(ctx *Context) error {
-	ctx.Info(fmt.Sprintf("Starting task: job %d, frame %d, format: %s",
-		ctx.JobID, ctx.Frame, ctx.GetOutputFormat()))
-	log.Printf("Processing task %d: job %d, frame %d", ctx.TaskID, ctx.JobID, ctx.Frame)
+	if err := ctx.CheckCancelled(); err != nil {
+		return err
+	}
+
+	if ctx.FrameEnd > ctx.Frame {
+		ctx.Info(fmt.Sprintf("Starting task: job %d, frames %d-%d, format: %s",
+			ctx.JobID, ctx.Frame, ctx.FrameEnd, ctx.GetOutputFormat()))
+		log.Printf("Processing task %d: job %d, frames %d-%d", ctx.TaskID, ctx.JobID, ctx.Frame, ctx.FrameEnd)
+	} else {
+		ctx.Info(fmt.Sprintf("Starting task: job %d, frame %d, format: %s",
+			ctx.JobID, ctx.Frame, ctx.GetOutputFormat()))
+		log.Printf("Processing task %d: job %d, frame %d", ctx.TaskID, ctx.JobID, ctx.Frame)
+	}

 	// Find .blend file
 	blendFile, err := workspace.FindFirstBlendFile(ctx.WorkDir)
@@ -64,12 +74,8 @@ func (p *RenderProcessor) Process(ctx *Context) error {
 		return fmt.Errorf("failed to create Blender home directory: %w", err)
 	}

-	// Determine render format
-	outputFormat := ctx.GetOutputFormat()
-	renderFormat := outputFormat
-	if outputFormat == "EXR_264_MP4" || outputFormat == "EXR_AV1_MP4" || outputFormat == "EXR_VP9_WEBM" {
-		renderFormat = "EXR" // Use EXR for maximum quality
-	}
+	// We always render EXR (linear) for VFX accuracy; job output_format is the deliverable (EXR sequence or video).
+	renderFormat := "EXR"

 	// Create render script
 	if err := p.createRenderScript(ctx, renderFormat); err != nil {
@@ -77,18 +83,30 @@ func (p *RenderProcessor) Process(ctx *Context) error {
 	}

 	// Render
-	ctx.Info(fmt.Sprintf("Starting Blender render for frame %d...", ctx.Frame))
+	if ctx.FrameEnd > ctx.Frame {
+		ctx.Info(fmt.Sprintf("Starting Blender render for frames %d-%d...", ctx.Frame, ctx.FrameEnd))
+	} else {
+		ctx.Info(fmt.Sprintf("Starting Blender render for frame %d...", ctx.Frame))
+	}
 	if err := p.runBlender(ctx, blenderBinary, blendFile, outputDir, renderFormat, blenderHome); err != nil {
+		if errors.Is(err, ErrJobCancelled) {
+			ctx.Warn("Render stopped because job was cancelled")
+			return err
+		}
 		ctx.Error(fmt.Sprintf("Blender render failed: %v", err))
 		return err
 	}

-	// Verify output
-	if _, err := p.findOutputFile(ctx, outputDir, renderFormat); err != nil {
+	// Verify output (range or single frame)
+	if err := p.verifyOutputRange(ctx, outputDir, renderFormat); err != nil {
 		ctx.Error(fmt.Sprintf("Output verification failed: %v", err))
 		return err
 	}
-	ctx.Info(fmt.Sprintf("Blender render completed for frame %d", ctx.Frame))
+	if ctx.FrameEnd > ctx.Frame {
+		ctx.Info(fmt.Sprintf("Blender render completed for frames %d-%d", ctx.Frame, ctx.FrameEnd))
+	} else {
+		ctx.Info(fmt.Sprintf("Blender render completed for frame %d", ctx.Frame))
+	}

 	return nil
 }
@@ -116,10 +134,9 @@ func (p *RenderProcessor) createRenderScript(ctx *Context, renderFormat string)
 		return errors.New(errMsg)
 	}

-	// Write output format
-	outputFormat := ctx.GetOutputFormat()
-	ctx.Info(fmt.Sprintf("Writing output format '%s' to format file", outputFormat))
-	if err := os.WriteFile(formatFilePath, []byte(outputFormat), 0644); err != nil {
+	// Write EXR to format file so Blender script sets OPEN_EXR (job output_format is for downstream deliverable only).
+	ctx.Info("Writing output format 'EXR' to format file")
+	if err := os.WriteFile(formatFilePath, []byte("EXR"), 0644); err != nil {
 		errMsg := fmt.Sprintf("failed to create format file: %v", err)
 		ctx.Error(errMsg)
 		return errors.New(errMsg)
@@ -151,7 +168,12 @@ func (p *RenderProcessor) runBlender(ctx *Context, blenderBinary, blendFile, out
 	outputAbsPattern, _ := filepath.Abs(outputPattern)
 	args = append(args, "-o", outputAbsPattern)

-	args = append(args, "-f", fmt.Sprintf("%d", ctx.Frame))
+	// Render single frame or range: -f N for one frame, -s start -e end -a for range
+	if ctx.FrameEnd > ctx.Frame {
+		args = append(args, "-s", fmt.Sprintf("%d", ctx.Frame), "-e", fmt.Sprintf("%d", ctx.FrameEnd), "-a")
+	} else {
+		args = append(args, "-f", fmt.Sprintf("%d", ctx.Frame))
+	}

 	// Wrap with xvfb-run
 	xvfbArgs := []string{"-a", "-s", "-screen 0 800x600x24", blenderBinary}
@@ -185,6 +207,8 @@ func (p *RenderProcessor) runBlender(ctx *Context, blenderBinary, blendFile, out
 	if err := cmd.Start(); err != nil {
 		return fmt.Errorf("failed to start blender: %w", err)
 	}
+	stopMonitor := ctx.StartCancellationMonitor(cmd, "render")
+	defer stopMonitor()

 	// Track process
 	ctx.Processes.Track(ctx.TaskID, cmd)
@@ -231,6 +255,9 @@ func (p *RenderProcessor) runBlender(ctx *Context, blenderBinary, blendFile, out
 	<-stderrDone

 	if err != nil {
+		if cancelled, checkErr := ctx.IsJobCancelled(); checkErr == nil && cancelled {
+			return ErrJobCancelled
+		}
 		if exitErr, ok := err.(*exec.ExitError); ok {
 			if exitErr.ExitCode() == 137 {
 				return errors.New("Blender was killed due to excessive memory usage (OOM)")
@@ -242,60 +269,64 @@ func (p *RenderProcessor) runBlender(ctx *Context, blenderBinary, blendFile, out
 	return nil
 }

-func (p *RenderProcessor) findOutputFile(ctx *Context, outputDir, renderFormat string) (string, error) {
+// verifyOutputRange checks that output files exist for the task's frame range (first and last at minimum).
+func (p *RenderProcessor) verifyOutputRange(ctx *Context, outputDir, renderFormat string) error {
 	entries, err := os.ReadDir(outputDir)
 	if err != nil {
-		return "", fmt.Errorf("failed to read output directory: %w", err)
+		return fmt.Errorf("failed to read output directory: %w", err)
 	}

 	ctx.Info("Checking output directory for files...")
+	ext := strings.ToLower(renderFormat)

-	// Try exact match first
-	expectedFile := filepath.Join(outputDir, fmt.Sprintf("frame_%04d.%s", ctx.Frame, strings.ToLower(renderFormat)))
-	if _, err := os.Stat(expectedFile); err == nil {
-		ctx.Info(fmt.Sprintf("Found output file: %s", filepath.Base(expectedFile)))
-		return expectedFile, nil
+	// Check first and last frame in range (minimum required for range; single frame = one check)
+	framesToCheck := []int{ctx.Frame}
+	if ctx.FrameEnd > ctx.Frame {
+		framesToCheck = append(framesToCheck, ctx.FrameEnd)
 	}
-
-	// Try without zero padding
-	altFile := filepath.Join(outputDir, fmt.Sprintf("frame_%d.%s", ctx.Frame, strings.ToLower(renderFormat)))
-	if _, err := os.Stat(altFile); err == nil {
-		ctx.Info(fmt.Sprintf("Found output file: %s", filepath.Base(altFile)))
-		return altFile, nil
-	}
-
-	// Try just frame number
-	altFile2 := filepath.Join(outputDir, fmt.Sprintf("%04d.%s", ctx.Frame, strings.ToLower(renderFormat)))
-	if _, err := os.Stat(altFile2); err == nil {
-		ctx.Info(fmt.Sprintf("Found output file: %s", filepath.Base(altFile2)))
-		return altFile2, nil
-	}
-
-	// Search through all files
-	for _, entry := range entries {
-		if !entry.IsDir() {
-			fileName := entry.Name()
-			if strings.Contains(fileName, "%04d") || strings.Contains(fileName, "%d") {
-				ctx.Warn(fmt.Sprintf("Skipping file with literal pattern: %s", fileName))
-				continue
-			}
-			frameStr := fmt.Sprintf("%d", ctx.Frame)
-			frameStrPadded := fmt.Sprintf("%04d", ctx.Frame)
-			if strings.Contains(fileName, frameStrPadded) ||
-				(strings.Contains(fileName, frameStr) && strings.HasSuffix(strings.ToLower(fileName), strings.ToLower(renderFormat))) {
-				outputFile := filepath.Join(outputDir, fileName)
-				ctx.Info(fmt.Sprintf("Found output file: %s", fileName))
-				return outputFile, nil
+	for _, frame := range framesToCheck {
+		found := false
+		// Try frame_0001.ext, frame_1.ext, 0001.ext
+		for _, name := range []string{
+			fmt.Sprintf("frame_%04d.%s", frame, ext),
+			fmt.Sprintf("frame_%d.%s", frame, ext),
+			fmt.Sprintf("%04d.%s", frame, ext),
+		} {
+			if _, err := os.Stat(filepath.Join(outputDir, name)); err == nil {
+				found = true
+				ctx.Info(fmt.Sprintf("Found output file: %s", name))
+				break
 			}
 		}
-	}
-
-	// Not found
-	fileList := []string{}
-	for _, entry := range entries {
-		if !entry.IsDir() {
-			fileList = append(fileList, entry.Name())
+		if !found {
+			// Search entries for this frame number
+			frameStr := fmt.Sprintf("%d", frame)
+			frameStrPadded := fmt.Sprintf("%04d", frame)
+			for _, entry := range entries {
+				if entry.IsDir() {
+					continue
+				}
+				fileName := entry.Name()
+				if strings.Contains(fileName, "%04d") || strings.Contains(fileName, "%d") {
+					continue
+				}
+				if (strings.Contains(fileName, frameStrPadded) ||
+					strings.Contains(fileName, frameStr)) && strings.HasSuffix(strings.ToLower(fileName), ext) {
+					found = true
+					ctx.Info(fmt.Sprintf("Found output file: %s", fileName))
+					break
+				}
+			}
+		}
+		if !found {
+			fileList := []string{}
+			for _, e := range entries {
+				if !e.IsDir() {
+					fileList = append(fileList, e.Name())
+				}
+			}
+			return fmt.Errorf("output file for frame %d not found; files in output directory: %v", frame, fileList)
 		}
 	}
-	return "", fmt.Errorf("output file not found: %s\nFiles in output directory: %v", expectedFile, fileList)
+	return nil
 }