bizyengine 1.2.29__py3-none-any.whl → 1.2.31__py3-none-any.whl

bizyengine/bizy_server/server.py

@@ -3,6 +3,7 @@ import configparser
 import json
 import logging
 import os
+import random
 import shutil
 import threading
 import time
@@ -14,7 +15,8 @@ import execution
 import openai
 from server import PromptServer
 
-from bizyengine.core.common.env_var import BIZYAIR_SERVER_MODE
+from bizyengine.core.common.env_var import BIZYAIR_SERVER_ADDRESS, BIZYAIR_SERVER_MODE
+from bizyengine.core.configs.conf import ModelRule, config_manager
 
 from .api_client import APIClient
 from .errno import ErrorNo, errnos
@@ -47,6 +49,16 @@ def _get_request_api_key(request_headers):
     return None, None
 
 
+def _get_api_key_from_cookie(cookie_str):
+    if not cookie_str:
+        return None
+    cookies = cookie_str.split("; ")
+    for cookie in cookies:
+        if cookie.startswith("apiKey="):
+            return cookie[7:]
+    return None
+
+
 class BizyAirServer:
     def __init__(self):
         BizyAirServer.instance = self
@@ -858,6 +870,60 @@ class BizyAirServer:
 
                 return ErrResponse(errnos.MODEL_API_ERROR)
 
+        @self.prompt_server.routes.post(f"/{MODEL_API}/image-edit")
+        async def image_edit(request):
+            try:
+                request_api_key, err = _get_request_api_key(request.headers)
+                if err:
+                    return ErrResponse(err)
+                auth_header = request.headers.get("Authorization", "")
+                cookie_str = request.headers.get("Cookie", "")
+                cookie_api_key = _get_api_key_from_cookie(cookie_str)
+                request_data = await request.json()
+                target_url = f"{BIZYAIR_SERVER_ADDRESS}{config_manager.get_rules('comfyagent-flux1-kontext')[0].route}"
+                forward_payload = {
+                    "prompt": request_data.get("prompt", "请编辑这张图片"),
+                    "image": request_data.get("image", ""),
+                    "seed": request_data.get("seed", random.randint(1, 9999999999)),
+                    "num_inference_steps": request_data.get("num_inference_steps", 20),
+                    "guidance_scale": request_data.get("guidance_scale", 2.5),
+                }
+                async with aiohttp.ClientSession() as session:
+                    headers = {
+                        "Content-Type": "application/json",
+                        "User-Agent": "BizyAir Server",
+                        "x-bizyair-client-version": "1.2.21",
+                    }
+                    if request_api_key:
+                        headers["Authorization"] = f"Bearer {request_api_key}"
+                    elif cookie_api_key:
+                        headers["Authorization"] = f"Bearer {cookie_api_key}"
+                    elif auth_header:
+                        if not auth_header.startswith("Bearer "):
+                            headers["Authorization"] = f"Bearer {auth_header}"
+                        else:
+                            headers["Authorization"] = auth_header
+                    else:
+                        from bizyengine.core.common.env_var import load_api_key
+
+                        has_key, file_api_key = load_api_key()
+                        if has_key and file_api_key:
+                            headers["Authorization"] = f"Bearer {file_api_key}"
+                            logging.debug("Using API key from api_key.ini file")
+                    async with session.post(
+                        target_url, headers=headers, json=forward_payload, timeout=120
+                    ) as response:
+                        response_data = await response.json()
+                        logging.debug(response_data)
+
+                        if response.status == 200:
+                            return OKResponse(response_data)
+                        else:
+                            return ErrResponse(errnos.MODEL_API_ERROR)
+
+            except Exception:
+                return ErrResponse(errnos.MODEL_API_ERROR)
+
         @self.prompt_server.routes.post(f"/{MODEL_API}/images")
         async def image_generations(request):
             try:

bizyengine/bizyair_extras/nodes_nunchaku.py

@@ -11,7 +11,11 @@ class NunchakuFluxDiTLoader(BizyAirBaseNode):
         return {
             "required": {
                 "model_path": (
-                    ["svdq-int4-flux.1-dev", "svdq-int4-flux.1-fill-dev"],
+                    [
+                        "svdq-int4-flux.1-dev",
+                        "svdq-int4-flux.1-fill-dev",
+                        "svdq-int4_r32-flux.1-kontext-dev.safetensors",
+                    ],
                     {"tooltip": "The SVDQuant quantized FLUX.1 models."},
                 ),
                 "cache_threshold": (

bizyengine/core/commands/processors/prompt_processor.py

@@ -1,5 +1,7 @@
 import json
+import time
 from collections import deque
+from pathlib import Path
 from typing import Any, Dict, List
 
 from bizyengine.core.commands.base import Processor  # type: ignore
@@ -109,17 +111,28 @@ class PromptProcessor(Processor):
         last_node_ids: List[str],
         **kwargs,
     ):
-        dict = {
+        request_data = {
             "prompt": prompt,
             "last_node_id": last_node_ids[0],
             "exec_info": self._exec_info(prompt, kwargs["api_key"]),
         }
         if "prompt_id" in kwargs:
-            dict["prompt_id"] = kwargs["prompt_id"]
-
+            request_data["prompt_id"] = kwargs["prompt_id"]
+
+        if BIZYAIR_DEBUG:
+            save_dir = Path("runs") / "request_bodies"
+            save_dir.mkdir(parents=True, exist_ok=True)
+            timestamp = time.strftime("%Y%m%d_%H%M%S")
+            prompt_id = request_data.get("prompt_id", "no_prompt_id")
+            file_path = save_dir / f"request_{timestamp}_{prompt_id}.json"
+            file_path.write_text(
+                json.dumps(request_data, indent=2, ensure_ascii=False), encoding="utf-8"
+            )
+
+        json_payload = json.dumps(request_data).encode("utf-8")
         return client.send_request(
             url=url,
-            data=json.dumps(dict).encode("utf-8"),
+            data=json_payload,
             headers=client.headers(api_key=kwargs["api_key"]),
         )
 

bizyengine/core/configs/models.yaml

@@ -62,6 +62,25 @@ model_rules:
           unet_name:
             - ^flux1-dev-kontext-onediff.safetensors$
 
+  - mode_type: unet
+    base_model: FLUX-kontext
+    describe: flux1-kontext
+    score: 3
+    route: /supernode/bizyair-comfyui-flux1-kontext-svdq
+    nodes:
+      - class_type: NunchakuFluxDiTLoader
+        inputs:
+          model_path:
+            - ^svdq-int4_r32-flux.1-kontext-dev.safetensors$
+
+  - mode_type: unet
+    base_model: FLUX-kontext
+    describe: flux1-kontext for bizybot only
+    score: 0
+    route: /supernode/comfyagent-flux1-kontext
+    nodes:
+      - class_type: comfyagent-flux1-kontext
+
   - mode_type: unet
     base_model: FLUX
     describe: flux1-schnell
@@ -94,6 +113,7 @@ model_rules:
         inputs:
           model_path:
             - ^svdq-int4-flux.1-fill-dev$
+
   - mode_type: unet
     base_model: FLUX
     describe: NunchakuPulidLoader

bizyengine/version.txt

@@ -1 +1 @@
-1.2.29
+1.2.31

{bizyengine-1.2.29.dist-info → bizyengine-1.2.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizyengine
-Version: 1.2.29
+Version: 1.2.31
 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.29.dist-info → bizyengine-1.2.31.dist-info}/RECORD

@@ -1,5 +1,5 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=8UbXkWb3cQmVLROEmDOpmLGeuURRw6434TkE3B5WEfI,6
+bizyengine/version.txt,sha256=8k_K6cZwraSxzwRljwaYEJU4CJ6aEZ_N8-tcuJ9lNi8,6
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
 bizyengine/bizy_server/api_client.py,sha256=t6cwob7hs993oy5WdFcjKtIzfi3S_eUhODdDVv_Hedo,43822
 bizyengine/bizy_server/errno.py,sha256=Q-U96XnZQCuPH_44Om8wnc2-Kh7qFqwLKtox27msU54,16095
@@ -7,7 +7,7 @@ bizyengine/bizy_server/error_handler.py,sha256=MGrfO1AEqbfEgMWPL8B6Ypew_zHiQAdYG
 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=bPJaLX8AoHPq4u-q5nuwf58jezXNQdsHO_wUibi10Ik,54594
+bizyengine/bizy_server/server.py,sha256=Eyg1wqyvr7n2kQGLIKvPKyhUIPoG92refahTQjkTweo,57815
 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
@@ -27,7 +27,7 @@ bizyengine/bizyair_extras/nodes_image_utils.py,sha256=BldF_CKD2M01K8-SnG-QV86u3H
 bizyengine/bizyair_extras/nodes_ip2p.py,sha256=GSEFJvrs4f2tv0xwYkWqc8uhsXrzAJVPvvwcw0gTjR0,619
 bizyengine/bizyair_extras/nodes_janus_pro.py,sha256=hAdMsS09RkRHZn9cNwpmyOaH7ODOMjVt9SbBsD-UvbM,2665
 bizyengine/bizyair_extras/nodes_model_advanced.py,sha256=RR2pzvlNW7NEcgtRcQSLZ8Vy7_ygA0NOZDjd7ZfzX5k,1756
-bizyengine/bizyair_extras/nodes_nunchaku.py,sha256=ERxDOQAV-ejgbeRMOCIaPBiSfNpP4G2jmdMNbO-U6hI,8079
+bizyengine/bizyair_extras/nodes_nunchaku.py,sha256=E0E8f9LmEzfn4a_LdWIUBatV9n-8RFLSYlPb90SKKxs,8222
 bizyengine/bizyair_extras/nodes_sd3.py,sha256=lZCxj0IFmuxk1fZTDcRKgVV5QWHjkUdpR4w9-DZbMf4,1727
 bizyengine/bizyair_extras/nodes_segment_anything.py,sha256=x1ei2UggHnB8T6aUtK_ZcUehMALEyLUnDoD5SNJCbFU,7249
 bizyengine/bizyair_extras/nodes_segment_anything_utils.py,sha256=ZefAqrFrevDH3XY_wipr_VwKfeXrgpZEUFaqg_JGOdU,4714
@@ -52,7 +52,7 @@ bizyengine/core/commands/__init__.py,sha256=82yRdMT23RTiZPkFW_G3fVa-fj3-TUAXnj6c
 bizyengine/core/commands/base.py,sha256=TYH9lhr033B2roBLPkWkxcvoz_fW3cdzx_bvP_FI7dg,635
 bizyengine/core/commands/invoker.py,sha256=8wcIMd8k44o96LAvxFrIiKOlVtf1MW-AcMDXsZkb5Qc,215
 bizyengine/core/commands/processors/model_hosting_processor.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bizyengine/core/commands/processors/prompt_processor.py,sha256=RpNFzlFwpf_PsgmKpIcuqg9eTOm-EB_sNsyfyRDBaho,4391
+bizyengine/core/commands/processors/prompt_processor.py,sha256=jG0EuphvtycH5Dm-frBGtlIcxkTCXiFMQ1vFMvi_Re0,4963
 bizyengine/core/commands/servers/model_server.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bizyengine/core/commands/servers/prompt_server.py,sha256=f5qTTyoe7_cFJ8xESG--mvP2axATKUgHyTBeV6JrBCI,8529
 bizyengine/core/common/__init__.py,sha256=GicZw6YeAZk1PsKmFDt9dm1F75zPUlpia9Q_ki5vW1Y,179
@@ -62,7 +62,7 @@ bizyengine/core/common/env_var.py,sha256=1EAW3gOXY2bKouCqrGa583vTJRdDasQ1IsFTnzD
 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=NqYVmp-ICpr1vFgafWjJMu5dyuRt9ffVUJmov3_-xRY,2746
-bizyengine/core/configs/models.yaml,sha256=ZsHC2vBS8jfhwgT7NId2G7Hf_iJX3Az7ykbPN3h-1EQ,9648
+bizyengine/core/configs/models.yaml,sha256=vK8knwfQm9RS4y5NXrDp2tt76-x08gFHxy7cnC7wA5w,10160
 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.29.dist-info/METADATA,sha256=7ephykrOGACrIgVCPXBXRq1SqHhkGJ7r-HmB7geWUT0,675
-bizyengine-1.2.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.29.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.29.dist-info/RECORD,,
+bizyengine-1.2.31.dist-info/METADATA,sha256=kEzb7uTkB3vTTZy6LuqXXuRsg4YI3SCg7SE-lsdjNh8,675
+bizyengine-1.2.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.31.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.31.dist-info/RECORD,,