polling jobs implemented!

End to End Polling job done without using sessions.

frontend/apps/editor2d/src/KonvaApp/Api.ts

@@ -148,7 +148,6 @@ export class ApiManager {
       formData.append("file", blob);
     }
 
-    // console.log(`HELLO${formData}`);
     return this.fetchMultipartFormData<T>(endpoint, {
       method: "POST",
       headers: {
@@ -327,7 +326,10 @@ export class Api extends ApiManager {
     return result;
   }
 
-  public async pollJobSession(jobToken: string): Promise<
+  public async pollJobSession(
+    jobToken: string,
+    thumbnailWidth: number = 256,
+  ): Promise<
     ApiResponse<{
       job_token: string;
       request: {
@@ -338,6 +340,9 @@ export class Api extends ApiManager {
         progress_percentage: number;
       };
       result: {
+        image_url: string;
+        thumbnail_url: string;
+        public_bucket_path: string;
         generated_images?: string[];
         error?: string;
       };
@@ -345,41 +350,53 @@ export class Api extends ApiManager {
   > {
     const endpoint = `${this.ApiTargets.BaseApi}/v1/jobs/job/${jobToken}`;
 
-    const response = await this.get<{
-      success?: boolean;
-      status?: string;
-      result?: {
-        generated_images?: string[];
-        error?: string;
-      };
-      BadInput?: string;
-    }>({
+    const response = await this.get<any>({
       endpoint,
     });
+    console.log("Job Polling Response:");
+    console.log(response);
+
+    let image_url = response.state.maybe_result?.media_links?.cdn_url;
+    let public_bucket_path =
+      response.state.maybe_result?.maybe_public_bucket_media_path;
+
+    let thumbnail_url =
+      response.state.maybe_result?.media_links?.maybe_thumbnail_template?.replace(
+        "{WIDTH}",
+        thumbnailWidth.toString(),
+      );
+
+    let progress_percentage = response.state.status.progress_percentage;
+    let status_string = response.state.status.status;
+
+    console.log("Image URL:", image_url);
+    console.log("Thumbnail URL:", thumbnail_url);
+    console.log("Progress Percentage:", progress_percentage);
+    console.log("Status", status_string);
 
     console.log("response FROM JOBS");
     console.log(response);
 
     const success = response.success ?? false;
     const status = response.status ?? "";
-    const result = response.result ?? {
-      generated_images: [],
-      error: undefined,
-    };
-
     const errorMessage = response.BadInput;
 
     return {
       success,
       data: {
-        result,
+        result: {
+          image_url: image_url || "",
+          thumbnail_url: thumbnail_url || "",
+          public_bucket_path: public_bucket_path || "",
+          error: undefined,
+        },
         job_token: jobToken,
         request: {
           maybe_model_title: "Image Generation",
         },
         status: {
-          status: status.toLowerCase(),
-          progress_percentage: 0,
+          status: status_string.toLowerCase(),
+          progress_percentage: progress_percentage,
         },
       },
       errorMessage,

frontend/apps/editor2d/src/components/JobContext.tsx

@@ -1,8 +1,10 @@
 import React, { createContext, useContext, useState } from "react";
 
 interface JobContextType {
-  jobToken: string | null;
-  setJobToken: (token: string | null) => void;
+  jobTokens: string[];
+  addJobToken: (token: string) => void;
+  removeJobToken: (token: string) => void;
+  clearJobTokens: () => void;
 }
 
 const JobContext = createContext<JobContextType | undefined>(undefined);
@@ -10,10 +12,24 @@ const JobContext = createContext<JobContextType | undefined>(undefined);
 export const JobProvider: React.FC<{ children: React.ReactNode }> = ({
   children,
 }) => {
-  const [jobToken, setJobToken] = useState<string | null>(null);
+  const [jobTokens, setJobTokens] = useState<string[]>([]);
+
+  const addJobToken = (token: string) => {
+    setJobTokens((prevTokens) => [...prevTokens, token]);
+  };
+
+  const removeJobToken = (token: string) => {
+    setJobTokens((prevTokens) => prevTokens.filter((t) => t !== token));
+  };
+
+  const clearJobTokens = () => {
+    setJobTokens([]);
+  };
 
   return (
-    <JobContext.Provider value={{ jobToken, setJobToken }}>
+    <JobContext.Provider
+      value={{ jobTokens, addJobToken, removeJobToken, clearJobTokens }}
+    >
       {children}
     </JobContext.Provider>
   );

frontend/apps/editor2d/src/components/PromptBox.tsx

@@ -47,7 +47,8 @@ export const PromptBox = () => {
   const isDesktopApp = window.navigator.userAgent.includes("Tauri");
   console.log("Is this a desktop app?", isDesktopApp);
 
-  const { jobToken, setJobToken } = useJobContext();
+  const { jobTokens, addJobToken, removeJobToken, clearJobTokens } =
+    useJobContext();
 
   //const { lastRenderedBitmap } = useCanvasSignal();
   const [prompt, setPrompt] = useState("");
@@ -119,7 +120,7 @@ export const PromptBox = () => {
                 setUploadingImages((prev) =>
                   prev.filter((img) => img.id !== uploadId),
                 );
-                console.log("Reference image added:", referenceImage);
+                toast.success("Reference image added.");
               } else if (
                 newState.status === UploaderStates.assetError ||
                 newState.status === UploaderStates.imageCreateError
@@ -127,7 +128,8 @@ export const PromptBox = () => {
                 setUploadingImages((prev) =>
                   prev.filter((img) => img.id !== uploadId),
                 );
-                console.error("Upload failed");
+
+                toast.error("Upload failed. Please try again.");
               }
             },
           });
@@ -206,7 +208,7 @@ export const PromptBox = () => {
         const api = new Api();
         let image = getCanvasRenderBitmap();
         if (image === undefined) {
-          console.error(
+          toast.error(
             "Error: Unable to generate image. Please check the input and try again.",
           );
           return;
@@ -229,7 +231,9 @@ export const PromptBox = () => {
         });
 
         if (snapshotMediaToken.data === undefined) {
-          console.error("Error: Unable to upload scene snapshot.");
+          toast.error(
+            "Error: Unable to upload scene snapshot Please try again.",
+          );
           return;
         }
 
@@ -242,17 +246,13 @@ export const PromptBox = () => {
         });
 
         if (response.success === true) {
-          console.error("Successfully enqueued image generation.");
-
+          toast.success("Please wait while we process your image.");
           if (response.data) {
-            console.log("Response:", response.data);
-            setJobToken(response.data);
+            addJobToken(response.data);
           }
-
           return;
         } else {
-          console.log("Image generation Not Successful.");
-          toast.error("Failed to generate image. Please try again.");
+          toast.error("Failed to enqueue image generation. Please try again.");
         }
       }
     } catch (error) {

frontend/apps/editor2d/src/components/features/ToolbarMain/ToolbarMain.tsx

@@ -63,12 +63,11 @@ export const ToolbarMain = ({
             buttonProps={buttonProps.SELECT}
             tooltip="Select"
           />
-          {/* <ToolbarButton
+          <ToolbarButton
             icon={faText}
             buttonProps={buttonProps.ADD_TEXT}
             tooltip="Add Text"
-          /> */}
-
+          />
           <Popover className="relative">
             {({ close }) => (
               <>

frontend/apps/editor2d/src/components/features/ToolbarTopRight/index.tsx

@@ -1,4 +1,5 @@
 import { twMerge } from "tailwind-merge";
+import { Login } from "~/app/pages/login";
 import { Activity } from "~/components/ui/Activity/Activity";
 // import { paperWrapperStyles } from "~/components/styles";
 // import { faPlus, faQuestion } from "@fortawesome/pro-solid-svg-icons";

frontend/apps/editor2d/src/components/ui/Activity/Activity.tsx

@@ -6,6 +6,8 @@ import { CompletedCard } from "./CompletedCard";
 import { InProgressCard } from "./InProgressCard";
 import { useJobContext } from "~/components/JobContext";
 import { Api } from "~/KonvaApp/Api";
+import { toast } from "sonner";
+
 // Dummy data types
 interface CompletedItem {
   token: string;
@@ -65,90 +67,72 @@ const dummyCompletedItems: CompletedItem[] = [
 // ];
 
 export function Activity() {
-  const { jobToken, setJobToken } = useJobContext();
+  const { jobTokens, addJobToken, removeJobToken, clearJobTokens } =
+    useJobContext();
   const [completedItems, setCompletedItems] = useState<CompletedItem[]>([]);
   const [jobs, setJobs] = useState<ActiveJob[]>([]);
   const [loading, setLoading] = useState(true);
 
-  // Dummy polling function
   useEffect(() => {
     const pollData = async () => {
-      if (jobToken) {
-        console.log("Current Job Token:", jobToken);
+      if (jobTokens.length > 0) {
+        console.log("Current Job Tokens:", jobTokens);
         const api = new Api();
-        const job = await api.pollJobSession(jobToken);
-        console.log("Job response:", job);
 
-        if (job.success && job.data) {
-          const { status, progress_percentage } = job.data.status;
-          const { job_token } = job.data;
+        // Create a map to store the latest job data
+        const updatedJobs = new Map<string, ActiveJob>();
 
-          console.log("Job status:", status);
-          console.log("Progress percentage:", progress_percentage);
-          console.log("Job token:", job_token);
+        for (const jobToken of jobTokens) {
+          const job = await api.pollJobSession(jobToken);
 
-          // Update jobs with real job data
-          if (
-            status.toLowerCase() === "completed" ||
-            status.toLowerCase() === "failed"
-          ) {
-            // If job is completed or failed, remove it from active jobs
-            setJobs((prevJobs) =>
-              prevJobs.filter((j) => j.job_token !== job_token),
-            );
+          if (job.success && job.data) {
+            const { status, progress_percentage } = job.data.status;
+            const { job_token } = job.data;
 
-            // Add to completed items if it was successful
             if (
-              status.toLowerCase() === "completed" &&
-              job.data.result.generated_images
+              status.toLowerCase() === "complete_success" ||
+              status.toLowerCase() === "failed"
             ) {
-              const newCompletedItem: CompletedItem = {
-                id: job_token,
-                title: job.data.request.maybe_model_title || "Image Generation",
-                timestamp: new Date().toISOString(),
-                type: "image",
-                imageUrl: job.data.result.generated_images[0] || "",
-              };
+              // If job is complete_success or failed, we'll remove it later
+              removeJobToken(job_token);
 
-              setCompletedItems((prev) => [newCompletedItem, ...prev]);
+              // Add to complete_success items if it was successful
+              if (status.toLowerCase() === "complete_success") {
+                const newCompletedItem: CompletedItem = {
+                  token: job_token,
+                  maybe_title:
+                    job.data.request.maybe_model_title || "Image Generation",
+                  public_bucket_path: job.data.result.image_url || "",
+                  updated_at: new Date().toISOString(),
+                };
+                setCompletedItems((prev) => [newCompletedItem, ...prev]);
+                toast.success("Done Processing Image");
+              }
+            } else {
+              // Store the job in our map
+              const updatedJob: ActiveJob = {
+                job_token,
+                request: {
+                  maybe_model_title:
+                    job.data.request.maybe_model_title || "Image Generation",
+                },
+                status: {
+                  status: status.toUpperCase(),
+                  progress_percentage: progress_percentage || 0,
+                },
+              };
+              updatedJobs.set(job_token, updatedJob);
             }
           } else {
-            // Update or add the job to the active jobs list
-            const updatedJob: ActiveJob = {
-              job_token,
-              request: {
-                maybe_model_title:
-                  job.data.request.maybe_model_title || "Image Generation",
-              },
-              status: {
-                status: status.toUpperCase(),
-                progress_percentage: progress_percentage || 0,
-              },
-            };
-
-            setJobs((prevJobs) => {
-              const existingJobIndex = prevJobs.findIndex(
-                (j) => j.job_token === job_token,
-              );
-              if (existingJobIndex >= 0) {
-                // Update existing job
-                const newJobs = [...prevJobs];
-                newJobs[existingJobIndex] = updatedJob;
-                return newJobs;
-              } else {
-                // Add new job
-                return [updatedJob, ...prevJobs];
-              }
-            });
+            console.error("Failed to fetch job status:", job.errorMessage);
           }
-        } else {
-          console.error("Failed to fetch job status:", job.errorMessage);
         }
-      } else {
-        console.log("No Job Token available.");
-      }
 
-      if (jobs.length === 0) {
+        // Update jobs state with the deduplicated jobs
+        setJobs(Array.from(updatedJobs.values()));
+      }
+      if (jobTokens.length === 0) {
+        setJobs([]);
         setLoading(false);
       }
     };
@@ -163,7 +147,7 @@ export function Activity() {
     }, 5000);
 
     return () => clearInterval(interval);
-  }, [jobToken]);
+  }, [jobTokens, removeJobToken]);
 
   return (
     <PopoverMenu

frontend/apps/editor2d/src/components/ui/Activity/CompletedCard.tsx

@@ -17,8 +17,10 @@ interface Props {
 export function CompletedCard({ job }: Props) {
   const [loadError, setLoadError] = useState(false);
   const [isModalOpen, setIsModalOpen] = useState(false);
-  const imageUrl = job.public_bucket_path + "-thumb.gif";
+  const imageUrl = job.public_bucket_path;
   const fullImageUrl = job.public_bucket_path;
+  console.log("I am hjere");
+  console.log(job);
 
   return (
     <>