Skip to content

Commit 8adbcd9

Browse files
linjm8780860dfhfg123doombeaker
authored
get_silicon_cloud_llm_models接口添加自定义请求头authorization (#66)
* 未登陆时不调用fetchUnreadCount (#55) * fix:bizybot对话传入prompt_id和request_id (#56) * fix (#57) * fix * auto prettier format code --------- Co-authored-by: linjm8780860 <11494038+linjm8780860@users.noreply.github.com> * Dev limit interval (#59) * fix * auto prettier format code * fix * fix --------- Co-authored-by: linjm8780860 <11494038+linjm8780860@users.noreply.github.com> * fix * 修改siliconflow登录的clientId * fix * fix * fix * auto prettier format code * fix * fix * auto prettier format code * fix * fix * add version check * Update check_version.yml * Update version.txt --------- Co-authored-by: liu changzhi <116055578+dfhfg123@users.noreply.github.com> Co-authored-by: linjm8780860 <11494038+linjm8780860@users.noreply.github.com> Co-authored-by: Yao Chi <later@usopp.net> Co-authored-by: doombeaker <3351623+doombeaker@users.noreply.github.com>
1 parent b08f87d commit 8adbcd9

7 files changed

Lines changed: 161 additions & 9 deletions

File tree

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Check Version Updated
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
11+
env:
12+
target_branch: ${{ github.base_ref || 'master' }}
13+
14+
jobs:
15+
check_version:
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v4
21+
with:
22+
fetch-depth: 0
23+
ref: ${{ github.head_ref }}
24+
25+
- name: Fetch target branch
26+
run: |
27+
git fetch origin ${{ env.target_branch }}
28+
29+
- name: Diff version.txt
30+
run: |
31+
echo "Current directory: $(pwd)"
32+
modified_files=$(git diff --name-only origin/${{ env.target_branch }}...HEAD | grep version.txt)
33+
echo "Modified files: $modified_files"
34+
if [[ ! -n $modified_files ]]; then
35+
echo "version.txt unchanged"
36+
exit 1
37+
else
38+
echo "version.txt changed"
39+
fi
40+
41+
- name: Add PR review comment if version.txt is not updated
42+
if: failure() && !cancelled()
43+
uses: actions/github-script@v4
44+
with:
45+
script: |
46+
const { pull_request } = context.payload;
47+
const comment = "代码改动同时请更新版本文件 version.txt";
48+
await github.issues.createComment({
49+
issue_number: pull_request.number,
50+
owner: context.repo.owner,
51+
repo: context.repo.repo,
52+
body: comment
53+
});

bizyui/js/apply_image_to_node.js

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { app } from "../../scripts/app.js";
2-
2+
import { getCookie } from "./subassembly/tools.js";
33

44
function inspectNode(node) {
55
console.log('节点信息:', {
@@ -38,6 +38,27 @@ window.addEventListener('message', async function(event) {
3838
return;
3939
}
4040

41+
// 检查服务器模式
42+
const serverModeResponse = await fetch("/bizyair/server_mode");
43+
const serverModeData = await serverModeResponse.json();
44+
45+
let token = null;
46+
if (serverModeData.data.server_mode) {
47+
// 服务器模式,需要token
48+
token = await new Promise((resolve) => {
49+
const checkToken = () => {
50+
const token = getCookie("bizy_token");
51+
if (token) {
52+
clearInterval(timer);
53+
resolve(token);
54+
}
55+
};
56+
57+
const timer = setInterval(checkToken, 300);
58+
checkToken(); // 立即执行一次检查
59+
});
60+
}
61+
4162
// 保存原始节点大小
4263
const originalSize = targetNode.size ? [...targetNode.size] : null;
4364

@@ -86,9 +107,15 @@ window.addEventListener('message', async function(event) {
86107
formData.append('filename', filename);
87108

88109
// 发送请求
110+
const headers = {};
111+
if (token) {
112+
headers["Authorization"] = `Bearer ${token}`;
113+
}
114+
89115
const response = await fetch('/upload/image', {
90116
method: 'POST',
91-
body: formData
117+
body: formData,
118+
headers: headers
92119
});
93120

94121
if (!response.ok) {

bizyui/js/model_apply.js

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { app } from "../../scripts/app.js";
33
import './bizyair_frontend.js'
44
import './apply_image_to_node.js'
55
import { hideWidget } from './subassembly/tools.js'
6-
6+
import { getCookie } from './subassembly/tools.js'
77
const possibleWidgetNames=[
88
"clip_name",
99
"clip_name1",
@@ -37,8 +37,36 @@ const NodeInfoLogger = (function() {
3737
// 获取图片并转换为base64
3838
const getImageAsBase64 = async (filename, type) => {
3939
try {
40+
// 检查服务器模式
41+
const serverModeResponse = await fetch("/bizyair/server_mode");
42+
const serverModeData = await serverModeResponse.json();
43+
44+
let token = null;
45+
if (serverModeData.data.server_mode) {
46+
// 服务器模式,需要token
47+
token = await new Promise((resolve) => {
48+
const checkToken = () => {
49+
const token = getCookie("bizy_token");
50+
if (token) {
51+
clearInterval(timer);
52+
resolve(token);
53+
}
54+
};
55+
56+
const timer = setInterval(checkToken, 300);
57+
checkToken(); // 立即执行一次检查
58+
});
59+
}
60+
4061
const imageUrl = buildImageUrl(filename, type);
41-
const response = await fetch(imageUrl);
62+
const headers = {};
63+
if (token) {
64+
headers["Authorization"] = `Bearer ${token}`;
65+
}
66+
67+
const response = await fetch(imageUrl, {
68+
headers: headers
69+
});
4270
if (!response.ok) {
4371
throw new Error(`获取图片失败: ${response.status} ${response.statusText}`);
4472
}

bizyui/js/siliconcloud_llm_api.js

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { app } from "../../scripts/app.js";
2+
import { getCookie } from "./subassembly/tools.js";
23

34
const createModelFetchExtension = (nodeName, endpoint) => {
45
return {
@@ -15,11 +16,48 @@ const createModelFetchExtension = (nodeName, endpoint) => {
1516

1617
const fetchModels = async () => {
1718
try {
19+
// 首先检查服务器模式
20+
const serverModeResponse = await fetch("/bizyair/server_mode");
21+
const serverModeData = await serverModeResponse.json();
22+
23+
if (serverModeData.data.server_mode) {
24+
// 服务器模式,需要token
25+
return new Promise((resolve) => {
26+
const checkToken = () => {
27+
const token = getCookie("bizy_token");
28+
if (token) {
29+
clearInterval(timer);
30+
fetchWithToken(token).then(resolve);
31+
}
32+
};
33+
34+
const timer = setInterval(checkToken, 300);
35+
checkToken(); // 立即执行一次检查
36+
});
37+
} else {
38+
// 非服务器模式,直接发送请求
39+
return fetchWithToken();
40+
}
41+
} catch (error) {
42+
console.error(`Error fetching ${nodeName} models`, error);
43+
return [];
44+
}
45+
};
46+
47+
const fetchWithToken = async (token) => {
48+
try {
49+
const headers = {
50+
"Content-Type": "application/json"
51+
};
52+
53+
// 只有在token存在时才添加Authorization头
54+
if (token) {
55+
headers["Authorization"] = `Bearer ${token}`;
56+
}
57+
1858
const response = await fetch(endpoint, {
1959
method: "POST",
20-
headers: {
21-
"Content-Type": "application/json",
22-
},
60+
headers: headers,
2361
body: JSON.stringify({}),
2462
});
2563

bizyui/js/subassembly/tools.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,10 @@ export const hideWidget = (node, widget_name) => {
1616
widget.height = undefined;
1717
};
1818
}
19+
20+
export function getCookie(name) {
21+
const value = `; ${document.cookie}`;
22+
const parts = value.split(`; ${name}=`);
23+
if (parts.length === 2) return parts.pop().split(';').shift();
24+
return null;
25+
}

src/main.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ app.directive('debounce', {
238238
export function mount(container: string | Element, comfyUIApp?: any) {
239239
app.provide('comfyUIApp', comfyUIApp)
240240
server_mode().then(res => {
241-
console.log('server_mode100', res)
242241
if (!res.data.server_mode) {
243242
app.use(i18n)
244243
app.mount(container)

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.10
1+
1.2.11

0 commit comments

Comments
 (0)