merge

Author: dfhfg123

bizyui/js/apply_image_to_node.js

@@ -109,7 +109,7 @@ window.addEventListener('message', async function(event) {
             // 发送请求
             const headers = {};
             if (token) {
-                headers["Authorization"] = `Bearer ${token}`;
+                headers["Authorization"] = token;
             }
 
             const response = await fetch('/upload/image', {

bizyui/js/bizyair_tools.js

@@ -1,36 +1,60 @@
 import { app, ComfyApp } from "../../scripts/app.js";
 import { api } from "../../../scripts/api.js";
 
-app.registerExtension({
-	name: "bizyair.tool",
-	setup() {
+async function handleFile(json_data) {
+    const jsonContent = json_data
 
-        async function handleFile(json_data) {
-            const jsonContent = json_data
+    await app.loadGraphData(
+        jsonContent,
+        true,
+        false,
+        "convert_test"
+      );
+}
 
-            await app.loadGraphData(
-                jsonContent,
-                true,
-                false,
-                "convert_test"
-              );
+// 检查是否为服务器模式
+async function isServerMode() {
+        const serverModeResponse = await fetch("/bizyair/server_mode");
+        const serverModeData = await serverModeResponse.json();
+        return serverModeData.data.server_mode === true;
+}
 
-        }
-        async function convert(){
-            const p2 = await app.graphToPrompt();
-            const json = JSON.stringify(p2["workflow"], null, 2);
+async function convert(){
+    const p2 = await app.graphToPrompt();
+    const json = JSON.stringify(p2["workflow"], null, 2);
+    await api.fetchApi("/bizyair/node_converter", {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: json
+      }).then(response => response.json())
+      .then(data => handleFile(data))
+      .catch(error => console.error("Error:", error));
+}
 
-            await api.fetchApi("/bizyair/node_converter", {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                body: json
-              }).then(response => response.json())
-              .then(data => handleFile(data))
-              .catch(error => console.error("Error:", error));
-        }
-        // Add canvas menu options
+// 全局变量，用于节流控制
+let lastConvertTime = 0;
+const MIN_CONVERT_INTERVAL = 3000; // 最小间隔3秒
+
+// 节流函数确保convert不会被频繁调用
+async function throttledConvert() {
+    const serverMode = await isServerMode();
+    if (!serverMode) {
+        return;
+    }
+    const now = Date.now();
+    if (now - lastConvertTime > MIN_CONVERT_INTERVAL) {
+        lastConvertTime = now;;
+        convert();
+    } 
+}
+
+app.registerExtension({
+    name: "bizyair.tool",
+    setup() {
+        console.log('BizyAir Tools extension setup');      
+        // 添加菜单选项
         const orig = LGraphCanvas.prototype.getCanvasMenuOptions;
         LGraphCanvas.prototype.getCanvasMenuOptions = function () {
             const options = orig.apply(this, arguments);
@@ -48,7 +72,33 @@ app.registerExtension({
                 },
             });
             return options;
-        };
-
-	},
+        };             
+        // 监听导入
+        const origLoadGraphData = app.loadGraphData;
+        if (origLoadGraphData) {
+            app.loadGraphData = async function() {
+                const result = origLoadGraphData.apply(this, arguments);
+                const serverMode = await isServerMode();
+                if (serverMode) {
+                    setTimeout(() => {
+                        throttledConvert();
+                    }, 500); 
+                }            
+                return result;
+            };
+        }
+    },  
+    // 添加init钩子，在ComfyUI初始化后调用convert函数
+    init() {
+        console.log('BizyAir Tools initializing...');
+        lastConvertTime = Date.now(); // 记录初始化时间   
+        // 检查是否为服务器模式
+        setTimeout(async () => {
+            const serverMode = await isServerMode();
+            if (serverMode) {
+                console.log('服务器模式，页面初始化完成，调用convert');
+                convert();
+            } 
+        }, 500); 
+    }
 });

bizyui/js/model_apply.js

@@ -34,53 +34,39 @@ const NodeInfoLogger = (function() {
         return `${baseUrl}?filename=${filename}&subfolder=&type=${type}&rand=${Math.random()}`;
     };
 
-    // 获取图片并转换为base64
+    // 获取图片并转换为base64（根据 server_mode 判断逻辑）
     const getImageAsBase64 = async (filename, type) => {
         try {
             // 检查服务器模式
             const serverModeResponse = await fetch("/bizyair/server_mode");
             const serverModeData = await serverModeResponse.json();
 
-            let token = null;
-            if (serverModeData.data.server_mode) {
-                // 服务器模式，需要token
-                token = await new Promise((resolve) => {
-                    const checkToken = () => {
-                        const token = getCookie("bizy_token");
-                        if (token) {
-                            clearInterval(timer);
-                            resolve(token);
-                        }
-                    };
-                    
-                    const timer = setInterval(checkToken, 300);
-                    checkToken(); // 立即执行一次检查
-                });
+            // 非服务器模式下，如果 filename 已经是 base64 数据，直接返回
+            if (!serverModeData.data.server_mode && filename.startsWith('data:')) {
+                console.log('本地模式：filename 已经是 base64 数据，直接返回');
+                return filename;
             }
-
-            const imageUrl = buildImageUrl(filename, type);
-            const headers = {};
-            if (token) {
-                headers["Authorization"] = `Bearer ${token}`;
+            
+            let imageUrl;
+            let headers = {};
+            
+            if (serverModeData.data.server_mode) {
+                // 服务器模式，改为请求后端转发接口
+                imageUrl = `/bizyair/proxy_view?filename=${encodeURIComponent(filename)}`;
+            } else {
+                // 本地模式，使用原有 buildImageUrl
+                imageUrl = buildImageUrl(filename, type);
             }
 
-            const response = await fetch(imageUrl, {
-                headers: headers
-            });
+            const response = await fetch(imageUrl, { headers });
             if (!response.ok) {
                 throw new Error(`获取图片失败: ${response.status} ${response.statusText}`);
             }
             const blob = await response.blob();
-            
-            // 将blob转为File对象
+            // 转 base64
             const file = new File([blob], filename, { type: blob.type });
-            
-            // 使用formatToWebp进行压缩
             const { base64: compressedBase64 } = await formatToWebp(file);
-            
             return compressedBase64;
-            
-     
         } catch (error) {
             console.error('获取图片并转换为base64失败:', error);
             return null;
@@ -121,17 +107,32 @@ const NodeInfoLogger = (function() {
         const blob = new Blob([byteArray], { type: mimeType || base64.split(':')[1].split(';')[0] })
         return new File([blob], filename, { type: blob.type })
       }
-    // 构建图片信息对象
-    const buildImageInfo = (imageData) => {
+    // 构建图片信息对象（根据 server_mode 判断逻辑）
+    const buildImageInfo = async (imageData) => {
         if (!imageData?.filename) return null;
-
-        // 根据节点类型确定图片类型
-        const type = imageData.type || 'temp'; 
+        // 检查服务器模式
+        const serverModeResponse = await fetch("/bizyair/server_mode");
+        const serverModeData = await serverModeResponse.json();
+        const type = imageData.type || 'temp';
         const path = `/${type}/${imageData.filename}`;
-
+        let url;
+        
+        if (serverModeData.data.server_mode) {
+            // 服务器模式，使用 view 接口
+            url = `/view?filename=${encodeURIComponent(imageData.filename)}`;
+        } else {
+            // 本地模式，如果 filename 是 base64 数据，直接使用
+            if (imageData.filename.startsWith('data:')) {
+                url = imageData.filename;
+            } else {
+                // 否则使用 buildImageUrl 构建 URL
+                url = buildImageUrl(imageData.filename, type);
+            }
+        }
+        
         return {
             filename: imageData.filename,
-            url: buildImageUrl(imageData.filename, type),
+            url: url,
             path: path,
             type: type
         };
@@ -252,7 +253,7 @@ const NodeInfoLogger = (function() {
                             // 使用异步IIFE处理图片，不阻塞主流程
                             (async () => {
                                 try {
-                                    const imageInfo = buildImageInfo(this.images[0]);
+                                    const imageInfo = await buildImageInfo(this.images[0]);
 
                                     // 检查是否存在全局bizyAirLib对象及logNodeInfo函数
                                     if (typeof bizyAirLib !== 'undefined' && typeof bizyAirLib.logNodeInfo === 'function') {

bizyui/js/siliconcloud_llm_api.js

@@ -52,7 +52,7 @@ const createModelFetchExtension = (nodeName, endpoint) => {
 
                             // 只有在token存在时才添加Authorization头
                             if (token) {
-                                headers["Authorization"] = `Bearer ${token}`;
+                                headers["Authorization"] = token;
                             }
 
                             const response = await fetch(endpoint, {

bizyui/js/subassembly/tools.js

@@ -9,6 +9,7 @@ export const hideWidget = (node, widget_name) => {
 
   widget.computeSize = () => [0, -4];
   widget.type = "hidden";
+  widget.hidden=true
   widget.options = widget.options || {};
   widget.show = () => {
     widget.computeSize = originalComputeSize;

src/components/assistant/Sidebar.vue

@@ -57,7 +57,8 @@
                     v-if="
                       message.role === 'assistant' &&
                       sidebarStore.nodeInfo &&
-                      canApplyToNode(sidebarStore.nodeInfo)
+                      canApplyToNode(sidebarStore.nodeInfo) &&
+                      !serverMode
                     "
                     class="image-actions"
                   >
@@ -354,6 +355,9 @@
     }
   }
 
+  // 服务端模式
+  const serverMode = ref(false)
+
   // 生图功能
   const isGeneratingImage = ref(false)
 
@@ -476,7 +480,10 @@
         // 生成成功后，添加带图片的助手消息
         const assistantMessage = {
           role: 'assistant' as const,
-          content: `已为您生成图片（点击LoadImage节点可以应用）`,
+          // 服务端模式下只展示"已为您生成图片"
+          content: serverMode.value
+            ? '已为您生成图片'
+            : '已为您生成图片（点击LoadImage节点可以应用）',
           time: getCurrentTime(),
           hasImage: true,
           image: imageUrl
@@ -925,6 +932,17 @@
     }
 
     chatMessages.value = [welcomeMessage]
+
+    // 异步获取 server_mode
+    ;(async () => {
+      try {
+        const res = await fetch('/bizyair/server_mode')
+        const data = await res.json()
+        serverMode.value = !!data?.data?.server_mode
+      } catch (e) {
+        serverMode.value = false
+      }
+    })()
   })
 </script>
 

src/components/assistant/util.ts

@@ -264,6 +264,9 @@ export async function sendStreamChatRequest(
         'Content-Type': 'application/json',
         Authorization: Cookies.get('bizy_token') || '',
         ...(options as any)?.headers
+        'Content-Type': 'application/json',
+        Authorization: Cookies.get('bizy_token') || '',
+        ...(options as any)?.headers
       },
       body: JSON.stringify(requestBody),
       signal: abortController.signal // 添加中止信号
@@ -430,7 +433,9 @@ export async function generateImage(options: {
     const response = await fetch('/bizyair/model/images', {
       method: 'POST',
       headers: {
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/json',
+        Authorization: Cookies.get('bizy_token') || '',
+        ...(options as any)?.headers
       },
       body: JSON.stringify({
         prompt: prompt,

src/components/community/detail/Index.vue

@@ -58,6 +58,14 @@
 
   const showAllTags = ref(false)
 
+  // 添加视频检测函数
+  const isVideoUrl = (url: string) => {
+    if (!url) return false
+    const videoExtensions = ['.mp4', '.webm', '.ogg', '.mov', '.avi', '.mkv']
+    const lowercaseUrl = url.toLowerCase()
+    return videoExtensions.some(ext => lowercaseUrl.includes(ext))
+  }
+
   const fetchModelDetail = async () => {
     try {
       const res = await model_detail({
@@ -821,15 +829,30 @@
           class="flex flex-col gap-4 items-start justify-start relative min-w-[620px] w-[65%] overflow-hidden"
         >
           <div class="w-full">
-            <NImageGroup v-if="currentVersion?.cover_urls && currentVersion?.cover_urls.length > 0">
-              <NImage
-                v-for="(cover, index) in currentVersion?.cover_urls"
-                :key="index"
-                :src="cover"
-                :preview-src="cover"
-                height="512px"
-              />
-            </NImageGroup>
+            <div
+              v-if="currentVersion?.cover_urls && currentVersion?.cover_urls.length > 0"
+              class="space-y-4"
+            >
+              <div v-for="(cover, index) in currentVersion?.cover_urls" :key="index" class="w-full">
+                <!-- 视频显示 -->
+                <video
+                  v-if="isVideoUrl(cover)"
+                  :src="cover"
+                  controls
+                  class="w-full h-auto max-h-[512px] object-contain rounded-lg"
+                  preload="metadata"
+                />
+                <!-- 图片显示 -->
+                <NImageGroup v-else>
+                  <NImage
+                    :src="cover"
+                    :preview-src="cover"
+                    height="512px"
+                    class="w-full object-contain"
+                  />
+                </NImageGroup>
+              </div>
+            </div>
             <MdPreview
               v-if="currentVersion?.intro"
               id="previewRef"