bizydraft 0.1.24__py3-none-any.whl → 0.1.25__py3-none-any.whl

bizydraft/hijack_routes.py

@@ -161,58 +161,39 @@ def hijack_routes():
                 "Hijacked /prompt route to handle prompt validation but not execution"
             )
             break
-    lazy_block_routes()
 
+    routes = comfy_server.routes
+    white_list = [
+        # 劫持改造过的
+        "/prompt",
+        "/view",
+        # 原生的
+        "/",
+        "/ws",
+        "/extensions",
+        "/object_info",
+        "/object_info/{node_class}",
+    ]
+
+    async def null_handler(request):
+        return web.Response(
+            status=403,
+            text="Access Forbidden: You do not have permission to access this resource.",
+        )
 
-def lazy_block_routes():
-    try:
-        import app.database.db
-
-        origin_init_db = app.database.db.init_db
-
-        def _block_routes():
-            routes = comfy_server.routes
-            white_list = [
-                # 劫持改造过的
-                "/prompt",
-                "/view",
-                # 原生的
-                "/",
-                "/ws",
-                "/extensions",
-                "/object_info",
-                "/object_info/{node_class}",
-            ]
-
-            async def null_handler(request):
-                return web.Response(
-                    status=403,
-                    text="Access Forbidden: You do not have permission to access this resource.",
+    for idx, route in enumerate(routes._items):
+        if (route.path not in white_list) and ("/bizyair" not in route.path):
+            if route.method == "GET":
+                logger.info(f"hijiack to null: {route.path}, {route.method}")
+                routes._items[idx] = web.get(route.path, null_handler)
+                routes._items[idx].kwargs.clear()
+            elif route.method == "POST":
+                logger.info(f"hijiack to null: {route.path}, {route.method}")
+                routes._items[idx] = web.post(route.path, null_handler)
+                routes._items[idx].kwargs.clear()
+            else:
+                logger.warning(
+                    f"neither GET or POST, passed: {route.path}, {route.method}"
                 )
-
-            for idx, route in enumerate(routes._items):
-                if (route.path not in white_list) and ("/bizyair" not in route.path):
-                    if route.method == "GET":
-                        logger.info(f"hijiack to null: {route.path}, {route.method}")
-                        routes._items[idx] = web.get(route.path, null_handler)
-                        routes._items[idx].kwargs.clear()
-                    elif route.method == "POST":
-                        logger.info(f"hijiack to null: {route.path}, {route.method}")
-                        routes._items[idx] = web.post(route.path, null_handler)
-                        routes._items[idx].kwargs.clear()
-                    else:
-                        logger.warning(
-                            f"neither GET or POST, passed: {route.path}, {route.method}"
-                        )
-                else:
-                    logger.warning(f"passed directly: {route.path}, {route.method}")
-
-        def new_init_db():
-            _block_routes()
-            origin_init_db()
-
-        app.database.db.init_db = new_init_db
-
-    except Exception as e:
-        logger.error(f"failed to block routes: {e}")
-        exit(1)
+        else:
+            logger.warning(f"passed directly: {route.path}, {route.method}")

bizydraft/postload.py

@@ -0,0 +1,25 @@
+from loguru import logger
+
+
+def lazy_hook():
+    try:
+        import app.database.db
+
+        origin_init_db = app.database.db.init_db
+
+        def hijack_all():
+            from bizydraft.hijack_nodes import hijack_nodes
+            from bizydraft.hijack_routes import hijack_routes
+
+            hijack_nodes()
+            hijack_routes()
+
+        def new_init_db():
+            hijack_all()
+            origin_init_db()
+
+        app.database.db.init_db = new_init_db
+
+    except Exception as e:
+        logger.error(f"failed to lazyhook: {e}")
+        exit(1)

bizydraft/{monkey_patch.py → prestartup_patch.py}

@@ -1,7 +1,7 @@
 from loguru import logger
 
 
-def monkey_patch():
+def prestartup_patch():
     def empty_download(*args, **kwargs):
         logger.warning(f"Blocked download {args}")
         return

{bizydraft-0.1.24.dist-info → bizydraft-0.1.25.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.1.24
+Version: 0.1.25
 Summary: bizydraft

{bizydraft-0.1.24.dist-info → bizydraft-0.1.25.dist-info}/RECORD

@@ -1,7 +1,8 @@
 bizydraft/__init__.py,sha256=OM-sKCQrPh25nHVJIX-DgF1raMYyoWLSuyduIAHt0Gs,78
 bizydraft/hijack_nodes.py,sha256=xPVLBBnRiJaI8ZbR80O8W4C9SlNAp7MxP7dKj_pRlYs,869
-bizydraft/hijack_routes.py,sha256=ZaPXpaZ9Fft1mOlJvyo8fep9ZgfoG543H1PV1TMwe8U,8080
-bizydraft/monkey_patch.py,sha256=n4KVPkG8v-2avX6MTLhLFgQhHhadNSFJi1sEUr0-m1w,312
+bizydraft/hijack_routes.py,sha256=MlietlmTU-Lj7evZo5yZE-ghQJZ9_1vdpyHXAXYfoFw,7417
+bizydraft/postload.py,sha256=YfiFjJ7MLN6WNar19lLdAL_3IPr5GyI3G4rbZIiAgXU,562
+bizydraft/prestartup_patch.py,sha256=Rh_D-rEUmPaojSrl8CEBMAhSgwtLSm6gH2Mzmk5NCuQ,316
 bizydraft/resp.py,sha256=8INvKOe5Dgai3peKfqKjrhUoYeuXWXn358w30-_cY-A,369
 bizydraft/server.py,sha256=ES1fBYr_Ufv_YWsynLck1ln9bXTGjK3KXas1CK9WBqM,1358
 bizydraft/static/js/handleStyle.js,sha256=P2DNMiKHr--ekn3CGNOAHU46OJCCsifejxw97kLmb7Q,1676
@@ -11,7 +12,7 @@ bizydraft/static/js/postEvent.js,sha256=B879Dl5hTUqddll58stY5TFYxpFtQbI1KtMqfgrW
 bizydraft/static/js/socket.js,sha256=vewGQLgdJSrjvqptEDxLirZRXZUjWTJDmDdjs4mbf4k,2436
 bizydraft/static/js/tool.js,sha256=Ejyb5GiFhuoCp5_dBvu2suagbxGHCkR2Lg_4rMKN2ls,756
 bizydraft/static/js/uploadFile.js,sha256=5OjLLaCHZkobLltNs27K5GgZBFHZJowBwS-oakLoNW4,4985
-bizydraft-0.1.24.dist-info/METADATA,sha256=aKJrV9QoQshpN5jH9Xt03i3O7oagceUr4I1KfxkoI7c,73
-bizydraft-0.1.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.1.24.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.1.24.dist-info/RECORD,,
+bizydraft-0.1.25.dist-info/METADATA,sha256=4U2zOdTUhIFS4tNlsMhhUCxz29e5CSJW4hOz6cvggGU,73
+bizydraft-0.1.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.1.25.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.1.25.dist-info/RECORD,,