bizyengine 1.2.32__py3-none-any.whl → 1.2.33__py3-none-any.whl

bizyengine/bizy_server/errno.py

@@ -1,3 +1,6 @@
+import copy
+
+
 class ErrorNo:
     def __init__(self, http_status_code, code, payload, messages):
         self.http_status_code = http_status_code
@@ -6,11 +9,21 @@ class ErrorNo:
         self.data = payload
 
     def copy(self):
-        return ErrorNo(self.http_status_code, self.code, self.data, self.messages)
+        return ErrorNo(
+            self.http_status_code,
+            self.code,
+            copy.deepcopy(self.data),
+            copy.deepcopy(self.messages),
+        )
 
     def get_message(self, lang="en"):
         return self.messages.get(lang, self.messages.get("en", "Unknown error"))
 
+    def set_message(self, msg, lang="en"):
+        self.messages[lang] = msg
+
+    message = property(fget=get_message, fset=set_message)
+
 
 class errnos:
     OK = ErrorNo(200, 20000, None, {"en": "Success", "zh": "成功"})

bizyengine/bizy_server/server.py

@@ -30,6 +30,7 @@ from .utils import (
     decrypt_apikey,
     is_string_valid,
     types,
+    update_base_model_types,
 )
 
 API_PREFIX = "bizyair"
@@ -39,6 +40,9 @@ USER_API = f"{API_PREFIX}/user"
 INVOICE_API = f"{API_PREFIX}/invoices"
 MODEL_API = f"{API_PREFIX}/model"
 
+BIZYAIR_DATA_DICT = {}
+BIZYAIR_DATA_DICT_UPDATED_AT = 0.0
+
 logging.basicConfig(level=logging.DEBUG)
 
 
@@ -310,7 +314,10 @@ class BizyAirServer:
                 # 检查base_model, path和sign是否有值
                 for field in ["base_model", "path", "sign"]:
                     if not is_string_valid(version.get(field)):
-                        return ErrResponse(errnos.INVALID_VERSION_FIELD(field))
+                        err = errnos.INVALID_VERSION_FIELD.copy()
+                        err.set_message(err.get_message("en") + ": " + field, "en")
+                        err.set_message(err.get_message("zh") + ": " + field, "zh")
+                        return ErrResponse(err)
 
             # 调用API更新模型
             request_api_key, err = _get_request_api_key(request.headers)
@@ -456,12 +463,23 @@ class BizyAirServer:
             request_api_key, err = _get_request_api_key(request.headers)
             if err:
                 return ErrResponse(err)
+
+            # 缓存一小时
+            global BIZYAIR_DATA_DICT, BIZYAIR_DATA_DICT_UPDATED_AT
+            if BIZYAIR_DATA_DICT_UPDATED_AT + 3600 > time.time():
+                return OKResponse(BIZYAIR_DATA_DICT)
+
             data_dict, err = await self.api_client.get_data_dict(
                 request_api_key=request_api_key
             )
             if err is not None:
                 return ErrResponse(err)
 
+            # Update base model types
+            update_base_model_types(data_dict["base_models"])
+            BIZYAIR_DATA_DICT = data_dict
+            BIZYAIR_DATA_DICT_UPDATED_AT = time.time()
+
             return OKResponse(data_dict)
 
         @self.prompt_server.routes.post(f"/{COMMUNITY_API}/datasets")
@@ -1054,7 +1072,8 @@ class BizyAirServer:
                 for field in ["base_model", "path", "sign"]:
                     if not is_string_valid(version.get(field)):
                         err = errnos.INVALID_VERSION_FIELD.copy()
-                        err.message = "Invalid version field: " + field
+                        err.set_message(err.get_message("en") + ": " + field, "en")
+                        err.set_message(err.get_message("zh") + ": " + field, "zh")
                         return ErrResponse(err)
 
             # 调用API提交模型

bizyengine/bizy_server/utils.py

@@ -105,10 +105,17 @@ def types():
     return types
 
 
+def update_base_model_types(new_types_from_dict):
+    global BASE_MODEL_TYPE_OPTIONS
+    BASE_MODEL_TYPE_OPTIONS = {}
+    for item in new_types_from_dict:
+        BASE_MODEL_TYPE_OPTIONS[item["label"]] = item["value"]
+
+
 def base_model_types():
     base_model_types = []
-    for k, v in BASE_MODEL_TYPE_OPTIONS.items():
-        base_model_types.append({"label": k, "value": v})
+    for v in BASE_MODEL_TYPE_OPTIONS.values():
+        base_model_types.append({"label": v, "value": v})
     return base_model_types
 
 

bizyengine/version.txt

@@ -1 +1 @@
-1.2.32
+1.2.33

{bizyengine-1.2.32.dist-info → bizyengine-1.2.33.dist-info}/METADATA

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

@@ -1,15 +1,15 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=yc10PMdAsRPIE3P3QW2RFxGobS76YW2vkxyYMV4CLRw,6
+bizyengine/version.txt,sha256=uruE8qHcOMHtyKGjgFCkaQ8HCk39_t-NlbecbI-aF48,7
 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
+bizyengine/bizy_server/errno.py,sha256=1UiFmE2U7r7hCHgsw4-p_YL0VCmTJc9NyYDEbhkanaY,16336
 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=Eyg1wqyvr7n2kQGLIKvPKyhUIPoG92refahTQjkTweo,57815
+bizyengine/bizy_server/server.py,sha256=M9P0oungSiUFGRxev3jJxhUTvjm8ixREQ-DCoyzU0gA,58617
 bizyengine/bizy_server/stream_response.py,sha256=H2XHqlVRtQMhgdztAuG7l8-iV_Pm42u2x6WJ0gNVIW0,9654
-bizyengine/bizy_server/utils.py,sha256=CIoRrCy8Wv4D9FDdr_QtNP03AjWw8M6GSm2QcrVJl6Y,3739
+bizyengine/bizy_server/utils.py,sha256=dgTyLdJtj3POzIC17TOPx_S7WllRJDdyvF8FdSmBSfU,3957
 bizyengine/bizyair_extras/__init__.py,sha256=EjyLEdLpPm5I4Z25YmnoK4PYQDmsEyXtCXQt9UDGmi0,1009
 bizyengine/bizyair_extras/nodes_advanced_refluxcontrol.py,sha256=cecfjrtnjJAty9aNkhz8BlmHUC1NImkFlUDiA0COEa4,2242
 bizyengine/bizyair_extras/nodes_cogview4.py,sha256=Ni0TDOycczyDhYPvSR68TxGV_wE2uhaxd8MIj-J4-3o,2031
@@ -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.32.dist-info/METADATA,sha256=I3PGMY7lLy3N6D9-Q7jPPZIlaT9VI7zK7QbuXUpYXlg,675
-bizyengine-1.2.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.32.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.32.dist-info/RECORD,,
+bizyengine-1.2.33.dist-info/METADATA,sha256=wRBpNpUIpqJs8bk0BWy-FoxDUdZiH42YVmQElIQgAWg,675
+bizyengine-1.2.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.33.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.33.dist-info/RECORD,,