Improved task code / task names

Author: D-K-P

product-image-generator/README.md

@@ -144,7 +144,7 @@ Each generation builds an enhanced prompt from the structured product analysis.
 src/
 ├── trigger/
 │   ├── image-upload.ts              # Upload to R2 + structured product analysis (OpenAI)
-│   └── generate-and-upload-image.ts # Flux generation (Replicate) + R2 upload
+│   └── generate-image-and-upload.ts # Flux generation (Replicate) + R2 upload
 ├── app/
 │   ├── actions.ts                   # Server actions: trigger tasks + public tokens
 │   ├── components/
@@ -183,7 +183,7 @@ src/
 
 ### Adding Generation Styles
 
-Add a new style key in `generate-and-upload-image.ts` inside `stylePrompts` and wire a corresponding button/card in `app/page.tsx`.
+Add a new style key in `generate-image-and-upload.ts` inside `stylePrompts` and wire a corresponding button/card in `app/page.tsx`.
 
 ### Modifying Image Dimensions
 

product-image-generator/app/actions.ts

@@ -1,8 +1,8 @@
 "use server";
 
 import { auth, tasks } from "@trigger.dev/sdk";
-import type { generateAndUploadImage } from "../src/trigger/generate-and-upload-image";
-import type { uploadImageToR2 } from "../src/trigger/image-upload";
+import type { generateAndUploadImage } from "../src/trigger/generate-image-and-upload";
+import type { uploadImageToR2 } from "../src/trigger/upload-image-and-analyze";
 import type { ProductAnalysis } from "./types/trigger";
 
 export async function triggerUploadTask(payload: {
@@ -12,7 +12,7 @@ export async function triggerUploadTask(payload: {
 }) {
   try {
     const handle = await tasks.trigger<typeof uploadImageToR2>(
-      "upload-image-to-r2",
+      "upload-image-and-analyze",
       payload,
     );
 
@@ -44,7 +44,7 @@ export async function triggerGenerationTask(payload: {
 }) {
   try {
     const handle = await tasks.trigger<typeof generateAndUploadImage>(
-      "generate-and-upload-image",
+      "generate-image-and-upload",
       payload,
     );
 

product-image-generator/app/components/CustomPromptCard.tsx

@@ -13,7 +13,7 @@ import {
 } from "lucide-react";
 import { useState, useEffect } from "react";
 import { triggerGenerationTask } from "../actions";
-import type { generateAndUploadImage } from "../../src/trigger/generate-and-upload-image";
+import type { generateAndUploadImage } from "../../src/trigger/generate-image-and-upload";
 import type { ProductAnalysis } from "../types/trigger";
 import { Button } from "./ui/button";
 import { Card } from "./ui/card";

product-image-generator/app/components/GeneratedCard.tsx

@@ -14,7 +14,7 @@ import {
 import { useState, useEffect, useCallback } from "react";
 import { useRealtimeRun } from "@trigger.dev/react-hooks";
 import { triggerGenerationTask } from "../actions";
-import type { generateAndUploadImage } from "../../src/trigger/generate-and-upload-image";
+import type { generateAndUploadImage } from "../../src/trigger/generate-image-and-upload";
 import type { ProductAnalysis } from "../types/trigger";
 
 interface GeneratedCardProps {

product-image-generator/app/components/UploadCard.tsx

@@ -3,7 +3,7 @@
 import { useRealtimeTaskTrigger } from "@trigger.dev/react-hooks";
 import { LucideLoader, Upload } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
-import type { uploadImageToR2 } from "../../src/trigger/image-upload";
+import type { uploadImageToR2 } from "../../src/trigger/upload-image-and-analyze";
 import type {
   ProductAnalysis,
   UploadTaskMetadata,
@@ -32,7 +32,7 @@ export default function UploadCard({
   // Use realtime task trigger hook for immediate triggering
   const { submit, run, error, isLoading } = useRealtimeTaskTrigger<
     typeof uploadImageToR2
-  >("upload-image-to-r2", {
+  >("upload-image-and-analyze", {
     accessToken: triggerToken,
     enabled: Boolean(triggerToken),
   });
@@ -133,7 +133,7 @@ export default function UploadCard({
 
   return (
     <Card
-      className={`aspect-[3/4] border-2 border-dashed transition-colors cursor-pointer group relative overflow-hidden ${
+      className={`aspect-[3/4] border-2 border-dashed transition-colors cursor-pointer group relative overflow-hidden  ${
         isDragOver
           ? "border-gray-500 bg-gray-500/5"
           : "border-gray-500 bg-card hover:border-gray-500/80"

product-image-generator/app/page.tsx

@@ -3,7 +3,7 @@ import ProductImageGenerator from "./ProductImageGenerator";
 
 export default async function Page() {
   const triggerToken = await auth.createTriggerPublicToken([
-    "upload-image-to-r2",
+    "upload-image-and-analyze",
   ]);
   return <ProductImageGenerator triggerToken={triggerToken} />;
 }

…src/trigger/generate-and-upload-image.ts …src/trigger/generate-image-and-upload.tsproduct-image-generator/src/trigger/generate-and-upload-image.ts renamed to product-image-generator/src/trigger/generate-image-and-upload.ts product-image-generator/src/trigger/generate-and-upload-image.ts renamed to product-image-generator/src/trigger/generate-image-and-upload.ts

@@ -18,7 +18,7 @@ const s3Client = new S3Client({
 const aiModel = "black-forest-labs/flux-dev";
 
 export const generateAndUploadImage = task({
-  id: "generate-and-upload-image",
+  id: "generate-image-and-upload",
   maxDuration: 600, // 10 minutes max
   run: async (payload: {
     promptStyle: string; // Style prompt (table-shot, lifestyle, hero, custom)

…ge-generator/src/trigger/image-upload.ts …/src/trigger/upload-image-and-analyze.tsproduct-image-generator/src/trigger/image-upload.ts renamed to product-image-generator/src/trigger/upload-image-and-analyze.ts product-image-generator/src/trigger/image-upload.ts renamed to product-image-generator/src/trigger/upload-image-and-analyze.ts

@@ -90,44 +90,38 @@ async function analyzeProductStructured(imageUrl: string) {
 }
 
 export const uploadImageToR2 = task({
-  id: "upload-image-to-r2",
-  maxDuration: 300, // 5 minutes max
+  id: "upload-image-and-analyze",
+  maxDuration: 300, // 5 mins
   run: async (payload: {
     imageBuffer: string; // base64 encoded image
     fileName: string;
     contentType: string;
   }) => {
     const { imageBuffer, fileName, contentType } = payload;
 
-    // Set initial metadata with 5 steps (added analysis)
+    // Step 1: Start the upload and analysis
     metadata.set("status", "starting");
     metadata.set("progress", {
       step: 1,
-      total: 5,
+      total: 4,
       message: "Preparing upload and analysis...",
     });
 
     logger.log("Starting image upload and analysis", { fileName, contentType });
 
-    // Convert base64 to buffer
-    metadata.set("progress", {
-      step: 2,
-      total: 5,
-      message: "Processing image data...",
-    });
     const buffer = Buffer.from(imageBuffer, "base64");
     const fileSize = buffer.length;
 
     logger.log(`Image size: ${fileSize} bytes`);
 
-    // Generate unique key for R2
+    // Step 2: Generate unique key for R2
     const timestamp = Date.now();
     const sanitizedFileName = fileName.replace(/[^a-zA-Z0-9.-]/g, "_");
     const r2Key = `uploaded-images/${timestamp}-${sanitizedFileName}`;
 
     metadata.set("progress", {
-      step: 3,
-      total: 5,
+      step: 2,
+      total: 4,
       message: "Uploading to storage...",
     });
 
@@ -158,20 +152,20 @@ export const uploadImageToR2 = task({
       // Construct the public URL using the R2_PUBLIC_URL env var
       const publicUrl = `${process.env.R2_PUBLIC_URL}/${r2Key}`;
 
-      // Step 4: Analyze product properties
+      // Step 3: Analyze product properties
       metadata.set("progress", {
-        step: 4,
-        total: 5,
+        step: 3,
+        total: 4,
         message: "Analyzing product properties...",
       });
 
       const productAnalysis = await analyzeProductStructured(publicUrl);
       logger.log("Product analysis completed", { productAnalysis });
 
-      // Step 5: Complete
+      // Step 4: Complete
       metadata.set("progress", {
-        step: 5,
-        total: 5,
+        step: 4,
+        total: 4,
         message: "Upload and analysis completed!",
       });
       metadata.set("status", "completed");
@@ -200,7 +194,7 @@ export const uploadImageToR2 = task({
       metadata.set("status", "failed");
       metadata.set("progress", {
         step: 0,
-        total: 5,
+        total: 4,
         message: "Upload and analysis failed",
       });
       metadata.set(