Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-22 23:23:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

update：格式调整

Browse Source
This commit is contained in:
rainv123
2025-11-05 09:13:44 +08:00
parent 0008ca6335
commit a82cf6e300
18 changed files with 733 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-web/src/apis/module/knowledgeBase.js
+164 -265
View File
@@ -8,6 +8,54 @@ function getAuthToken() {
return localStorage.getItem('token') || '';
}
/**
* 通用API请求包装器
* @param {Object} config - 请求配置
* @param {string} config.url - 请求URL
* @param {string} config.method - 请求方法
* @param {Object} [config.data] - 请求数据
* @param {Object} [config.headers] - 额外请求头
* @param {Function} config.callback - 成功回调
* @param {Function} [config.errorCallback] - 错误回调
* @param {string} [config.errorMessage] - 错误消息
* @param {Function} [config.retryFunction] - 重试函数
*/
function makeApiRequest(config) {
const token = getAuthToken();
const { url, method, data, headers, callback, errorCallback, errorMessage, retryFunction } = config;
const requestBuilder = RequestService.sendRequest()
.url(url)
.method(method)
.header({
'Authorization': `Bearer ${token}`,
...headers
});
if (data) {
requestBuilder.data(data);
}
requestBuilder
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error(errorMessage || '操作失败', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
if (retryFunction) {
RequestService.reAjaxFun(() => {
retryFunction();
});
}
}).send();
}
/**
* 知识库管理相关API
*/
@@ -19,33 +67,20 @@ export default {
* @param {Function} errorCallback - 错误回调
*/
getKnowledgeBaseList(params, callback, errorCallback) {
const token = getAuthToken();
const queryParams = new URLSearchParams({
page: params.page,
page_size: params.page_size,
name: params.name || ''
}).toString();
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets?${queryParams}`)
.method('GET')
.header({ 'Authorization': `Bearer ${token}` })
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('获取知识库列表失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.getKnowledgeBaseList(params, callback, errorCallback);
});
}).send();
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets?${queryParams}`,
method: 'GET',
callback: callback,
errorCallback: errorCallback,
errorMessage: '获取知识库列表失败',
retryFunction: () => this.getKnowledgeBaseList(params, callback, errorCallback)
});
},
/**
@@ -56,20 +91,18 @@ export default {
*/
createKnowledgeBase(data, callback, errorCallback) {
console.log('createKnowledgeBase called with data:', data);
const token = getAuthToken();
console.log('Token exists:', !!token);
console.log('API URL:', `${getServiceUrl()}/api/v1/datasets`);
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets`)
.method('POST')
.data(data)
.header({ 'Authorization': `Bearer ${token}` })
.success((res) => {
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets`,
method: 'POST',
data: data,
headers: { 'Content-Type': 'application/json' },
callback: (res) => {
console.log('createKnowledgeBase success response:', res);
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
},
errorCallback: (err) => {
console.error('创建知识库失败:', err);
if (err.response) {
console.error('Error response data:', err.response.data);
@@ -78,14 +111,10 @@ export default {
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
console.log('Network failure, retrying...');
const self = this;
RequestService.reAjaxFun(() => {
self.createKnowledgeBase(data, callback, errorCallback);
});
}).send();
},
errorMessage: '创建知识库失败',
retryFunction: () => this.createKnowledgeBase(data, callback, errorCallback)
});
},
/**
@@ -97,30 +126,18 @@ export default {
*/
updateKnowledgeBase(datasetId, data, callback, errorCallback) {
console.log('updateKnowledgeBase called with datasetId:', datasetId, 'data:', data);
const token = getAuthToken();
console.log('Token exists:', !!token);
console.log('API URL:', `${getServiceUrl()}/api/v1/datasets/${datasetId}`);
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}`)
.method('PUT')
.data(data)
.header({ 'Authorization': `Bearer ${token}` })
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('更新知识库失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.updateKnowledgeBase(datasetId, data, callback, errorCallback);
});
}).send();
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets/${datasetId}`,
method: 'PUT',
data: data,
headers: { 'Content-Type': 'application/json' },
callback: callback,
errorCallback: errorCallback,
errorMessage: '更新知识库失败',
retryFunction: () => this.updateKnowledgeBase(datasetId, data, callback, errorCallback)
});
},
/**
@@ -131,29 +148,16 @@ export default {
*/
deleteKnowledgeBase(datasetId, callback, errorCallback) {
console.log('deleteKnowledgeBase called with datasetId:', datasetId);
const token = getAuthToken();
console.log('Token exists:', !!token);
console.log('API URL:', `${getServiceUrl()}/api/v1/datasets/${datasetId}`);
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}`)
.method('DELETE')
.header({ 'Authorization': `Bearer ${token}` })
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('删除知识库失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.deleteKnowledgeBase(datasetId, callback, errorCallback);
});
}).send();
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets/${datasetId}`,
method: 'DELETE',
callback: callback,
errorCallback: errorCallback,
errorMessage: '删除知识库失败',
retryFunction: () => this.deleteKnowledgeBase(datasetId, callback, errorCallback)
});
},
/**
@@ -163,29 +167,17 @@ export default {
* @param {Function} errorCallback - 错误回调
*/
deleteKnowledgeBases(ids, callback, errorCallback) {
const token = getAuthToken();
// 确保ids是正确格式的字符串
const idsStr = Array.isArray(ids) ? ids.join(',') : ids;
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/batch?ids=${idsStr}`)
.method('DELETE')
.header({ 'Authorization': `Bearer ${token}` })
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('批量删除知识库失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.deleteKnowledgeBases(ids, callback, errorCallback);
});
}).send();
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets/batch?ids=${idsStr}`,
method: 'DELETE',
callback: callback,
errorCallback: errorCallback,
errorMessage: '批量删除知识库失败',
retryFunction: () => this.deleteKnowledgeBases(ids, callback, errorCallback)
});
},
/**
@@ -196,33 +188,20 @@ export default {
* @param {Function} errorCallback - 错误回调
*/
getDocumentList(datasetId, params, callback, errorCallback) {
const token = getAuthToken();
const queryParams = new URLSearchParams({
page: params.page,
page_size: params.page_size,
name: params.name || ''
}).toString();
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/documents?${queryParams}`)
.method('GET')
.header({ 'Authorization': `Bearer ${token}` })
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('获取文档列表失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.getDocumentList(datasetId, params, callback, errorCallback);
});
}).send();
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents?${queryParams}`,
method: 'GET',
callback: callback,
errorCallback: errorCallback,
errorMessage: '获取文档列表失败',
retryFunction: () => this.getDocumentList(datasetId, params, callback, errorCallback)
});
},
/**
@@ -233,31 +212,16 @@ export default {
* @param {Function} errorCallback - 错误回调
*/
uploadDocument(datasetId, formData, callback, errorCallback) {
const token = getAuthToken();
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/documents`)
.method('POST')
.data(formData)
.header({
'Authorization': `Bearer ${token}`,
'Content-Type': 'multipart/form-data'
})
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('上传文档失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.uploadDocument(datasetId, formData, callback, errorCallback);
});
}).send();
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents`,
method: 'POST',
data: formData,
headers: { 'Content-Type': 'multipart/form-data' },
callback: callback,
errorCallback: errorCallback,
errorMessage: '上传文档失败',
retryFunction: () => this.uploadDocument(datasetId, formData, callback, errorCallback)
});
},
/**
@@ -268,35 +232,20 @@ export default {
* @param {Function} errorCallback - 错误回调
*/
parseDocument(datasetId, documentId, callback, errorCallback) {
const token = getAuthToken();
const requestBody = {
document_ids: [documentId]
};
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/chunks`)
.method('POST')
.data(requestBody)
.header({
'Authorization': `Bearer ${token}`,
'Content-Type': 'application/json'
})
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('解析文档失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.parseDocument(datasetId, documentId, callback, errorCallback);
});
}).send();
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/chunks`,
method: 'POST',
data: requestBody,
headers: { 'Content-Type': 'application/json' },
callback: callback,
errorCallback: errorCallback,
errorMessage: '解析文档失败',
retryFunction: () => this.parseDocument(datasetId, documentId, callback, errorCallback)
});
},
/**
@@ -307,27 +256,14 @@ export default {
* @param {Function} errorCallback - 错误回调
*/
deleteDocument(datasetId, documentId, callback, errorCallback) {
const token = getAuthToken();
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}`)
.method('DELETE')
.header({ 'Authorization': `Bearer ${token}` })
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('删除文档失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.deleteDocument(datasetId, documentId, callback, errorCallback);
});
}).send();
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}`,
method: 'DELETE',
callback: callback,
errorCallback: errorCallback,
errorMessage: '删除文档失败',
retryFunction: () => this.deleteDocument(datasetId, documentId, callback, errorCallback)
});
},
/**
@@ -339,8 +275,7 @@ export default {
* @param {Function} errorCallback - 错误回调
*/
listChunks(datasetId, documentId, params, callback, errorCallback) {
const token = getAuthToken();
const queryParams = new URLSearchParams({
let queryParams = new URLSearchParams({
page: params.page || 1,
page_size: params.page_size || 10
}).toString();
@@ -350,26 +285,14 @@ export default {
queryParams += `&keywords=${encodeURIComponent(params.keywords)}`;
}
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}/chunks?${queryParams}`)
.method('GET')
.header({ 'Authorization': `Bearer ${token}` })
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('获取切片列表失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.listChunks(datasetId, documentId, params, callback, errorCallback);
});
}).send();
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}/chunks?${queryParams}`,
method: 'GET',
callback: callback,
errorCallback: errorCallback,
errorMessage: '获取切片列表失败',
retryFunction: () => this.listChunks(datasetId, documentId, params, callback, errorCallback)
});
},
/**
@@ -381,28 +304,16 @@ export default {
* @param {Function} errorCallback - 错误回调
*/
addChunk(datasetId, documentId, data, callback, errorCallback) {
const token = getAuthToken();
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}/chunks`)
.method('POST')
.data(data)
.header({ 'Authorization': `Bearer ${token}` })
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('添加切片失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.addChunk(datasetId, documentId, data, callback, errorCallback);
});
}).send();
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}/chunks`,
method: 'POST',
data: data,
headers: { 'Content-Type': 'application/json' },
callback: callback,
errorCallback: errorCallback,
errorMessage: '添加切片失败',
retryFunction: () => this.addChunk(datasetId, documentId, data, callback, errorCallback)
});
},
/**
@@ -413,28 +324,16 @@ export default {
* @param {Function} errorCallback - 错误回调
*/
retrievalTest(datasetId, data, callback, errorCallback) {
const token = getAuthToken();
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/retrieval-test`)
.method('POST')
.data(data)
.header({ 'Authorization': `Bearer ${token}` })
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('召回测试失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.retrievalTest(datasetId, data, callback, errorCallback);
});
}).send();
makeApiRequest({
url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/retrieval-test`,
method: 'POST',
data: data,
headers: { 'Content-Type': 'application/json' },
callback: callback,
errorCallback: errorCallback,
errorMessage: '召回测试失败',
retryFunction: () => this.retrievalTest(datasetId, data, callback, errorCallback)
});
}
};
main/manager-web/src/i18n/en.js
+1 -1
View File
@@ -1206,7 +1206,7 @@ export default {
'knowledgeFileUpload.documentNamePlaceholder': 'Please enter document name',
'knowledgeFileUpload.file': 'File',
'knowledgeFileUpload.clickToUpload': 'Click to upload',
'knowledgeFileUpload.uploadTip': 'Only pdf, doc, docx, txt files are supported, and file size should not exceed 10MB',
'knowledgeFileUpload.uploadTip': 'Supported file types: PDF, DOC, DOCX, TXT, MD, CSV, XLS, XLSX, PPT, PPTX. Maximum 32 files per upload, each file size up to 10MB',
'knowledgeFileUpload.dragOrClick': 'Drag file here, or click to upload',
'knowledgeFileUpload.cancel': 'Cancel',
'knowledgeFileUpload.confirm': 'Confirm',
main/manager-web/src/i18n/zh_CN.js
+1 -1
View File
@@ -1206,7 +1206,7 @@ export default {
'knowledgeFileUpload.documentNamePlaceholder': '请输入文档名称',
'knowledgeFileUpload.file': '文件',
'knowledgeFileUpload.clickToUpload': '点击上传',
'knowledgeFileUpload.uploadTip': '只能上传pdf、doc、docx、txt文件，且不超过10MB',
'knowledgeFileUpload.uploadTip': '支持的文档类型：PDF、DOC、DOCX、TXT、MD、CSV、XLS、XLSX、PPT、PPTX，单次批量上传文件数不超过 32 个',
'knowledgeFileUpload.dragOrClick': '将文件拖到此处，或点击上传',
'knowledgeFileUpload.cancel': '取消',
'knowledgeFileUpload.confirm': '确定',
main/manager-web/src/i18n/zh_TW.js
+1 -1
View File
@@ -1206,7 +1206,7 @@ export default {
'knowledgeFileUpload.documentNamePlaceholder': '請輸入文檔名稱',
'knowledgeFileUpload.file': '文件',
'knowledgeFileUpload.clickToUpload': '點擊上傳',
'knowledgeFileUpload.uploadTip': '只能上傳pdf、doc、docx、txt文件，且不超過10MB',
'knowledgeFileUpload.uploadTip': '支持的文件類型：PDF、DOC、DOCX、TXT、MD、CSV、XLS、XLSX、PPT、PPTX，单次批量上傳文件數不超過 32 個，每個文件大小不超過 10MB',
'knowledgeFileUpload.dragOrClick': '將文件拖到此處，或點擊上傳',
'knowledgeFileUpload.cancel': '取消',
'knowledgeFileUpload.confirm': '確定',
main/manager-web/src/views/KnowledgeBaseManagement.vue
+1 -1
View File
@@ -15,7 +15,7 @@
<div class="content-panel">
<div class="content-area">
<el-card class="params-card" shadow="never">
<div class="table-wrapper">
<div>
<el-table ref="paramsTable" :data="knowledgeBaseList" class="transparent-table" v-loading="loading"
:element-loading-text="$t('common.loading')" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(255, 255, 255, 0.7)"
main/manager-web/src/views/KnowledgeFileUpload.vue
+3 -186
View File
@@ -310,7 +310,6 @@ export default {
uploadDialogVisible: false,
uploading: false,
uploadForm: {
name: '',
file: null
},
uploadUrl: '',
@@ -323,7 +322,6 @@ export default {
currentDocumentName: '',
sliceList: [],
sliceLoading: false,
sliceSearchKeyword: '',
sliceCurrentPage: 1,
slicePageSize: 10,
sliceTotal: 0,
@@ -977,17 +975,6 @@ export default {
this.fetchSlices();
},
handleSliceDialogClose: function(done) {
this.sliceDialogVisible = false;
this.currentDocumentId = null;
this.currentDocumentName = '';
this.sliceList = [];
this.sliceTotal = 0;
if (done) {
done();
}
},
// 跳转到切片管理第一页
goToSliceFirstPage: function() {
if (this.sliceCurrentPage !== 1) {
@@ -1433,9 +1420,9 @@ export default {
/* 拖拽上传区域样式 */
.document-uploader {
:deep(.el-upload-dragger) {
width: 100%;
height: 200px;
min-height: 200px;
width: 600px;
height: 300px;
min-height: 300px;
border: 2px dashed #c0c4cc;
border-radius: 16px;
cursor: pointer;
@@ -1993,10 +1980,6 @@ export default {
gap: 10px;
}
.slice-table {
margin-bottom: 20px;
}
.slice-pagination {
text-align: right;
margin-top: 20px;
@@ -2007,172 +1990,6 @@ export default {
justify-content: flex-end;
gap: 5px;
}
:deep(.el-pagination) {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 8px;
.el-pagination__sizes {
margin-right: 8px;
.el-input__inner {
height: 32px;
line-height: 32px;
border-radius: 4px;
border: 1px solid #e4e7ed;
background: #dee7ff;
color: #606266;
font-size: 14px;
}
.el-input__suffix {
right: 6px;
width: 15px;
height: 20px;
display: flex;
justify-content: center;
align-items: center;
top: 6px;
border-radius: 4px;
}
.el-input__suffix-inner {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
}
.el-icon-arrow-up:before {
content: "";
display: inline-block;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-top: 9px solid #606266;
position: relative;
transform: rotate(0deg);
transition: transform 0.3s;
}
}
.btn-prev, .btn-next {
min-width: 60px;
height: 32px;
padding: 0 12px;
border-radius: 4px;
border: 1px solid #e4e7ed;
background: #dee7ff;
color: #606266;
font-size: 14px;
cursor: pointer;
transition: all 0.3s ease;
&:hover {
background: #d7dce6;
}
&:disabled {
opacity: 0.6;
cursor: not-allowed;
}
}
.el-pager {
display: flex;
gap: 4px;
.number {
min-width: 28px;
height: 32px;
padding: 0;
border-radius: 4px;
border: 1px solid transparent;
background: transparent;
color: #606266;
font-size: 14px;
cursor: pointer;
transition: all 0.3s ease;
&:hover {
background: rgba(245, 247, 250, 0.3);
}
&.active {
background: #5f70f3 !important;
color: #ffffff !important;
border-color: #5f70f3 !important;
&:hover {
background: #6d7cf5 !important;
}
}
}
}
.el-pagination__jump {
margin-left: 8px;
color: #606266;
font-size: 14px;
.el-pagination__editor {
width: 50px;
margin: 0 8px;
.el-input__inner {
height: 32px;
line-height: 32px;
border-radius: 4px;
border: 1px solid #e4e7ed;
background: #dee7ff;
color: #606266;
font-size: 14px;
}
}
}
.el-pagination__total {
margin-right: 8px;
color: #606266;
font-size: 14px;
}
}
}
.slice-content {
max-height: 300px;
min-height: 60px;
overflow-y: auto;
word-break: break-all;
line-height: 1.4;
padding: 8px 12px;
border: 1px solid #e4e7ed;
border-radius: 4px;
background-color: #f8f9fa;
white-space: pre-wrap;
}
.slice-keywords, .slice-questions {
max-height: 60px;
overflow-y: auto;
}
.slice-tag {
margin: 2px;
}
.add-slice-form {
padding: 20px 0;
}
.form-item {
margin-bottom: 20px;
}
.form-actions {
text-align: right;
margin-top: 20px;
}
@media (min-width: 1144px) {