bizyengine 1.2.26__py3-none-any.whl → 1.2.28__py3-none-any.whl

bizyengine/bizy_server/api_client.py

@@ -1122,9 +1122,11 @@ class APIClient:
             print(f"\033[31m[BizyAir]\033[0m Fail to get recent cost: {str(e)}")
             return None, errnos.GET_RECENT_COST
 
-    def forward_model_request(self, request_data):
+    def forward_model_request(self, request_data, request_api_key):
         try:
-            api_key = get_api_key()
+            api_key = request_api_key
+            if not BIZYAIR_SERVER_MODE:
+                api_key = get_api_key()
             if not api_key:
                 return None, errnos.INVALID_API_KEY
 
@@ -1170,9 +1172,11 @@ class APIClient:
             print(f"\033[31m[BizyAir]\033[0m Model API forwarding failed: {str(e)}")
             return None, errnos.MODEL_API_ERROR
 
-    async def forward_image_request(self, request_data):
+    async def forward_image_request(self, request_data, request_api_key):
         try:
-            api_key = get_api_key()
+            api_key = request_api_key
+            if not BIZYAIR_SERVER_MODE:
+                api_key = get_api_key()
             if not api_key:
                 return None, errnos.INVALID_API_KEY
             headers = {

bizyengine/bizy_server/server.py

@@ -739,6 +739,126 @@ class BizyAirServer:
                 err.data = {"error": valid[1], "node_errors": valid[3]}
                 return ErrResponse(err)
 
+        @self.prompt_server.routes.post(f"/{MODEL_API}/chat")
+        async def chat_completions(request):
+            request_api_key, err = _get_request_api_key(request.headers)
+            if err:
+                return ErrResponse(err)
+
+            response = None  # 确保变量在退出前定义
+            resp = None  # 响应对象引用
+            req_id = f"req-{id(request)}"  # 为请求生成唯一ID
+
+            try:
+                # 解析请求数据
+                request_data = await request.json()
+
+                # 转发请求到模型服务
+                with self.api_client.forward_model_request(
+                    request_data, request_api_key
+                ) as response:
+                    # 创建并准备流式响应
+                    resp = aiohttp.web.StreamResponse(
+                        status=200,
+                        reason="OK",
+                        headers={
+                            "Content-Type": "text/event-stream",
+                            "Cache-Control": "no-cache",
+                            "Connection": "keep-alive",
+                            "X-Accel-Buffering": "no",  # 禁用Nginx缓冲
+                        },
+                    )
+                    await resp.prepare(request)
+
+                    # 开始流式传输
+                    any_chunk_sent = False  # 跟踪是否发送了任何数据块
+                    try:
+                        for bytes in response.iter_bytes(1024):
+                            if bytes:
+                                await resp.write(bytes)
+                                any_chunk_sent = True
+                                await resp.drain()  # 确保数据被立即发送
+                    except Exception as e:
+                        print(
+                            f"\033[31m[聊天请求-{req_id}]\033[0m 流式传输错误: {str(e)}"
+                        )
+                        # 如果尚未发送任何数据块，尝试发送错误信息
+                        if not any_chunk_sent and not resp.prepared:
+                            return ErrResponse(errnos.MODEL_API_ERROR)
+                        elif not any_chunk_sent:
+                            try:
+                                error_msg = json.dumps(
+                                    {"error": f"流式传输错误: {str(e)}"}
+                                )
+                                await resp.write(
+                                    f"data: {error_msg}\n\n".encode("utf-8")
+                                )
+                                await resp.write(b"data: [DONE]\n\n")
+                            except Exception as write_err:
+                                print(
+                                    f"\033[31m[聊天请求-{req_id}]\033[0m 写入错误消息时出错: {str(write_err)}"
+                                )
+
+                    try:
+                        await resp.write_eof()
+                    except Exception as e:
+                        print(
+                            f"\033[31m[聊天请求-{req_id}]\033[0m 结束响应时出错: {str(e)}"
+                        )
+
+                    return resp
+
+            except openai.APIConnectionError as e:
+                print("The server could not be reached")
+                print(
+                    e.__cause__
+                )  # an underlying Exception, likely raised within httpx.
+            except openai.RateLimitError:
+                print("A 429 status code was received; we should back off a bit.")
+            except openai.APIStatusError as e:
+                print("Another non-200-range status code was received")
+                print(e.status_code)
+                print(e.response)
+            except Exception as e:
+                print(
+                    f"\033[31m[聊天请求-{req_id}]\033[0m 处理请求时发生错误: {str(e)}"
+                )
+                # 如果响应已经准备好，尝试发送错误信息
+                if resp and resp.prepared:
+                    try:
+                        error_msg = json.dumps({"error": f"服务器错误: {str(e)}"})
+                        await resp.write(f"data: {error_msg}\n\n".encode("utf-8"))
+                        await resp.write(b"data: [DONE]\n\n")
+                        await resp.write_eof()
+                    except:
+                        pass
+                    return resp
+
+                return ErrResponse(errnos.MODEL_API_ERROR)
+
+        @self.prompt_server.routes.post(f"/{MODEL_API}/images")
+        async def image_generations(request):
+            try:
+                request_api_key, err = _get_request_api_key(request.headers)
+                if err:
+                    return ErrResponse(err)
+
+                # 解析请求数据
+                request_data = await request.json()
+
+                # 转发图像生成请求
+                result, err = await self.api_client.forward_image_request(
+                    request_data, request_api_key
+                )
+                if err is not None:
+                    return ErrResponse(err)
+
+                # 返回结果
+                return OKResponse(result)
+
+            except Exception:
+                return ErrResponse(errnos.MODEL_API_ERROR)
+
         # 服务器模式独占
         if BIZYAIR_SERVER_MODE:
             return
@@ -1129,114 +1249,6 @@ class BizyAirServer:
 
             return OKResponse(resp)
 
-        @self.prompt_server.routes.post(f"/{MODEL_API}/chat")
-        async def chat_completions(request):
-            response = None  # 确保变量在退出前定义
-            resp = None  # 响应对象引用
-            req_id = f"req-{id(request)}"  # 为请求生成唯一ID
-
-            try:
-                # 解析请求数据
-                request_data = await request.json()
-
-                # 转发请求到模型服务
-                with self.api_client.forward_model_request(request_data) as response:
-                    # 创建并准备流式响应
-                    resp = aiohttp.web.StreamResponse(
-                        status=200,
-                        reason="OK",
-                        headers={
-                            "Content-Type": "text/event-stream",
-                            "Cache-Control": "no-cache",
-                            "Connection": "keep-alive",
-                            "X-Accel-Buffering": "no",  # 禁用Nginx缓冲
-                        },
-                    )
-                    await resp.prepare(request)
-
-                    # 开始流式传输
-                    any_chunk_sent = False  # 跟踪是否发送了任何数据块
-                    try:
-                        for bytes in response.iter_bytes(1024):
-                            if bytes:
-                                await resp.write(bytes)
-                                any_chunk_sent = True
-                                await resp.drain()  # 确保数据被立即发送
-                    except Exception as e:
-                        print(
-                            f"\033[31m[聊天请求-{req_id}]\033[0m 流式传输错误: {str(e)}"
-                        )
-                        # 如果尚未发送任何数据块，尝试发送错误信息
-                        if not any_chunk_sent and not resp.prepared:
-                            return ErrResponse(errnos.MODEL_API_ERROR)
-                        elif not any_chunk_sent:
-                            try:
-                                error_msg = json.dumps(
-                                    {"error": f"流式传输错误: {str(e)}"}
-                                )
-                                await resp.write(
-                                    f"data: {error_msg}\n\n".encode("utf-8")
-                                )
-                                await resp.write(b"data: [DONE]\n\n")
-                            except Exception as write_err:
-                                print(
-                                    f"\033[31m[聊天请求-{req_id}]\033[0m 写入错误消息时出错: {str(write_err)}"
-                                )
-
-                    try:
-                        await resp.write_eof()
-                    except Exception as e:
-                        print(
-                            f"\033[31m[聊天请求-{req_id}]\033[0m 结束响应时出错: {str(e)}"
-                        )
-
-                    return resp
-
-            except openai.APIConnectionError as e:
-                print("The server could not be reached")
-                print(
-                    e.__cause__
-                )  # an underlying Exception, likely raised within httpx.
-            except openai.RateLimitError:
-                print("A 429 status code was received; we should back off a bit.")
-            except openai.APIStatusError as e:
-                print("Another non-200-range status code was received")
-                print(e.status_code)
-                print(e.response)
-            except Exception as e:
-                print(
-                    f"\033[31m[聊天请求-{req_id}]\033[0m 处理请求时发生错误: {str(e)}"
-                )
-                # 如果响应已经准备好，尝试发送错误信息
-                if resp and resp.prepared:
-                    try:
-                        error_msg = json.dumps({"error": f"服务器错误: {str(e)}"})
-                        await resp.write(f"data: {error_msg}\n\n".encode("utf-8"))
-                        await resp.write(b"data: [DONE]\n\n")
-                        await resp.write_eof()
-                    except:
-                        pass
-                    return resp
-
-                return ErrResponse(errnos.MODEL_API_ERROR)
-
-        @self.prompt_server.routes.post(f"/{MODEL_API}/images")
-        async def image_generations(request):
-            try:
-                # 解析请求数据
-                request_data = await request.json()
-
-                # 转发图像生成请求
-                result, err = await self.api_client.forward_image_request(request_data)
-                if err is not None:
-                    return ErrResponse(err)
-
-                # 返回结果
-                return OKResponse(result)
-
-            except Exception:
-                return ErrResponse(errnos.MODEL_API_ERROR)
-
     async def send_json(self, event, data, sid=None):
         message = {"type": event, "data": data}
 

bizyengine/bizyair_extras/nodes_flux.py

@@ -38,6 +38,23 @@ class CLIPTextEncodeFlux(BizyAirBaseNode):
     #     return (new_clip,)
 
 
+class ReferenceLatent(BizyAirBaseNode):
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "conditioning": ("CONDITIONING",),
+            },
+            "optional": {
+                "latent": ("LATENT",),
+            },
+        }
+
+    RETURN_TYPES = ("CONDITIONING",)
+    CATEGORY = "advanced/conditioning/edit_models"
+    DESCRIPTION = "This node sets the guiding latent for an edit model. If the model supports it you can chain multiple to set multiple reference images."
+
+
 class FluxGuidance(BizyAirBaseNode):
     @classmethod
     def INPUT_TYPES(s):

bizyengine/core/configs/models.json

@@ -54,7 +54,8 @@
       "meijia_flux_lora_rank16_bf16.safetensors"
     ]
   },
-  "unet": ["shuttle-3.1-aesthetic.safetensors",{
+  "unet": ["shuttle-3.1-aesthetic.safetensors",
+    "flux1-dev-kontext_fp8_scaled.safetensors", {
     "kolors": [
       "Kolors-Inpainting.safetensors",
       "Kolors.safetensors"

bizyengine/core/configs/models.yaml

@@ -40,6 +40,16 @@ model_rules:
         inputs:
           unet_name:
             - ^flux/flux1-dev.sft$
+  - mode_type: unet
+    base_model: FLUX-kontext
+    describe: flux1-kontext
+    score: 3
+    route: /supernode/bizyair-comfyui-flux1-kontext-fp8
+    nodes:
+      - class_type: UNETLoader
+        inputs:
+          unet_name:
+            - ^flux1-dev-kontext_fp8_scaled.safetensors$
 
   - mode_type: unet
     base_model: FLUX

bizyengine/core/data_types.py

@@ -1,4 +1,7 @@
 # https://docs.comfy.org/essentials/custom_node_datatypes#model-datatypes
+from functools import singledispatch
+from typing import Any, Dict, List, Tuple, Union
+
 # Model datatypes
 MODEL = "BIZYAIR_MODEL"
 CLIP = "BIZYAIR_CLIP"
@@ -31,3 +34,24 @@ def is_model_datatype(datatype):
 # https://docs.comfy.org/essentials/custom_node_images_and_masks
 def is_send_request_datatype(datatype: str) -> bool:
     return datatype in {"IMAGE", "LATENT", "MASK", "STRING", "FLOAT", "INT"}
+
+
+@singledispatch
+def convert_to_custom_type(data: Any) -> Any:
+    return data
+
+
+@convert_to_custom_type.register(str)
+def _(data: str) -> Union[str, Any]:
+    return BIZYAIR_TYPE_MAP.get(data, data)
+
+
+@convert_to_custom_type.register(dict)
+def _(data: Dict) -> Dict:
+    return {k: convert_to_custom_type(v) for k, v in data.items()}
+
+
+@convert_to_custom_type.register(list)
+@convert_to_custom_type.register(tuple)
+def _(data: Union[List, Tuple]) -> Union[List, Tuple]:
+    return type(data)(convert_to_custom_type(item) for item in data)

bizyengine/core/nodes_base.py

@@ -10,7 +10,7 @@ from bizyengine.core.common.env_var import BIZYAIR_DEBUG, BIZYAIR_SERVER_MODE
 from bizyengine.core.configs.conf import config_manager
 
 from .common.client import get_api_key
-from .data_types import is_send_request_datatype
+from .data_types import convert_to_custom_type, is_send_request_datatype
 from .nodes_io import BizyAirNodeIO, create_node_data
 
 try:
@@ -134,6 +134,7 @@ def ensure_hidden_unique_id_and_prompt(org_input_types_func):
         nonlocal original_has_unique_id
 
         result = org_input_types_func()
+        result = convert_to_custom_type(result)
         if "hidden" not in result:
             result["hidden"] = {"unique_id": "UNIQUE_ID"}
         elif "unique_id" not in result["hidden"]:
@@ -156,6 +157,10 @@ class BizyAirBaseNode:
     def __init_subclass__(cls, **kwargs):
         if not cls.CATEGORY.startswith(f"{LOGO}{PREFIX}"):
             cls.CATEGORY = f"{LOGO}{PREFIX}/{cls.CATEGORY}"
+
+        if hasattr(cls, "RETURN_TYPES"):
+            setattr(cls, "RETURN_TYPES", convert_to_custom_type(cls.RETURN_TYPES))
+
         register_node(cls, PREFIX)
         cls.setup_input_types()
 

bizyengine/version.txt

@@ -1 +1 @@
-1.2.26
+1.2.28

{bizyengine-1.2.26.dist-info → bizyengine-1.2.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizyengine
-Version: 1.2.26
+Version: 1.2.28
 Summary: [a/BizyAir](https://github.com/siliconflow/BizyAir) Comfy Nodes that can run in any environment.
 Author-email: SiliconFlow <yaochi@siliconflow.cn>
 Project-URL: Repository, https://github.com/siliconflow/BizyAir

{bizyengine-1.2.26.dist-info → bizyengine-1.2.28.dist-info}/RECORD

@@ -1,13 +1,13 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=XmSQdL2rcd2Ni6nWmucswtJ_1MSf4wAxT_j0jRYjkdU,7
+bizyengine/version.txt,sha256=5L1cydx4tADQd48y4rHkNWBcq8rAyN4XJZ3nQNbzL1Q,6
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
-bizyengine/bizy_server/api_client.py,sha256=qY1hQ11AeDf5m647qrYvn3YPBzP6Yaw8n2Z9hTk5Wtg,43624
+bizyengine/bizy_server/api_client.py,sha256=t6cwob7hs993oy5WdFcjKtIzfi3S_eUhODdDVv_Hedo,43822
 bizyengine/bizy_server/errno.py,sha256=Q-U96XnZQCuPH_44Om8wnc2-Kh7qFqwLKtox27msU54,16095
 bizyengine/bizy_server/error_handler.py,sha256=MGrfO1AEqbfEgMWPL8B6Ypew_zHiQAdYGlhN9bZohrY,167
 bizyengine/bizy_server/execution.py,sha256=ayaEf6eGJKQsVZV-1_UlGlvwwmlH7FEek31Uq-MbUjA,1644
 bizyengine/bizy_server/profile.py,sha256=f4juAzJ73gCm0AhagYpt9WnG8HEI6xze_U96-omBLqU,3044
 bizyengine/bizy_server/resp.py,sha256=iOFT5Ud7VJBP2uqkojJIgc3y2ifMjjEXoj0ewneL9lc,710
-bizyengine/bizy_server/server.py,sha256=XWGO8gdTtIgwTO_WQNEYOumBVVN4SUYqohKmKmwFe0o,53130
+bizyengine/bizy_server/server.py,sha256=9zCDdtK-0FwA6VYCBhrur99WQs2geNvA2jlfncMnSj0,53520
 bizyengine/bizy_server/stream_response.py,sha256=H2XHqlVRtQMhgdztAuG7l8-iV_Pm42u2x6WJ0gNVIW0,9654
 bizyengine/bizy_server/utils.py,sha256=CIoRrCy8Wv4D9FDdr_QtNP03AjWw8M6GSm2QcrVJl6Y,3739
 bizyengine/bizyair_extras/__init__.py,sha256=EjyLEdLpPm5I4Z25YmnoK4PYQDmsEyXtCXQt9UDGmi0,1009
@@ -21,7 +21,7 @@ bizyengine/bizyair_extras/nodes_controlnet.py,sha256=79eM_Q-5iddWamIQo5T47HPchqQ
 bizyengine/bizyair_extras/nodes_custom_sampler.py,sha256=NK-7sdcp8oxJisjTEFfBskknQJF5I1fRwQkJbG3dKfc,3457
 bizyengine/bizyair_extras/nodes_dataset.py,sha256=htF0YZb_FHncLhLDEbJfNCVqJ6rvlo1ZLk7iY42Rylc,3440
 bizyengine/bizyair_extras/nodes_differential_diffusion.py,sha256=nSrbD-w0XtrwktwzME5M0Vmi1sI7Z08AqwgymTdThqo,370
-bizyengine/bizyair_extras/nodes_flux.py,sha256=jdi8KM_s8a_2mEksHyM1StHVW0Odm0d3JXNOztOOrxA,2157
+bizyengine/bizyair_extras/nodes_flux.py,sha256=ls94kGBuBNgW5c6uhG36iZLk1TTM2TIoTTcpERgEE5E,2683
 bizyengine/bizyair_extras/nodes_hunyuan3d.py,sha256=dWHLeqX68N7zKnfDMzm9nutmCNtFT6-wwt7P5cPDu7Q,2058
 bizyengine/bizyair_extras/nodes_image_utils.py,sha256=BldF_CKD2M01K8-SnG-QV86u3HZqFz_GP5GrCQ5CFDQ,2875
 bizyengine/bizyair_extras/nodes_ip2p.py,sha256=GSEFJvrs4f2tv0xwYkWqc8uhsXrzAJVPvvwcw0gTjR0,619
@@ -44,9 +44,9 @@ bizyengine/bizyair_extras/nodes_ipadapter_plus/nodes_ipadapter_plus.py,sha256=lO
 bizyengine/bizyair_extras/nodes_kolors_mz/__init__.py,sha256=HsCCCphW8q0SrWEiFlZKK_W2lQr1T0UJIJL7gEn37ME,3729
 bizyengine/bizyair_extras/oauth_callback/main.py,sha256=KQOZWor3kyNx8xvUNHYNMoHfCF9g_ht13_iPk4K_5YM,3633
 bizyengine/core/__init__.py,sha256=EV9ZtTwOHC0S_eNvCu-tltIydfxfMsH59LbgVX4e_1c,359
-bizyengine/core/data_types.py,sha256=U1Ai149lvbVA-z59sfgniES9KSsyFIbDs_vcjpjlUK4,967
+bizyengine/core/data_types.py,sha256=2f7QqqZvhKmXw3kZV1AvXuPTda34b4wXQE9tyO8nUSM,1595
 bizyengine/core/image_utils.py,sha256=--DmQb3R9Ev21MfZG9rfgOGsU2zRywJ-hpiNNN0N8p8,8586
-bizyengine/core/nodes_base.py,sha256=n54RfLRnCb3lNd2euYj-IVQWlf7_CkVr33bzpPmVyEU,8821
+bizyengine/core/nodes_base.py,sha256=h2f_FWTWj6lpdKjwHRuOmoRifqwkV59ovM2ZxPK4h9c,9019
 bizyengine/core/nodes_io.py,sha256=VhwRwYkGp0g3Mh0hx1OSwNZbV06NEV13w2aODSiAm5M,2832
 bizyengine/core/commands/__init__.py,sha256=82yRdMT23RTiZPkFW_G3fVa-fj3-TUAXnj6cnGA3xRA,22
 bizyengine/core/commands/base.py,sha256=TYH9lhr033B2roBLPkWkxcvoz_fW3cdzx_bvP_FI7dg,635
@@ -61,8 +61,8 @@ bizyengine/core/common/client.py,sha256=1Ka8DIjbmD9Gme9c_Q1zwXXueSCP3_OSdEDyGYEo
 bizyengine/core/common/env_var.py,sha256=1EAW3gOXY2bKouCqrGa583vTJRdDasQ1IsFTnzDg7Dk,3450
 bizyengine/core/common/utils.py,sha256=bm-XmSPy83AyjD0v5EfWp6jiO6_5p7rkZ_HQAuVmgmo,3086
 bizyengine/core/configs/conf.py,sha256=D_UWG9SSJnK5EhbrfNFryJQ8hUwwdvhOGlq1TielwpI,3830
-bizyengine/core/configs/models.json,sha256=jCrqQgjVeHugLb191Xay5rg0m3duTVISPp_GxVGQ3HA,2656
-bizyengine/core/configs/models.yaml,sha256=x8TOo-VHMKtrxfWO5_OUtFg6wNqxFQbf_eOWWfRBjAk,9082
+bizyengine/core/configs/models.json,sha256=vQH4xVvybUYuoSWoT8kHLVBapB-ItVzsd0HFjSb56Hc,2705
+bizyengine/core/configs/models.yaml,sha256=i7Om9jajsysqLQxrVt_8D2NbryyaVwhoQXdse7Sf9Ss,9364
 bizyengine/core/path_utils/__init__.py,sha256=JVpqNHgaKiEtTI8_r47af8GtWHxrtOockQ6Qpzp9_MQ,260
 bizyengine/core/path_utils/path_manager.py,sha256=tRVAcpsYvfWD-tK7khLvNCZayB0wpU9L0tRTH4ZESzM,10549
 bizyengine/core/path_utils/utils.py,sha256=kQfPQjGU27qF9iyzRxLSRg5cMsd-VixuCUldART7cgY,2394
@@ -77,7 +77,7 @@ bizyengine/misc/route_sam.py,sha256=-bMIR2QalfnszipGxSxvDAHGJa5gPSrjkYPb5baaRg4,
 bizyengine/misc/segment_anything.py,sha256=wNKYwlYPMszfwj23524geFZJjZaG4eye65SGaUnh77I,8941
 bizyengine/misc/supernode.py,sha256=STN9gaxfTSErH8OiHeZa47d8z-G9S0I7fXuJvHQOBFM,4532
 bizyengine/misc/utils.py,sha256=deQjBgLAkxIr-NaOMm77TcgBT3ExAp0MFm5ehUJ3CGs,6829
-bizyengine-1.2.26.dist-info/METADATA,sha256=MFyKRe1Yh8HQLoRl2UB3Ass0xyMfd27yUsGx0Yqphmc,675
-bizyengine-1.2.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.26.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.26.dist-info/RECORD,,
+bizyengine-1.2.28.dist-info/METADATA,sha256=cmzaHXGfelwLTQvVs-T9dETqQ8N5Ji-Z034Bqwe7WAA,675
+bizyengine-1.2.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.28.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.28.dist-info/RECORD,,