Update artworks.yaml

artworks.yaml

@@ -13,6 +13,7 @@ nodes:
     category:
       _id: generate_images
       title: en=Generate images;ru=Генерация изображений
+    description: ""
     environment:
       OPEN_PAAS_USER:
         title: PaaS user
@@ -26,6 +27,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     groups:
       inputs:
         SDXL:
@@ -323,8 +325,6 @@ nodes:
     source: catalog
     title: en=Image to image;ru=Пересоздать изображение
     version: 1
-    description: ""
-    execution: regular
   generate_image_artworks:
     _id: generate_image_artworks
     arrange:
@@ -346,6 +346,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     groups:
       inputs:
         SDXL:
@@ -669,7 +670,6 @@ nodes:
     source: catalog
     title: en=Generate image;ru=Генерация изображения
     version: 2
-    execution: regular
   inpaint_image_artworks:
     _id: inpaint_image_artworks
     arrange:
@@ -691,6 +691,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     groups:
       inputs:
         mask:
@@ -1024,7 +1025,6 @@ nodes:
     source: catalog
     title: en=Inpaint on image;ru=Улучшить изображение
     version: 1
-    execution: regular
   exctract_mask_on_image_artworks:
     _id: exctract_mask_on_image_artworks
     arrange:
@@ -1032,7 +1032,6 @@ nodes:
       y: 50
     category:
       _id: image_analysis
-      id: image_analysis
       title: en=Image analysis;ru=Анализ изображений
     environment:
       OPEN_PAAS_USER:
@@ -1047,6 +1046,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     inputs:
       image:
         order: 1
@@ -1282,14 +1282,14 @@ nodes:
     source: catalog
     title: en=Extract mask on image;ru=Выделить маску
     version: 1
-  upscale_image_artworks:
-    _id: upscale_image_artworks
+  detect_face_on_image_artworks:
+    _id: detect_face_on_image_artworks
     arrange:
-      x: 470
-      y: 400
+      x: 1070
+      y: 330
     category:
-      _id: generate_images
-      title: en=Generate images;ru=Генерация изображений
+      _id: image_analysis
+      title: en=Image analysis;ru=Анализ изображений
     environment:
       OPEN_PAAS_USER:
         title: PaaS user
@@ -1303,29 +1303,95 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     inputs:
       image:
         order: 1
         title: en=Image;ru=Изображение
         type: image
         required: true
-      upscalingResize:
+      index:
         order: 2
-        title: en=Resize;ru=Увеличение
-        type: float
+        title: en=Index;ru=Индекс
+        type: integer
         required: true
-        min: 0.1
-        max: 4
-        step: 0.1
-        default: 2
+        default: 0
     outputs:
-      image:
-        title: en=Image;ru=Изображение
+      face:
+        title: en=Face;ru=Лицо
         type: image
+      features:
+        title: en=Features;ru=Характеристики
+        type: json
+        schema: face-features
     package: artworks
-    script: |-
+    script: |
       const CHECK_TASK_INTERVAL = 3000;
-      const MAX_ATTEMPTS = 20;
+      const MAX_ATTEMPTS = 10;
+
+      const FIT_FACE_SIZE = 512;
+
+      export async function fit(image, { maxWidth, maxHeight }) {
+          const { width, height } = await image.metadata();
+          const orientation = width >= height ? "-" : "|";
+
+          const sharp = require('sharp/lib/index.js');
+
+          switch (orientation) {
+              case "-":
+                  if (width > maxWidth) {
+                      return sharp(await image.resize({ width: maxWidth }).toBuffer());
+                  }
+                  break;
+              case "|":
+                  if (height > maxHeight) {
+                      return sharp(await image.resize({ height: maxHeight }).toBuffer());
+                  }
+                  break;
+          }
+
+          return image;
+      }
+
+      export async function crop(source, face) {
+          const sharp = require('sharp/lib/index.js');
+
+          const image = await sharp(source);
+          const metadata = await image.metadata();
+
+          const UNCROP = 0.6;
+
+          let { x, y, width, height } = face;
+
+          const uncropX = width * UNCROP;
+          const uncropY = height * UNCROP;
+
+          width = Math.round(width + uncropX);
+          height = Math.round(height + uncropY);
+          x = Math.round(x - uncropX / 2);
+          y = Math.round(y - uncropY / 2);
+
+          const [left, top] = [Math.max(x, 0), Math.max(y, 0)];
+          [width, height] = [
+              Math.min(width, metadata.width - left),
+              Math.min(height, metadata.height - top),
+          ];
+          const size = Math.min(width, height);
+
+          const crop = {
+              left,
+              top,
+              width: size,
+              height: size,
+          };
+
+          const area = await fit(await image.clone().extract(crop).webp(), {
+              maxWidth: FIT_FACE_SIZE,
+              maxHeight: FIT_FACE_SIZE,
+          });
+
+          return area.toBuffer();
+      }
 
       export async function run({ inputs, state }) {
 
@@ -1352,18 +1418,15 @@ nodes:
           });
 
           if (!state) {
-              const {
-                  image,
-                  upscalingResize,
-              } = inputs;
+              const { image, index } = inputs;
 
               const payload = {
-                  type: "upscale-image",
+                  type: "detect-faces",
                   isFast: true,
                   payload: {
                       base64: false,
                       image,
-                      upscalingResize,
+                      features: ["age", "gender", "race", "emotion"],
                   },
               };
               try {
@@ -1380,7 +1443,7 @@ nodes:
                           total: MAX_ATTEMPTS,
                           processed: 0
                       },
-                      delay: 5000
+                      delay: 2000
                   });
               } catch (e) {
                   if (e instanceof ArtWorksError) {
@@ -1425,11 +1488,30 @@ nodes:
                           },
                       });
                   }
-                  let { image: { url: image } } = results;
+                  const { faces } = results;
+                  const { image, index } = inputs;
+                  const face = faces[index];
+                  if (!face) {
+                      throw new FatalError("Face with such index was not found");
+                  }
+                  const { x, y, width, height, ageFrom, ageTo, gender, race, emotion } = face;
+                  const { data } = await download(image);
                   return NextNode.from({
                       outputs: {
-                          image
-                      }
+                          face: await crop(data, {
+                              x,
+                              y,
+                              width,
+                              height,
+                          }),
+                          features: {
+                              ageFrom,
+                              ageTo,
+                              gender,
+                              race,
+                              emotion,
+                          },
+                      },
                   });
               } catch (e) {
                   if (e instanceof ArtWorksError) {
@@ -1440,17 +1522,16 @@ nodes:
           }
       }
     source: catalog
-    title: en=Upscale image;ru=Увеличить изображение
+    title: en=Detect face;ru=Определить лицо
     version: 1
-    execution: regular
-  detect_face_on_image_artworks:
-    _id: detect_face_on_image_artworks
+  upscale_image_artworks:
+    _id: upscale_image_artworks
     arrange:
-      x: 1070
-      y: 330
+      x: 470
+      y: 400
     category:
-      _id: image_analysis
-      title: en=Image analysis;ru=Анализ изображений
+      _id: generate_images
+      title: en=Generate images;ru=Генерация изображений
     environment:
       OPEN_PAAS_USER:
         title: PaaS user
@@ -1464,94 +1545,30 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     inputs:
       image:
         order: 1
         title: en=Image;ru=Изображение
         type: image
         required: true
-      index:
+      upscalingResize:
         order: 2
-        title: en=Index;ru=Индекс
-        type: integer
+        title: en=Resize;ru=Увеличение
+        type: float
         required: true
-        default: 0
+        min: 0.1
+        max: 4
+        step: 0.1
+        default: 2
     outputs:
-      face:
-        title: en=Face;ru=Лицо
+      image:
+        title: en=Image;ru=Изображение
         type: image
-      features:
-        title: en=Features;ru=Характеристики
-        type: json
-        schema: face-features
     package: artworks
-    script: |
+    script: |-
       const CHECK_TASK_INTERVAL = 3000;
-      const MAX_ATTEMPTS = 10;
-
-      const FIT_FACE_SIZE = 512;
-
-      export async function fit(image, { maxWidth, maxHeight }) {
-          const { width, height } = await image.metadata();
-          const orientation = width >= height ? "-" : "|";
-
-          const sharp = require('sharp/lib/index.js');
-
-          switch (orientation) {
-              case "-":
-                  if (width > maxWidth) {
-                      return sharp(await image.resize({ width: maxWidth }).toBuffer());
-                  }
-                  break;
-              case "|":
-                  if (height > maxHeight) {
-                      return sharp(await image.resize({ height: maxHeight }).toBuffer());
-                  }
-                  break;
-          }
-
-          return image;
-      }
-
-      export async function crop(source, face) {
-          const sharp = require('sharp/lib/index.js');
-
-          const image = await sharp(source);
-          const metadata = await image.metadata();
-
-          const UNCROP = 0.6;
-
-          let { x, y, width, height } = face;
-
-          const uncropX = width * UNCROP;
-          const uncropY = height * UNCROP;
-
-          width = Math.round(width + uncropX);
-          height = Math.round(height + uncropY);
-          x = Math.round(x - uncropX / 2);
-          y = Math.round(y - uncropY / 2);
-
-          const [left, top] = [Math.max(x, 0), Math.max(y, 0)];
-          [width, height] = [
-              Math.min(width, metadata.width - left),
-              Math.min(height, metadata.height - top),
-          ];
-          const size = Math.min(width, height);
-
-          const crop = {
-              left,
-              top,
-              width: size,
-              height: size,
-          };
-
-          const area = await fit(await image.clone().extract(crop).webp(), {
-              maxWidth: FIT_FACE_SIZE,
-              maxHeight: FIT_FACE_SIZE,
-          });
-
-          return area.toBuffer();
-      }
+      const MAX_ATTEMPTS = 20;
 
       export async function run({ inputs, state }) {
 
@@ -1578,15 +1595,18 @@ nodes:
           });
 
           if (!state) {
-              const { image, index } = inputs;
+              const {
+                  image,
+                  upscalingResize,
+              } = inputs;
 
               const payload = {
-                  type: "detect-faces",
+                  type: "upscale-image",
                   isFast: true,
                   payload: {
                       base64: false,
                       image,
-                      features: ["age", "gender", "race", "emotion"],
+                      upscalingResize,
                   },
               };
               try {
@@ -1603,7 +1623,7 @@ nodes:
                           total: MAX_ATTEMPTS,
                           processed: 0
                       },
-                      delay: 2000
+                      delay: 5000
                   });
               } catch (e) {
                   if (e instanceof ArtWorksError) {
@@ -1648,30 +1668,11 @@ nodes:
                           },
                       });
                   }
-                  const { faces } = results;
-                  const { image, index } = inputs;
-                  const face = faces[index];
-                  if (!face) {
-                      throw new FatalError("Face with such index was not found");
-                  }
-                  const { x, y, width, height, ageFrom, ageTo, gender, race, emotion } = face;
-                  const { data } = await download(image);
+                  let { image: { url: image } } = results;
                   return NextNode.from({
                       outputs: {
-                          face: await crop(data, {
-                              x,
-                              y,
-                              width,
-                              height,
-                          }),
-                          features: {
-                              ageFrom,
-                              ageTo,
-                              gender,
-                              race,
-                              emotion,
-                          },
-                      },
+                          image
+                      }
                   });
               } catch (e) {
                   if (e instanceof ArtWorksError) {
@@ -1682,9 +1683,8 @@ nodes:
           }
       }
     source: catalog
-    title: en=Detect face;ru=Определить лицо
+    title: en=Upscale image;ru=Увеличить изображение
     version: 1
-    execution: regular
   classify_image_artworks:
     _id: classify_image_artworks
     arrange:
@@ -1706,6 +1706,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     inputs:
       image:
         order: 1
@@ -1846,7 +1847,6 @@ nodes:
     source: catalog
     title: en=Classify image;ru=Тегировать изображение
     version: 1
-    execution: regular
   translate_text_artworks:
     _id: translate_text_artworks
     arrange:
@@ -1868,6 +1868,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     inputs:
       source:
         order: 1
@@ -2046,7 +2047,6 @@ nodes:
     source: catalog
     title: en=Translate text;ru=Перевести текст
     version: 1
-    execution: regular
   face_swap_on_image_artworks:
     _id: face_swap_on_image_artworks
     arrange:
@@ -2068,6 +2068,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     inputs:
       face:
         order: 1
@@ -2208,7 +2209,6 @@ nodes:
     source: catalog
     title: en=Face swap on image;ru=Замена лица на изображении
     version: 1
-    execution: regular
   remove_background_artworks:
     _id: remove_background_artworks
     arrange:
@@ -2230,6 +2230,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     inputs:
       image:
         order: 1
@@ -2369,7 +2370,6 @@ nodes:
     source: catalog
     title: en=Remove background;ru=Удалить фон
     version: 1
-    execution: regular
   outpaint_image_artworks:
     _id: outpaint_image_artworks
     arrange:
@@ -2391,6 +2391,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     groups:
       inputs:
         base:
@@ -2695,7 +2696,6 @@ nodes:
     source: catalog
     title: en=Outpaint on image;ru=Расширить изображение
     version: 1
-    execution: regular
   ask_llm_artworks:
     _id: ask_llm_artworks
     arrange:
@@ -2717,6 +2717,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     inputs:
       model:
         order: 1
@@ -2878,7 +2879,6 @@ nodes:
     source: catalog
     title: en=Ask LLM agent;ru=Спросить LLM
     version: 1
-    execution: regular
   ask_vlm_artworks:
     _id: ask_vlm_artworks
     arrange:
@@ -3057,6 +3057,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     inputs:
       image:
         order: 1
@@ -3182,7 +3183,6 @@ nodes:
     source: catalog
     title: en=Detect NSFW;ru=Определить NSFW
     version: 1
-    execution: regular
   srore_aesthetics:
     _id: srore_aesthetics
     arrange:
@@ -3204,6 +3204,7 @@ nodes:
         title: PaaS base url
         type: string
         scope: global
+    execution: regular
     inputs:
       image:
         order: 1
@@ -3329,4 +3330,3 @@ nodes:
     source: catalog
     title: en=Score aesthetics;ru=Оценить эстестику
     version: 1
-    execution: regular