bizyengine 1.2.7__py3-none-any.whl → 1.2.9__py3-none-any.whl

bizyengine/misc/llm.py

@@ -3,13 +3,14 @@ import json
 
 import aiohttp
 from aiohttp import web
+from bizyengine.core import BizyAirMiscBaseNode, pop_api_key_and_prompt_id
+from bizyengine.core.common import client
 from bizyengine.core.common.env_var import BIZYAIR_SERVER_ADDRESS
 from bizyengine.core.image_utils import decode_data, encode_comfy_image, encode_data
 from server import PromptServer
 
 from .utils import (
     decode_and_deserialize,
-    get_api_key,
     get_llm_response,
     get_vlm_response,
     send_post_request,
@@ -17,52 +18,7 @@ from .utils import (
 )
 
 
-async def fetch_all_models(api_key):
-    url = f"{BIZYAIR_SERVER_ADDRESS}/llm/models"
-    headers = {"accept": "application/json", "authorization": f"Bearer {api_key}"}
-    params = {"type": "text", "sub_type": "chat"}
-
-    try:
-        async with aiohttp.ClientSession() as session:
-            async with session.get(
-                url, headers=headers, params=params, timeout=10
-            ) as response:
-                if response.status == 200:
-                    data = await response.json()
-                    all_models = [model["id"] for model in data["data"]]
-                    return all_models
-                else:
-                    print(f"Error fetching models: HTTP Status {response.status}")
-                    return []
-    except aiohttp.ClientError as e:
-        print(f"Error fetching models: {e}")
-        return []
-    except asyncio.exceptions.TimeoutError:
-        print("Request to fetch models timed out")
-        return []
-
-
-@PromptServer.instance.routes.post("/bizyair/get_silicon_cloud_llm_models")
-async def get_silicon_cloud_llm_models_endpoint(request):
-    data = await request.json()
-    api_key = data.get("api_key", get_api_key())
-    all_models = await fetch_all_models(api_key)
-    llm_models = [model for model in all_models if "vl" not in model.lower()]
-    llm_models.append("No LLM Enhancement")
-    return web.json_response(llm_models)
-
-
-@PromptServer.instance.routes.post("/bizyair/get_silicon_cloud_vlm_models")
-async def get_silicon_cloud_vlm_models_endpoint(request):
-    data = await request.json()
-    api_key = data.get("api_key", get_api_key())
-    all_models = await fetch_all_models(api_key)
-    vlm_models = [model for model in all_models if "vl" in model.lower()]
-    vlm_models.append("No VLM Enhancement")
-    return web.json_response(vlm_models)
-
-
-class SiliconCloudLLMAPI:
+class SiliconCloudLLMAPI(BizyAirMiscBaseNode):
     def __init__(self):
         pass
 
@@ -93,7 +49,7 @@ class SiliconCloudLLMAPI:
                     "FLOAT",
                     {"default": 0.7, "min": 0.0, "max": 2.0, "step": 0.01},
                 ),
-            }
+            },
         }
 
     RETURN_TYPES = ("STRING",)
@@ -102,23 +58,18 @@ class SiliconCloudLLMAPI:
     CATEGORY = "☁️BizyAir/AI Assistants"
 
     def get_llm_model_response(
-        self, model, system_prompt, user_prompt, max_tokens, temperature
+        self, model, system_prompt, user_prompt, max_tokens, temperature, **kwargs
     ):
         if model == "No LLM Enhancement":
             return {"ui": {"text": (user_prompt,)}, "result": (user_prompt,)}
-        response = get_llm_response(
-            model,
-            system_prompt,
-            user_prompt,
-            max_tokens,
-            temperature,
+        ret = get_llm_response(
+            model, system_prompt, user_prompt, max_tokens, temperature, **kwargs
         )
-        ret = json.loads(response)
         text = ret["choices"][0]["message"]["content"]
         return (text,)  # if update ui:  {"ui": {"text": (text,)}, "result": (text,)}
 
 
-class SiliconCloudVLMAPI:
+class SiliconCloudVLMAPI(BizyAirMiscBaseNode):
     def __init__(self):
         pass
 
@@ -148,7 +99,7 @@ class SiliconCloudVLMAPI:
                     {"default": 0.7, "min": 0.0, "max": 2.0, "step": 0.01},
                 ),
                 "detail": (["auto", "low", "high"], {"default": "auto"}),
-            }
+            },
         }
 
     RETURN_TYPES = ("STRING",)
@@ -157,7 +108,15 @@ class SiliconCloudVLMAPI:
     CATEGORY = "☁️BizyAir/AI Assistants"
 
     def get_vlm_model_response(
-        self, model, system_prompt, user_prompt, images, max_tokens, temperature, detail
+        self,
+        model,
+        system_prompt,
+        user_prompt,
+        images,
+        max_tokens,
+        temperature,
+        detail,
+        **kwargs,
     ):
         if model == "No VLM Enhancement":
             return (user_prompt,)
@@ -171,7 +130,7 @@ class SiliconCloudVLMAPI:
         # 提取所有编码后的图像
         base64_images = list(encoded_images_dict.values())
 
-        response = get_vlm_response(
+        ret = get_vlm_response(
             model,
             system_prompt,
             user_prompt,
@@ -179,13 +138,13 @@ class SiliconCloudVLMAPI:
             max_tokens,
             temperature,
             detail,
+            **kwargs,
         )
-        ret = json.loads(response)
         text = ret["choices"][0]["message"]["content"]
         return (text,)
 
 
-class BizyAirJoyCaption:
+class BizyAirJoyCaption(BizyAirMiscBaseNode):
     # refer to: https://huggingface.co/spaces/fancyfeast/joy-caption-pre-alpha
     API_URL = f"{BIZYAIR_SERVER_ADDRESS}/supernode/joycaption2"
 
@@ -216,7 +175,7 @@ class BizyAirJoyCaption:
                         "display": "number",
                     },
                 ),
-            }
+            },
         }
 
     RETURN_TYPES = ("STRING",)
@@ -224,8 +183,10 @@ class BizyAirJoyCaption:
 
     CATEGORY = "☁️BizyAir/AI Assistants"
 
-    def joycaption(self, image, do_sample, temperature, max_tokens):
-        API_KEY = get_api_key()
+    def joycaption(self, image, do_sample, temperature, max_tokens, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+
         SIZE_LIMIT = 1536
         # device = image.device
         _, w, h, c = image.shape
@@ -244,17 +205,18 @@ class BizyAirJoyCaption:
             "name_input": "",
             "custom_prompt": "A descriptive caption for this image:\n",
         }
-        auth = f"Bearer {API_KEY}"
-        headers = {
-            "accept": "application/json",
-            "content-type": "application/json",
-            "authorization": auth,
-        }
         input_image = encode_data(image, disable_image_marker=True)
         payload["image"] = input_image
-
-        ret: str = send_post_request(self.API_URL, payload=payload, headers=headers)
-        ret = json.loads(ret)
+        if "prompt_id" in extra_data:
+            payload["prompt_id"] = extra_data["prompt_id"]
+        data = json.dumps(payload).encode("utf-8")
+
+        ret = client.send_request(
+            url=self.API_URL,
+            data=data,
+            headers=headers,
+            callback=None,
+        )
 
         try:
             if "result" in ret:
@@ -275,7 +237,7 @@ class BizyAirJoyCaption:
         return (caption,)
 
 
-class BizyAirJoyCaption2:
+class BizyAirJoyCaption2(BizyAirMiscBaseNode):
     def __init__(self):
         pass
 
@@ -348,7 +310,7 @@ class BizyAirJoyCaption2:
                         "multiline": True,
                     },
                 ),
-            }
+            },
         }
 
     RETURN_TYPES = ("STRING",)
@@ -367,8 +329,11 @@ class BizyAirJoyCaption2:
         extra_options,
         name_input,
         custom_prompt,
+        **kwargs,
     ):
-        API_KEY = get_api_key()
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+
         SIZE_LIMIT = 1536
         _, w, h, c = image.shape
         assert (
@@ -386,17 +351,15 @@ class BizyAirJoyCaption2:
             "name_input": name_input,
             "custom_prompt": custom_prompt,
         }
-        auth = f"Bearer {API_KEY}"
-        headers = {
-            "accept": "application/json",
-            "content-type": "application/json",
-            "authorization": auth,
-        }
         input_image = encode_data(image, disable_image_marker=True)
         payload["image"] = input_image
+        if "prompt_id" in extra_data:
+            payload["prompt_id"] = extra_data["prompt_id"]
+        data = json.dumps(payload).encode("utf-8")
 
-        ret: str = send_post_request(self.API_URL, payload=payload, headers=headers)
-        ret = json.loads(ret)
+        ret: str = client.send_request(
+            url=self.API_URL, data=data, headers=headers, callback=None
+        )
 
         try:
             if "result" in ret:

bizyengine/misc/mzkolors.py

@@ -1,23 +1,29 @@
+import json
 import os
 import uuid
 
 import torch
-from bizyengine.core import BizyAirBaseNode, BizyAirNodeIO, create_node_data
+from bizyengine.core import (
+    BizyAirBaseNode,
+    BizyAirMiscBaseNode,
+    BizyAirNodeIO,
+    create_node_data,
+)
+from bizyengine.core.common import client
 from bizyengine.core.common.env_var import BIZYAIR_SERVER_ADDRESS
 from bizyengine.core.data_types import CONDITIONING
 from bizyengine.core.image_utils import encode_data
 
 from .utils import (
     decode_and_deserialize,
-    get_api_key,
-    send_post_request,
+    pop_api_key_and_prompt_id,
     serialize_and_encode,
 )
 
 CATEGORY_NAME = "☁️BizyAir/Kolors"
 
 
-class BizyAirMZChatGLM3TextEncode:
+class BizyAirMZChatGLM3TextEncode(BizyAirMiscBaseNode):
     API_URL = f"{BIZYAIR_SERVER_ADDRESS}/supernode/mzkolorschatglm3"
 
     @classmethod
@@ -25,7 +31,7 @@ class BizyAirMZChatGLM3TextEncode:
         return {
             "required": {
                 "text": ("STRING", {"multiline": True, "dynamicPrompts": True}),
-            }
+            },
         }
 
     RETURN_TYPES = ("CONDITIONING",)
@@ -33,24 +39,26 @@ class BizyAirMZChatGLM3TextEncode:
     FUNCTION = "encode"
     CATEGORY = CATEGORY_NAME
 
-    def encode(self, text):
-        API_KEY = get_api_key()
+    def encode(self, text, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+
         assert len(text) <= 4096, f"the prompt is too long, length: {len(text)}"
 
         payload = {
             "text": text,
         }
-        auth = f"Bearer {API_KEY}"
-        headers = {
-            "accept": "application/json",
-            "content-type": "application/json",
-            "authorization": auth,
-        }
-
-        response: str = send_post_request(
-            self.API_URL, payload=payload, headers=headers
+        if "prompt_id" in extra_data:
+            payload["prompt_id"] = extra_data["prompt_id"]
+        data = json.dumps(payload).encode("utf-8")
+
+        tensors_np = client.send_request(
+            url=self.API_URL,
+            data=data,
+            headers=headers,
+            callback=None,
+            response_handler=decode_and_deserialize,
         )
-        tensors_np = decode_and_deserialize(response)
 
         ret_conditioning = []
         for item in tensors_np:
@@ -69,8 +77,8 @@ class BizyAir_MinusZoneChatGLM3TextEncode(BizyAirMZChatGLM3TextEncode, BizyAirBa
 
     FUNCTION = "mz_encode"
 
-    def mz_encode(self, text):
-        out = self.encode(text)[0]
+    def mz_encode(self, text, **kwargs):
+        out = self.encode(text=text, **kwargs)[0]
         node_data = create_node_data(
             class_type="ComfyAirLoadData",
             inputs={"conditioning": {"relay": out}},

bizyengine/misc/nodes.py

@@ -55,10 +55,11 @@ class BizyAir_KSampler(BizyAirBaseNode):
         }
 
     RETURN_TYPES = ("LATENT",)
-    FUNCTION = "sample"
+    # FUNCTION = "sample"
     RETURN_NAMES = (f"LATENT",)
     CATEGORY = f"{PREFIX}/sampling"
 
+    # deprecated
     def sample(
         self,
         model,
@@ -127,7 +128,7 @@ class KSamplerAdvanced(BizyAirBaseNode):
         }
 
     RETURN_TYPES = ("LATENT",)
-    FUNCTION = "sample"
+    # FUNCTION = "sample"
 
     CATEGORY = "sampling"
 
@@ -177,7 +178,7 @@ class BizyAir_CheckpointLoaderSimple(BizyAirBaseNode):
             return False
         return True
 
-    def load_checkpoint(self, ckpt_name, model_version_id=""):
+    def load_checkpoint(self, ckpt_name, model_version_id="", **kwargs):
         if model_version_id != "":
             # use model version id as lora name
             ckpt_name = (
@@ -224,7 +225,7 @@ class BizyAir_CLIPTextEncode(BizyAirBaseNode):
 
     RETURN_TYPES = (data_types.CONDITIONING,)
     RETURN_NAMES = ("CONDITIONING",)
-    FUNCTION = "encode"
+    # FUNCTION = "encode"
 
     CATEGORY = f"{PREFIX}/conditioning"
 
@@ -249,7 +250,7 @@ class BizyAir_VAEDecode(BizyAirBaseNode):
 
     RETURN_TYPES = ("IMAGE",)
     RETURN_NAMES = (f"IMAGE",)
-    FUNCTION = "decode"
+    # FUNCTION = "decode"
 
     CATEGORY = f"{PREFIX}/latent"
 
@@ -298,6 +299,7 @@ class BizyAir_LoraLoader(BizyAirBaseNode):
     RETURN_TYPES = (data_types.MODEL, data_types.CLIP)
     RETURN_NAMES = ("MODEL", "CLIP")
 
+    # 不能使用default_function
     FUNCTION = "load_lora"
     CATEGORY = f"{PREFIX}/loaders"
 
@@ -309,6 +311,7 @@ class BizyAir_LoraLoader(BizyAirBaseNode):
         strength_model,
         strength_clip,
         model_version_id: str = None,
+        **kwargs,
     ):
         assigned_id = self.assigned_id
         new_model: BizyAirNodeIO = model.copy(assigned_id)
@@ -371,7 +374,9 @@ class BizyAir_LoraLoader_Legacy(BizyAirBaseNode):
 
     CATEGORY = f"{PREFIX}/loaders"
 
-    def load_lora(self, model, clip, lora_name, strength_model, strength_clip):
+    def load_lora(
+        self, model, clip, lora_name, strength_model, strength_clip, **kwargs
+    ):
         assigned_id = self.assigned_id
         new_model: BizyAirNodeIO = model.copy(assigned_id)
         new_clip: BizyAirNodeIO = clip.copy(assigned_id)
@@ -401,9 +406,10 @@ class BizyAir_VAEEncode(BizyAirBaseNode):
 
     RETURN_TYPES = ("LATENT",)
     RETURN_NAMES = (f"LATENT",)
-    FUNCTION = "encode"
+    # FUNCTION = "encode"
     CATEGORY = f"{PREFIX}/latent"
 
+    # deprecated
     def encode(self, vae, pixels):
         new_vae: BizyAirNodeIO = vae.copy(self.assigned_id)
         new_vae.add_node_data(
@@ -431,9 +437,10 @@ class BizyAir_VAEEncodeForInpaint(BizyAirBaseNode):
 
     RETURN_TYPES = (f"LATENT",)
     RETURN_NAMES = (f"LATENT",)
-    FUNCTION = "encode"
+    # FUNCTION = "encode"
     CATEGORY = f"{PREFIX}/latent/inpaint"
 
+    # deprecated
     def encode(self, vae, pixels, mask, grow_mask_by=6):
         new_vae: BizyAirNodeIO = vae.copy(self.assigned_id)
         new_vae.add_node_data(
@@ -477,7 +484,7 @@ class BizyAir_ControlNetLoader(BizyAirBaseNode):
             return True
         return True
 
-    def load_controlnet(self, control_net_name, model_version_id):
+    def load_controlnet(self, control_net_name, model_version_id, **kwargs):
         if model_version_id is not None and model_version_id != "":
             control_net_name = (
                 f"{config_manager.get_model_version_id_prefix()}{model_version_id}"
@@ -506,11 +513,12 @@ class BizyAir_ControlNetLoader_Legacy(BizyAirBaseNode):
 
     RETURN_TYPES = (data_types.CONTROL_NET,)
     RETURN_NAMES = ("CONTROL_NET",)
+    # 似乎不能用default实现
     FUNCTION = "load_controlnet"
 
     CATEGORY = f"{PREFIX}/loaders"
 
-    def load_controlnet(self, control_net_name):
+    def load_controlnet(self, control_net_name, **kwargs):
 
         node_data = create_node_data(
             class_type="ControlNetLoader",
@@ -550,7 +558,7 @@ class BizyAir_ControlNetApplyAdvanced(BizyAirBaseNode):
 
     RETURN_TYPES = (data_types.CONDITIONING, data_types.CONDITIONING)
     RETURN_NAMES = ("positive", "negative")
-    FUNCTION = "apply_controlnet"
+    # FUNCTION = "apply_controlnet"
 
     CATEGORY = "conditioning"
 
@@ -587,7 +595,7 @@ class BizyAir_ControlNetApply(BizyAirBaseNode):
 
     RETURN_TYPES = (data_types.CONDITIONING,)
     RETURN_NAMES = ("CONDITIONING",)
-    FUNCTION = "apply_controlnet"
+    # FUNCTION = "apply_controlnet"
 
     CATEGORY = f"{PREFIX}/conditioning/controlnet"
 
@@ -629,7 +637,7 @@ class BizyAir_CLIPVisionLoader(BizyAirBaseNode):
         }
 
     RETURN_TYPES = ("CLIP_VISION",)
-    FUNCTION = "load_clip"
+    # FUNCTION = "load_clip"
 
     CATEGORY = "loaders"
 
@@ -689,7 +697,7 @@ class VAELoader(BizyAirBaseNode):
 
     RETURN_TYPES = (data_types.VAE,)
     RETURN_NAMES = ("vae",)
-    FUNCTION = "load_vae"
+    # FUNCTION = "load_vae"
 
     CATEGORY = "loaders"
 
@@ -757,7 +765,7 @@ class UNETLoader(BizyAirBaseNode):
         }
 
     RETURN_TYPES = (data_types.MODEL,)
-    FUNCTION = "load_unet"
+    # FUNCTION = "load_unet"
 
     CATEGORY = "advanced/loaders"
 
@@ -851,7 +859,7 @@ class BasicGuider(BizyAirBaseNode):
 
     RETURN_TYPES = ("GUIDER",)
 
-    FUNCTION = "get_guider"
+    # FUNCTION = "get_guider"
     CATEGORY = "sampling/custom_sampling/guiders"
 
     def get_guider(self, model: BizyAirNodeIO, conditioning):
@@ -885,7 +893,7 @@ class BasicScheduler(BizyAirBaseNode):
     RETURN_TYPES = ("SIGMAS",)
     CATEGORY = "sampling/custom_sampling/schedulers"
 
-    FUNCTION = "get_sigmas"
+    # FUNCTION = "get_sigmas"
 
     def get_sigmas(self, **kwargs):
         new_model: BizyAirNodeIO = kwargs["model"].copy(self.assigned_id)
@@ -931,7 +939,7 @@ class DualCLIPLoader(BizyAirBaseNode):
         }
 
     RETURN_TYPES = (data_types.CLIP,)
-    FUNCTION = "load_clip"
+    # FUNCTION = "load_clip"
 
     CATEGORY = "advanced/loaders"
 
@@ -1004,7 +1012,7 @@ class KSamplerSelect(BizyAirBaseNode):
     RETURN_TYPES = ("SAMPLER",)
     CATEGORY = "sampling/custom_sampling/samplers"
 
-    FUNCTION = "get_sampler"
+    # FUNCTION = "get_sampler"
 
     def get_sampler(self, **kwargs):
         node_data = create_node_data(
@@ -1032,7 +1040,7 @@ class RandomNoise(BizyAirBaseNode):
         }
 
     RETURN_TYPES = ("NOISE",)
-    FUNCTION = "get_noise"
+    # FUNCTION = "get_noise"
     CATEGORY = "sampling/custom_sampling/noise"
 
     def get_noise(self, noise_seed):
@@ -1064,7 +1072,7 @@ class CLIPSetLastLayer(BizyAirBaseNode):
         }
 
     RETURN_TYPES = (data_types.CLIP,)
-    FUNCTION = "set_last_layer"
+    # FUNCTION = "set_last_layer"
 
     CATEGORY = "conditioning"
 
@@ -1141,6 +1149,7 @@ class SharedLoraLoader(BizyAir_LoraLoader_Legacy):
 
     RETURN_TYPES = (data_types.MODEL, data_types.CLIP)
     RETURN_NAMES = ("MODEL", "CLIP")
+    # 似乎不能用default实现
     FUNCTION = "shared_load_lora"
     CATEGORY = f"{PREFIX}/loaders"
     NODE_DISPLAY_NAME = "Shared Lora Loader"
@@ -1422,3 +1431,14 @@ class StyleModelApply(BizyAirBaseNode):
     # FUNCTION = "apply_stylemodel"
 
     CATEGORY = "conditioning/style_model"
+
+
+# 仅用于使用meta传参，故没有输入输出
+class PassParameter(BizyAirBaseNode):
+    @classmethod
+    def INPUT_TYPES(s):
+        return {}
+
+    RETURN_TYPES = ()
+
+    CATEGORY = "☁️BizyAir"

bizyengine/misc/nodes_controlnet_aux.py

@@ -1,22 +1,20 @@
+import json
 import os
 
 import numpy as np
 import torch
+from bizyengine.core import BizyAirMiscBaseNode, pop_api_key_and_prompt_id
+from bizyengine.core.common import client
 from bizyengine.core.common.env_var import BIZYAIR_SERVER_ADDRESS
 
-from .utils import (
-    decode_and_deserialize,
-    get_api_key,
-    send_post_request,
-    serialize_and_encode,
-)
+from .utils import decode_and_deserialize, serialize_and_encode
 
 # Sync with theoritical limit from Comfy base
 # https://github.com/comfyanonymous/ComfyUI/blob/eecd69b53a896343775bcb02a4f8349e7442ffd1/nodes.py#L45
 MAX_RESOLUTION = 1024
 
 
-class BasePreprocessor:
+class BasePreprocessor(BizyAirMiscBaseNode):
     def __init_subclass__(cls, **kwargs):
         super().__init_subclass__(**kwargs)
         if not hasattr(cls, "model_name"):
@@ -24,27 +22,29 @@ class BasePreprocessor:
         cls.API_URL = f"{BIZYAIR_SERVER_ADDRESS}{cls.model_name}"
         cls.CATEGORY = f"☁️BizyAir/{cls.CATEGORY}"
 
-    @staticmethod
-    def get_headers():
-        return {
-            "accept": "application/json",
-            "content-type": "application/json",
-            "authorization": f"Bearer {get_api_key()}",
-        }
-
     RETURN_TYPES = ("IMAGE",)
     FUNCTION = "execute"
 
     def execute(self, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+
         compress = True
         image: torch.Tensor = kwargs.pop("image")
         device = image.device
         kwargs["image"] = serialize_and_encode(image, compress)[0]
         kwargs["is_compress"] = compress
-        response: str = send_post_request(
-            self.API_URL, payload=kwargs, headers=self.get_headers()
+        if "prompt_id" in extra_data:
+            kwargs["prompt_id"] = extra_data["prompt_id"]
+        data = json.dumps(kwargs).encode("utf-8")
+
+        image_np = client.send_request(
+            url=self.API_URL,
+            data=data,
+            headers=headers,
+            callback=None,
+            response_handler=decode_and_deserialize,
         )
-        image_np = decode_and_deserialize(response)
         image_torch = torch.from_numpy(image_np).to(device)
         return (image_torch,)