fixed prot!

prototype_index.html

@@ -372,92 +372,63 @@
             captionResultDiv.innerHTML = "Generating caption…";
             
             try {
-              console.log("=== DETAILED DEBUG INFO ===");
-              console.log("imageToCaption:", {
-                name: imageToCaption.name,
-                size: imageToCaption.size,
-                type: imageToCaption.type,
-                constructor: imageToCaption.constructor.name,
-                isFile: imageToCaption instanceof File
-              });
-              console.log("captionType:", captionType);
-              console.log("captionLength:", captionLength);
+              console.log("=== CALLING JOY CAPTION ===");
+              console.log("imageToCaption:", imageToCaption.name, imageToCaption.size, imageToCaption.type);
               
-              // Check Space status first
-              console.log("Checking Space status...");
-              try {
-                const apiInfo = await joyCaption.view_api();
-                console.log("Space API info:", apiInfo);
-              } catch (apiErr) {
-                console.warn("Could not get API info:", apiErr);
+              // Build the prompt using the helper function logic from Joy Caption
+              let promptTemplate;
+              if (captionLength === "any") {
+                promptTemplate = "Write a detailed description for this image.";
+              } else if (captionLength.match(/^\d+$/)) {
+                promptTemplate = `Write a detailed description for this image in ${captionLength} words or less.`;
+              } else {
+                promptTemplate = `Write a ${captionLength} detailed description for this image.`;
+              }
+              
+              // Adjust template based on caption type
+              if (captionType === "Descriptive (Informal)") {
+                promptTemplate = promptTemplate.replace("detailed description", "descriptive caption in a casual tone");
+              } else if (captionType === "Training Prompt") {
+                promptTemplate = "Output a stable diffusion prompt that is indistinguishable from a real stable diffusion prompt.";
+              } else if (captionType === "MidJourney") {
+                promptTemplate = "Write a MidJourney prompt for this image.";
+              } else if (captionType === "Booru tag list") {
+                promptTemplate = "Generate only comma-separated Danbooru tags (lowercase_underscores). Strict order: `artist:`, `copyright:`, `character:`, `meta:`, then general tags.";
+              } else if (captionType === "Booru-like tag list") {
+                promptTemplate = "Write a list of Booru-like tags for this image.";
+              } else if (captionType === "Art Critic") {
+                promptTemplate = "Analyze this image like an art critic would with information about its composition, style, symbolism, the use of color, light, any artistic movement it might belong to, etc.";
+              } else if (captionType === "Product Listing") {
+                promptTemplate = "Write a caption for this image as though it were a product listing.";
+              } else if (captionType === "Social Media Post") {
+                promptTemplate = "Write a caption for this image as if it were being used for a social media post.";
               }
               
+              console.log("Using prompt:", promptTemplate);
+              
+              // Call the correct endpoint with correct parameters
+              // chat_joycaption expects: input_image, prompt, temperature, top_p, max_new_tokens, log_prompt
               console.log("Calling joyCaption.predict...");
+              const result = await joyCaption.predict("/chat_joycaption", [
+                imageToCaption,  // input_image
+                promptTemplate,  // prompt
+                0.6,            // temperature
+                0.9,            // top_p
+                512,            // max_new_tokens
+                false           // log_prompt
+              ]);
               
-              // Try different approaches
-              let output;
-              let attempt = 1;
+              console.log("Raw result:", result);
               
-              // Attempt 1: Direct File object (original approach)
-              try {
-                console.log(`Attempt ${attempt}: Direct File object`);
-                output = await joyCaption.predict("/stream_chat", [
-                  imageToCaption,
-                  captionType,
-                  captionLength,
-                  [], // extra_options
-                  "", // name_input
-                  ""  // custom_prompt
-                ]);
-                console.log("Success with direct File!");
-              } catch (err1) {
-                console.warn(`Attempt ${attempt} failed:`, err1);
-                attempt++;
-                
-                // Attempt 2: Convert to blob URL
-                try {
-                  console.log(`Attempt ${attempt}: Blob URL`);
-                  const blobUrl = URL.createObjectURL(imageToCaption);
-                  output = await joyCaption.predict("/stream_chat", [
-                    blobUrl,
-                    captionType,
-                    captionLength,
-                    [], // extra_options
-                    "", // name_input
-                    ""  // custom_prompt
-                  ]);
-                  console.log("Success with blob URL!");
-                  URL.revokeObjectURL(blobUrl);
-                } catch (err2) {
-                  console.warn(`Attempt ${attempt} failed:`, err2);
-                  attempt++;
-                  
-                  // Attempt 3: Convert to data URL
-                  try {
-                    console.log(`Attempt ${attempt}: Data URL`);
-                    const dataUrl = await new Promise((resolve) => {
-                      const reader = new FileReader();
-                      reader.onload = () => resolve(reader.result);
-                      reader.readAsDataURL(imageToCaption);
-                    });
-                    output = await joyCaption.predict("/stream_chat", [
-                      dataUrl,
-                      captionType,
-                      captionLength,
-                      [], // extra_options
-                      "", // name_input
-                      ""  // custom_prompt
-                    ]);
-                    console.log("Success with data URL!");
-                  } catch (err3) {
-                    console.error(`All ${attempt} attempts failed. Last error:`, err3);
-                    throw err3;
-                  }
-                }
+              // For generator endpoints, the result might be different
+              let caption;
+              if (result && result.data) {
+                caption = result.data[0] || result.data;
+              } else {
+                caption = result;
               }
               
-              console.log("Success! Output:", output);
-              const [prompt, caption] = output.data;
+              console.log("Success! Caption:", caption);
               captionResultDiv.innerHTML = `
                 <div style="background:#f8f9fa; padding:1rem; border-radius:6px; margin-top:1rem;">
                   <h4>Generated Caption</h4>