fix: onnx runtime version

# Conflicts:
#	blender/avatar_main_output.py

blender/avatar_main_output.py

@@ -79,6 +79,7 @@ class AvatarMainOutput(blender_node.ObjectOps):
             "files": [{
                 "filename": filepath.replace(f"{self.output_dir}/", ""),
                 "content_type": "model/gltf+json",
+                "type": "output"
             },],
             "SHAPE_FLOW": {SHAPE_FLOW}, 
             "auto_save": {'true' if auto_save else 'false'}, 

blender/mesh_utils.py

@@ -259,7 +259,7 @@ def get_avatar_file(output):
 
 def upload_avatar_file(output):
     file = get_avatar_file(output)
-    response = requests.get("https://labs.avatech.ai/api/share")
+    response = requests.get("https://labs.avatech.ai/api/share?version=v2")
     labData = response.json()
     modelId = labData["modelId"]
 
@@ -272,15 +272,15 @@ def upload_avatar_file(output):
     requests.put(labData["url"], headers=headers, data=file)
 
     # send notification
-    webhook_url = os.getenv("DISCORD_WEBHOOK_URL")
+    # webhook_url = os.getenv("DISCORD_WEBHOOK_URL")
-    data = {
+    # data = {
-        "username": "Avabot",
+    #     "username": "Avabot",
-        "avatar_url": "https://avatech-avatar-dev1.nyc3.cdn.digitaloceanspaces.com/avatechai.png",
+    #     "avatar_url": "https://avatech-avatar-dev1.nyc3.cdn.digitaloceanspaces.com/avatechai.png",
-        "content": "[API Call] New register!",
+    #     "content": "[API Call] New register!",
-    }
+    # }
-    headers = {
+    # headers = {
-        "Content-Type": "application/json",
+    #     "Content-Type": "application/json",
-    }
+    # }
-    response = requests.post(webhook_url, headers=headers, data=json.dumps(data))
+    # response = requests.post(webhook_url, headers=headers, data=json.dumps(data))
 
     return modelId

blender/ops_create_mesh_layer.py

@@ -41,7 +41,7 @@ class Object_CreateMeshLayer(blender_node.ObjectOps):
         bpy.ops.mesh.select_all(action='SELECT')
         bpy.ops.mesh.edge_face_add()
 
-        bpy.ops.transform.resize(value=(scale_x, scale_y, 1))
+        bpy.ops.transform.resize(value=(float(scale_x), float(scale_y), 1))
 
         bpy.context.object.vertex_groups.new(name=mesh_layer_name)
         bpy.ops.object.vertex_group_assign()

blender/ops_set_shape_key_value.py

@@ -0,0 +1,26 @@
+import blender_node
+
+
+class Mesh_SetShapeKeyValue(blender_node.ObjectOps):
+
+    CUSTOM_NAME = "Set Shape Key Value"
+
+    EXTRA_INPUT_TYPES = {
+        "shape_key_name": ("STRING", {
+            "multiline": False,
+            "default": "my_shape_key",
+        }),
+        "value": ("FLOAT", {"default": 0.0, "min": 0.0, "max": 1.0, "step": 0.01, "display": "number"}),
+    }
+
+    def blender_process(self, bpy, BPY_OBJ, shape_key_name, value):
+        # Check if the object has shape keys
+        if BPY_OBJ.data.shape_keys:
+            # Check if the specified shape key exists
+            if shape_key_name in BPY_OBJ.data.shape_keys.key_blocks:
+                BPY_OBJ.data.shape_keys.key_blocks[shape_key_name].value = float(value)
+            else:
+                print(f"The shape key {shape_key_name} does not exist on the object.")
+        else:
+            print("The object does not have any shape keys.")
+        return (BPY_OBJ,)

blender/render_image.py

@@ -0,0 +1,132 @@
+import blender_node
+import math
+import folder_paths
+import torch
+import numpy as np
+import os
+from PIL import Image, ImageOps
+
+def get_incremented_filename(folder_path, base_filename):
+    # Initialize the counter and create the full initial path
+    counter = 0
+    output_path = f"{folder_path}/{base_filename}.png"
+
+    # Check if the file exists and increment the counter until the file does not exist
+    while os.path.exists(output_path):
+        counter += 1
+        output_path = f"{folder_path}/{base_filename}_{counter}.png"
+
+    return output_path
+
+class BlenderRenderImage(blender_node.ObjectOps):
+    def __init__(self):
+        pass
+
+    EXTRA_INPUT_TYPES = {
+    }
+
+    # OUTPUT_NODE = True
+    RETURN_TYPES = ("BPY_OBJ", "IMAGE")
+
+    def add_light(self, bpy):
+        # Check if there is at least one light source in the scene
+        light_exists = any(ob for ob in bpy.data.objects if ob.type == 'LIGHT')
+        if not light_exists:
+            # Create a new Area light datablock for ambient light
+            light_data = bpy.data.lights.new(name='AmbientLight', type='AREA')
+            light_object = bpy.data.objects.new(name='AmbientLight', object_data=light_data)
+            bpy.context.collection.objects.link(light_object)
+            # Position the light in the scene
+            light_object.location = (0, 0, 10)
+            # Set light size for soft shadows and ambient effect
+            light_data.size = 10
+            light_data.energy = 1000
+            print("Added an ambient light source to the scene.")
+    
+    def add_camera(self, bpy):
+        # Check if there is a camera in the scene
+        if bpy.context.scene.camera:
+            return bpy.context.scene.camera 
+
+        # If not, create a new camera
+        cam_data = bpy.data.cameras.new(name='Camera')
+        cam = bpy.data.objects.new(name='Camera', object_data=cam_data)
+        bpy.context.collection.objects.link(cam)
+        # Set the new camera to the active camera
+        bpy.context.scene.camera = cam
+        # Position the camera to a default view
+        cam.location = (0, 0, 10)
+        return cam
+    
+    def get_texture_size(self, obj):
+        # Get the first material slot
+        mat = obj.data.materials[0]
+        
+        # Check if the material has a node tree
+        if mat.node_tree:
+            nodes = mat.node_tree.nodes
+            # Find an image texture node in the node tree
+            for node in nodes:
+                if node.type == 'TEX_IMAGE':
+                    texture = node.image
+                    if texture:
+                        return texture.size
+            print("No image texture node found in the material's node tree.")
+        else:
+            print("Material has no node tree.")
+
+
+    def blender_process(self, bpy, BPY_OBJ=None):
+        cam = self.add_camera(bpy)
+
+        plane = BPY_OBJ
+        if plane:
+            tex_width, tex_height = self.get_texture_size(plane)
+            # Calculate the aspect ratio of the plane
+            aspect_ratio_plane = tex_width / tex_height
+
+            # Set the render resolution to match the plane's aspect ratio
+            # Choose an arbitrary resolution for the longer side of the plane
+            base_resolution = 512
+
+            if aspect_ratio_plane > 1:
+                # Plane is wider than it is tall
+                bpy.context.scene.render.resolution_x = base_resolution
+                bpy.context.scene.render.resolution_y = int(base_resolution / aspect_ratio_plane)
+            else:
+                # Plane is taller than it is wide
+                bpy.context.scene.render.resolution_x = int(base_resolution * aspect_ratio_plane)
+                bpy.context.scene.render.resolution_y = base_resolution
+            bpy.context.scene.render.resolution_percentage = 100
+
+
+        ortho_scale = max(plane.dimensions.x, plane.dimensions.y)
+        cam.data.type = 'ORTHO'
+        cam.data.ortho_scale = ortho_scale
+
+        self.add_light(bpy)
+
+        # Update the scene to reflect changes
+        bpy.context.view_layer.update()
+
+        # Set render engine (e.g., 'BLENDER_EEVEE', 'CYCLES', 'BLENDER_WORKBENCH')
+        bpy.context.scene.render.engine = "BLENDER_EEVEE"
+
+        # Specify the render output path
+        
+        output_path = get_incremented_filename(folder_paths.get_output_directory(), "render")
+        bpy.context.scene.render.filepath = output_path
+
+        # Render the image
+        bpy.ops.render.render(write_still=True)
+
+        # Load the image
+        i = Image.open(output_path)
+        i = ImageOps.exif_transpose(i)
+        image = i.convert("RGB")
+        image = np.array(image).astype(np.float32) / 255.0
+        image = torch.from_numpy(image)[None,]
+
+        # print(image.shape)
+
+        return (BPY_OBJ, image)

js/AvatarPreview.js

@@ -173,10 +173,6 @@ async function prepareImageFromUrlRedirect(stage) {
 
 export function AvatarPreview() {
   console.log("getting workflow json now");
-  loadJSONWorkflow("default").then(() => {
-    console.log("done loading");
-    jsonWorkflowLoading.val = false;
-  });
 
   const loading = van.state(false);
   const shareLoading = van.state("share"); // share, loading, shared
@@ -465,7 +461,7 @@ export function AvatarPreview() {
       name: "avatech-viewer-iframe",
       allow: "cross-origin-isolated",
       class: () =>
-        "w-full h-full min-w-[400px] min-h-[400px] z-[100] pointer-events-auto flex border-none overflow-hidden" +
+        "w-full h-full min-w-[350px] min-h-[350px] z-[100] pointer-events-auto flex border-none overflow-hidden bg-transparent" +
         (showPreview.val ? "" : "hidden"),
       // src: "https://labs.avatech.ai/viewer/default",
       // src: "http://localhost:3000/viewer/default",
@@ -710,51 +706,12 @@ export function AvatarPreview() {
         console.log(showPreview);
 
         return (
-          (showPreview.val ? "" : "hidden ") +
+          (showPreview.val && !showEditor.val ? "" : "hidden ") +
-          "w-full h-full absolute left-0 top-0 z-[99] pointer-events-auto flex border-none bg-white"
+          "absolute w-[360px] h-[360px] rounded-xl overflow-hidden right-0 top-0 z-[99] pointer-events-auto flex border-none bg-transparent"
         );
       },
     },
-    div(
+    renderIFrame(),
-      { class: "overflow-y-auto overflow-x-hidden w-full h-full" },
-      div(
-        {
-          class: "absolute top-4 left-4 flex flex-row gap-2",
-        },
-        renderCloseButton(),
-        renderRestartButton(),
-        renderChangeWorkflowButton()
-      ),
-      renderTwitter(),
-      () => {
-        if (isMobileDevice()) {
-          return div(
-            {
-              class: () =>
-                "flex flex-col w-full h-fit bg-white justify-center items-center py-16 px-4 gap-2" +
-                (showPreview.val ? "" : "hidden"),
-            },
-            renderIFrame(),
-            renderSteps(),
-            renderShareLink()
-          );
-        } else {
-          return div(
-            {
-              class: () =>
-                "flex w-full h-full bg-white justify-around items-center p-24" +
-                (showPreview.val ? "" : "hidden"),
-            },
-            renderSteps(),
-            div(
-              { class: () => "flex flex-col" },
-              renderIFrame(),
-              renderShareLink()
-            )
-          );
-        }
-      }
-    )
   );
 }
 

js/CombinePointsDialog.js

@@ -7,12 +7,21 @@ van.derive(() => {
     combinePointsNode.val != undefined &&
     combinePointsNode.val.type === "Combine Points"
   ) {
-    const inputNames =
+    const inputNames = combinePointsNode.val.inputs?.map((x) => x.name) || [];
-      combinePointsNode.val.inputs?.map((x) => x.name).slice(1) || [];
     const record = Object.keys(samPrompts.val);
 
+    const diff = inputNames.filter((x) => !record.includes(x));
     const missingDiff = record.filter((x) => !inputNames.includes(x));
 
+    if (diff.length > 0) {
+      diff.forEach((x) => {
+        combinePointsNode.val.removeInput(
+          combinePointsNode.val.findInputSlot(x)
+        );
+      });
+      combinePointsNode.val.graph.change();
+    }
+
     if (missingDiff.length > 0) {
       missingDiff.forEach((x) => {
         combinePointsNode.val.addInput(x, "POINTS");

js/SideBar.js

@@ -6,6 +6,7 @@ import {
   targetNode,
   showImageEditor,
   allImagePrompts,
+  samPrompts,
 } from "./state.js";
 import { van } from "./van.js";
 const {
@@ -24,6 +25,33 @@ const {
   span,
 } = van.tags;
 
+export const updateOutputs = () => {
+  const outputNames = targetNode.val.outputs.map((x) => x.name).slice(1);
+  const record = Object.keys(imagePromptsMulti.val);
+
+  const diff = outputNames.filter((x) => !record.includes(x));
+  const missingDiff = record.filter((x) => !outputNames.includes(x));
+
+  if (diff.length > 0) {
+    console.log("Cleaning up missing output slots", diff);
+    diff.forEach((x) => {
+      targetNode.val.removeOutput(targetNode.val.findOutputSlot(x));
+    });
+    targetNode.val.graph.change();
+  }
+
+  if (missingDiff.length > 0) {
+    console.log("Adding missing output slots", diff);
+    missingDiff.forEach((x) => {
+      targetNode.val.addOutput(
+        x,
+        targetNode.val.type === "SAM MultiLayer" ? "IMAGE" : "SAM_PROMPT"
+      );
+    });
+    targetNode.val.graph.change();
+  }
+};
+
 van.derive(() => {
   if (
     showImageEditor.val &&
@@ -31,30 +59,7 @@ van.derive(() => {
     targetNode.val.outputs &&
     targetNode.val.type === "SAM MultiLayer"
   ) {
-    const outputNames = targetNode.val.outputs.map((x) => x.name).slice(1);
+    updateOutputs();
-    const record = Object.keys(imagePromptsMulti.val);
-
-    const diff = outputNames.filter((x) => !record.includes(x));
-    const missingDiff = record.filter((x) => !outputNames.includes(x));
-
-    if (diff.length > 0) {
-      console.log("Cleaning up missing output slots", diff);
-      diff.forEach((x) => {
-        targetNode.val.removeOutput(targetNode.val.findOutputSlot(x));
-      });
-      targetNode.val.graph.change();
-    }
-
-    if (missingDiff.length > 0) {
-      console.log("Adding missing output slots", diff);
-      missingDiff.forEach((x) => {
-        targetNode.val.addOutput(
-          x,
-          targetNode.val.type === "SAM MultiLayer" ? "IMAGE" : "SAM_PROMPT"
-        );
-      });
-      targetNode.val.graph.change();
-    }
   }
 });
 

js/index.js

@@ -18,6 +18,7 @@ import {
   previewModelId,
   embeddingID,
   enableAutoSegment,
+  samPrompts,
 } from "./state.js";
 import { van } from "./van.js";
 import { app } from "./app.js";
@@ -34,6 +35,7 @@ import {
 import { infoDialog } from "./dialog.js";
 import { sharedAvatarLink } from "./AvatarPreview.js";
 import { updateImagePrompts } from "./LayerEditor.js";
+import { updateOutputs } from "./SideBar.js";
 
 export const generatedImages = {};
 
@@ -358,7 +360,6 @@ function showMyImageEditor(node) {
           drawSegment(getClicks());
           updateImagePrompts();
         });
-        targetNode.val = node;
       })
       .catch((err) => {
         console.log(err);
@@ -386,6 +387,15 @@ const ext = {
           showMyImageEditor(node);
           btn.serialize = false;
         });
+
+        targetNode.val = node;
+        node.onConnectInput = (node, slot, targetSlot) => {
+          if (targetSlot.name === "SAM_PROMPTS") {
+            imagePromptsMulti.val = samPrompts.val;
+            updateOutputs();
+          }
+        };
+
         return {
           widget: btn,
         };

js/onnx.js

@@ -1,16 +1,18 @@
-import "https://cdn.jsdelivr.net/npm/onnxruntime-web/dist/ort.min.js";
+import "https://cdn.jsdelivr.net/npm/onnxruntime-web@1.16.3/dist/ort.min.js";
 import npyjs from "https://esm.sh/npyjs";
 import { imageSize } from "./state.js";
 import { modelData, onnxMaskToImage } from "./onnx_helper.js";
 
-ort.env.wasm.wasmPaths = "https://cdn.jsdelivr.net/npm/onnxruntime-web/dist/";
+ort.env.wasm.wasmPaths = "https://cdn.jsdelivr.net/npm/onnxruntime-web@1.16.3/dist/";
 
 export let model = null;
+let modelType = null;
 
 // Initialize the ONNX model
-export const initModel = async (modelType) => {
+export const initModel = async (type) => {
   try {
-    if (!model) {
+    if (!model || modelType !== type) {
+      modelType = type;
       model = await ort.InferenceSession.create(
         `${location.protocol}//${location.host}/sam_model?type=${modelType}`
       );

js/state.js

@@ -19,13 +19,15 @@
  */
 
 import { van } from "./van.js";
-
 export const iframeSrc = van.state("https://editor.avatech.ai?comfyui=true");
 export const showEditor = van.state(false);
 // localStorage.getItem("showPreview") == 'true'
-export const showPreview = van.state(true);
+console.log(localStorage.getItem("showPreview"));
+if (localStorage.getItem("showPreview") == null)
+  localStorage.setItem("showPreview", 'true')
+export const showPreview = van.state(localStorage.getItem("showPreview") == 'true');
 export const previewUrl = van.state(
-  "https://editor.avatech.ai/viewer?avatarId=default&debug=false&width=400&height=400&hideTrigger=true&voiceSelection=true&hideUI=true"
+  "https://editor.avatech.ai/viewer?avatarId=default&debug=true&width=350&height=350&hideTrigger=true&voiceSelection=true&hideUI=true"
 );
 export const previewImg = van.state("");
 export const previewImgLoading = van.state(false);

js/tw-styles.css

@@ -1,7 +1,7 @@
 @import url('https://fonts.googleapis.com/css2?family=Gabarito&display=swap');
 
 /*
-! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
+! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -501,7 +501,7 @@ html{
 :root{
   color-scheme: light;
   --in: 0.7206 0.191 231.6;
-  --su: 0.7441 0.213 164.75;
+  --su: 64.8% 0.150 160;
   --wa: 0.8471 0.199 83.87;
   --er: 0.7176 0.221 22.18;
   --pc: 0.89824 0.06192 275.75;
@@ -742,7 +742,7 @@ html{
   justify-content: center;
   border-radius: var(--rounded-btn, 0.5rem);
   border-color: transparent;
-  border-color: oklch(var(--btn-color, var(--b2)) / var(--tw-border-opacity, 1));
+  border-color: oklch(var(--btn-color, var(--b2)) / var(--tw-border-opacity));
   padding-left: 1rem;
   padding-right: 1rem;
   text-align: center;
@@ -762,7 +762,9 @@ html{
   --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color);
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
   outline-color: var(--fallback-bc,oklch(var(--bc)/1));
-  background-color: oklch(var(--btn-color, var(--b2)) / var(--tw-bg-opacity, 1));
+  background-color: oklch(var(--btn-color, var(--b2)) / var(--tw-bg-opacity));
+  --tw-bg-opacity: 1;
+  --tw-border-opacity: 1;
 }
 
 .btn-disabled,
@@ -870,8 +872,7 @@ html{
   flex-grow: 1;
   --tw-content: '';
   content: var(--tw-content);
-  --tw-bg-opacity: 1;
+  background-color: var(--fallback-bc,oklch(var(--bc)/0.1));
-  background-color: var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)));
 }
 
 .dropdown{
@@ -959,18 +960,23 @@ html{
   .btn:hover{
     --tw-border-opacity: 1;
     border-color: var(--fallback-b3,oklch(var(--b3)/var(--tw-border-opacity)));
-    border-color: color-mix(
-          in oklab,
-          oklch(var(--btn-color, var(--b2)) / var(--tw-border-opacity, 1)) 90%,
-          black
-        );
     --tw-bg-opacity: 1;
     background-color: var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)));
-    background-color: color-mix(
+  }
-          in oklab,
+
-          oklch(var(--btn-color, var(--b2)) / var(--tw-bg-opacity, 1)) 90%,
+  @supports (color: color-mix(in oklab, black, black)){
-          black
+    .btn:hover{
-        );
+      background-color: color-mix(
+            in oklab,
+            oklch(var(--btn-color, var(--b2)) / var(--tw-bg-opacity, 1)) 90%,
+            black
+          );
+      border-color: color-mix(
+            in oklab,
+            oklch(var(--btn-color, var(--b2)) / var(--tw-border-opacity, 1)) 90%,
+            black
+          );
+    }
   }
 
   @supports not (color: oklch(0 0 0)){
@@ -1007,50 +1013,85 @@ html{
   .btn-outline.btn-primary:hover{
     --tw-text-opacity: 1;
     color: var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)));
-    background-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+  }
-    border-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+
+  @supports (color: color-mix(in oklab, black, black)){
+    .btn-outline.btn-primary:hover{
+      background-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+    }
   }
 
   .btn-outline.btn-secondary:hover{
     --tw-text-opacity: 1;
     color: var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)));
-    background-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
+  }
-    border-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
+
+  @supports (color: color-mix(in oklab, black, black)){
+    .btn-outline.btn-secondary:hover{
+      background-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
+    }
   }
 
   .btn-outline.btn-accent:hover{
     --tw-text-opacity: 1;
     color: var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)));
-    background-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+  }
-    border-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+
+  @supports (color: color-mix(in oklab, black, black)){
+    .btn-outline.btn-accent:hover{
+      background-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+    }
   }
 
   .btn-outline.btn-success:hover{
     --tw-text-opacity: 1;
     color: var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)));
-    background-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+  }
-    border-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+
+  @supports (color: color-mix(in oklab, black, black)){
+    .btn-outline.btn-success:hover{
+      background-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+    }
   }
 
   .btn-outline.btn-info:hover{
     --tw-text-opacity: 1;
     color: var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));
-    background-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+  }
-    border-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+
+  @supports (color: color-mix(in oklab, black, black)){
+    .btn-outline.btn-info:hover{
+      background-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+    }
   }
 
   .btn-outline.btn-warning:hover{
     --tw-text-opacity: 1;
     color: var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)));
-    background-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+  }
-    border-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+
+  @supports (color: color-mix(in oklab, black, black)){
+    .btn-outline.btn-warning:hover{
+      background-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+    }
   }
 
   .btn-outline.btn-error:hover{
     --tw-text-opacity: 1;
     color: var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));
-    background-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+  }
-    border-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+
+  @supports (color: color-mix(in oklab, black, black)){
+    .btn-outline.btn-error:hover{
+      background-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+    }
   }
 
   .btn-disabled:hover,
@@ -1063,9 +1104,11 @@ html{
     --tw-text-opacity: 0.2;
   }
 
-  .btn:is(input[type="checkbox"]:checked):hover, .btn:is(input[type="radio"]:checked):hover{
+  @supports (color: color-mix(in oklab, black, black)){
-    background-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+    .btn:is(input[type="checkbox"]:checked):hover, .btn:is(input[type="radio"]:checked):hover{
-    border-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+      background-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+    }
   }
 
   .dropdown.dropdown-hover:hover .dropdown-content{
@@ -1076,8 +1119,6 @@ html{
 
   :where(.menu li:not(.menu-title):not(.disabled) > *:not(ul):not(details):not(.menu-title)):not(.active):hover, :where(.menu li:not(.menu-title):not(.disabled) > details > summary:not(.menu-title)):not(.active):hover{
     cursor: pointer;
-    --tw-text-opacity: 1;
-    color: var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));
     outline: 2px solid transparent;
     outline-offset: 2px;
   }
@@ -1108,6 +1149,9 @@ html{
 
 .input{
   flex-shrink: 1;
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none;
   height: 3rem;
   padding-left: 1rem;
   padding-right: 1rem;
@@ -1210,10 +1254,8 @@ html{
 .menu :where(li ul){
   position: relative;
   white-space: nowrap;
-  -webkit-margin-start: 1rem;
+  margin-inline-start: 1rem;
-          margin-inline-start: 1rem;
+  padding-inline-start: 0.5rem;
-  -webkit-padding-start: 0.5rem;
-          padding-inline-start: 0.5rem;
 }
 
 .menu :where(li:not(.menu-title) > *:not(ul):not(details):not(.menu-title)),
@@ -1394,6 +1436,43 @@ html{
   }
 }
 
+@supports (color: color-mix(in oklab, black, black)){
+  .btn-outline.btn-primary.btn-active{
+    background-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+  }
+
+  .btn-outline.btn-secondary.btn-active{
+    background-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
+  }
+
+  .btn-outline.btn-accent.btn-active{
+    background-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+  }
+
+  .btn-outline.btn-success.btn-active{
+    background-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+  }
+
+  .btn-outline.btn-info.btn-active{
+    background-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+  }
+
+  .btn-outline.btn-warning.btn-active{
+    background-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+  }
+
+  .btn-outline.btn-error.btn-active{
+    background-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+  }
+}
+
 .btn:focus-visible{
   outline-style: solid;
   outline-width: 2px;
@@ -1467,8 +1546,6 @@ html{
 .btn-outline.btn-primary.btn-active{
   --tw-text-opacity: 1;
   color: var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)));
-  background-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
-  border-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
 }
 
 .btn-outline.btn-secondary{
@@ -1479,8 +1556,6 @@ html{
 .btn-outline.btn-secondary.btn-active{
   --tw-text-opacity: 1;
   color: var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)));
-  background-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
-  border-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
 }
 
 .btn-outline.btn-accent{
@@ -1491,8 +1566,6 @@ html{
 .btn-outline.btn-accent.btn-active{
   --tw-text-opacity: 1;
   color: var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)));
-  background-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
-  border-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
 }
 
 .btn-outline.btn-success{
@@ -1503,8 +1576,6 @@ html{
 .btn-outline.btn-success.btn-active{
   --tw-text-opacity: 1;
   color: var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)));
-  background-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
-  border-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
 }
 
 .btn-outline.btn-info{
@@ -1515,8 +1586,6 @@ html{
 .btn-outline.btn-info.btn-active{
   --tw-text-opacity: 1;
   color: var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));
-  background-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
-  border-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
 }
 
 .btn-outline.btn-warning{
@@ -1527,8 +1596,6 @@ html{
 .btn-outline.btn-warning.btn-active{
   --tw-text-opacity: 1;
   color: var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)));
-  background-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
-  border-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
 }
 
 .btn-outline.btn-error{
@@ -1539,8 +1606,6 @@ html{
 .btn-outline.btn-error.btn-active{
   --tw-text-opacity: 1;
   color: var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));
-  background-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
-  border-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
 }
 
 .btn.btn-disabled,
@@ -1646,8 +1711,7 @@ details.collapse summary::-webkit-details-marker{
 :where(.collapse > input[type="radio"]){
   width: 100%;
   padding: 1rem;
-  -webkit-padding-end: 3rem;
+  padding-inline-end: 3rem;
-          padding-inline-end: 3rem;
   min-height: 3.75rem;
   transition: background-color 0.2s ease-out;
 }
@@ -1750,11 +1814,14 @@ details.collapse summary::-webkit-details-marker{
   --tw-placeholder-opacity: 0.2;
 }
 
+.input::-webkit-date-and-time-value{
+  text-align: inherit;
+}
+
 .join > :where(*:not(:first-child)){
   margin-top: 0px;
   margin-bottom: 0px;
-  -webkit-margin-start: -1px;
+  margin-inline-start: -1px;
-          margin-inline-start: -1px;
 }
 
 .link:focus{
@@ -1797,7 +1864,9 @@ details.collapse summary::-webkit-details-marker{
 }
 
 :where(.menu li:empty){
-  background-color: var(--fallback-bc,oklch(var(--bc)/0.1));
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));
+  opacity: 0.1;
   margin: 0.5rem 1rem;
   height: 1px;
 }
@@ -1808,7 +1877,9 @@ details.collapse summary::-webkit-details-marker{
   inset-inline-start: 0px;
   top: 0.75rem;
   width: 1px;
-  background-color: var(--fallback-bc,oklch(var(--bc)/0.1));
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));
+  opacity: 0.1;
   content: "";
 }
 
@@ -1933,7 +2004,7 @@ details.collapse summary::-webkit-details-marker{
 
 .modal:not(dialog:not(.modal-open)),
   .modal::backdrop{
-  background-color: rgba(0, 0, 0, 0.3);
+  background-color: #0006;
   animation: modal-pop 0.2s ease-out;
 }
 
@@ -2256,8 +2327,7 @@ details.collapse summary::-webkit-details-marker{
 .join.join-horizontal > :where(*:not(:first-child)){
   margin-top: 0px;
   margin-bottom: 0px;
-  -webkit-margin-start: -1px;
+  margin-inline-start: -1px;
-          margin-inline-start: -1px;
 }
 
 .modal-top :where(.modal-box){
@@ -2399,6 +2469,10 @@ details.collapse summary::-webkit-details-marker{
   z-index: 200;
 }
 
+.z-\[999\]{
+  z-index: 999;
+}
+
 .z-\[99\]{
   z-index: 99;
 }
@@ -2465,21 +2539,20 @@ details.collapse summary::-webkit-details-marker{
   height: 24rem;
 }
 
-.h-\[394px\]{
+.h-\[360px\]{
-  height: 394px;
+  height: 360px;
 }
 
-.h-fit{
+.h-\[394px\]{
-  height: -moz-fit-content;
+  height: 394px;
-  height: fit-content;
 }
 
 .h-full{
   height: 100%;
 }
 
-.min-h-\[400px\]{
+.min-h-\[350px\]{
-  min-height: 400px;
+  min-height: 350px;
 }
 
 .w-20{
@@ -2506,6 +2579,10 @@ details.collapse summary::-webkit-details-marker{
   width: 32rem;
 }
 
+.w-\[360px\]{
+  width: 360px;
+}
+
 .w-fit{
   width: -moz-fit-content;
   width: fit-content;
@@ -2515,8 +2592,8 @@ details.collapse summary::-webkit-details-marker{
   width: 100%;
 }
 
-.min-w-\[400px\]{
+.min-w-\[350px\]{
-  min-width: 400px;
+  min-width: 350px;
 }
 
 .max-w-\[100\%\]{
@@ -2569,10 +2646,6 @@ details.collapse summary::-webkit-details-marker{
   justify-content: space-between;
 }
 
-.justify-around{
-  justify-content: space-around;
-}
-
 .gap-2{
   gap: 0.5rem;
 }
@@ -2589,14 +2662,6 @@ details.collapse summary::-webkit-details-marker{
   overflow: hidden;
 }
 
-.overflow-y-auto{
-  overflow-y: auto;
-}
-
-.overflow-x-hidden{
-  overflow-x: hidden;
-}
-
 .rounded{
   border-radius: 0.25rem;
 }
@@ -2621,6 +2686,10 @@ details.collapse summary::-webkit-details-marker{
   border-radius: 0.125rem;
 }
 
+.rounded-xl{
+  border-radius: 0.75rem;
+}
+
 .rounded-b-md{
   border-bottom-right-radius: 0.375rem;
   border-bottom-left-radius: 0.375rem;
@@ -2834,10 +2903,6 @@ details.collapse summary::-webkit-details-marker{
   padding: 0.5rem;
 }
 
-.p-24{
-  padding: 6rem;
-}
-
 .p-4{
   padding: 1rem;
 }
@@ -2857,11 +2922,6 @@ details.collapse summary::-webkit-details-marker{
   padding-right: 1rem;
 }
 
-.py-16{
-  padding-top: 4rem;
-  padding-bottom: 4rem;
-}
-
 .py-2{
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;

routes.py

@@ -126,7 +126,7 @@ async def post_sam_model(request):
                 }
                 json.dump(data, f)
         else:
-            sam = sam_model_registry[model_type](checkpoint=ckpt).to("cuda")
+            sam = sam_model_registry[model_type](checkpoint=ckpt)
             predictor = SamPredictor(sam)
 
             image_np = (image * 255).astype(np.uint8)
@@ -222,8 +222,6 @@ def load_workflow(workflow_name):
         return "\n".join(f.readlines())
 
 
-default_workflow = load_workflow("avatar_generation_mask_api_v11(FaceToon)")
-
 
 @server.PromptServer.instance.routes.post("/avatar_generation")
 async def post_prompt_block(request):
@@ -235,8 +233,6 @@ async def post_prompt_block(request):
         workflow = uploaded_workflow
     elif workflow_name is not None:
         workflow = load_workflow(workflow_name)
-    else:
-        workflow = default_workflow
 
     ref_image = post.get("ref_image")
     base_image = post.get("base_image")
@@ -289,6 +285,52 @@ async def post_prompt_block(request):
                     return web.json_response({"id": modelId}, status=200)
         time.sleep(0.5)
 
+# TODO: refactor the code
+@server.PromptServer.instance.routes.post("/rendering_generation")
+async def post_data_generation(request):
+    prompt_server = server.PromptServer.instance
+    post = await request.json()
+    workflow_name = post.get("workflow_name")
+    workflow = load_workflow(workflow_name)
+    workflow = workflow.replace("SEED", str(randomSeed()))
+
+    inputs = post.get("inputs")
+
+    for key, value in inputs.items():
+        workflow = workflow.replace(f'"{key}"', f'"{str(value)}"')
+
+    res = post_prompt({"prompt": json.loads(workflow)})
+    prompt_id = json.loads(res.text)["prompt_id"]
+    while True:
+        history = prompt_server.prompt_queue.get_history(prompt_id=prompt_id)
+        if history:
+            outputs = history[prompt_id]["outputs"]
+            for node_id, output in outputs.items():
+                if "images" in output:
+                    filename = output["images"][0]["filename"]
+                    if filename.startswith("rendered"):
+                        return web.json_response({"image": filename}, status=200)
+        time.sleep(0.5)
+
+@server.PromptServer.instance.routes.post("/image_generation")
+async def post_image_generation(request):
+    prompt_server = server.PromptServer.instance
+    workflow = load_workflow("generation")
+    workflow = workflow.replace("SEED", str(randomSeed()))
+
+    res = post_prompt({"prompt": json.loads(workflow)})
+    prompt_id = json.loads(res.text)["prompt_id"]
+    while True:
+        history = prompt_server.prompt_queue.get_history(prompt_id=prompt_id)
+        if history:
+            outputs = history[prompt_id]["outputs"]
+            for node_id, output in outputs.items():
+                if "images" in output:
+                    filename = output["images"][0]["filename"]
+                    if filename.startswith("avatar"):
+                        return web.json_response({"image": filename}, status=200)
+        time.sleep(0.5)
+
 
 # @server.PromptServer.instance.routes.get("/get_default_workflow")
 # async def get_default_workflow(request):

sam/combine_points.py

@@ -1,3 +1,4 @@
+import json
 
 class CombinePoints:
     @classmethod
@@ -7,7 +8,8 @@ class CombinePoints:
             },
         }
 
-    RETURN_TYPES = ("SAM_PROMPTS",)
+    RETURN_NAMES = ("SAM_PROMPTS",)
+    RETURN_TYPES = ("STRING",)
 
     FUNCTION = "run"
 
@@ -16,9 +18,8 @@ class CombinePoints:
     # OUTPUT_NODE = True
 
     def run(self, *args, **kwargs):
-        print("args", args)
+        sam_prompts = json.dumps(kwargs, default=str)
-        print("kwargs", kwargs)
+        return (sam_prompts,)
-        return ([])
 
 
 NODE_CLASS_MAPPINGS = {"Combine Points": CombinePoints}

sam/load_value_from_request.py

@@ -0,0 +1,31 @@
+class LoadValueFromRequest:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "name": (
+                    "STRING",
+                    {"multiline": False, "default": "key_name"},
+                ),
+            },
+            "optional": {
+                "value": ("FLOAT", {"default": 1.0, "min": -10.0, "max": 10.0, "step": 0.01, "display": "number"}),
+            }
+        }
+
+    RETURN_TYPES = ("FLOAT",)
+    RETURN_NAMES = ("value",)
+
+    FUNCTION = "run"
+
+    CATEGORY = "image"
+
+    def run(self, name, value=None):
+        if name:
+            value = name
+        return (value,)
+
+
+NODE_CLASS_MAPPINGS = {"LoadValueFromRequest": LoadValueFromRequest}
+
+NODE_DISPLAY_NAME_MAPPINGS = {"LoadValueFromRequest": "Load Value From Request"}

sam/sam_multilayer.py

@@ -4,6 +4,7 @@ import numpy as np
 import torch
 import re
 import json
+import uuid
 from segment_anything import sam_model_registry, SamPredictor
 from einops import rearrange, repeat
 from PIL import Image
@@ -126,7 +127,7 @@ class SAMMultiLayer:
         global global_predictor, face_landmarker, pose_landmarker
 
         ckpt = folder_paths.get_full_path("sams", ckpt)
-        sam = sam_model_registry[model_type](checkpoint=ckpt)  # .to("cuda")
+        sam = sam_model_registry[model_type](checkpoint=ckpt) # .to("cuda")
         global_predictor = SamPredictor(sam)
 
         face_landmarker_model_path = os.path.join(
@@ -270,16 +271,24 @@ class SAMMultiLayer:
             image_format=mp.ImageFormat.SRGB, data=(np_image * 255).astype(np.uint8)
         )
         face_landmarks = face_landmarker.detect(mp_image).face_landmarks
-        face_landmarks = face_landmarks[0] if len(face_landmarks) > 0 else None
+        if len(face_landmarks) == 0:
+            print("Warning: no face detected")
+            return None, None
+
         pose_landmarks = pose_landmarker.detect(mp_image).pose_landmarks
-        pose_landmarks = pose_landmarks[0] if len(pose_landmarks) > 0 else None
+        if len(pose_landmarks) == 0:
+            print("Warning: no pose detected")
+            return None, None
+
         imagePromptsMulti, boxesMulti = self.auto_segment(
-            np_image, face_landmarks, pose_landmarks
+            np_image, face_landmarks[0], pose_landmarks[0]
         )
 
         return imagePromptsMulti, boxesMulti
 
     def load_image(self, image, ckpt, embedding_id, image_prompts_json):
+        if 'COMFY_DEPLOY' in os.environ and os.getenv('COMFY_DEPLOY', 'FALSE') == "TRUE":
+            embedding_id = str(uuid.uuid4())
         image_prompts = json.loads(image_prompts_json.replace("'", '"'))
 
         order_file = f"{self.output_dir}/segments_{embedding_id}/order.json"
@@ -338,7 +347,7 @@ class SAMMultiLayer:
             imagePromptsMulti, boxesMulti = self.detect_face(image[0].numpy())
 
             image_prompts = json.loads(image_prompts_json.replace("'", '"'))
-            result = [image_prompts]
+            result = [image_prompts]  # use imagePromptsMulti
 
             if isinstance(image_prompts, list):
                 pass
@@ -350,7 +359,9 @@ class SAMMultiLayer:
                         continue
 
                     points = (
-                        imagePromptsMulti[key] if key in imagePromptsMulti else item
+                        imagePromptsMulti[key]
+                        if imagePromptsMulti is not None and key in imagePromptsMulti
+                        else item
                     )
                     point_coords = np.array([[p["x"], p["y"]] for p in points])
                     point_labels = np.array([p["label"] for p in points])
@@ -358,7 +369,9 @@ class SAMMultiLayer:
                     masks, _, _ = global_predictor.predict(
                         point_coords=point_coords,
                         point_labels=point_labels,
-                        box=boxesMulti[key] if key in boxesMulti else None,
+                        box=boxesMulti[key]
+                        if boxesMulti is not None and key in boxesMulti
+                        else None,
                     )
                     masks = torch.from_numpy(masks)
                     masks = rearrange(masks[0], "h w -> 1 h w")