bizyengine 1.1.2__py3-none-any.whl → 1.2.1__py3-none-any.whl

bizyengine/bizy_server/server.py

@@ -1,6 +1,8 @@
 import asyncio
-import json
+import configparser
 import logging
+import os
+import shutil
 import threading
 import time
 import urllib.parse
@@ -12,6 +14,7 @@ from server import PromptServer
 from .api_client import APIClient
 from .errno import ErrorNo, errnos
 from .error_handler import ErrorHandler
+from .profile import user_profile
 from .resp import ErrResponse, OKResponse
 from .utils import base_model_types, check_str_param, check_type, is_string_valid, types
 
@@ -19,6 +22,7 @@ API_PREFIX = "bizyair"
 COMMUNITY_API = f"{API_PREFIX}/community"
 MODEL_HOST_API = f"{API_PREFIX}/modelhost"
 USER_API = f"{API_PREFIX}/user"
+INVOICE_API = f"{API_PREFIX}/invoices"
 
 logging.basicConfig(level=logging.DEBUG)
 
@@ -764,6 +768,195 @@ class BizyAirServer:
                 return ErrResponse(err)
             return OKResponse(resp)
 
+        @self.prompt_server.routes.get(f"/{USER_API}/wallet")
+        async def get_wallet(request):
+            # 获取用户钱包信息
+            resp, err = await self.api_client.get_wallet()
+            if err:
+                return ErrResponse(err)
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.get(f"/{USER_API}/coins")
+        async def query_coins(request):
+            # 获取用户金币记录
+            current = int(request.rel_url.query.get("current", "1"))
+            page_size = int(request.rel_url.query.get("page_size", "10"))
+            coin_type = int(request.rel_url.query.get("coin_type", "0"))
+            expire_days = int(request.rel_url.query.get("expire_days", "0"))
+
+            resp, err = await self.api_client.query_coins(
+                current, page_size, coin_type, expire_days
+            )
+            if err:
+                return ErrResponse(err)
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.get(f"/{USER_API}/metadata")
+        async def get_user_metadata(request):
+            # 获取用户元数据
+            resp, err = await self.api_client.get_user_metadata()
+            if err:
+                return ErrResponse(err)
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.put(f"/{USER_API}/metadata")
+        async def update_user_info(request):
+            # 更新用户信息
+            json_data = await request.json()
+            name = json_data.get("name")
+            avatar = json_data.get("avatar")
+            introduction = json_data.get("introduction")
+
+            resp, err = await self.api_client.update_user_info(
+                name, avatar, introduction
+            )
+            if err:
+                return ErrResponse(err)
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.post(f"/{USER_API}/real_name")
+        async def user_real_name(request):
+            # 实名认证
+            resp, err = await self.api_client.user_real_name()
+            if err:
+                return ErrResponse(err)
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.get(f"/{USER_API}/language")
+        async def get_user_profile(request):
+            return OKResponse(user_profile.getLang())
+
+        @self.prompt_server.routes.get(f"/{USER_API}/profile")
+        async def get_user_profile(request):
+            return OKResponse(user_profile.getAll())
+
+        @self.prompt_server.routes.put(f"/{USER_API}/profile")
+        async def update_user_profile(request):
+            # 更新用户本地配置
+            json_data = await request.json()
+
+            err = user_profile.update_profile(json_data)
+            if err is not None:
+                return ErrResponse(err)
+            return OKResponse({})
+
+        @self.prompt_server.routes.get(f"/{USER_API}/products")
+        async def list_products(request):
+            # 获取产品列表
+            resp, err = await self.api_client.list_products()
+            if err:
+                return ErrResponse(err)
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.get(f"/{USER_API}/pay/page")
+        async def list_pay_orders(request):
+            # 获取订单列表
+            current = int(request.rel_url.query.get("current", "1"))
+            page_size = int(request.rel_url.query.get("page_size", "10"))
+            status = request.rel_url.query.get("status", None)
+            resp, err = await self.api_client.list_pay_orders(
+                current, page_size, status
+            )
+            if err:
+                return ErrResponse(err)
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.post(f"/{USER_API}/buy")
+        async def buy_product(request):
+            # 购买商品
+            json_data = await request.json()
+
+            if "product_id" not in json_data:
+                return ErrResponse(errnos.INVALID_PRODUCT_ID)
+            product_id = json_data.get("product_id")
+
+            if "platform" not in json_data:
+                return ErrResponse(errnos.INVALID_PAY_PLATFORM)
+            platform = json_data.get("platform")
+
+            resp, err = await self.api_client.buy_product(product_id, platform)
+            if err:
+                return ErrResponse(err)
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.get(f"/{USER_API}/pay/orders")
+        async def list_pay_orders(request):
+            # 获取支付订单状态
+            order_no = request.rel_url.query.get("order_no", None)
+            if order_no == None:
+                return ErrResponse(errnos.INVALID_ORDER_NO)
+            resp, err = await self.api_client.get_pay_status(order_no)
+            if err:
+                return ErrResponse(err)
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.delete(f"/{USER_API}/pay/orders")
+        async def cancel_pay_order(request):
+            # 取消支付订单
+            json_data = await request.json()
+            if "order_no" not in json_data:
+                return ErrResponse(errnos.INVALID_ORDER_NO)
+            order_no = json_data.get("order_no")
+            resp, err = await self.api_client.cancel_pay_order(order_no)
+            if err:
+                return ErrResponse(err)
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.get(f"/{INVOICE_API}/year_cost")
+        async def get_year_cost(request):
+            year = request.rel_url.query.get("year", "")
+            api_key = request.rel_url.query.get("api_key", "")
+
+            if not year:
+                return ErrResponse(errnos.INVALID_YEAR_PARAM)
+
+            resp, err = await self.api_client.get_year_cost(year=year, api_key=api_key)
+            if err is not None:
+                return ErrResponse(err)
+
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.get(f"/{INVOICE_API}/month_cost")
+        async def get_month_cost(request):
+            month = request.rel_url.query.get("month", "")
+            api_key = request.rel_url.query.get("api_key", "")
+
+            if not month:
+                return ErrResponse(errnos.INVALID_MONTH_PARAM)
+
+            resp, err = await self.api_client.get_month_cost(
+                month=month, api_key=api_key
+            )
+            if err is not None:
+                return ErrResponse(err)
+
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.get(f"/{INVOICE_API}/day_cost")
+        async def get_day_cost(request):
+            day = request.rel_url.query.get("day", "")
+            api_key = request.rel_url.query.get("api_key", "")
+
+            if not day:
+                return ErrResponse(errnos.INVALID_DAY_PARAM)
+
+            resp, err = await self.api_client.get_day_cost(day=day, api_key=api_key)
+            if err is not None:
+                return ErrResponse(err)
+
+            return OKResponse(resp)
+
+        @self.prompt_server.routes.get(f"/{INVOICE_API}/recent_cost")
+        async def get_recent_cost(request):
+
+            api_key = request.rel_url.query.get("api_key", "")
+
+            resp, err = await self.api_client.get_recent_cost(api_key=api_key)
+            if err is not None:
+                return ErrResponse(err)
+
+            return OKResponse(resp)
+
     async def send_json(self, event, data, sid=None):
         message = {"type": event, "data": data}
 

bizyengine/bizy_server/utils.py

@@ -7,6 +7,15 @@ from .resp import ErrResponse
 TYPE_OPTIONS = {
     "LoRA": "LoRA",
     "Controlnet": "Controlnet",
+    "Checkpoint": "Checkpoint",
+    # "Clip": "Clip",
+    # "Ipadapter": "Ipadapter",
+    # "Unet": "Unet",
+    # "Vae": "Vae",
+    # "Upscale_models": "Upscale_models",
+    # "Instantid": "Instantid",
+    # "Pulid": "Pulid",
+    # "Style_models": "Style_models",
 }
 
 BASE_MODEL_TYPE_OPTIONS = {
@@ -17,6 +26,8 @@ BASE_MODEL_TYPE_OPTIONS = {
     "Pony": "Pony",
     "Kolors": "Kolors",
     "Hunyuan 1": "Hunyuan 1",
+    "Hunyuan Video": "Hunyuan Video",
+    "Wan Video": "Wan Video",
     "Other": "Other",
 }
 

bizyengine/bizyair_extras/nodes_comfyui_instantid.py

@@ -8,6 +8,17 @@ class InstantIDModelLoader(BizyAirBaseNode):
         return {
             "required": {
                 "instantid_file": (folder_paths.get_filename_list("instantid"),)
+                # "instantid_file": (
+                #     [
+                #         "to choose",
+                #     ],
+                # ),
+                # "model_version_id": (
+                #     "STRING",
+                #     {
+                #         "default": "",
+                #     },
+                # ),
             }
         }
 

bizyengine/bizyair_extras/nodes_comfyui_pulid_flux.py

@@ -11,6 +11,21 @@ class PulidFluxModelLoader(BizyAirBaseNode):
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {"pulid_file": (folder_paths.get_filename_list("pulid"),)}}
+        # return {
+        #     "required": {
+        #         "pulid_file": (
+        #             [
+        #                 "to choose",
+        #             ],
+        #         ),
+        #         "model_version_id": (
+        #             "STRING",
+        #             {
+        #                 "default": "",
+        #             },
+        #         ),
+        #     }
+        # }
 
     RETURN_TYPES = (PULIDFLUX,)
     RETURN_NAMES = ("pulid_flux",)

bizyengine/bizyair_extras/nodes_ipadapter_plus/nodes_ipadapter_plus.py

@@ -4,6 +4,7 @@ import os
 import folder_paths
 import torch
 from bizyengine.core import BizyAirBaseNode, BizyAirNodeIO, create_node_data
+from bizyengine.core.configs.conf import config_manager
 from bizyengine.core.data_types import CLIP, CONDITIONING, MODEL
 
 # set the models directory
@@ -160,6 +161,19 @@ class IPAdapterModelLoader(BizyAirBaseNode):
     def INPUT_TYPES(s):
         return {
             "required": {"ipadapter_file": (["kolors/ip_adapter_plus_general.bin"],)}
+            # "required": {
+            #     "ipadapter_file": (
+            #         [
+            #             "to choose",
+            #         ],
+            #     ),
+            #     "model_version_id": (
+            #         "STRING",
+            #         {
+            #             "default": "",
+            #         },
+            #     ),
+            # }
         }
 
     RETURN_TYPES = ("IPADAPTER",)
@@ -174,6 +188,31 @@ class IPAdapterModelLoader(BizyAirBaseNode):
         )
         return (BizyAirNodeIO(self.assigned_id, nodes={self.assigned_id: node_data}),)
 
+    # @classmethod
+    # def VALIDATE_INPUTS(cls, ipadapter_file):
+    #     # TODO
+    #     import warnings
+
+    #     warnings.warn(message=f"TODO fix {cls}VALIDATE_INPUTS")
+    #     if ipadapter_file == "" or ipadapter_file is None:
+    #         return False
+    #     return True
+
+    # def load_ipadapter_model(self, **kwargs):
+    #     model_version_id = kwargs.get("model_version_id", "")
+    #     if model_version_id != "":
+    #         # use model version id as lora name
+    #         ipadapter_file = (
+    #             f"{config_manager.get_model_version_id_prefix()}{model_version_id}"
+    #         )
+    #         kwargs["ipadapter_file"] = ipadapter_file
+    #     node_data = create_node_data(
+    #         class_type="IPAdapterModelLoader",
+    #         inputs=kwargs,
+    #         outputs={"slot_index": 0},
+    #     )
+    #     return (BizyAirNodeIO(self.assigned_id, nodes={self.assigned_id: node_data}),)
+
 
 # class IPAdapterInsightFaceLoader:
 #     @classmethod

bizyengine/bizyair_extras/nodes_kolors_mz/__init__.py

@@ -2,6 +2,7 @@ import os
 
 from bizyengine.core import BizyAirBaseNode, BizyAirNodeIO, create_node_data
 from bizyengine.core import path_utils as folder_paths
+from bizyengine.core.configs.conf import config_manager
 from bizyengine.core.data_types import CLIP, CONDITIONING, CONTROL_NET, MODEL
 
 AUTHOR_NAME = "MinusZone"
@@ -14,6 +15,17 @@ class MZ_KolorsUNETLoaderV2(BizyAirBaseNode):
         return {
             "required": {
                 "unet_name": (folder_paths.get_filename_list("unet"),),
+                # "unet_name": (
+                #     [
+                #         "to choose",
+                #     ],
+                # ),
+                # "model_version_id": (
+                #     "STRING",
+                #     {
+                #         "default": "",
+                #     },
+                # ),
             }
         }
 
@@ -26,7 +38,6 @@ class MZ_KolorsUNETLoaderV2(BizyAirBaseNode):
     NODE_DISPLAY_NAME = f"{AUTHOR_NAME} - KolorsUNETLoaderV2"
 
     def load_unet(self, **kwargs):
-
         node_data = create_node_data(
             class_type="MZ_KolorsUNETLoaderV2",
             inputs=kwargs,
@@ -38,6 +49,35 @@ class MZ_KolorsUNETLoaderV2(BizyAirBaseNode):
         )
         return (out,)
 
+    # @classmethod
+    # def VALIDATE_INPUTS(cls, unet_name):
+    #     # TODO
+    #     import warnings
+
+    #     warnings.warn(message=f"TODO fix {cls}VALIDATE_INPUTS")
+    #     if unet_name == "" or unet_name is None:
+    #         return False
+    #     return True
+
+    # def load_unet(self, **kwargs):
+    #     model_version_id = kwargs.get("model_version_id", "")
+    #     if model_version_id != "":
+    #         # use model version id as lora name
+    #         unet_name = (
+    #             f"{config_manager.get_model_version_id_prefix()}{model_version_id}"
+    #         )
+    #         kwargs["unet_name"] = unet_name
+    #     node_data = create_node_data(
+    #         class_type="MZ_KolorsUNETLoaderV2",
+    #         inputs=kwargs,
+    #         outputs={"slot_index": 0},
+    #     )
+    #     config_file = folder_paths.guess_config(unet_name=kwargs["unet_name"])
+    #     out = BizyAirNodeIO(
+    #         self.assigned_id, {self.assigned_id: node_data}, config_file=config_file
+    #     )
+    #     return (out,)
+
 
 WEIGHT_TYPES = [
     "linear",

bizyengine/bizyair_extras/nodes_upscale_model.py

@@ -9,6 +9,17 @@ class UpscaleModelLoader(BizyAirBaseNode):
         return {
             "required": {
                 "model_name": (folder_paths.get_filename_list("upscale_models"),),
+                # "model_name": (
+                #     [
+                #         "to choose",
+                #     ],
+                # ),
+                # "model_version_id": (
+                #     "STRING",
+                #     {
+                #         "default": "",
+                #     },
+                # ),
             }
         }
 

bizyengine/core/commands/processors/prompt_processor.py

@@ -15,6 +15,7 @@ from bizyengine.core.path_utils import (
     convert_prompt_label_path_to_real_path,
     guess_url_from_node,
 )
+from server import PromptServer
 
 
 def is_link(obj):
@@ -106,15 +107,21 @@ class PromptProcessor(Processor):
     def process(
         self, url: str, prompt: Dict[str, Dict[str, Any]], last_node_ids: List[str]
     ):
+        dict = {
+            "prompt": prompt,
+            "last_node_id": last_node_ids[0],
+            "exec_info": self._exec_info(prompt),
+        }
+        if (
+            PromptServer.instance is not None
+            and PromptServer.instance.last_prompt_id is not None
+        ):
+            dict["prompt_id"] = PromptServer.instance.last_prompt_id
+            print("Processing prompt with ID: " + PromptServer.instance.last_prompt_id)
+
         return client.send_request(
             url=url,
-            data=json.dumps(
-                {
-                    "prompt": prompt,
-                    "last_node_id": last_node_ids[0],
-                    "exec_info": self._exec_info(prompt),
-                }
-            ).encode("utf-8"),
+            data=json.dumps(dict).encode("utf-8"),
         )
 
     def validate_input(

bizyengine/core/common/client.py

@@ -21,6 +21,10 @@ from .env_var import BIZYAIR_API_KEY, BIZYAIR_DEBUG, BIZYAIR_SERVER_ADDRESS
 
 IS_API_KEY_VALID = None
 
+version_path = os.path.join(os.path.dirname(__file__), "..", "..", "version.txt")
+with open(version_path, "r") as file:
+    CLIENT_VERSION = file.read().strip()
+
 
 @dataclass
 class APIKeyState:
@@ -126,6 +130,7 @@ def send_request(
     try:
         headers = kwargs.pop("headers") if "headers" in kwargs else _headers()
         headers["User-Agent"] = "BizyAir Client"
+        headers["x-bizyair-client-version"] = CLIENT_VERSION
 
         req = urllib.request.Request(
             url, data=data, headers=headers, method=method, **kwargs
@@ -155,14 +160,23 @@ def send_request(
                 "If you have the key, please click the 'API Key' button at the bottom right to set the key."
             )
         elif code != "N/A" and message != "N/A":
-            raise ConnectionError(
-                f"Failed to handle your request: {error_message}.\n"
-                + f"    Error code: {code}.\n"
-                + f"    Error message: {message}\n."
-                + "The cause of this issue may be incorrect parameter status or ongoing background tasks. \n"
-                + "If retrying after waiting for a while still does not resolve the issue, please report it to "
-                + "Bizyair's official support."
-            )
+            if code in [20049, 20050]:
+                raise ConnectionError(
+                    f"""Failed to handle your request:
+
+    {message}"""
+                )
+            else:
+                raise ConnectionError(
+                    f"""Failed to handle your request: {error_message}
+
+    Error code: {code}
+    Error message: {message}
+
+    The cause of this issue may be incorrect parameter status or ongoing background tasks.
+    If retrying after waiting for a while still does not resolve the issue,
+    please report it to Bizyair's official support."""
+                )
         else:
             common_sites = [
                 "https://www.baidu.com",

bizyengine/core/common/env_var.py

@@ -87,10 +87,13 @@ def create_api_key_file(api_key):
 #     service_address: https://bizyair-api.siliconflow.cn/x/v1
 #   uat:
 #     service_address: https://uat-bizyair-api.siliconflow.cn/x/v1
-_BIZYAIR_SERVER_ADDRESS = os.getenv(
-    "BIZYAIR_SERVER_ADDRESS", "https://bizyair-api.siliconflow.cn/x/v1"
-)
-BIZYAIR_SERVER_ADDRESS = ServerAddress(_BIZYAIR_SERVER_ADDRESS)
+_BIZYAIR_DOMAIN = os.getenv("BIZYAIR_DOMAIN", "https://api.bizyair.cn")
+BIZYAIR_DOMAIN = ServerAddress(_BIZYAIR_DOMAIN)
+BIZYAIR_X_SERVER = f"{_BIZYAIR_DOMAIN}/x/v1"
+BIZYAIR_Y_SERVER = f"{_BIZYAIR_DOMAIN}/y/v1"
+
+BIZYAIR_SERVER_ADDRESS = ServerAddress(BIZYAIR_X_SERVER)
+
 BIZYAIR_API_KEY = env("BIZYAIR_API_KEY", str, load_api_key()[1])
 # Development Settings
 BIZYAIR_DEV_REQUEST_URL = env("BIZYAIR_DEV_REQUEST_URL", str, None)

bizyengine/core/configs/models.yaml

@@ -1,6 +1,8 @@
 # Common configuration
 model_version_config:
   model_version_id_prefix: "BIZYAIR_MODEL_VERSION_ID:"
+  detect_model_type:
+    url: "todo"
 
 cache_config:
   max_size: 100 # 100 items
@@ -93,6 +95,8 @@ model_rules:
         inputs:
           ckpt_name:
             - ^sd3.5_large.safetensors$
+            - action: detect_model
+              detection_type: ckpt
 
   - mode_type: checkpoint
     base_model: SD3
@@ -104,6 +108,8 @@ model_rules:
         inputs:
           ckpt_name:
             - ^sd3.5_large_turbo.safetensors$
+            - action: detect_model
+              detection_type: ckpt
 
   - mode_type: checkpoint
     base_model: BaseModel
@@ -115,6 +121,8 @@ model_rules:
         inputs:
           ckpt_name:
             - ^sd15/dreamshaper_8.safetensors$
+            - action: detect_model
+              detection_type: ckpt
 
 
   - mode_type: checkpoint
@@ -127,6 +135,9 @@ model_rules:
         inputs:
           ckpt_name:
             - ^sdxl.*
+            - action: detect_model
+              detection_type: ckpt
+
 
   - mode_type: checkpoint
     base_model: SDXL

bizyengine/core/nodes_base.py

@@ -4,6 +4,8 @@ import warnings
 from functools import wraps
 from typing import List
 
+from bizyengine.core.configs.conf import config_manager
+
 from .data_types import is_send_request_datatype
 from .nodes_io import BizyAirNodeIO, create_node_data
 
@@ -22,6 +24,23 @@ NODE_CLASS_MAPPINGS = {}
 NODE_DISPLAY_NAME_MAPPINGS = {}
 
 
+def process_kwargs(kwargs):
+    possibleWidgetNames = [
+        "model_name",
+        "instantid_file",
+        "pulid_file",
+        "style_model_name",
+    ]
+
+    model_version_id = kwargs.get("model_version_id", "")
+    if model_version_id:
+        name = f"{config_manager.get_model_version_id_prefix()}{model_version_id}"
+        for key in possibleWidgetNames:
+            if key in kwargs:
+                kwargs[key] = name
+    return kwargs
+
+
 def to_camel_case(s):
     return "".join(word.capitalize() for word in s.split("_"))
 
@@ -122,7 +141,7 @@ class BizyAirBaseNode:
 
     def default_function(self, **kwargs):
         class_type = self._determine_class_type()
-
+        kwargs = process_kwargs(kwargs)
         node_ios = self._process_non_send_request_types(class_type, kwargs)
         # TODO: add processing for send_request_types
         send_request_datatype_list = self._get_send_request_datatypes()