bizydraft 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

bizydraft/static/js/hookLoadImage.js

@@ -6,9 +6,17 @@ app.registerExtension({
     name: "bizyair.image.to.oss",
     async beforeRegisterNodeDef(nodeType, nodeData) {
         if (nodeData.name === 'LoadImage') {
+            let workflowParams = null
+            document.addEventListener('workflowLoaded', (event) => {
+                workflowParams = event.detail;
+            });
             nodeType.prototype.onNodeCreated = async function() {
+                const image_widget = this.widgets.find(w => w.name === 'image');
+                console.log(image_widget)
                 // const apiHost = 'http://localhost:3000/api'
                 const apiHost = 'https://uat87.bizyair.cn/api'
+                const node = this;
+                let image_list = []
                 const getData = async () => {
                     const res = await fetch(`${apiHost}/special/community/commit_input_resource?${
                         new URLSearchParams({
@@ -27,7 +35,7 @@ app.registerExtension({
                     })
                     const {data} = await res.json()
                     const list = data.data.data.list || []
-                    const image_list = list.filter(item => item.name).map(item => {
+                    image_list = list.filter(item => item.name).map(item => {
                         return {
                             url: item.url,
                             name: item.name
@@ -36,22 +44,54 @@ app.registerExtension({
                     })
                     const image_widget = this.widgets.find(w => w.name === 'image');
                     
-                    const node = this;
+
+                    let image_path_widget = this.widgets.find(w => w.name === 'image_path');
+                    if (!image_path_widget) {
+                        image_path_widget = this.addWidget("text", "image_path", "", function(){}, {
+                            serialize: true
+                        });
+                        image_path_widget.type = "hidden";
+                        image_path_widget.computeSize = () => [0, 0]; // 隐藏显示
+                    }
 
                     image_widget.options.values = image_list.map(item => item.name);
-                    
+                    console.log(image_widget.value)
                     // image_widget.value = image_list[0].url;
                     // image_widget.value = image_list[0];
                     if (image_list[0] && image_list[0].url) {
-                        image_widget.value = image_list[0].name;
-                        previewImage(node, decodeURIComponent(image_list[0].url))
+                        const defaultImageUrl = decodeURIComponent(image_list[0].url);
+                        image_path_widget.value = defaultImageUrl;
+                        
+                        previewImage(node, defaultImageUrl)
                     }
                     image_widget.callback = function(e) {
                         const image_url = decodeURIComponent(image_list.find(item => item.name === e).url);
+                        image_path_widget.value = image_url;
                         previewImage(node, image_url)
                     }
+                    return true
+                }
+                
+                await getData()
+
+
+
+
+                const imageNode = workflowParams.json.nodes.find(item => item.type === 'LoadImage')
+                if (imageNode && imageNode.widgets_values && imageNode.widgets_values[2]) {
+                    const temp = {
+                        name: imageNode.widgets_values[0],
+                        url: imageNode.widgets_values[2]
+                    }
+                    image_list.push(temp)
+                    image_widget.value = temp.name
+                    image_widget.options.values = image_list.map(item => item.name)
+                    previewImage(node, temp.url)
+                    
+                    requestAnimationFrame(() => {
+                        previewImage(node, temp.url)
+                    })
                 }
-                getData()
                 
 
                 const upload_widget = this.widgets.find(w => w.name === 'upload');
@@ -76,22 +116,13 @@ function previewImage(node, image_url) {
     const img = new Image();
     img.onload = function() {
         node.imgs = [img];
-        if (node.graph) {
+        if (node.graph && node.graph.setDirtyCanvas) {
             node.graph.setDirtyCanvas(true);
         } else {
             console.warn('[BizyAir] 无法访问graph对象进行重绘');
         }
-        const imageOutputStore = 
-            node.nodeOutputStore || 
-            window.app?.nodeOutputStore || 
-            app?.nodeOutputStore;
-            
-        if (imageOutputStore) {
-            console.log('[BizyAir] 设置节点输出数据');
-            imageOutputStore.setNodeOutputs(node, image_url, { isAnimated: false });
-        } else {
-            console.warn('[BizyAir] 未找到nodeOutputStore');
-        }
+        
+        console.log('[BizyAir] 图片预览加载成功');
     };
     img.onerror = function(err) {
         console.error('[BizyAir] 图片加载失败:', image_url, err);

bizydraft/static/js/postEvent.js

@@ -502,6 +502,9 @@ app.registerExtension({
 
             loadWorkflow: function (params) {
                 app.graph.clear();
+                document.dispatchEvent(new CustomEvent('workflowLoaded', { 
+                    detail: params 
+                }));
                 if (params.json.version) {
                     app.loadGraphData(params.json);
                 } else {
@@ -555,19 +558,35 @@ app.registerExtension({
             runWorkflow: async function () {
                 try {
                     // 确保有连接
-                    await getSocketAsync();
+                    // await getSocketAsync();
                     
                     const graph = await app.graphToPrompt();
-                    const res = await app.queuePrompt(graph.output);
-                    console.log("-----------queuePrompt-----------", res)
                     const clientId = sessionStorage.getItem("clientId");
+                    const resPrompt = await fetch("api/prompt", {
+                        method: "POST",
+                        body: JSON.stringify({
+                            prompt: graph.output,
+                            clientId,
+                            number: graph.output,
+                            extra_data: {
+                                extra_pnginfo: {
+                                    workflow: graph.workflow
+                                }
+                            }
+                        })
+                    });
+                    const resPromptJson = await resPrompt.json();
+                    if (resPromptJson.error) {
+                        await app.queuePrompt(graph.output);
+                    }
                     window.parent.postMessage({
                         type: 'functionResult',
                         method: 'runWorkflow',
                         result: {
                             clientId: clientId,
                             jsonWorkflow: graph.output,
-                            workflow: graph.workflow
+                            workflow: graph.workflow,
+                            prompt: resPromptJson
                         }
                     }, '*');
                     return true;

{bizydraft-0.1.11.dist-info → bizydraft-0.1.13.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.1.11
+Version: 0.1.13
 Summary: bizydraft

{bizydraft-0.1.11.dist-info → bizydraft-0.1.13.dist-info}/RECORD

@@ -4,13 +4,13 @@ bizydraft/hijack_routes.py,sha256=tzSIY-3wLiwoHALf7MswjAF5FqDSmXynGjpfTgRdkxE,61
 bizydraft/resp.py,sha256=8INvKOe5Dgai3peKfqKjrhUoYeuXWXn358w30-_cY-A,369
 bizydraft/server.py,sha256=ES1fBYr_Ufv_YWsynLck1ln9bXTGjK3KXas1CK9WBqM,1358
 bizydraft/static/js/handleStyle.js,sha256=vIR_W3GLKn-saIPhKfLeuJ7QbeNI4PhjAkjGjJpxVcA,1461
-bizydraft/static/js/hookLoadImage.js,sha256=rcXKi9y88n0gfad6XERr5UcP8c0zOUdaVyk3lbhiQSY,3951
+bizydraft/static/js/hookLoadImage.js,sha256=9ksy4ecRKT2OY90_klXAt2qipk121ZUmBwo5pB0NZeE,5413
 bizydraft/static/js/main.js,sha256=cZ-7wR9T8aNLzIrTjc-g9xVZf7z6TXWl1zhP_wXSSVo,150
-bizydraft/static/js/postEvent.js,sha256=e6q1iiwLDm7OLLJLt3Vy4yoKWLfW6UJQqsaGqQdTW8Q,26054
+bizydraft/static/js/postEvent.js,sha256=12O0PR8LLYuTI5lPW4EPsxf9mslIyOi-EfDFGE4_r5A,26852
 bizydraft/static/js/socket.js,sha256=q_SWsySJdVV7ZTH-3Pdr09pkWGQj08C9xVAQES7eJaU,2440
 bizydraft/static/js/tool.js,sha256=IlDVjddodT9DtfdIGiIzSIKdxbUMztDLQ4jI0uFJCwk,206
 bizydraft/static/js/uploadFile.js,sha256=Ae0VdYRE3c1bx1GBQGUpJ-NOXXB984u3T_grhLXOvgQ,4973
-bizydraft-0.1.11.dist-info/METADATA,sha256=wUykvVxmdVcrs2Hq0JnQbzJHILWiBGbCXQj96wH7-18,73
-bizydraft-0.1.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.1.11.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.1.11.dist-info/RECORD,,
+bizydraft-0.1.13.dist-info/METADATA,sha256=VeErj2DVGnthcb2WurwdGm9K3A-fXmru6O6F8US7dgo,73
+bizydraft-0.1.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.1.13.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.1.13.dist-info/RECORD,,