n8n-nodes-commandos-image 0.1.4 → 0.1.6

package/dist/nodes/CommandosImage.node.js

@@ -15,10 +15,36 @@ const resolveGenerationUrl = (resolvedModel) => {
     }
     return GENERATION_URL_DEFAULT;
 };
-const buildGenerationRequest = ({ model, prompt, ratio, references }) => {
+/**
+ * Maps standard ratios to specific model requirements
+ */
+const mapRatio = (model, ratio) => {
+    if (model.includes('seedream')) {
+        if (ratio === '2:3')
+            return 'portrait_3_2';
+        if (ratio === '3:2')
+            return 'landscape_2_3';
+    }
+    return ratio;
+};
+/**
+ * Maps standard formats to specific model requirements (jpeg vs jpg)
+ */
+const mapFormat = (model, format) => {
+    const f = String(format || 'png').toLowerCase().trim();
+    if (model === 'nano-banana-pro') {
+        return (f === 'jpeg' || f === 'jpg') ? 'jpg' : f;
+    }
+    if (model.includes('google/nano-banana')) {
+        return (f === 'jpeg' || f === 'jpg') ? 'jpeg' : f;
+    }
+    return f;
+};
+const buildGenerationRequest = ({ model, prompt, ratio, references, outputFormat = 'png', quality = 'basic', resolution = '1K', }) => {
     const hasReferences = references.length > 0;
     const requestedModel = model;
     let resolvedModel = model;
+    // Model Resolution
     if (requestedModel === 'flux-pro') {
         resolvedModel = hasReferences ? 'flux-2/pro-image-to-image' : 'flux-2/pro-text-to-image';
     }
@@ -29,11 +55,15 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }) => {
         resolvedModel = 'nano-banana-pro';
     }
     else if (requestedModel === 'seedream') {
-        resolvedModel = 'bytedance/seedream-v4-edit';
+        resolvedModel = hasReferences ? 'seedream/4.5-edit' : 'seedream/4.5';
     }
+    // Fallback for MJ or generic seedream
     if (!hasReferences && (requestedModel === 'seedream' || requestedModel === 'midjourney')) {
-        if (requestedModel !== 'midjourney') {
-            resolvedModel = 'gpt4o-image';
+        if (requestedModel === 'seedream') {
+            // Handled above for 4.5
+        }
+        else if (requestedModel === 'midjourney') {
+            resolvedModel = 'midjourney';
         }
     }
     let body = {};
@@ -42,7 +72,7 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }) => {
             filesUrl: references,
             prompt,
             size: ratio,
-            callBackUrl: 'https://your-callback-url.com/callback',
+            callBackUrl: 'https://api.comandos.ai/internal/kie/callback', // Fixed to internal
             fallbackModel: 'FLUX_MAX',
         };
     }
@@ -52,19 +82,30 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }) => {
             input: {
                 prompt,
                 aspect_ratio: ratio,
-                resolution: '1K',
+                resolution,
                 ...(hasReferences ? { input_urls: references } : {}),
             },
         };
     }
+    else if (resolvedModel === 'seedream/4.5' || resolvedModel === 'seedream/4.5-edit') {
+        body = {
+            model: resolvedModel,
+            input: {
+                prompt,
+                aspect_ratio: mapRatio(resolvedModel, ratio),
+                quality,
+                ...(hasReferences ? { image_urls: references } : {}),
+            },
+        };
+    }
     else if (resolvedModel === 'nano-banana-pro') {
         body = {
             model: resolvedModel,
             input: {
                 prompt,
                 aspect_ratio: ratio,
-                resolution: '1K',
-                output_format: 'png',
+                resolution,
+                output_format: mapFormat(resolvedModel, outputFormat),
                 ...(hasReferences ? { image_input: references } : {}),
             },
         };
@@ -75,7 +116,7 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }) => {
             input: {
                 prompt,
                 image_size: ratio,
-                output_format: 'png',
+                output_format: mapFormat(resolvedModel, outputFormat),
                 ...(hasReferences ? { image_urls: references } : {}),
             },
         };
@@ -91,13 +132,13 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }) => {
         };
     }
     else {
+        // Default fallback (v4 edit style)
         body = {
-            model: 'bytedance/seedream-v4-edit',
+            model: requestedModel === 'gpt4o-image' ? 'gpt-4o' : 'bytedance/seedream-v4-edit',
             input: {
                 image_urls: references,
                 prompt,
-                image_size: ratio === '2:3' ? 'portrait_3_2' : ratio,
-                image_resolution: '1K',
+                image_size: mapRatio('seedream', ratio),
             },
         };
     }
@@ -111,16 +152,24 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }) => {
         hasReferences,
     };
 };
-const extractReferences = (raw) => {
+const extractReferences = (raw, model) => {
     if (!raw || typeof raw !== 'object') {
         return [];
     }
     const collection = raw;
     const items = Array.isArray(collection.reference) ? collection.reference : [];
+    // Dynamic limit based on model docs
+    let limit = 8;
+    if (model === 'seedream')
+        limit = 14;
+    if (model === 'gpt4o-image')
+        limit = 16;
+    if (model.includes('nano-banana'))
+        limit = 10;
     return items
         .map((entry) => String((entry === null || entry === void 0 ? void 0 : entry.url) || '').trim())
         .filter((value) => value.length > 0 && /^https?:\/\//i.test(value))
-        .slice(0, 2);
+        .slice(0, limit);
 };
 class CommandosImage {
     constructor() {
@@ -165,14 +214,14 @@ class CommandosImage {
                     name: 'model',
                     type: 'options',
                     options: [
+                        { name: 'Seedream 4.5', value: 'seedream' },
                         { name: 'Flux Pro', value: 'flux-pro' },
                         { name: 'GPT-4o Image', value: 'gpt4o-image' },
                         { name: 'Nano Banana', value: 'nano-banana' },
                         { name: 'Nano Banana Pro', value: 'nano-banana-pro' },
-                        { name: 'Seedream', value: 'seedream' },
                         { name: 'Midjourney', value: 'midjourney' },
                     ],
-                    default: 'flux-pro',
+                    default: 'seedream',
                     displayOptions: {
                         show: {
                             operation: ['create'],
@@ -204,6 +253,9 @@ class CommandosImage {
                         { name: '4:5', value: '4:5' },
                         { name: '16:9', value: '16:9' },
                         { name: '9:16', value: '9:16' },
+                        { name: '4:3', value: '4:3' },
+                        { name: '3:4', value: '3:4' },
+                        { name: '21:9', value: '21:9' },
                     ],
                     default: '2:3',
                     displayOptions: {
@@ -212,6 +264,56 @@ class CommandosImage {
                         },
                     },
                 },
+                {
+                    displayName: 'Output Format',
+                    name: 'outputFormat',
+                    type: 'options',
+                    options: [
+                        { name: 'PNG', value: 'png' },
+                        { name: 'JPEG', value: 'jpeg' },
+                    ],
+                    default: 'png',
+                    displayOptions: {
+                        show: {
+                            operation: ['create'],
+                            model: ['nano-banana', 'nano-banana-pro'],
+                        },
+                    },
+                },
+                {
+                    displayName: 'Quality',
+                    name: 'quality',
+                    type: 'options',
+                    options: [
+                        { name: 'Basic (2K)', value: 'basic' },
+                        { name: 'High (4K)', value: 'high' },
+                        { name: 'Medium (Balanced)', value: 'medium' },
+                    ],
+                    default: 'basic',
+                    displayOptions: {
+                        show: {
+                            operation: ['create'],
+                            model: ['seedream', 'gpt4o-image', 'flux-pro'],
+                        },
+                    },
+                },
+                {
+                    displayName: 'Resolution',
+                    name: 'resolution',
+                    type: 'options',
+                    options: [
+                        { name: '1K', value: '1K' },
+                        { name: '2K', value: '2K' },
+                        { name: '4K', value: '4K' },
+                    ],
+                    default: '1K',
+                    displayOptions: {
+                        show: {
+                            operation: ['create'],
+                            model: ['flux-pro', 'nano-banana-pro'],
+                        },
+                    },
+                },
                 {
                     displayName: 'References',
                     name: 'references',
@@ -269,11 +371,29 @@ class CommandosImage {
                     const model = String(this.getNodeParameter('model', i));
                     const prompt = String(this.getNodeParameter('prompt', i) || '').trim();
                     const ratio = String(this.getNodeParameter('ratio', i));
-                    const references = extractReferences(this.getNodeParameter('references', i, {}));
+                    const references = extractReferences(this.getNodeParameter('references', i, {}), model);
+                    // Get optional parameters safely
+                    const outputFormat = ['nano-banana', 'nano-banana-pro'].includes(model)
+                        ? String(this.getNodeParameter('outputFormat', i, 'png'))
+                        : 'png';
+                    const quality = ['seedream', 'gpt4o-image', 'flux-pro'].includes(model)
+                        ? String(this.getNodeParameter('quality', i, 'basic'))
+                        : 'basic';
+                    const resolution = ['flux-pro', 'nano-banana-pro'].includes(model)
+                        ? String(this.getNodeParameter('resolution', i, '1K'))
+                        : '1K';
                     if (!prompt) {
                         throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Prompt is required', { itemIndex: i });
                     }
-                    const request = buildGenerationRequest({ model, prompt, ratio, references });
+                    const request = buildGenerationRequest({
+                        model,
+                        prompt,
+                        ratio,
+                        references,
+                        outputFormat,
+                        quality,
+                        resolution
+                    });
                     if (!request.url) {
                         throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'URL генерации не настроен. Проверь переменные окружения COMMANDOS_IMAGE_URL_DEFAULT/COMMANDOS_IMAGE_URL_GPT4O/COMMANDOS_IMAGE_URL_MJ', { itemIndex: i });
                     }
@@ -316,17 +436,13 @@ class CommandosImage {
                     });
                     results.push({ json: response });
                 }
-                else {
-                    throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Unknown operation: ${operation}`, {
-                        itemIndex: i,
-                    });
-                }
             }
             catch (error) {
                 if (error instanceof n8n_workflow_1.NodeOperationError) {
                     throw error;
                 }
-                throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Request failed', { itemIndex: i });
+                const message = error instanceof Error ? error.message : 'Request failed';
+                throw new n8n_workflow_1.NodeOperationError(this.getNode(), message, { itemIndex: i });
             }
         }
         return [results];

package/nodes/CommandosImage.node.ts

@@ -17,6 +17,9 @@ type BuildParams = {
   prompt: string;
   ratio: string;
   references: string[];
+  outputFormat?: string;
+  quality?: string;
+  resolution?: string;
 };
 
 type BuildResult = {
@@ -39,11 +42,45 @@ const resolveGenerationUrl = (resolvedModel: string): string => {
   return GENERATION_URL_DEFAULT;
 };
 
-const buildGenerationRequest = ({ model, prompt, ratio, references }: BuildParams): BuildResult => {
+/**
+ * Maps standard ratios to specific model requirements
+ */
+const mapRatio = (model: string, ratio: string): string => {
+  if (model.includes('seedream')) {
+    if (ratio === '2:3') return 'portrait_3_2';
+    if (ratio === '3:2') return 'landscape_2_3';
+  }
+  return ratio;
+};
+
+/**
+ * Maps standard formats to specific model requirements (jpeg vs jpg)
+ */
+const mapFormat = (model: string, format: string): string => {
+  const f = String(format || 'png').toLowerCase().trim();
+  if (model === 'nano-banana-pro') {
+    return (f === 'jpeg' || f === 'jpg') ? 'jpg' : f;
+  }
+  if (model.includes('google/nano-banana')) {
+    return (f === 'jpeg' || f === 'jpg') ? 'jpeg' : f;
+  }
+  return f;
+};
+
+const buildGenerationRequest = ({
+  model,
+  prompt,
+  ratio,
+  references,
+  outputFormat = 'png',
+  quality = 'basic',
+  resolution = '1K',
+}: BuildParams): BuildResult => {
   const hasReferences = references.length > 0;
   const requestedModel = model;
   let resolvedModel = model;
 
+  // Model Resolution
   if (requestedModel === 'flux-pro') {
     resolvedModel = hasReferences ? 'flux-2/pro-image-to-image' : 'flux-2/pro-text-to-image';
   } else if (requestedModel === 'nano-banana') {
@@ -51,12 +88,15 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }: BuildParam
   } else if (requestedModel === 'nano-banana-pro') {
     resolvedModel = 'nano-banana-pro';
   } else if (requestedModel === 'seedream') {
-    resolvedModel = 'bytedance/seedream-v4-edit';
+    resolvedModel = hasReferences ? 'seedream/4.5-edit' : 'seedream/4.5';
   }
 
+  // Fallback for MJ or generic seedream
   if (!hasReferences && (requestedModel === 'seedream' || requestedModel === 'midjourney')) {
-    if (requestedModel !== 'midjourney') {
-      resolvedModel = 'gpt4o-image';
+    if (requestedModel === 'seedream') {
+       // Handled above for 4.5
+    } else if (requestedModel === 'midjourney') {
+       resolvedModel = 'midjourney';
     }
   }
 
@@ -67,7 +107,7 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }: BuildParam
       filesUrl: references,
       prompt,
       size: ratio,
-      callBackUrl: 'https://your-callback-url.com/callback',
+      callBackUrl: 'https://api.comandos.ai/internal/kie/callback', // Fixed to internal
       fallbackModel: 'FLUX_MAX',
     };
   } else if (resolvedModel.includes('flux-2/')) {
@@ -76,18 +116,28 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }: BuildParam
       input: {
         prompt,
         aspect_ratio: ratio,
-        resolution: '1K',
+        resolution,
         ...(hasReferences ? { input_urls: references } : {}),
       },
     };
+  } else if (resolvedModel === 'seedream/4.5' || resolvedModel === 'seedream/4.5-edit') {
+    body = {
+      model: resolvedModel,
+      input: {
+        prompt,
+        aspect_ratio: mapRatio(resolvedModel, ratio),
+        quality,
+        ...(hasReferences ? { image_urls: references } : {}),
+      },
+    };
   } else if (resolvedModel === 'nano-banana-pro') {
     body = {
       model: resolvedModel,
       input: {
         prompt,
         aspect_ratio: ratio,
-        resolution: '1K',
-        output_format: 'png',
+        resolution,
+        output_format: mapFormat(resolvedModel, outputFormat),
         ...(hasReferences ? { image_input: references } : {}),
       },
     };
@@ -97,7 +147,7 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }: BuildParam
       input: {
         prompt,
         image_size: ratio,
-        output_format: 'png',
+        output_format: mapFormat(resolvedModel, outputFormat),
         ...(hasReferences ? { image_urls: references } : {}),
       },
     };
@@ -111,13 +161,13 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }: BuildParam
       enableTranslation: true,
     };
   } else {
+    // Default fallback (v4 edit style)
     body = {
-      model: 'bytedance/seedream-v4-edit',
+      model: requestedModel === 'gpt4o-image' ? 'gpt-4o' : 'bytedance/seedream-v4-edit',
       input: {
         image_urls: references,
         prompt,
-        image_size: ratio === '2:3' ? 'portrait_3_2' : ratio,
-        image_resolution: '1K',
+        image_size: mapRatio('seedream', ratio),
       },
     };
   }
@@ -133,16 +183,23 @@ const buildGenerationRequest = ({ model, prompt, ratio, references }: BuildParam
   };
 };
 
-const extractReferences = (raw: unknown): string[] => {
+const extractReferences = (raw: unknown, model: string): string[] => {
   if (!raw || typeof raw !== 'object') {
     return [];
   }
   const collection = raw as { reference?: Array<{ url?: string }> };
   const items = Array.isArray(collection.reference) ? collection.reference : [];
+  
+  // Dynamic limit based on model docs
+  let limit = 8;
+  if (model === 'seedream') limit = 14;
+  if (model === 'gpt4o-image') limit = 16;
+  if (model.includes('nano-banana')) limit = 10;
+
   return items
     .map((entry) => String(entry?.url || '').trim())
     .filter((value) => value.length > 0 && /^https?:\/\//i.test(value))
-    .slice(0, 2);
+    .slice(0, limit);
 };
 
 export class CommandosImage implements INodeType {
@@ -187,14 +244,14 @@ export class CommandosImage implements INodeType {
         name: 'model',
         type: 'options',
         options: [
+          { name: 'Seedream 4.5', value: 'seedream' },
           { name: 'Flux Pro', value: 'flux-pro' },
           { name: 'GPT-4o Image', value: 'gpt4o-image' },
           { name: 'Nano Banana', value: 'nano-banana' },
           { name: 'Nano Banana Pro', value: 'nano-banana-pro' },
-          { name: 'Seedream', value: 'seedream' },
           { name: 'Midjourney', value: 'midjourney' },
         ],
-        default: 'flux-pro',
+        default: 'seedream',
         displayOptions: {
           show: {
             operation: ['create'],
@@ -226,6 +283,9 @@ export class CommandosImage implements INodeType {
           { name: '4:5', value: '4:5' },
           { name: '16:9', value: '16:9' },
           { name: '9:16', value: '9:16' },
+          { name: '4:3', value: '4:3' },
+          { name: '3:4', value: '3:4' },
+          { name: '21:9', value: '21:9' },
         ],
         default: '2:3',
         displayOptions: {
@@ -234,6 +294,56 @@ export class CommandosImage implements INodeType {
           },
         },
       },
+      {
+        displayName: 'Output Format',
+        name: 'outputFormat',
+        type: 'options',
+        options: [
+          { name: 'PNG', value: 'png' },
+          { name: 'JPEG', value: 'jpeg' },
+        ],
+        default: 'png',
+        displayOptions: {
+          show: {
+            operation: ['create'],
+            model: ['nano-banana', 'nano-banana-pro'],
+          },
+        },
+      },
+      {
+        displayName: 'Quality',
+        name: 'quality',
+        type: 'options',
+        options: [
+          { name: 'Basic (2K)', value: 'basic' },
+          { name: 'High (4K)', value: 'high' },
+          { name: 'Medium (Balanced)', value: 'medium' },
+        ],
+        default: 'basic',
+        displayOptions: {
+          show: {
+            operation: ['create'],
+            model: ['seedream', 'gpt4o-image', 'flux-pro'],
+          },
+        },
+      },
+      {
+        displayName: 'Resolution',
+        name: 'resolution',
+        type: 'options',
+        options: [
+          { name: '1K', value: '1K' },
+          { name: '2K', value: '2K' },
+          { name: '4K', value: '4K' },
+        ],
+        default: '1K',
+        displayOptions: {
+          show: {
+            operation: ['create'],
+            model: ['flux-pro', 'nano-banana-pro'],
+          },
+        },
+      },
       {
         displayName: 'References',
         name: 'references',
@@ -294,13 +404,35 @@ export class CommandosImage implements INodeType {
           const model = String(this.getNodeParameter('model', i));
           const prompt = String(this.getNodeParameter('prompt', i) || '').trim();
           const ratio = String(this.getNodeParameter('ratio', i));
-          const references = extractReferences(this.getNodeParameter('references', i, {}));
+          const references = extractReferences(this.getNodeParameter('references', i, {}), model);
+
+          // Get optional parameters safely
+          const outputFormat = ['nano-banana', 'nano-banana-pro'].includes(model) 
+            ? String(this.getNodeParameter('outputFormat', i, 'png'))
+            : 'png';
+
+          const quality = ['seedream', 'gpt4o-image', 'flux-pro'].includes(model)
+            ? String(this.getNodeParameter('quality', i, 'basic'))
+            : 'basic';
+
+          const resolution = ['flux-pro', 'nano-banana-pro'].includes(model)
+            ? String(this.getNodeParameter('resolution', i, '1K'))
+            : '1K';
 
           if (!prompt) {
             throw new NodeOperationError(this.getNode(), 'Prompt is required', { itemIndex: i });
           }
 
-          const request = buildGenerationRequest({ model, prompt, ratio, references });
+          const request = buildGenerationRequest({ 
+            model, 
+            prompt, 
+            ratio, 
+            references,
+            outputFormat,
+            quality,
+            resolution
+          });
+          
           if (!request.url) {
             throw new NodeOperationError(
               this.getNode(),
@@ -350,16 +482,13 @@ export class CommandosImage implements INodeType {
           });
 
           results.push({ json: response as IDataObject });
-        } else {
-          throw new NodeOperationError(this.getNode(), `Unknown operation: ${operation}`, {
-            itemIndex: i,
-          });
         }
       } catch (error) {
         if (error instanceof NodeOperationError) {
           throw error;
         }
-        throw new NodeOperationError(this.getNode(), 'Request failed', { itemIndex: i });
+        const message = error instanceof Error ? error.message : 'Request failed';
+        throw new NodeOperationError(this.getNode(), message, { itemIndex: i });
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-commandos-image",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Commandos Image custom node",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",