Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion bizyui/js/model_apply.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,11 @@ const NodeInfoLogger = (function() {
}

// 使用装饰器模式扩展节点的onMouseDown方法
const serverModeResponse = await fetch("/bizyair/server_mode");
const serverModeData = await serverModeResponse.json();
node.onMouseDown = function(e, pos, canvas) {
if (this._isServerMode && this.type === 'LoadImage') {
if (serverModeData.data.server_mode && this.type === 'LoadImage') {
console.log(this.type, 'this=p------');
return;
}
// 对于小部件点击或右键点击,直接使用原始方法处理
Expand Down
38 changes: 34 additions & 4 deletions src/components/assistant/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -422,9 +422,23 @@

return
} catch (error: any) {
const errorMsgTime = getCurrentTime()
let errorMessage = ''
if (error) {
errorMessage = error.message
}
chatMessages.value.push({
role: 'assistant',
content: `发生错误: ${errorMessage}<br><br><span style="color: #ff4d4f;">建议检查Bizyair是否更新到最新版本,并检查网络状态或者代理</span>`,
time: errorMsgTime
})
isLoading.value = false
isGenerating.value = false
processingStatus.value = ''
setTimeout(() => {
scrollToBottom()
}, 0)

return
}
}
Expand Down Expand Up @@ -521,13 +535,15 @@
},
onError: error => {
console.error('多模态请求失败:', error)

const errorMsgTime = getCurrentTime()

let errorMessage = ''
if (error) {
errorMessage = error.message
}
// 添加错误消息
chatMessages.value.push({
role: 'assistant',
content: t('sidebar.assistant.errorMessage'),
content: `发生错误: ${errorMessage}<br><br><span style="color: #ff4d4f;">建议检查Bizyair是否更新到最新版本,并检查网络状态或者代理</span>`,
time: errorMsgTime
})

Expand All @@ -545,6 +561,19 @@
)
} catch (error) {
const errorMsgTime = getCurrentTime()
// 获取错误信息
let errorMessage = ''
if (
error &&
typeof error === 'object' &&
'message' in error &&
typeof error.message === 'string'
) {
errorMessage = error.message
} else {
errorMessage = String(error)
}

// 添加错误消息
chatMessages.value.push({
role: 'assistant',
Expand All @@ -553,7 +582,8 @@
})

// 更新状态
// isLoading.value = false;
isLoading.value = false
isGenerating.value = false
processingStatus.value = ''
} finally {
console.log('请求处理完成,重置状态')
Expand Down
17 changes: 13 additions & 4 deletions src/components/assistant/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ export async function sendStreamChatRequest(
})

if (!response.ok) {
throw new Error(`API请求失败: ${response.status} ${response.statusText}`)
throw new Error(`HTTP错误: [${response.status}] ${response.statusText}`)
}

if (!response.body) {
Expand Down Expand Up @@ -489,6 +489,9 @@ export async function handleImageWithKontextPro(
},
body: JSON.stringify(requestBody)
})
if (!response.ok) {
throw new Error(`HTTP错误: [${response.status}] ${response.statusText}`)
}
const responseData = await response.json()

if (responseData.code === 20000 && responseData.data) {
Expand All @@ -511,10 +514,16 @@ export async function handleImageWithKontextPro(
}
} else {
console.error('API响应格式不符合预期:', responseData)
throw new Error(`API响应错误: ${responseData.message || '未知错误'}`)
const statusCode = responseData.code || ''
const errorMsg = responseData.message || ''
throw new Error(`API响应错误: [${statusCode}] ${errorMsg}`)
}
} catch (error: any) {
console.error('图片编辑处理失败:', error)
throw error
const errorMessage = {
code: 50000,
message: error.message,
data: null
}
throw errorMessage
}
}
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.17
1.2.18
Loading