Update imgen.js

imgen.js

@@ -10,12 +10,18 @@ class ImageGenerator {
         this.sampler = 'DPM++ 2M';
         this.strength = 0.7;
         this.seed = -1;
+        this.guidanceScale = 7.5;
+        this.numReturnSequences = 1;
+        this.temperature = 1.0;
+        this.topK = 50;
+        this.topP = 0.9;
+        this.eta = 0.1;
         this.returnType = 'dataURL'; // dataURL or blobURL
     }
 
-    // Generate URL for fetching (no num_return_sequences)
+    // Generate URL for fetching
     generateFetchURL() {
-        return `${this.baseURL}?prompt=${encodeURIComponent(this.prompt)}&negative_prompt=${encodeURIComponent(this.negativePrompt)}&width=${this.width}&height=${this.height}&steps=${this.steps}&cfgs=${this.cfgs}&sampler=${encodeURIComponent(this.sampler)}&strength=${this.strength}&seed=${this.seed}`;
+        return `${this.baseURL}?prompt=${encodeURIComponent(this.prompt)}&negative_prompt=${encodeURIComponent(this.negativePrompt)}&width=${this.width}&height=${this.height}&steps=${this.steps}&cfgs=${this.cfgs}&sampler=${encodeURIComponent(this.sampler)}&strength=${this.strength}&seed=${this.seed}&guidance_scale=${this.guidanceScale}&num_return_sequences=${this.numReturnSequences}&temperature=${this.temperature}&top_k=${this.topK}&top_p=${this.topP}&eta=${this.eta}`;
     }
 
     // Return parameters as JSON for debugging
@@ -29,22 +35,22 @@ class ImageGenerator {
             cfgs: this.cfgs,
             sampler: this.sampler,
             strength: this.strength,
-            seed: this.seed
+            seed: this.seed,
+            guidanceScale: this.guidanceScale,
+            numReturnSequences: this.numReturnSequences,
+            temperature: this.temperature,
+            topK: this.topK,
+            topP: this.topP,
+            eta: this.eta
         });
     }
 
-    // Improved fetch function with detailed error handling
+    // Fetch function to generate the image
     async fetchImage() {
         const url = this.generateFetchURL();
         try {
-            console.log("Fetch URL:", url); // Debugging URL
             const response = await fetch(url);
-
-            if (!response.ok) {
-                const errorMessage = await response.text();
-                console.error('Error response:', errorMessage); // Log detailed error message
-                throw new Error(`Failed to generate image: ${errorMessage}`);
-            }
+            if (!response.ok) throw new Error('Failed to generate image');
 
             const blob = await response.blob();
             if (this.returnType === 'blobURL') {
@@ -59,7 +65,7 @@ class ImageGenerator {
                 });
             }
         } catch (error) {
-            console.error('Error generating image:', error); // Log full error object for debugging
+            console.error(error);
             throw new Error('Error generating image: ' + error.message);
         }
     }
@@ -78,6 +84,12 @@ class ImageGenerator {
                 { opcode: 'setSampler', blockType: Scratch.BlockType.COMMAND, text: 'set sampler to [TEXT]', arguments: { TEXT: { type: Scratch.ArgumentType.STRING, defaultValue: 'DPM++ 2M' } } },
                 { opcode: 'setStrength', blockType: Scratch.BlockType.COMMAND, text: 'set strength to [NUM]', arguments: { NUM: { type: Scratch.ArgumentType.NUMBER, defaultValue: 0.7 } } },
                 { opcode: 'setSeed', blockType: Scratch.BlockType.COMMAND, text: 'set seed to [NUM]', arguments: { NUM: { type: Scratch.ArgumentType.NUMBER, defaultValue: -1 } } },
+                { opcode: 'setGuidanceScale', blockType: Scratch.BlockType.COMMAND, text: 'set guidance scale to [NUM]', arguments: { NUM: { type: Scratch.ArgumentType.NUMBER, defaultValue: 7.5 } } },
+                { opcode: 'setNumReturnSequences', blockType: Scratch.BlockType.COMMAND, text: 'set number of return sequences to [NUM]', arguments: { NUM: { type: Scratch.ArgumentType.NUMBER, defaultValue: 1 } } },
+                { opcode: 'setTemperature', blockType: Scratch.BlockType.COMMAND, text: 'set temperature to [NUM]', arguments: { NUM: { type: Scratch.ArgumentType.NUMBER, defaultValue: 1.0 } } },
+                { opcode: 'setTopK', blockType: Scratch.BlockType.COMMAND, text: 'set top K to [NUM]', arguments: { NUM: { type: Scratch.ArgumentType.NUMBER, defaultValue: 50 } } },
+                { opcode: 'setTopP', blockType: Scratch.BlockType.COMMAND, text: 'set top P to [NUM]', arguments: { NUM: { type: Scratch.ArgumentType.NUMBER, defaultValue: 0.9 } } },
+                { opcode: 'setEta', blockType: Scratch.BlockType.COMMAND, text: 'set eta to [NUM]', arguments: { NUM: { type: Scratch.ArgumentType.NUMBER, defaultValue: 0.1 } } },
                 { opcode: 'setReturnType', blockType: Scratch.BlockType.COMMAND, text: 'set return type to [TYPE]', arguments: { TYPE: { type: Scratch.ArgumentType.STRING, menu: 'returnTypes', defaultValue: 'dataURL' } } },
                 { opcode: 'generateImage', blockType: Scratch.BlockType.REPORTER, text: 'generate image' },
                 { opcode: 'getFetchURL', blockType: Scratch.BlockType.REPORTER, text: 'get fetch URL' },
@@ -99,6 +111,12 @@ class ImageGenerator {
     setSampler(args) { this.sampler = args.TEXT; }
     setStrength(args) { this.strength = args.NUM; }
     setSeed(args) { this.seed = args.NUM; }
+    setGuidanceScale(args) { this.guidanceScale = args.NUM; }
+    setNumReturnSequences(args) { this.numReturnSequences = args.NUM; }
+    setTemperature(args) { this.temperature = args.NUM; }
+    setTopK(args) { this.topK = args.NUM; }
+    setTopP(args) { this.topP = args.NUM; }
+    setEta(args) { this.eta = args.NUM; }
     setReturnType(args) { this.returnType = args.TYPE; }
 
     async generateImage() { return this.fetchImage(); }