feat:优化重构
parent
4b4079d96f
commit
6df950ec3f
|
|
@ -1,3 +1,4 @@
|
|||
from knowledge.serializers.common import get_embedding_model_by_knowledge_id_list
|
||||
# coding=utf-8
|
||||
"""
|
||||
@project: maxkb
|
||||
|
|
@ -66,8 +67,7 @@ class BaseSearchDatasetStep(ISearchDatasetStep):
|
|||
if model.model_type != "EMBEDDING":
|
||||
raise Exception(_("Model does not exist"))
|
||||
self.context['model_name'] = model.name
|
||||
default_params = get_model_default_params(model)
|
||||
embedding_model = ModelManage.get_model(model_id, lambda _id: get_model(model, **{**default_params}))
|
||||
embedding_model = get_embedding_model_by_knowledge_id_list(knowledge_id_list)
|
||||
embedding_value = embedding_model.embed_query(exec_problem_text)
|
||||
vector = VectorStore.get_embedding_vector()
|
||||
embedding_list = vector.query(exec_problem_text, embedding_value, knowledge_id_list, None, exclude_document_id_list,
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
from knowledge.serializers.common import get_embedding_model_by_knowledge_id_list
|
||||
# coding=utf-8
|
||||
"""
|
||||
@project: maxkb
|
||||
|
|
@ -102,7 +103,8 @@ class BaseSearchKnowledgeNode(ISearchKnowledgeStepNode):
|
|||
return get_none_result(question)
|
||||
model_id = get_embedding_id(knowledge_id_list)
|
||||
workspace_id = self.workflow_manage.get_body().get('workspace_id')
|
||||
embedding_model = get_model_instance_by_model_workspace_id(model_id, workspace_id)
|
||||
get_model_instance_by_model_workspace_id(model_id, workspace_id) # Preserve resource access validation.
|
||||
embedding_model = get_embedding_model_by_knowledge_id_list(knowledge_id_list)
|
||||
embedding_value = embedding_model.embed_query(question)
|
||||
vector = VectorStore.get_embedding_vector()
|
||||
exclude_document_id_list = [str(document.id) for document in
|
||||
|
|
|
|||
|
|
@ -357,7 +357,7 @@ class ListenerManagement:
|
|||
@staticmethod
|
||||
def update_problem(args: UpdateProblemArgs):
|
||||
problem_paragraph_mapping_list = QuerySet(ProblemParagraphMapping).filter(problem_id=args.problem_id)
|
||||
embed_value = args.embedding_model.embed_query(args.problem_content)
|
||||
embed_value = args.embedding_model.embed_documents([args.problem_content])[0]
|
||||
VectorStore.get_embedding_vector().update_by_source_ids([v.id for v in problem_paragraph_mapping_list],
|
||||
{'embedding': embed_value})
|
||||
|
||||
|
|
|
|||
|
|
@ -22,3 +22,4 @@ from .table_checkbox import *
|
|||
from .radio_card_field import *
|
||||
from .label import *
|
||||
from .slider_field import *
|
||||
from .switch_field import *
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ from charset_normalizer import detect
|
|||
|
||||
from common.handle.base_split_handle import BaseSplitHandle
|
||||
from common.utils.logger import maxkb_logger
|
||||
from common.utils.table_split import split_table_rows
|
||||
|
||||
|
||||
def post_cell(cell_value):
|
||||
|
|
@ -28,7 +29,7 @@ def row_to_md(row):
|
|||
|
||||
|
||||
class CsvSplitHandle(BaseSplitHandle):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image, overlap: int = 0):
|
||||
buffer = get_buffer(file)
|
||||
paragraphs = []
|
||||
file_name = os.path.basename(file.name)
|
||||
|
|
@ -46,22 +47,7 @@ class CsvSplitHandle(BaseSplitHandle):
|
|||
return result
|
||||
if len(title_row_list) == 0:
|
||||
return result
|
||||
result_item_content = ''
|
||||
for row in reader:
|
||||
next_md_content = row_to_md(row)
|
||||
next_md_content_len = len(next_md_content)
|
||||
result_item_content_len = len(result_item_content)
|
||||
if len(result_item_content) == 0:
|
||||
result_item_content += title_md_content
|
||||
result_item_content += next_md_content
|
||||
else:
|
||||
if result_item_content_len + next_md_content_len < limit:
|
||||
result_item_content += next_md_content
|
||||
else:
|
||||
paragraphs.append({'content': result_item_content, 'title': ''})
|
||||
result_item_content = title_md_content + next_md_content
|
||||
if len(result_item_content) > 0:
|
||||
paragraphs.append({'content': result_item_content, 'title': ''})
|
||||
paragraphs.extend(split_table_rows(title_md_content, (row_to_md(row) for row in reader), limit, overlap))
|
||||
return result
|
||||
except Exception as e:
|
||||
maxkb_logger.error(f"Error processing CSV file {file.name}: {e}, {traceback.format_exc()}")
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ class DocSplitHandle(BaseSplitHandle):
|
|||
for element
|
||||
in elements])
|
||||
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image, overlap: int = 0):
|
||||
file_name = os.path.basename(file.name)
|
||||
try:
|
||||
if type(limit) is str:
|
||||
|
|
@ -206,9 +206,9 @@ class DocSplitHandle(BaseSplitHandle):
|
|||
if len(image_list) > 0:
|
||||
save_image(image_list)
|
||||
if pattern_list is not None and len(pattern_list) > 0:
|
||||
split_model = SplitModel(pattern_list, with_filter, limit)
|
||||
split_model = SplitModel(pattern_list, with_filter, limit, overlap)
|
||||
else:
|
||||
split_model = SplitModel(default_pattern_list, with_filter=with_filter, limit=limit)
|
||||
split_model = SplitModel(default_pattern_list, with_filter=with_filter, limit=limit, overlap=overlap)
|
||||
except BaseException as e:
|
||||
maxkb_logger.error(f"Error processing XLSX file {file.name}: {e}, {traceback.format_exc()}")
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -44,16 +44,16 @@ class HTMLSplitHandle(BaseSplitHandle):
|
|||
return True
|
||||
return False
|
||||
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image, overlap: int = 0):
|
||||
buffer = get_buffer(file)
|
||||
if type(limit) is str:
|
||||
limit = int(limit)
|
||||
if type(with_filter) is str:
|
||||
with_filter = with_filter.lower() == 'true'
|
||||
if pattern_list is not None and len(pattern_list) > 0:
|
||||
split_model = SplitModel(pattern_list, with_filter, limit)
|
||||
split_model = SplitModel(pattern_list, with_filter, limit, overlap)
|
||||
else:
|
||||
split_model = SplitModel(default_pattern_list, with_filter=with_filter, limit=limit)
|
||||
split_model = SplitModel(default_pattern_list, with_filter=with_filter, limit=limit, overlap=overlap)
|
||||
try:
|
||||
encoding = get_encoding(buffer)
|
||||
content = buffer.decode(encoding)
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ def check_links_in_pdf(doc):
|
|||
|
||||
|
||||
class PdfSplitHandle(BaseSplitHandle):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image, overlap: int = 0):
|
||||
with tempfile.NamedTemporaryFile(delete=False) as temp_file:
|
||||
# 将上传的文件保存到临时文件中
|
||||
for chunk in file.chunks():
|
||||
|
|
@ -57,12 +57,12 @@ class PdfSplitHandle(BaseSplitHandle):
|
|||
if type(with_filter) is str:
|
||||
with_filter = with_filter.lower() == 'true'
|
||||
# 处理有目录的pdf
|
||||
result = self.handle_toc(pdf_document, limit)
|
||||
result = self.handle_toc(pdf_document, limit, overlap)
|
||||
if result is not None:
|
||||
return {'name': file.name, 'content': result}
|
||||
|
||||
# 没目录但是有链接的pdf
|
||||
result = self.handle_links(pdf_document, pattern_list, with_filter, limit)
|
||||
result = self.handle_links(pdf_document, pattern_list, with_filter, limit, overlap)
|
||||
if result is not None and len(result) > 0:
|
||||
return {'name': file.name, 'content': result}
|
||||
|
||||
|
|
@ -70,9 +70,9 @@ class PdfSplitHandle(BaseSplitHandle):
|
|||
content = self.handle_pdf_content(file, pdf_document)
|
||||
|
||||
if pattern_list is not None and len(pattern_list) > 0:
|
||||
split_model = SplitModel(pattern_list, with_filter, limit)
|
||||
split_model = SplitModel(pattern_list, with_filter, limit, overlap)
|
||||
else:
|
||||
split_model = SplitModel(default_pattern_list, with_filter=with_filter, limit=limit)
|
||||
split_model = SplitModel(default_pattern_list, with_filter=with_filter, limit=limit, overlap=overlap)
|
||||
except BaseException as e:
|
||||
maxkb_logger.error(f"File: {file.name}, error: {e}, {traceback.format_exc()}")
|
||||
return {
|
||||
|
|
@ -131,7 +131,7 @@ class PdfSplitHandle(BaseSplitHandle):
|
|||
return content
|
||||
|
||||
@staticmethod
|
||||
def handle_toc(doc, limit):
|
||||
def handle_toc(doc, limit, overlap: int = 0):
|
||||
# 找到目录
|
||||
toc = doc.get_toc()
|
||||
if toc is None or len(toc) == 0:
|
||||
|
|
@ -183,7 +183,7 @@ class PdfSplitHandle(BaseSplitHandle):
|
|||
real_chapter_title = chapter_title[:256]
|
||||
# 限制章节内容长度
|
||||
if 0 < limit < len(chapter_text):
|
||||
split_text = smart_split_paragraph(chapter_text, limit)
|
||||
split_text = smart_split_paragraph(chapter_text, limit, overlap)
|
||||
for text in split_text:
|
||||
chapters.append({"title": real_chapter_title, "content": text})
|
||||
else:
|
||||
|
|
@ -193,7 +193,7 @@ class PdfSplitHandle(BaseSplitHandle):
|
|||
return chapters
|
||||
|
||||
@staticmethod
|
||||
def handle_links(doc, pattern_list, with_filter, limit):
|
||||
def handle_links(doc, pattern_list, with_filter, limit, overlap: int = 0):
|
||||
# 检查文档是否包含内部链接
|
||||
if not check_links_in_pdf(doc):
|
||||
return
|
||||
|
|
@ -262,7 +262,7 @@ class PdfSplitHandle(BaseSplitHandle):
|
|||
|
||||
# 限制章节内容长度
|
||||
if 0 < limit < len(chapter_text):
|
||||
split_text = smart_split_paragraph(chapter_text, limit)
|
||||
split_text = smart_split_paragraph(chapter_text, limit, overlap)
|
||||
for text in split_text:
|
||||
chapters.append({"title": link_title, "content": text})
|
||||
else:
|
||||
|
|
@ -285,9 +285,9 @@ class PdfSplitHandle(BaseSplitHandle):
|
|||
except BaseException as e:
|
||||
maxkb_logger.error(_('This document has no preface and is treated as ordinary text: {e}').format(e=e))
|
||||
if pattern_list is not None and len(pattern_list) > 0:
|
||||
split_model = SplitModel(pattern_list, with_filter, limit)
|
||||
split_model = SplitModel(pattern_list, with_filter, limit, overlap)
|
||||
else:
|
||||
split_model = SplitModel(default_pattern_list, with_filter=with_filter, limit=limit)
|
||||
split_model = SplitModel(default_pattern_list, with_filter=with_filter, limit=limit, overlap=overlap)
|
||||
# 插入目录前的部分
|
||||
page_content = re.sub(r'(?<!。)\n+', '', page_content)
|
||||
page_content = re.sub(r'(?<!.)\n+', '', page_content)
|
||||
|
|
|
|||
|
|
@ -39,16 +39,16 @@ class TextSplitHandle(BaseSplitHandle):
|
|||
return True
|
||||
return False
|
||||
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image, overlap: int = 0):
|
||||
buffer = get_buffer(file)
|
||||
if type(limit) is str:
|
||||
limit = int(limit)
|
||||
if type(with_filter) is str:
|
||||
with_filter = with_filter.lower() == 'true'
|
||||
if pattern_list is not None and len(pattern_list) > 0:
|
||||
split_model = SplitModel(pattern_list, with_filter, limit)
|
||||
split_model = SplitModel(pattern_list, with_filter, limit, overlap)
|
||||
else:
|
||||
split_model = SplitModel(default_pattern_list, with_filter=with_filter, limit=limit)
|
||||
split_model = SplitModel(default_pattern_list, with_filter=with_filter, limit=limit, overlap=overlap)
|
||||
try:
|
||||
content = buffer.decode(detect(buffer)['encoding'])
|
||||
except BaseException as e:
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import xlrd
|
|||
|
||||
from common.handle.base_split_handle import BaseSplitHandle
|
||||
from common.utils.logger import maxkb_logger
|
||||
from common.utils.table_split import split_table_rows
|
||||
|
||||
|
||||
def post_cell(cell_value):
|
||||
|
|
@ -24,7 +25,7 @@ def row_to_md(row):
|
|||
[post_cell(str(cell)) if cell is not None else '' for cell in row]) + ' |\n'
|
||||
|
||||
|
||||
def handle_sheet(file_name, sheet, limit: int):
|
||||
def handle_sheet(file_name, sheet, limit: int, overlap: int = 0):
|
||||
rows = iter([sheet.row_values(i) for i in range(sheet.nrows)])
|
||||
paragraphs = []
|
||||
result = {'name': file_name, 'content': paragraphs}
|
||||
|
|
@ -37,27 +38,12 @@ def handle_sheet(file_name, sheet, limit: int):
|
|||
return result
|
||||
if len(title_row_list) == 0:
|
||||
return result
|
||||
result_item_content = ''
|
||||
for row in rows:
|
||||
next_md_content = row_to_md(row)
|
||||
next_md_content_len = len(next_md_content)
|
||||
result_item_content_len = len(result_item_content)
|
||||
if len(result_item_content) == 0:
|
||||
result_item_content += title_md_content
|
||||
result_item_content += next_md_content
|
||||
else:
|
||||
if result_item_content_len + next_md_content_len < limit:
|
||||
result_item_content += next_md_content
|
||||
else:
|
||||
paragraphs.append({'content': result_item_content, 'title': ''})
|
||||
result_item_content = title_md_content + next_md_content
|
||||
if len(result_item_content) > 0:
|
||||
paragraphs.append({'content': result_item_content, 'title': ''})
|
||||
paragraphs.extend(split_table_rows(title_md_content, (row_to_md(row) for row in rows), limit, overlap))
|
||||
return result
|
||||
|
||||
|
||||
class XlsSplitHandle(BaseSplitHandle):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image, overlap: int = 0):
|
||||
buffer = get_buffer(file)
|
||||
try:
|
||||
if type(limit) is str:
|
||||
|
|
@ -67,8 +53,8 @@ class XlsSplitHandle(BaseSplitHandle):
|
|||
worksheets_size = len(worksheets)
|
||||
return [row for row in
|
||||
[handle_sheet(file.name,
|
||||
sheet, limit) if worksheets_size == 1 and sheet.name == 'Sheet1' else handle_sheet(
|
||||
sheet.name, sheet, limit) for sheet
|
||||
sheet, limit, overlap) if worksheets_size == 1 and sheet.name == 'Sheet1' else handle_sheet(
|
||||
sheet.name, sheet, limit, overlap) for sheet
|
||||
in worksheets] if row is not None]
|
||||
except Exception as e:
|
||||
maxkb_logger.error(f"Error processing XLS file {file.name}: {e}, {traceback.format_exc()}")
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import openpyxl
|
|||
from common.handle.base_split_handle import BaseSplitHandle
|
||||
from common.handle.impl.common_handle import xlsx_embed_cells_images
|
||||
from common.utils.logger import maxkb_logger
|
||||
from common.utils.table_split import split_table_rows
|
||||
|
||||
|
||||
def post_cell(image_dict, cell_value):
|
||||
|
|
@ -30,7 +31,7 @@ def row_to_md(row, image_dict):
|
|||
in row]) + ' |\n'
|
||||
|
||||
|
||||
def handle_sheet(file_name, sheet, image_dict, limit: int):
|
||||
def handle_sheet(file_name, sheet, image_dict, limit: int, overlap: int = 0):
|
||||
rows = sheet.rows
|
||||
paragraphs = []
|
||||
result = {'name': file_name, 'content': paragraphs}
|
||||
|
|
@ -43,27 +44,12 @@ def handle_sheet(file_name, sheet, image_dict, limit: int):
|
|||
return result
|
||||
if len(title_row_list) == 0:
|
||||
return result
|
||||
result_item_content = ''
|
||||
for row in rows:
|
||||
next_md_content = row_to_md(row, image_dict)
|
||||
next_md_content_len = len(next_md_content)
|
||||
result_item_content_len = len(result_item_content)
|
||||
if len(result_item_content) == 0:
|
||||
result_item_content += title_md_content
|
||||
result_item_content += next_md_content
|
||||
else:
|
||||
if result_item_content_len + next_md_content_len < limit:
|
||||
result_item_content += next_md_content
|
||||
else:
|
||||
paragraphs.append({'content': result_item_content, 'title': ''})
|
||||
result_item_content = title_md_content + next_md_content
|
||||
if len(result_item_content) > 0:
|
||||
paragraphs.append({'content': result_item_content, 'title': ''})
|
||||
paragraphs.extend(split_table_rows(title_md_content, (row_to_md(row, image_dict) for row in rows), limit, overlap))
|
||||
return result
|
||||
|
||||
|
||||
class XlsxSplitHandle(BaseSplitHandle):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image, overlap: int = 0):
|
||||
buffer = get_buffer(file)
|
||||
try:
|
||||
if type(limit) is str:
|
||||
|
|
@ -80,8 +66,8 @@ class XlsxSplitHandle(BaseSplitHandle):
|
|||
[handle_sheet(file.name,
|
||||
sheet,
|
||||
image_dict,
|
||||
limit) if worksheets_size == 1 and sheet.title == 'Sheet1' else handle_sheet(
|
||||
sheet.title, sheet, image_dict, limit) for sheet
|
||||
limit, overlap) if worksheets_size == 1 and sheet.title == 'Sheet1' else handle_sheet(
|
||||
sheet.title, sheet, image_dict, limit, overlap) for sheet
|
||||
in worksheets] if row is not None]
|
||||
except Exception as e:
|
||||
maxkb_logger.error(f"Error processing XLSX file {file.name}: {e}, {traceback.format_exc()}")
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@ split_handles = [
|
|||
]
|
||||
|
||||
|
||||
def file_to_paragraph(file, pattern_list: List, with_filter: bool, limit: int, save_inner_image):
|
||||
def file_to_paragraph(file, pattern_list: List, with_filter: bool, limit: int, save_inner_image, overlap: int = 0):
|
||||
get_buffer = FileBufferHandle().get_buffer
|
||||
for split_handle in split_handles:
|
||||
if split_handle.support(file, get_buffer):
|
||||
return split_handle.handle(file, pattern_list, with_filter, limit, get_buffer, save_inner_image)
|
||||
return split_handle.handle(file, pattern_list, with_filter, limit, get_buffer, save_inner_image, overlap)
|
||||
raise Exception(_('Unsupported file format'))
|
||||
|
||||
|
||||
|
|
@ -116,7 +116,7 @@ def filter_image_file(result_list: list, image_list):
|
|||
|
||||
|
||||
class ZipSplitHandle(BaseSplitHandle):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image):
|
||||
def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_buffer, save_image, overlap: int = 0):
|
||||
if type(limit) is str:
|
||||
limit = int(limit)
|
||||
if type(with_filter) is str:
|
||||
|
|
@ -137,7 +137,7 @@ class ZipSplitHandle(BaseSplitHandle):
|
|||
try:
|
||||
# 处理一下文件名
|
||||
f.name = get_file_name(f.name)
|
||||
value = file_to_paragraph(f, pattern_list, with_filter, limit, save_image)
|
||||
value = file_to_paragraph(f, pattern_list, with_filter, limit, save_image, overlap)
|
||||
if isinstance(value, list):
|
||||
result = [*result, *value]
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@ class GunicornLocalModelService(BaseService):
|
|||
print("\n- Start Gunicorn Local Model WSGI HTTP Server")
|
||||
log_format = '%(h)s %(t)s %(L)ss "%(r)s" %(s)s %(b)s '
|
||||
bind = f'{CONFIG.get("LOCAL_MODEL_HOST")}:{CONFIG.get("LOCAL_MODEL_PORT")}'
|
||||
worker = CONFIG.get("LOCAL_MODEL_HOST_WORKER", 1)
|
||||
# Weights and the load queue have one owner; inference remains multithreaded.
|
||||
worker = 1
|
||||
max_requests = 10240 if int(worker) > 1 else 0
|
||||
cmd = [
|
||||
'gunicorn', 'maxkb.wsgi:application',
|
||||
|
|
|
|||
|
|
@ -274,16 +274,22 @@ def post_handler_paragraph(content: str, limit: int):
|
|||
return reduce(lambda x, y: [*x, *y], map(lambda row: re.findall(pattern, row), result), [])
|
||||
|
||||
|
||||
def smart_split_paragraph(content: str, limit: int):
|
||||
def smart_split_paragraph(content: str, limit: int, overlap: int = 0):
|
||||
"""
|
||||
智能分段:在limit前找到合适的分割点(句号、回车等)
|
||||
:param content: 需要分段的文本
|
||||
:param limit: 最大字符限制
|
||||
:param overlap: 相邻分段的重叠长度
|
||||
:return: 分段后的文本列表
|
||||
"""
|
||||
if len(content) <= limit:
|
||||
return [content]
|
||||
|
||||
if overlap is None or overlap < 0:
|
||||
overlap = 0
|
||||
if overlap >= limit:
|
||||
overlap = max(0, limit // 2)
|
||||
|
||||
result = []
|
||||
start = 0
|
||||
|
||||
|
|
@ -318,7 +324,9 @@ def smart_split_paragraph(content: str, limit: int):
|
|||
best_split = end
|
||||
|
||||
result.append(content[start:best_split])
|
||||
start = best_split
|
||||
# 相邻分段保留 overlap 字符重叠,且保证向前推进
|
||||
next_start = best_split - overlap if overlap > 0 else best_split
|
||||
start = next_start if next_start > start else best_split
|
||||
|
||||
return [text for text in result if text.strip()]
|
||||
|
||||
|
|
@ -345,7 +353,7 @@ def filter_special_char(content: str):
|
|||
|
||||
class SplitModel:
|
||||
|
||||
def __init__(self, content_level_pattern, with_filter=True, limit=100000):
|
||||
def __init__(self, content_level_pattern, with_filter=True, limit=100000, overlap=0):
|
||||
self.content_level_pattern = content_level_pattern
|
||||
self.with_filter = with_filter
|
||||
if type(limit) is not int:
|
||||
|
|
@ -355,6 +363,16 @@ class SplitModel:
|
|||
if limit < 50:
|
||||
limit = 50
|
||||
self.limit = limit
|
||||
if type(overlap) is not int:
|
||||
try:
|
||||
overlap = int(overlap)
|
||||
except (TypeError, ValueError):
|
||||
overlap = 0
|
||||
if overlap is None or overlap < 0:
|
||||
overlap = 0
|
||||
if overlap >= self.limit:
|
||||
overlap = max(0, self.limit // 2)
|
||||
self.overlap = overlap
|
||||
|
||||
def parse_to_tree(self, text: str, index=0):
|
||||
"""
|
||||
|
|
@ -365,7 +383,8 @@ class SplitModel:
|
|||
"""
|
||||
level_content_list = parse_title_level(text, self.content_level_pattern, index)
|
||||
if len(level_content_list) == 0:
|
||||
return [to_tree_obj(row, 'block') for row in smart_split_paragraph(text, limit=self.limit)]
|
||||
return [to_tree_obj(row, 'block') for row in smart_split_paragraph(text, limit=self.limit,
|
||||
overlap=self.overlap)]
|
||||
if index == 0 and text.lstrip().index(level_content_list[0]["content"].lstrip()) != 0:
|
||||
level_content_list.insert(0, to_tree_obj(""))
|
||||
|
||||
|
|
@ -374,7 +393,7 @@ class SplitModel:
|
|||
for i in range(len(level_title_content_list)):
|
||||
start_content: str = level_title_content_list[i].get('content')
|
||||
if cursor < text.index(start_content, cursor):
|
||||
for row in smart_split_paragraph(text[cursor: text.index(start_content, cursor)], limit=self.limit):
|
||||
for row in smart_split_paragraph(text[cursor: text.index(start_content, cursor)], limit=self.limit, overlap=self.overlap):
|
||||
level_content_list.insert(0, to_tree_obj(row, 'block'))
|
||||
|
||||
block, cursor = get_level_block(text, level_title_content_list, i, cursor)
|
||||
|
|
|
|||
|
|
@ -56,6 +56,46 @@ class KnowledgeScope(models.TextChoices):
|
|||
WORKSPACE = "WORKSPACE", "工作空间可用"
|
||||
|
||||
|
||||
class RebuildStatus(models.TextChoices):
|
||||
PENDING = "PENDING", "待执行"
|
||||
RUNNING = "RUNNING", "执行中"
|
||||
SUCCESS = "SUCCESS", "成功"
|
||||
PARTIAL = "PARTIAL", "部分成功"
|
||||
FAILED = "FAILED", "失败"
|
||||
|
||||
|
||||
class KnowledgeRebuildTask(AppModelMixin):
|
||||
"""知识库独立索引重建任务。
|
||||
|
||||
与“更换向量模型自动触发重向量化”分开:本表记录管理员在配置不变时
|
||||
主动发起的重建请求、执行状态、文档统计和失败原因。
|
||||
"""
|
||||
|
||||
id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid7, editable=False, verbose_name="主键id")
|
||||
knowledge = models.ForeignKey('knowledge.Knowledge', on_delete=models.CASCADE, db_constraint=False,
|
||||
related_name="rebuild_tasks", verbose_name="知识库")
|
||||
workspace_id = models.CharField(max_length=64, verbose_name="工作空间id", default="default", db_index=True)
|
||||
status = models.CharField(max_length=20, choices=RebuildStatus.choices, default=RebuildStatus.PENDING,
|
||||
db_index=True, verbose_name="任务状态")
|
||||
config_snapshot = models.JSONField(verbose_name="配置快照", default=dict)
|
||||
document_total = models.IntegerField(verbose_name="文档总数", default=0)
|
||||
document_success = models.IntegerField(verbose_name="成功文档数", default=0)
|
||||
document_failed = models.IntegerField(verbose_name="失败文档数", default=0)
|
||||
error_message = models.TextField(verbose_name="失败原因", default="", blank=True)
|
||||
operator = models.ForeignKey(User, on_delete=models.SET_NULL, db_constraint=False, null=True, blank=True,
|
||||
related_name="+", verbose_name="操作人")
|
||||
started_at = models.DateTimeField(verbose_name="开始时间", null=True, blank=True)
|
||||
finished_at = models.DateTimeField(verbose_name="结束时间", null=True, blank=True)
|
||||
celery_task_id = models.CharField(max_length=128, verbose_name="Celery任务id", default="", blank=True)
|
||||
attempt = models.IntegerField(verbose_name="汇总轮询次数", default=0)
|
||||
|
||||
class Meta:
|
||||
db_table = "knowledge_rebuild_task"
|
||||
indexes = [
|
||||
models.Index(fields=["knowledge", "status"]),
|
||||
]
|
||||
|
||||
|
||||
class HitHandlingMethod(models.TextChoices):
|
||||
optimization = 'optimization', '模型优化'
|
||||
directly_return = 'directly_return', '直接返回'
|
||||
|
|
|
|||
|
|
@ -114,40 +114,31 @@ class ProblemParagraphManage:
|
|||
|
||||
|
||||
def get_embedding_model_by_knowledge_id_list(knowledge_id_list: List):
|
||||
knowledge_list = QuerySet(Knowledge).filter(id__in=knowledge_id_list)
|
||||
if len(set([knowledge.embedding_model_id for knowledge in knowledge_list])) > 1:
|
||||
raise Exception(_('The knowledge base is inconsistent with the vector model'))
|
||||
if len(knowledge_list) == 0:
|
||||
knowledge_list = list(QuerySet(Knowledge).select_related('embedding_model').filter(id__in=knowledge_id_list))
|
||||
if not knowledge_list:
|
||||
raise Exception(_('Knowledge base setting error, please reset the knowledge base'))
|
||||
if knowledge_list[0].embedding_model_id is None or knowledge_list[0].embedding_model is None:
|
||||
raise Exception(_('Knowledge base setting error, please reset the knowledge base'))
|
||||
|
||||
default_params = get_model_default_params(knowledge_list[0].embedding_model)
|
||||
|
||||
return ModelManage.get_model(
|
||||
str(knowledge_list[0].embedding_model_id),
|
||||
lambda _id: get_model(knowledge_list[0].embedding_model, **{**default_params})
|
||||
)
|
||||
from knowledge.embedding_params import knowledge_params
|
||||
configs = [(str(k.embedding_model_id), {key: value for key, value in knowledge_params(k).items()
|
||||
if key != 'batch_size'}) for k in knowledge_list]
|
||||
if any(config != configs[0] for config in configs[1:]):
|
||||
raise Exception('知识库的向量模型或嵌入参数不一致')
|
||||
return get_embedding_model_by_knowledge(knowledge_list[0])
|
||||
|
||||
|
||||
def get_embedding_model_by_knowledge_id(knowledge_id: str):
|
||||
knowledge = QuerySet(Knowledge).select_related('embedding_model').filter(id=knowledge_id).first()
|
||||
if knowledge is None or knowledge.embedding_model_id is None or knowledge.embedding_model is None:
|
||||
raise Exception(_('Knowledge base setting error, please reset the knowledge base'))
|
||||
|
||||
default_params = get_model_default_params(knowledge.embedding_model)
|
||||
|
||||
return ModelManage.get_model(str(knowledge.embedding_model_id),
|
||||
lambda _id: get_model(knowledge.embedding_model, **{**default_params}))
|
||||
return get_embedding_model_by_knowledge(knowledge)
|
||||
|
||||
|
||||
def get_embedding_model_by_knowledge(knowledge):
|
||||
if knowledge is None or knowledge.embedding_model_id is None or knowledge.embedding_model is None:
|
||||
raise Exception(_('Knowledge base setting error, please reset the knowledge base'))
|
||||
from knowledge.embedding_params import ConfiguredEmbedding, knowledge_params
|
||||
default_params = get_model_default_params(knowledge.embedding_model)
|
||||
|
||||
return ModelManage.get_model(str(knowledge.embedding_model_id),
|
||||
lambda _id: get_model(knowledge.embedding_model, **{**default_params}))
|
||||
model = ModelManage.get_model(str(knowledge.embedding_model_id),
|
||||
lambda _id: get_model(knowledge.embedding_model, **default_params))
|
||||
params = knowledge_params(knowledge)
|
||||
return ConfiguredEmbedding(model, params) if params else model
|
||||
|
||||
|
||||
def get_embedding_model_id_by_knowledge_id(knowledge_id):
|
||||
|
|
|
|||
|
|
@ -162,7 +162,8 @@ class DocumentEditInstanceSerializer(serializers.Serializer):
|
|||
|
||||
class DocumentSplitRequest(serializers.Serializer):
|
||||
file = serializers.ListField(required=True, label=_('file list'))
|
||||
limit = serializers.IntegerField(required=False, label=_('limit'))
|
||||
limit = serializers.IntegerField(required=False, min_value=50, max_value=100000, label=_('limit'))
|
||||
overlap = serializers.IntegerField(required=False, min_value=0, label=_('chunk overlap'))
|
||||
patterns = serializers.ListField(
|
||||
required=False,
|
||||
child=serializers.CharField(required=True, label=_('patterns')),
|
||||
|
|
@ -338,7 +339,8 @@ class DocumentSerializers(serializers.Serializer):
|
|||
else:
|
||||
document_list.update(knowledge_id=target_knowledge_id)
|
||||
model_id = None
|
||||
if knowledge.embedding_model_id != target_knowledge.embedding_model_id:
|
||||
if (knowledge.embedding_model_id != target_knowledge.embedding_model_id or
|
||||
(knowledge.meta or {}).get('embedding_params', {}) != (target_knowledge.meta or {}).get('embedding_params', {})):
|
||||
model_id = get_embedding_model_id_by_knowledge_id(target_knowledge_id)
|
||||
|
||||
pid_list = [paragraph.id for paragraph in paragraph_list]
|
||||
|
|
@ -1047,7 +1049,21 @@ class DocumentSerializers(serializers.Serializer):
|
|||
|
||||
def parse(self, instance):
|
||||
self.is_valid(instance=instance, raise_exception=True)
|
||||
DocumentSplitRequest(data=instance).is_valid(raise_exception=True)
|
||||
split_request = DocumentSplitRequest(data=instance)
|
||||
split_request.is_valid(raise_exception=True)
|
||||
instance = split_request.validated_data
|
||||
|
||||
# 分段长度/重叠未显式指定时,回退到知识库分段规则(meta.segmentation)
|
||||
knowledge = QuerySet(Knowledge).filter(id=self.data.get('knowledge_id')).first()
|
||||
segmentation = (knowledge.meta or {}).get('segmentation') if knowledge is not None else None
|
||||
segmentation = segmentation or {}
|
||||
default_limit = segmentation.get('chunk_size') or 4096
|
||||
default_overlap = segmentation.get('chunk_overlap') or 0
|
||||
limit = instance.get("limit", None) or default_limit
|
||||
overlap = instance.get("overlap", None)
|
||||
overlap = default_overlap if overlap is None else overlap
|
||||
if not 0 <= overlap < limit:
|
||||
raise AppApiException(500, "重叠长度必须满足 0 ≤ 重叠长度 < 分段长度")
|
||||
|
||||
file_list = instance.get("file")
|
||||
return reduce(
|
||||
|
|
@ -1056,7 +1072,8 @@ class DocumentSerializers(serializers.Serializer):
|
|||
f,
|
||||
instance.get("patterns", None),
|
||||
instance.get("with_filter", None),
|
||||
instance.get("limit", 4096)
|
||||
limit,
|
||||
overlap
|
||||
) for f in file_list],
|
||||
[]
|
||||
)
|
||||
|
|
@ -1095,7 +1112,7 @@ class DocumentSerializers(serializers.Serializer):
|
|||
item['source_file_id'] = file_id
|
||||
return result_list
|
||||
|
||||
def file_to_paragraph(self, file, pattern_list: List, with_filter: bool, limit: int):
|
||||
def file_to_paragraph(self, file, pattern_list: List, with_filter: bool, limit: int, overlap: int = 0):
|
||||
# 保存源文件
|
||||
file_id = uuid.uuid7()
|
||||
raw_file = File(
|
||||
|
|
@ -1108,12 +1125,22 @@ class DocumentSerializers(serializers.Serializer):
|
|||
raw_file.save(file.read())
|
||||
file.seek(0)
|
||||
|
||||
from system_manage.ai_hub_knowledge import split_with_parser
|
||||
parsed = split_with_parser(self.data.get('workspace_id'), self.data.get('knowledge_id'),
|
||||
self.context.get('user'), file, pattern_list, with_filter, limit, overlap)
|
||||
if parsed is not None:
|
||||
result, provenance = parsed
|
||||
raw_file.meta = {**(raw_file.meta or {}), 'parser': provenance}
|
||||
QuerySet(File).filter(id=file_id).update(meta=raw_file.meta)
|
||||
return self.normalize_split_result(result, file, default_split_handle, file_id)
|
||||
get_buffer = FileBufferHandle().get_buffer
|
||||
for split_handle in split_handles:
|
||||
if split_handle.support(file, get_buffer):
|
||||
result = split_handle.handle(file, pattern_list, with_filter, limit, get_buffer, self.save_image)
|
||||
result = split_handle.handle(file, pattern_list, with_filter, limit, get_buffer, self.save_image,
|
||||
overlap)
|
||||
return self.normalize_split_result(result, file, split_handle, file_id)
|
||||
result = default_split_handle.handle(file, pattern_list, with_filter, limit, get_buffer, self.save_image)
|
||||
result = default_split_handle.handle(file, pattern_list, with_filter, limit, get_buffer, self.save_image,
|
||||
overlap)
|
||||
return self.normalize_split_result(result, file, default_split_handle, file_id)
|
||||
|
||||
class SplitPattern(serializers.Serializer):
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ class KnowledgeWebCreateRequest(serializers.Serializer):
|
|||
|
||||
|
||||
class KnowledgeEditRequest(serializers.Serializer):
|
||||
embedding_params = serializers.DictField(required=False)
|
||||
name = serializers.CharField(required=False, max_length=64, min_length=1, label=_('knowledge name'))
|
||||
desc = serializers.CharField(required=False, max_length=256, min_length=1, label=_('knowledge description'))
|
||||
meta = serializers.DictField(required=False)
|
||||
|
|
@ -361,7 +362,7 @@ class KnowledgeSerializer(serializers.Serializer):
|
|||
@transaction.atomic
|
||||
def edit(self, instance: Dict, select_one=True):
|
||||
self.is_valid()
|
||||
knowledge = QuerySet(Knowledge).get(id=self.data.get("knowledge_id"))
|
||||
knowledge = QuerySet(Knowledge).select_for_update().get(id=self.data.get("knowledge_id"))
|
||||
if QuerySet(Knowledge).filter(
|
||||
workspace_id=knowledge.workspace_id,
|
||||
name=instance.get('name'),
|
||||
|
|
@ -376,7 +377,20 @@ class KnowledgeSerializer(serializers.Serializer):
|
|||
if 'desc' in instance:
|
||||
knowledge.desc = instance.get("desc")
|
||||
if 'meta' in instance:
|
||||
knowledge.meta = instance.get('meta')
|
||||
incoming_meta = dict(instance.get('meta') or {})
|
||||
# Independently saved metadata/rules must survive stale general settings forms.
|
||||
for managed_key in ('business_metadata', 'segmentation', 'parser_id', 'embedding_params'):
|
||||
incoming_meta.pop(managed_key, None)
|
||||
if managed_key in (knowledge.meta or {}):
|
||||
incoming_meta[managed_key] = knowledge.meta[managed_key]
|
||||
knowledge.meta = incoming_meta
|
||||
if 'embedding_params' in instance:
|
||||
from knowledge.embedding_params import validate_params
|
||||
try:
|
||||
params = validate_params(instance['embedding_params'])
|
||||
except ValueError as exc:
|
||||
raise AppApiException(500, str(exc))
|
||||
knowledge.meta = {**(knowledge.meta or {}), 'embedding_params': params}
|
||||
if 'folder_id' in instance:
|
||||
knowledge.folder_id = instance.get('folder_id')
|
||||
if 'file_size_limit' in instance:
|
||||
|
|
@ -384,6 +398,10 @@ class KnowledgeSerializer(serializers.Serializer):
|
|||
if 'file_count_limit' in instance:
|
||||
knowledge.file_count_limit = instance.get('file_count_limit')
|
||||
if 'user_id' in instance:
|
||||
if str(instance.get('user_id')) != str(knowledge.user_id):
|
||||
from knowledge.serializers.knowledge_ext import _creator_candidates
|
||||
if not _creator_candidates(knowledge.workspace_id).filter(id=instance.get('user_id')).exists():
|
||||
raise AppApiException(500, '创建者须为已激活且启用的成员')
|
||||
knowledge.user_id = instance.get('user_id')
|
||||
if 'create_user' in instance:
|
||||
knowledge.create_user = instance.get('create_user')
|
||||
|
|
|
|||
|
|
@ -597,7 +597,8 @@ class ParagraphSerializers(serializers.Serializer):
|
|||
target_knowledge = QuerySet(Knowledge).filter(id=target_knowledge_id).first()
|
||||
knowledge = QuerySet(Knowledge).filter(id=knowledge_id).first()
|
||||
embedding_model_id = None
|
||||
if target_knowledge.embedding_model_id != knowledge.embedding_model_id:
|
||||
if (target_knowledge.embedding_model_id != knowledge.embedding_model_id or
|
||||
(knowledge.meta or {}).get('embedding_params', {}) != (target_knowledge.meta or {}).get('embedding_params', {})):
|
||||
embedding_model_id = str(target_knowledge.embedding_model_id)
|
||||
pid_list = [paragraph.id for paragraph in paragraph_list]
|
||||
# 修改段落信息
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ from common.config.embedding_config import ModelManage
|
|||
from common.event.listener_manage import ListenerManagement, UpdateProblemArgs, UpdateEmbeddingKnowledgeIdArgs, \
|
||||
UpdateEmbeddingDocumentIdArgs
|
||||
from common.utils.logger import maxkb_logger
|
||||
from knowledge.models import Document, TaskType, State
|
||||
from knowledge.models import Document, Paragraph, Problem, TaskType, State
|
||||
from knowledge.serializers.common import drop_knowledge_index
|
||||
from models_provider.models import Model
|
||||
from models_provider.tools import get_model, get_model_default_params
|
||||
|
|
@ -35,21 +35,35 @@ def get_embedding_model(model_id, exception_handler=lambda e: maxkb_logger.error
|
|||
return embedding_model
|
||||
|
||||
|
||||
def scoped_model(model_id, knowledge_id):
|
||||
from knowledge.serializers.common import get_embedding_model_by_knowledge_id
|
||||
if knowledge_id is None:
|
||||
raise ValueError('无法确定向量化任务的知识库')
|
||||
return get_embedding_model_by_knowledge_id(knowledge_id)
|
||||
|
||||
|
||||
def paragraph_knowledge(ids):
|
||||
values = list(QuerySet(Paragraph).filter(id__in=ids).values_list('knowledge_id', flat=True).distinct())
|
||||
if len(values) != 1:
|
||||
raise ValueError('段落须属于同一知识库')
|
||||
return values[0]
|
||||
|
||||
|
||||
@celery_app.task(base=QueueOnce, once={'keys': ['paragraph_id']}, name='celery:embedding_by_paragraph')
|
||||
def embedding_by_paragraph(paragraph_id, model_id):
|
||||
embedding_model = get_embedding_model(model_id)
|
||||
embedding_model = scoped_model(model_id, paragraph_knowledge([paragraph_id]))
|
||||
ListenerManagement.embedding_by_paragraph(paragraph_id, embedding_model)
|
||||
|
||||
|
||||
@celery_app.task(base=QueueOnce, once={'keys': ['paragraph_id_list']}, name='celery:embedding_by_paragraph_data_list')
|
||||
def embedding_by_paragraph_data_list(data_list, paragraph_id_list, model_id):
|
||||
embedding_model = get_embedding_model(model_id)
|
||||
embedding_model = scoped_model(model_id, paragraph_knowledge(paragraph_id_list))
|
||||
ListenerManagement.embedding_by_paragraph_data_list(data_list, paragraph_id_list, embedding_model)
|
||||
|
||||
|
||||
@celery_app.task(base=QueueOnce, once={'keys': ['paragraph_id_list']}, name='celery:embedding_by_paragraph_list')
|
||||
def embedding_by_paragraph_list(paragraph_id_list, model_id):
|
||||
embedding_model = get_embedding_model(model_id)
|
||||
embedding_model = scoped_model(model_id, paragraph_knowledge(paragraph_id_list))
|
||||
ListenerManagement.embedding_by_paragraph_list(paragraph_id_list, embedding_model)
|
||||
|
||||
|
||||
|
|
@ -77,7 +91,11 @@ def embedding_by_document(document_id, model_id, state_list=None):
|
|||
traceback=traceback.format_exc()
|
||||
))
|
||||
|
||||
embedding_model = get_embedding_model(model_id, exception_handler)
|
||||
try:
|
||||
embedding_model = scoped_model(model_id, QuerySet(Document).filter(id=document_id).values_list('knowledge_id', flat=True).first())
|
||||
except Exception as exc:
|
||||
exception_handler(exc)
|
||||
raise
|
||||
#
|
||||
ListenerManagement.embedding_by_document(document_id, embedding_model, state_list)
|
||||
|
||||
|
|
@ -130,12 +148,15 @@ def embedding_by_problem(args, model_id):
|
|||
@param model_id: 模型id
|
||||
@return:
|
||||
"""
|
||||
embedding_model = get_embedding_model(model_id)
|
||||
embedding_model = scoped_model(model_id, args.get('knowledge_id'))
|
||||
ListenerManagement.embedding_by_problem(args, embedding_model)
|
||||
|
||||
|
||||
def embedding_by_data_list(args: List, model_id):
|
||||
embedding_model = get_embedding_model(model_id)
|
||||
if not args:
|
||||
return
|
||||
from knowledge.serializers.common import get_embedding_model_by_knowledge_id_list
|
||||
embedding_model = get_embedding_model_by_knowledge_id_list(list({str(row['knowledge_id']) for row in args}))
|
||||
ListenerManagement.embedding_by_data_list(args, embedding_model)
|
||||
|
||||
|
||||
|
|
@ -220,7 +241,7 @@ def update_problem_embedding(problem_id: str, problem_content: str, model_id):
|
|||
@param model_id:
|
||||
@return:
|
||||
"""
|
||||
model = get_embedding_model(model_id)
|
||||
model = scoped_model(model_id, QuerySet(Problem).filter(id=problem_id).values_list('knowledge_id', flat=True).first())
|
||||
ListenerManagement.update_problem(UpdateProblemArgs(problem_id, problem_content, model))
|
||||
|
||||
|
||||
|
|
@ -247,8 +268,8 @@ def delete_embedding_by_paragraph_ids(paragraph_ids: List[str]):
|
|||
|
||||
def update_embedding_document_id(paragraph_id_list, target_document_id, target_knowledge_id,
|
||||
target_embedding_model_id=None):
|
||||
target_embedding_model = get_embedding_model(
|
||||
target_embedding_model_id) if target_embedding_model_id is not None else None
|
||||
target_embedding_model = scoped_model(
|
||||
target_embedding_model_id, target_knowledge_id) if target_embedding_model_id is not None else None
|
||||
ListenerManagement.update_embedding_document_id(
|
||||
UpdateEmbeddingDocumentIdArgs(paragraph_id_list, target_document_id, target_knowledge_id,
|
||||
target_embedding_model))
|
||||
|
|
|
|||
|
|
@ -17,6 +17,12 @@ urlpatterns = [
|
|||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/sync', views.KnowledgeView.SyncWeb.as_view()),
|
||||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/generate_related', views.KnowledgeView.GenerateRelated.as_view()),
|
||||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/embedding', views.KnowledgeView.Embedding.as_view()),
|
||||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/metadata', views.KnowledgeView.Metadata.as_view()),
|
||||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/parser', views.KnowledgeView.Parser.as_view()),
|
||||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/segmentation', views.KnowledgeView.Segmentation.as_view()),
|
||||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/rebuild', views.KnowledgeView.Rebuild.as_view()),
|
||||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/rebuild/<str:task_id>', views.KnowledgeView.RebuildTask.as_view()),
|
||||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/rebuild/<str:task_id>/retry', views.KnowledgeView.RebuildRetry.as_view()),
|
||||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/hit_test', views.KnowledgeView.HitTest.as_view()),
|
||||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/export', views.KnowledgeView.Export.as_view()),
|
||||
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/export_zip', views.KnowledgeView.ExportZip.as_view()),
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ class BaseVectorStore(ABC):
|
|||
data = {'document_id': document_id, 'paragraph_id': paragraph_id, 'knowledge_id': knowledge_id,
|
||||
'is_active': is_active, 'source_id': source_id, 'source_type': source_type, 'text': text}
|
||||
chunk_list = chunk_data(data)
|
||||
result = sub_array(chunk_list)
|
||||
result = sub_array(chunk_list, self._embedding_batch_size(embedding))
|
||||
for child_array in result:
|
||||
self._batch_save(child_array, embedding, lambda: False)
|
||||
|
||||
|
|
@ -96,13 +96,22 @@ class BaseVectorStore(ABC):
|
|||
"""
|
||||
self.save_pre_handler()
|
||||
chunk_list = chunk_data_list(data_list)
|
||||
result = sub_array(chunk_list)
|
||||
result = sub_array(chunk_list, self._embedding_batch_size(embedding))
|
||||
for child_array in result:
|
||||
if not is_the_task_interrupted():
|
||||
self._batch_save(child_array, embedding, is_the_task_interrupted)
|
||||
else:
|
||||
break
|
||||
|
||||
@staticmethod
|
||||
def _embedding_batch_size(embedding):
|
||||
"""向量批次大小:优先取模型参数 batch_size,默认 10。"""
|
||||
try:
|
||||
batch_size = int(getattr(embedding, 'batch_size', 0) or 0)
|
||||
except (TypeError, ValueError):
|
||||
batch_size = 0
|
||||
return batch_size if batch_size > 0 else 10
|
||||
|
||||
@abstractmethod
|
||||
def _save(self, text, source_type: SourceType, knowledge_id: str, document_id: str, paragraph_id: str, source_id: str,
|
||||
is_active: bool,
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ class DocumentView(APIView):
|
|||
return result.success(DocumentSerializers.Split(data={
|
||||
'workspace_id': workspace_id,
|
||||
'knowledge_id': knowledge_id,
|
||||
}).parse(split_data))
|
||||
}, context={'user': request.user}).parse(split_data))
|
||||
|
||||
class SplitPattern(APIView):
|
||||
authentication_classes = [TokenAuth]
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
from system_manage.ai_hub_knowledge import parser_binding
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from drf_spectacular.utils import extend_schema
|
||||
from rest_framework.request import Request
|
||||
|
|
@ -14,6 +15,8 @@ from knowledge.api.knowledge import KnowledgeBaseCreateAPI, KnowledgeWebCreateAP
|
|||
from knowledge.models import KnowledgeScope
|
||||
from knowledge.serializers.common import get_knowledge_operation_object
|
||||
from knowledge.serializers.knowledge import KnowledgeSerializer
|
||||
from knowledge.serializers.knowledge_ext import KnowledgeMetadataSerializer, KnowledgeSegmentationSerializer
|
||||
from knowledge.serializers.rebuild import KnowledgeRebuildSerializer
|
||||
from models_provider.serializers.model_serializer import ModelSerializer
|
||||
|
||||
|
||||
|
|
@ -250,6 +253,154 @@ class KnowledgeView(APIView):
|
|||
data={'knowledge_id': knowledge_id, 'workspace_id': workspace_id, 'user_id': request.user.id}
|
||||
).embedding())
|
||||
|
||||
class Metadata(APIView):
|
||||
authentication_classes = [TokenAuth]
|
||||
|
||||
@extend_schema(methods=['GET'], summary="知识库业务元数据", tags=["Knowledge Base"])
|
||||
@has_permissions(
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_knowledge_permission(),
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_permission_workspace_manage_role(),
|
||||
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
|
||||
ViewPermission([RoleConstants.USER.get_workspace_role()],
|
||||
[PermissionConstants.KNOWLEDGE.get_workspace_knowledge_permission()], CompareConstants.AND),
|
||||
)
|
||||
def get(self, request: Request, workspace_id: str, knowledge_id: str):
|
||||
return result.success(KnowledgeMetadataSerializer.one(workspace_id, knowledge_id))
|
||||
|
||||
@extend_schema(methods=['PUT'], summary="修改知识库业务元数据", tags=["Knowledge Base"])
|
||||
@has_permissions(
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_knowledge_permission(),
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_permission_workspace_manage_role(),
|
||||
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
|
||||
RoleConstants.ADMIN,
|
||||
)
|
||||
@log(menu='Knowledge Base', operate='Modify knowledge metadata',
|
||||
get_operation_object=lambda r, k: get_knowledge_operation_object(k.get('knowledge_id')))
|
||||
def put(self, request: Request, workspace_id: str, knowledge_id: str):
|
||||
return result.success(KnowledgeMetadataSerializer.update(
|
||||
workspace_id, knowledge_id, request.user, request.data))
|
||||
|
||||
class Parser(APIView):
|
||||
authentication_classes = [TokenAuth]
|
||||
|
||||
@extend_schema(methods=['GET'], summary="知识库解析配置", tags=["Knowledge Base"])
|
||||
@has_permissions(
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_knowledge_permission(),
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_permission_workspace_manage_role(),
|
||||
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
|
||||
ViewPermission([RoleConstants.USER.get_workspace_role()],
|
||||
[PermissionConstants.KNOWLEDGE.get_workspace_knowledge_permission()], CompareConstants.AND),
|
||||
)
|
||||
def get(self, request: Request, workspace_id: str, knowledge_id: str):
|
||||
return result.success(parser_binding(workspace_id, knowledge_id, request.user))
|
||||
|
||||
@extend_schema(methods=['PUT'], summary="修改知识库解析配置", tags=["Knowledge Base"])
|
||||
@has_permissions(
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_knowledge_permission(),
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_permission_workspace_manage_role(),
|
||||
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
|
||||
RoleConstants.ADMIN,
|
||||
)
|
||||
@log(menu='Knowledge Base', operate='Modify knowledge parser',
|
||||
get_operation_object=lambda r, k: get_knowledge_operation_object(k.get('knowledge_id')))
|
||||
def put(self, request: Request, workspace_id: str, knowledge_id: str):
|
||||
return result.success(parser_binding(workspace_id, knowledge_id, request.user, request.data))
|
||||
|
||||
class Segmentation(APIView):
|
||||
authentication_classes = [TokenAuth]
|
||||
|
||||
@extend_schema(methods=['GET'], summary="知识库分段规则", tags=["Knowledge Base"])
|
||||
@has_permissions(
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_knowledge_permission(),
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_permission_workspace_manage_role(),
|
||||
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
|
||||
ViewPermission([RoleConstants.USER.get_workspace_role()],
|
||||
[PermissionConstants.KNOWLEDGE.get_workspace_knowledge_permission()], CompareConstants.AND),
|
||||
)
|
||||
def get(self, request: Request, workspace_id: str, knowledge_id: str):
|
||||
return result.success(KnowledgeSegmentationSerializer.one(workspace_id, knowledge_id))
|
||||
|
||||
@extend_schema(methods=['PUT'], summary="修改知识库分段规则", tags=["Knowledge Base"])
|
||||
@has_permissions(
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_knowledge_permission(),
|
||||
PermissionConstants.KNOWLEDGE_EDIT.get_workspace_permission_workspace_manage_role(),
|
||||
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
|
||||
ViewPermission([RoleConstants.USER.get_workspace_role()],
|
||||
[PermissionConstants.KNOWLEDGE.get_workspace_knowledge_permission()], CompareConstants.AND),
|
||||
)
|
||||
@log(menu='Knowledge Base', operate='Modify knowledge segmentation',
|
||||
get_operation_object=lambda r, k: get_knowledge_operation_object(k.get('knowledge_id')))
|
||||
def put(self, request: Request, workspace_id: str, knowledge_id: str):
|
||||
return result.success(KnowledgeSegmentationSerializer.update(
|
||||
workspace_id, knowledge_id, request.user, request.data))
|
||||
|
||||
class Rebuild(APIView):
|
||||
authentication_classes = [TokenAuth]
|
||||
|
||||
@extend_schema(methods=['POST'], summary="独立重建知识库索引", tags=["Knowledge Base"])
|
||||
@has_permissions(
|
||||
PermissionConstants.KNOWLEDGE_VECTOR.get_workspace_knowledge_permission(),
|
||||
PermissionConstants.KNOWLEDGE_VECTOR.get_workspace_permission_workspace_manage_role(),
|
||||
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
|
||||
ViewPermission([RoleConstants.USER.get_workspace_role()],
|
||||
[PermissionConstants.KNOWLEDGE.get_workspace_knowledge_permission()], CompareConstants.AND),
|
||||
)
|
||||
@log(menu='Knowledge Base', operate='Rebuild index',
|
||||
get_operation_object=lambda r, k: get_knowledge_operation_object(k.get('knowledge_id')))
|
||||
def post(self, request: Request, workspace_id: str, knowledge_id: str):
|
||||
return result.success(
|
||||
KnowledgeRebuildSerializer.create(workspace_id, knowledge_id, str(request.user.id))
|
||||
)
|
||||
|
||||
@extend_schema(methods=['GET'], summary="重建任务列表", tags=["Knowledge Base"])
|
||||
@has_permissions(
|
||||
PermissionConstants.KNOWLEDGE_VECTOR.get_workspace_knowledge_permission(),
|
||||
PermissionConstants.KNOWLEDGE_VECTOR.get_workspace_permission_workspace_manage_role(),
|
||||
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
|
||||
ViewPermission([RoleConstants.USER.get_workspace_role()],
|
||||
[PermissionConstants.KNOWLEDGE.get_workspace_knowledge_permission()], CompareConstants.AND),
|
||||
)
|
||||
def get(self, request: Request, workspace_id: str, knowledge_id: str):
|
||||
current_page = int(request.query_params.get('current_page', 1))
|
||||
page_size = int(request.query_params.get('page_size', 10))
|
||||
return result.success(
|
||||
KnowledgeRebuildSerializer.page(workspace_id, knowledge_id, current_page, page_size)
|
||||
)
|
||||
|
||||
class RebuildTask(APIView):
|
||||
authentication_classes = [TokenAuth]
|
||||
|
||||
@extend_schema(methods=['GET'], summary="重建任务详情", tags=["Knowledge Base"])
|
||||
@has_permissions(
|
||||
PermissionConstants.KNOWLEDGE_VECTOR.get_workspace_knowledge_permission(),
|
||||
PermissionConstants.KNOWLEDGE_VECTOR.get_workspace_permission_workspace_manage_role(),
|
||||
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
|
||||
ViewPermission([RoleConstants.USER.get_workspace_role()],
|
||||
[PermissionConstants.KNOWLEDGE.get_workspace_knowledge_permission()], CompareConstants.AND),
|
||||
)
|
||||
def get(self, request: Request, workspace_id: str, knowledge_id: str, task_id: str):
|
||||
return result.success(
|
||||
KnowledgeRebuildSerializer.one(workspace_id, knowledge_id, task_id)
|
||||
)
|
||||
|
||||
class RebuildRetry(APIView):
|
||||
authentication_classes = [TokenAuth]
|
||||
|
||||
@extend_schema(methods=['POST'], summary="重试重建任务", tags=["Knowledge Base"])
|
||||
@has_permissions(
|
||||
PermissionConstants.KNOWLEDGE_VECTOR.get_workspace_knowledge_permission(),
|
||||
PermissionConstants.KNOWLEDGE_VECTOR.get_workspace_permission_workspace_manage_role(),
|
||||
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
|
||||
ViewPermission([RoleConstants.USER.get_workspace_role()],
|
||||
[PermissionConstants.KNOWLEDGE.get_workspace_knowledge_permission()], CompareConstants.AND),
|
||||
)
|
||||
@log(menu='Knowledge Base', operate='Retry rebuild index',
|
||||
get_operation_object=lambda r, k: get_knowledge_operation_object(k.get('knowledge_id')))
|
||||
def post(self, request: Request, workspace_id: str, knowledge_id: str, task_id: str):
|
||||
return result.success(
|
||||
KnowledgeRebuildSerializer.retry(workspace_id, knowledge_id, task_id, str(request.user.id))
|
||||
)
|
||||
|
||||
class Export(APIView):
|
||||
authentication_classes = [TokenAuth]
|
||||
|
||||
|
|
|
|||
|
|
@ -4,3 +4,9 @@ from django.apps import AppConfig
|
|||
class LocalModelConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'local_model'
|
||||
|
||||
def ready(self):
|
||||
import os
|
||||
if os.environ.get('SERVER_NAME') == 'local_model' and os.environ.get('MAXKB_RUNTIME_AUTOSTART', '1') == '1':
|
||||
from local_model.runtime import start_runtime
|
||||
start_runtime()
|
||||
|
|
|
|||
|
|
@ -7,72 +7,14 @@
|
|||
@desc:
|
||||
"""
|
||||
import json
|
||||
import threading
|
||||
import time
|
||||
|
||||
from django.db import connection
|
||||
from django.db.models import QuerySet
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from langchain_core.documents import Document
|
||||
from rest_framework import serializers
|
||||
|
||||
from local_model.models import Model
|
||||
from local_model.serializers.rsa_util import rsa_long_decrypt
|
||||
from models_provider.impl.local_model_provider.local_model_provider import LocalModelProvider
|
||||
|
||||
from common.cache.mem_cache import MemCache
|
||||
|
||||
_lock = threading.Lock()
|
||||
locks = {}
|
||||
|
||||
|
||||
class ModelManage:
|
||||
cache = MemCache('model', {})
|
||||
up_clear_time = time.time()
|
||||
|
||||
@staticmethod
|
||||
def _get_lock(_id):
|
||||
lock = locks.get(_id)
|
||||
if lock is None:
|
||||
with _lock:
|
||||
lock = locks.get(_id)
|
||||
if lock is None:
|
||||
lock = threading.Lock()
|
||||
locks[_id] = lock
|
||||
|
||||
return lock
|
||||
|
||||
@staticmethod
|
||||
def get_model(_id, get_model):
|
||||
model_instance = ModelManage.cache.get(_id)
|
||||
if model_instance is None:
|
||||
lock = ModelManage._get_lock(_id)
|
||||
with lock:
|
||||
model_instance = ModelManage.cache.get(_id)
|
||||
if model_instance is None:
|
||||
model_instance = get_model(_id)
|
||||
ModelManage.cache.set(_id, model_instance, timeout=60 * 60 * 8)
|
||||
else:
|
||||
if model_instance.is_cache_model():
|
||||
ModelManage.cache.touch(_id, timeout=60 * 60 * 8)
|
||||
else:
|
||||
model_instance = get_model(_id)
|
||||
ModelManage.cache.set(_id, model_instance, timeout=60 * 60 * 8)
|
||||
ModelManage.clear_timeout_cache()
|
||||
return model_instance
|
||||
|
||||
@staticmethod
|
||||
def clear_timeout_cache():
|
||||
if time.time() - ModelManage.up_clear_time > 60 * 60:
|
||||
threading.Thread(target=lambda: ModelManage.cache.clear_timeout_data()).start()
|
||||
ModelManage.up_clear_time = time.time()
|
||||
|
||||
@staticmethod
|
||||
def delete_key(_id):
|
||||
if ModelManage.cache.has_key(_id):
|
||||
ModelManage.cache.delete(_id)
|
||||
|
||||
|
||||
def get_local_model(model, **kwargs):
|
||||
return LocalModelProvider().get_model(model.model_type, model.model_name,
|
||||
json.loads(
|
||||
|
|
@ -81,19 +23,10 @@ def get_local_model(model, **kwargs):
|
|||
streaming=True, **kwargs)
|
||||
|
||||
|
||||
def get_embedding_model(model_id):
|
||||
model = QuerySet(Model).filter(id=model_id).first()
|
||||
# 手动关闭数据库连接
|
||||
connection.close()
|
||||
embedding_model = ModelManage.get_model(model_id,
|
||||
lambda _id: get_local_model(model, use_local=True))
|
||||
return embedding_model
|
||||
|
||||
|
||||
class EmbedDocuments(serializers.Serializer):
|
||||
texts = serializers.ListField(required=True, child=serializers.CharField(required=True,
|
||||
label=_('vector text')),
|
||||
label=_('vector text list')),
|
||||
label=_('vector text list'))
|
||||
|
||||
|
||||
class EmbedQuery(serializers.Serializer):
|
||||
|
|
@ -133,28 +66,33 @@ class ModelApplySerializers(serializers.Serializer):
|
|||
self.is_valid(raise_exception=True)
|
||||
EmbedDocuments(data=instance).is_valid(raise_exception=True)
|
||||
|
||||
model = get_embedding_model(self.data.get('model_id'))
|
||||
return model.embed_documents(instance.getlist('texts'))
|
||||
from local_model.runtime import manager
|
||||
with manager.inference(self.data.get('model_id')) as model:
|
||||
texts = instance.getlist('texts') if hasattr(instance, 'getlist') else instance.get('texts')
|
||||
return model.embed_documents(texts)
|
||||
|
||||
def embed_query(self, instance, with_valid=True):
|
||||
if with_valid:
|
||||
self.is_valid(raise_exception=True)
|
||||
EmbedQuery(data=instance).is_valid(raise_exception=True)
|
||||
|
||||
model = get_embedding_model(self.data.get('model_id'))
|
||||
return model.embed_query(instance.get('text'))
|
||||
from local_model.runtime import manager
|
||||
with manager.inference(self.data.get('model_id')) as model:
|
||||
return model.embed_query(instance.get('text'))
|
||||
|
||||
def compress_documents(self, instance, with_valid=True):
|
||||
if with_valid:
|
||||
self.is_valid(raise_exception=True)
|
||||
CompressDocuments(data=instance).is_valid(raise_exception=True)
|
||||
model = get_embedding_model(self.data.get('model_id'))
|
||||
return [{'page_content': d.page_content, 'metadata': d.metadata} for d in model.compress_documents(
|
||||
[Document(page_content=document.get('page_content'), metadata=document.get('metadata')) for document in
|
||||
instance.get('documents')], instance.get('query'))]
|
||||
from local_model.runtime import manager
|
||||
with manager.inference(self.data.get('model_id')) as model:
|
||||
return [{'page_content': d.page_content, 'metadata': d.metadata} for d in model.compress_documents(
|
||||
[Document(page_content=document.get('page_content'), metadata=document.get('metadata')) for document in
|
||||
instance.get('documents')], instance.get('query'))]
|
||||
|
||||
def unload(self, with_valid=True):
|
||||
if with_valid:
|
||||
self.is_valid(raise_exception=True)
|
||||
ModelManage.delete_key(self.data.get('model_id'))
|
||||
from local_model.runtime import manager
|
||||
manager.unload(self.data.get('model_id'))
|
||||
return True
|
||||
|
|
|
|||
|
|
@ -3,10 +3,12 @@ import os
|
|||
from django.urls import path
|
||||
|
||||
from . import views
|
||||
from .views.runtime import LocalModelRuntime
|
||||
|
||||
app_name = "local_model"
|
||||
# @formatter:off
|
||||
urlpatterns = [
|
||||
path('model_runtime', LocalModelRuntime.as_view()),
|
||||
path('model/validate', views.LocalModelApply.Validate.as_view()),
|
||||
path('model/<str:model_id>/embed_documents', views.LocalModelApply.EmbedDocuments.as_view()),
|
||||
path('model/<str:model_id>/embed_query', views.LocalModelApply.EmbedQuery.as_view()),
|
||||
|
|
|
|||
|
|
@ -35,8 +35,9 @@ class LocalModelApply(APIView):
|
|||
|
||||
class Unload(APIView):
|
||||
def post(self, request: Request, model_id):
|
||||
return result.success(
|
||||
ModelApplySerializers(data={'model_id': model_id}).compress_documents(request.data))
|
||||
# Administrative weight operations use the signed runtime endpoint.
|
||||
from rest_framework.exceptions import PermissionDenied
|
||||
raise PermissionDenied('请通过模型管理卸载')
|
||||
|
||||
class Validate(APIView):
|
||||
def post(self, request: Request):
|
||||
|
|
|
|||
|
|
@ -46,7 +46,10 @@ class Config(dict):
|
|||
}
|
||||
|
||||
def get_debug(self) -> bool:
|
||||
return self.get('DEBUG') if 'DEBUG' in self else True
|
||||
value = self.get('DEBUG', True)
|
||||
if isinstance(value, str):
|
||||
return value.strip().lower() in ('1', 'true', 'yes', 'on')
|
||||
return bool(value)
|
||||
|
||||
def get_time_zone(self) -> str:
|
||||
return self.get('TIME_ZONE') if 'TIME_ZONE' in self else 'Asia/Shanghai'
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ MIDDLEWARE = [
|
|||
REST_FRAMEWORK = {
|
||||
'EXCEPTION_HANDLER': 'common.exception.handle_exception.handle_exception',
|
||||
'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema',
|
||||
'UNAUTHENTICATED_USER': None,
|
||||
'DEFAULT_AUTHENTICATION_CLASSES': ['common.auth.authenticate.AnonymousAuthentication']
|
||||
}
|
||||
STATICFILES_DIRS = [(os.path.join(PROJECT_DIR, 'ui', 'dist'))]
|
||||
|
|
|
|||
|
|
@ -25,6 +25,20 @@ class BaiLianLLMModelParams(BaseForm):
|
|||
precision=2
|
||||
)
|
||||
|
||||
top_p = forms.SliderField(
|
||||
TooltipLabel(
|
||||
_('TopP'),
|
||||
_('Nucleus sampling: the model considers the results of the top_p probability mass of tokens. '
|
||||
'The smaller the value, the more deterministic the generation')
|
||||
),
|
||||
required=True,
|
||||
default_value=0.8,
|
||||
_min=0,
|
||||
_max=1,
|
||||
_step=0.01,
|
||||
precision=2
|
||||
)
|
||||
|
||||
max_tokens = forms.SliderField(
|
||||
TooltipLabel(
|
||||
_('Output the maximum Tokens'),
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ from django.utils.translation import gettext_lazy as _, gettext
|
|||
|
||||
from common import forms
|
||||
from common.exception.app_exception import AppApiException
|
||||
from common.forms import BaseForm
|
||||
from common.forms import BaseForm, TooltipLabel
|
||||
from models_provider.base_model_provider import BaseModelCredential, ValidCode
|
||||
from models_provider.impl.local_model_provider.model.embedding import LocalEmbedding
|
||||
|
||||
|
|
@ -51,3 +51,29 @@ class LocalEmbeddingCredential(BaseForm, BaseModelCredential):
|
|||
return model
|
||||
|
||||
cache_folder = forms.TextInputField(_('Model catalog'), required=True)
|
||||
device = forms.SingleSelect(
|
||||
TooltipLabel(_('Device'), _('Runtime device for the embedding model')),
|
||||
text_field='label',
|
||||
value_field='value',
|
||||
option_list=[
|
||||
{'value': 'cpu', 'label': 'CPU'},
|
||||
{'value': 'cuda', 'label': 'GPU(CUDA)'},
|
||||
],
|
||||
required=False,
|
||||
default_value='cpu'
|
||||
)
|
||||
normalize = forms.SwitchField(
|
||||
TooltipLabel(_('Normalize'), _('Whether to normalize embeddings to unit length')),
|
||||
required=False,
|
||||
default_value=True,
|
||||
attrs={"active-value": "true", "inactive-value": "false"}
|
||||
)
|
||||
batch_size = forms.SliderField(
|
||||
TooltipLabel(_('Batch size'), _('Number of texts per embedding request')),
|
||||
required=False,
|
||||
default_value=10,
|
||||
_min=1,
|
||||
_max=64,
|
||||
_step=1,
|
||||
precision=0
|
||||
)
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ from models_provider.base_model_provider import MaxKBBaseModel
|
|||
|
||||
|
||||
class LocalEmbedding(MaxKBBaseModel, HuggingFaceEmbeddings):
|
||||
batch_size: int = 10
|
||||
@staticmethod
|
||||
def is_cache_model():
|
||||
return True
|
||||
|
|
@ -27,7 +28,15 @@ class LocalEmbedding(MaxKBBaseModel, HuggingFaceEmbeddings):
|
|||
local_model_path = os.path.join(cache_folder, model_name)
|
||||
if os.path.isdir(local_model_path):
|
||||
model_path = local_model_path
|
||||
return LocalEmbedding(model_name=model_path, cache_folder=cache_folder,
|
||||
model_kwargs={'device': model_credential.get('device')},
|
||||
encode_kwargs={'normalize_embeddings': True}
|
||||
)
|
||||
normalize = model_credential.get('normalize', True)
|
||||
if isinstance(normalize, str):
|
||||
normalize = normalize.lower() == 'true'
|
||||
instance = LocalEmbedding(model_name=model_path, cache_folder=cache_folder,
|
||||
model_kwargs={'device': model_credential.get('device')},
|
||||
encode_kwargs={'normalize_embeddings': normalize if normalize is not None else True}
|
||||
)
|
||||
try:
|
||||
instance.batch_size = int(model_credential.get('batch_size') or 10)
|
||||
except (TypeError, ValueError):
|
||||
instance.batch_size = 10
|
||||
return instance
|
||||
|
|
|
|||
|
|
@ -24,19 +24,25 @@ class LocalEmbedding(MaxKBBaseModel, BaseModel, Embeddings):
|
|||
|
||||
@staticmethod
|
||||
def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
|
||||
try:
|
||||
batch_size = int(model_credential.get('batch_size') or 10)
|
||||
except (TypeError, ValueError):
|
||||
batch_size = 10
|
||||
return LocalEmbedding(model_name=model_name, cache_folder=model_credential.get('cache_folder'),
|
||||
model_kwargs={'device': model_credential.get('device')},
|
||||
encode_kwargs={'normalize_embeddings': True},
|
||||
batch_size=batch_size,
|
||||
**model_kwargs)
|
||||
|
||||
model_id: str = None
|
||||
batch_size: int = 10
|
||||
|
||||
def embed_query(self, text: str) -> List[float]:
|
||||
bind = f'{CONFIG.get("LOCAL_MODEL_HOST")}:{CONFIG.get("LOCAL_MODEL_PORT")}'
|
||||
prefix = CONFIG.get_admin_path()
|
||||
res = requests.post(
|
||||
f'{CONFIG.get("LOCAL_MODEL_PROTOCOL")}://{bind}{prefix}/api/model/{self.model_id}/embed_query',
|
||||
{'text': text})
|
||||
{'text': text}, timeout=(5, 620))
|
||||
result = res.json()
|
||||
if result.get('code', 500) == 200:
|
||||
return result.get('data')
|
||||
|
|
@ -47,7 +53,7 @@ class LocalEmbedding(MaxKBBaseModel, BaseModel, Embeddings):
|
|||
prefix = CONFIG.get_admin_path()
|
||||
res = requests.post(
|
||||
f'{CONFIG.get("LOCAL_MODEL_PROTOCOL")}://{bind}{prefix}/api/model/{self.model_id}/embed_documents',
|
||||
{'texts': texts})
|
||||
{'texts': texts}, timeout=(5, 620))
|
||||
result = res.json()
|
||||
if result.get('code', 500) == 200:
|
||||
return result.get('data')
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
"""
|
||||
|
||||
from typing import Sequence, Optional, Dict, Any
|
||||
import os
|
||||
|
||||
from langchain_core.callbacks import Callbacks
|
||||
from langchain_core.documents import Document, BaseDocumentCompressor
|
||||
|
|
@ -39,7 +40,10 @@ class LocalReranker(MaxKBBaseModel, BaseDocumentCompressor):
|
|||
|
||||
@staticmethod
|
||||
def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
|
||||
return LocalReranker(model_name, cache_dir=model_credential.get('cache_dir'))
|
||||
cache_dir = model_credential.get('cache_dir') or model_credential.get('cache_folder')
|
||||
if cache_dir and not os.path.isabs(model_name) and os.path.isdir(os.path.join(cache_dir, model_name)):
|
||||
model_name = os.path.join(cache_dir, model_name)
|
||||
return LocalReranker(model_name, cache_dir=cache_dir, device=model_credential.get('device') or 'cpu')
|
||||
|
||||
def compress_documents(self, documents: Sequence[Document], query: str, callbacks: Optional[Callbacks] = None) -> \
|
||||
Sequence[Document]:
|
||||
|
|
@ -48,7 +52,7 @@ class LocalReranker(MaxKBBaseModel, BaseDocumentCompressor):
|
|||
import torch
|
||||
with torch.no_grad():
|
||||
inputs = self.tokenizer([[query, document.page_content] for document in documents], padding=True,
|
||||
truncation=True, return_tensors='pt', max_length=512)
|
||||
truncation=True, return_tensors='pt', max_length=512).to(self.client.device)
|
||||
scores = [torch.sigmoid(s).float().item() for s in
|
||||
self.client(**inputs, return_dict=True).logits.view(-1, ).float()]
|
||||
result = [Document(page_content=documents[index].page_content, metadata={'relevance_score': scores[index]})
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ class LocalReranker(MaxKBBaseModel, BaseModel, BaseDocumentCompressor):
|
|||
|
||||
def __init__(self, **kwargs):
|
||||
super().__init__(**kwargs)
|
||||
print('ssss', kwargs.get('model_id', None))
|
||||
self.model_id = kwargs.get('model_id', None)
|
||||
|
||||
def compress_documents(self, documents: Sequence[Document], query: str, callbacks: Optional[Callbacks] = None) -> \
|
||||
|
|
@ -44,7 +43,7 @@ class LocalReranker(MaxKBBaseModel, BaseModel, BaseDocumentCompressor):
|
|||
res = requests.post(
|
||||
f'{CONFIG.get("LOCAL_MODEL_PROTOCOL")}://{bind}{prefix}/api/model/{self.model_id}/compress_documents',
|
||||
json={'documents': [{'page_content': document.page_content, 'metadata': document.metadata} for document in
|
||||
documents], 'query': query}, headers={'Content-Type': 'application/json'})
|
||||
documents], 'query': query}, headers={'Content-Type': 'application/json'}, timeout=(5, 620))
|
||||
result = res.json()
|
||||
if result.get('code', 500) == 200:
|
||||
return [Document(page_content=document.get('page_content'), metadata=document.get('metadata')) for document
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ from django.utils.translation import gettext as _
|
|||
|
||||
from common import forms
|
||||
from common.exception.app_exception import AppApiException
|
||||
from common.forms import BaseForm
|
||||
from common.forms import BaseForm, TooltipLabel
|
||||
from models_provider.base_model_provider import BaseModelCredential, ValidCode
|
||||
from models_provider.impl.local_model_provider.model.embedding import LocalEmbedding
|
||||
|
||||
|
|
@ -47,3 +47,12 @@ class OllamaEmbeddingModelCredential(BaseForm, BaseModelCredential):
|
|||
return self
|
||||
|
||||
api_base = forms.TextInputField('API URL', required=True)
|
||||
batch_size = forms.SliderField(
|
||||
TooltipLabel(_('Batch size'), _('Number of texts per embedding request')),
|
||||
required=False,
|
||||
default_value=10,
|
||||
_min=1,
|
||||
_max=64,
|
||||
_step=1,
|
||||
precision=0
|
||||
)
|
||||
|
|
|
|||
|
|
@ -14,12 +14,26 @@ from models_provider.base_model_provider import MaxKBBaseModel
|
|||
|
||||
|
||||
class OllamaEmbedding(MaxKBBaseModel, OllamaEmbeddings):
|
||||
model_resource_id: str | None = None
|
||||
runtime_keep_alive: int = 300
|
||||
batch_size: int = 10
|
||||
|
||||
@property
|
||||
def _default_params(self):
|
||||
return {**super()._default_params, 'keep_alive': self.runtime_keep_alive}
|
||||
@staticmethod
|
||||
def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
|
||||
return OllamaEmbedding(
|
||||
try:
|
||||
batch_size = int(model_credential.get('batch_size') or 10)
|
||||
except (TypeError, ValueError):
|
||||
batch_size = 10
|
||||
instance = OllamaEmbedding(
|
||||
model=model_name,
|
||||
base_url=model_credential.get('api_base'),
|
||||
model_resource_id=str(model_kwargs['model_id']) if model_kwargs.get('model_id') else None,
|
||||
)
|
||||
instance.batch_size = batch_size
|
||||
return instance
|
||||
|
||||
def embed_documents(self, texts: List[str]) -> List[List[float]]:
|
||||
"""Embed documents using an Ollama deployed embedding model.
|
||||
|
|
@ -31,8 +45,13 @@ class OllamaEmbedding(MaxKBBaseModel, OllamaEmbeddings):
|
|||
List of embeddings, one for each text.
|
||||
"""
|
||||
instruction_pairs = [f"{text}" for text in texts]
|
||||
embeddings = self._embed(instruction_pairs)
|
||||
return embeddings
|
||||
if not texts:
|
||||
return []
|
||||
from common.model_runtime_client import inference_lease
|
||||
with inference_lease(self.model_resource_id) as state:
|
||||
if state:
|
||||
self.runtime_keep_alive = -1 if state['strategy'] == 'PRELOAD' else state['idle_seconds']
|
||||
return self._embed(instruction_pairs)
|
||||
|
||||
def embed_query(self, text: str) -> List[float]:
|
||||
"""Embed a query using a Ollama deployed embedding model.
|
||||
|
|
@ -44,5 +63,8 @@ class OllamaEmbedding(MaxKBBaseModel, OllamaEmbeddings):
|
|||
Embeddings for the text.
|
||||
"""
|
||||
instruction_pair = f"{text}"
|
||||
embedding = self._embed([instruction_pair])[0]
|
||||
return embedding
|
||||
from common.model_runtime_client import inference_lease
|
||||
with inference_lease(self.model_resource_id) as state:
|
||||
if state:
|
||||
self.runtime_keep_alive = -1 if state['strategy'] == 'PRELOAD' else state['idle_seconds']
|
||||
return self._embed([instruction_pair])[0]
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ def get_base_url(url: str):
|
|||
|
||||
|
||||
class OllamaChatModel(MaxKBBaseModel, ChatOllama):
|
||||
model_resource_id: str | None = None
|
||||
@staticmethod
|
||||
def is_cache_model():
|
||||
return False
|
||||
|
|
@ -37,8 +38,24 @@ class OllamaChatModel(MaxKBBaseModel, ChatOllama):
|
|||
optional_params = MaxKBBaseModel.filter_optional_params(model_kwargs)
|
||||
|
||||
return OllamaChatModel(model=model_name, base_url=base_url,
|
||||
model_resource_id=str(model_kwargs['model_id']) if model_kwargs.get('model_id') else None,
|
||||
stream=True, **optional_params)
|
||||
|
||||
def _create_chat_stream(self, messages, stop=None, **kwargs):
|
||||
from common.model_runtime_client import inference_lease
|
||||
with inference_lease(self.model_resource_id) as state:
|
||||
if state:
|
||||
kwargs['keep_alive'] = -1 if state['strategy'] == 'PRELOAD' else state['idle_seconds']
|
||||
yield from super()._create_chat_stream(messages, stop, **kwargs)
|
||||
|
||||
async def _acreate_chat_stream(self, messages, stop=None, **kwargs):
|
||||
from common.model_runtime_client import async_inference_lease
|
||||
async with async_inference_lease(self.model_resource_id) as state:
|
||||
if state:
|
||||
kwargs['keep_alive'] = -1 if state['strategy'] == 'PRELOAD' else state['idle_seconds']
|
||||
async for part in super()._acreate_chat_stream(messages, stop, **kwargs):
|
||||
yield part
|
||||
|
||||
def get_num_tokens_from_messages(self, messages: List[BaseMessage]) -> int:
|
||||
tokenizer = TokenizerManage.get_tokenizer()
|
||||
return sum([len(tokenizer.encode(get_buffer_string([m]))) for m in messages])
|
||||
|
|
|
|||
|
|
@ -3,10 +3,14 @@ import os
|
|||
from django.urls import path
|
||||
|
||||
from . import views
|
||||
from .views.local_imports import LocalModelImports
|
||||
from .views.runtime import ModelLoading
|
||||
|
||||
app_name = "models_provider"
|
||||
# @formatter:off
|
||||
urlpatterns = [
|
||||
path('workspace/<str:workspace_id>/model/<str:model_id>/runtime', ModelLoading.as_view()),
|
||||
path('local_model/imports', LocalModelImports.as_view()),
|
||||
path('provider', views.Provide.as_view()),
|
||||
path('provider/model_type_list', views.Provide.ModelTypeList.as_view()),
|
||||
path('provider/model_list', views.Provide.ModelList.as_view()),
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ configs['worker_concurrency'] = 5
|
|||
|
||||
configs["task_queues"] = [
|
||||
Queue("celery", Exchange("celery"), routing_key="celery"),
|
||||
Queue("model", Exchange("model"), routing_key="model")
|
||||
Queue("model", Exchange("model"), routing_key="model"),
|
||||
Queue("uniskb_knowledge", Exchange("uniskb_knowledge"), routing_key="uniskb_knowledge")
|
||||
]
|
||||
app.namespace = 'CELERY'
|
||||
app.conf.update(
|
||||
|
|
@ -30,4 +31,14 @@ app.conf.update(
|
|||
key) for
|
||||
key
|
||||
in configs.keys()})
|
||||
# 新知识库任务与共享 Redis 中的旧 celery 队列隔离。
|
||||
knowledge_routes = {
|
||||
"celery:embedding_*": {"queue": "uniskb_knowledge"},
|
||||
"celery:rebuild_knowledge_index": {"queue": "uniskb_knowledge"},
|
||||
"celery:finalize_rebuild_task": {"queue": "uniskb_knowledge"},
|
||||
}
|
||||
existing_routes = app.conf.task_routes or ()
|
||||
if isinstance(existing_routes, dict):
|
||||
existing_routes = (existing_routes,)
|
||||
app.conf.task_routes = (knowledge_routes, *existing_routes)
|
||||
app.autodiscover_tasks(lambda: [app_config.split('.')[0] for app_config in settings.INSTALLED_APPS])
|
||||
|
|
|
|||
|
|
@ -12,3 +12,4 @@ from .log_management import *
|
|||
from .chat_user import *
|
||||
from .user_menu_setting import *
|
||||
from .access_control_policy import *
|
||||
from .ai_hub import *
|
||||
|
|
|
|||
|
|
@ -48,6 +48,9 @@ class SystemProfileSerializer(serializers.Serializer):
|
|||
class SystemConfigSerializer(serializers.Serializer):
|
||||
@staticmethod
|
||||
def get_config():
|
||||
# Prefer the bundled workbench: it uses the current login through its parent.
|
||||
bundled = os.path.join(settings.STATIC_ROOT, 'admin', 'mindmap-workbench', 'index.html')
|
||||
return {
|
||||
'mindmap_url': CONFIG.get('MINDMAP_URL', '')
|
||||
'mindmap_url': (CONFIG.get_admin_path() + '/mindmap-workbench/index.html')
|
||||
if os.path.isfile(bundled) else CONFIG.get('MINDMAP_URL', '')
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,8 @@ from maxkb.settings import edition
|
|||
from models_provider.models import Model
|
||||
from system_manage.models import WorkspaceUserResourcePermission
|
||||
from tools.models import Tool
|
||||
from users.serializers.user import is_workspace_manage
|
||||
from users.models import User
|
||||
from users.serializers.user import is_workspace_manage, exclude_unactivated_users
|
||||
|
||||
|
||||
class PermissionSerializer(serializers.Serializer):
|
||||
|
|
@ -108,6 +109,13 @@ class UserResourcePermissionSerializer(serializers.Serializer):
|
|||
user_id = serializers.CharField(required=True, label=_('user id'))
|
||||
auth_target_type = serializers.CharField(required=True, label=_('resource'))
|
||||
|
||||
def is_valid(self, *, raise_exception=False):
|
||||
valid = super().is_valid(raise_exception=raise_exception)
|
||||
if valid and not exclude_unactivated_users(User.objects.filter(
|
||||
id=self.validated_data['user_id'])).exists():
|
||||
raise AppApiException(500, '仅可为已激活且启用的用户授权')
|
||||
return valid
|
||||
|
||||
def get_queryset(self, instance):
|
||||
resource_query_set = QuerySet(
|
||||
model=get_dynamics_model({
|
||||
|
|
@ -345,6 +353,9 @@ class ResourceUserPermissionSerializer(serializers.Serializer):
|
|||
"user_role_relation.workspace_id": models.CharField(),
|
||||
|
||||
}))
|
||||
user_query_set = user_query_set.filter(**{
|
||||
'u.id__in': exclude_unactivated_users(User.objects.all()).values('id')
|
||||
})
|
||||
nick_name = instance.get('nick_name')
|
||||
username = instance.get('username')
|
||||
permission = instance.get('permission')
|
||||
|
|
@ -458,6 +469,9 @@ class ResourceUserPermissionSerializer(serializers.Serializer):
|
|||
users_permission = instance
|
||||
|
||||
users_id = [item["user_id"] for item in users_permission]
|
||||
eligible_ids = exclude_unactivated_users(User.objects.filter(id__in=users_id))
|
||||
if eligible_ids.count() != len(set(users_id)):
|
||||
raise AppApiException(500, '仅可为已激活且启用的用户授权')
|
||||
include_children = users_permission[0].get('include_children')
|
||||
folder_ids = users_permission[0].get('folder_ids')
|
||||
# 删除已存在的对应的用户在该资源下的权限
|
||||
|
|
|
|||
|
|
@ -1,10 +1,15 @@
|
|||
from django.urls import path
|
||||
|
||||
from . import views
|
||||
from .views.ai_hub import HubView, PublishedRun, ParserTest
|
||||
|
||||
app_name = "system_manage"
|
||||
# @formatter:off
|
||||
urlpatterns = [
|
||||
path('workspace/<str:workspace_id>/ai_hub/parsers/<uuid:pk>/test', ParserTest.as_view()),
|
||||
path('workspace/<str:workspace_id>/ai_hub/published/<uuid:pk>/run', PublishedRun.as_view()),
|
||||
path('workspace/<str:workspace_id>/ai_hub/<str:kind>', HubView.as_view()),
|
||||
path('workspace/<str:workspace_id>/ai_hub/<str:kind>/<uuid:pk>', HubView.as_view()),
|
||||
path('workspace/<str:workspace_id>/user_resource_permission/user/<str:user_id>/resource/<str:resource>', views.WorkSpaceUserResourcePermissionView.as_view()),
|
||||
path('workspace/<str:workspace_id>/user_resource_permission/user/<str:user_id>/resource/<str:resource>/<int:current_page>/<int:page_size>', views.WorkSpaceUserResourcePermissionView.Page.as_view()),
|
||||
path('workspace/<str:workspace_id>/resource_user_permission/resource/<str:target>/resource/<str:resource>', views.WorkspaceResourceUserPermissionView.as_view()),
|
||||
|
|
|
|||
|
|
@ -7,3 +7,4 @@
|
|||
@desc:
|
||||
"""
|
||||
from .user import *
|
||||
from .user_manage_ext import *
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ from common.exception.app_exception import AppApiException
|
|||
from common.utils.common import password_encrypt, get_random_chars
|
||||
from common.utils.rsa_util import encrypt, decrypt
|
||||
from maxkb.const import CONFIG
|
||||
from users.models import User
|
||||
from users.models import User, UserActivationApplication, ActivationStatus
|
||||
|
||||
|
||||
class LoginRequest(serializers.Serializer):
|
||||
|
|
@ -117,6 +117,12 @@ class LoginSerializer(serializers.Serializer):
|
|||
record_login_fail(username)
|
||||
raise AppApiException(500, _('The username or password is incorrect'))
|
||||
if not user.is_active:
|
||||
application = UserActivationApplication.objects.filter(user_id=user.id).first()
|
||||
if application and application.status == ActivationStatus.PENDING:
|
||||
raise AppApiException(1005, '账号待审核')
|
||||
if application and application.status == ActivationStatus.REJECTED:
|
||||
reject_reason = application.reject_reason or '不符合激活条件'
|
||||
raise AppApiException(1005, f'注册申请未通过,拒绝原因:{reject_reason}')
|
||||
record_login_fail(username)
|
||||
raise AppApiException(1005, _("The user has been disabled, please contact the administrator!"))
|
||||
cache.delete(system_get_key(f'system_{username}'), version=system_version)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ from common.exception.app_exception import AppApiException
|
|||
from common.utils.common import valid_license, password_encrypt
|
||||
from maxkb.conf import PROJECT_DIR
|
||||
from system_manage.models import SystemSetting, SettingType
|
||||
from users.models import User
|
||||
from users.models import User, UserActivationApplication, ActivationStatus, UserRoleAssignment
|
||||
from django.utils.translation import gettext_lazy as _, to_locale
|
||||
from django.core import validators
|
||||
from django.core.mail import send_mail
|
||||
|
|
@ -46,6 +46,18 @@ PASSWORD_REGEX = re.compile(
|
|||
version, get_key = Cache_Version.SYSTEM.value
|
||||
|
||||
|
||||
def exclude_unactivated_users(query_set):
|
||||
"""仅保留“激活审核通过”的用户。
|
||||
|
||||
排除存在待激活申请且状态为 待审核/已拒绝 的用户,同时要求账号处于启用状态;
|
||||
未走激活审核流程的管理员创建用户不受影响。用于资源授权、角色/成员选择等场景。
|
||||
"""
|
||||
unapproved_user_ids = UserActivationApplication.objects.filter(
|
||||
status__in=[ActivationStatus.PENDING, ActivationStatus.REJECTED]
|
||||
).values('user_id')
|
||||
return query_set.exclude(id__in=unapproved_user_ids).filter(is_active=True)
|
||||
|
||||
|
||||
class UserProfileResponse(serializers.ModelSerializer):
|
||||
is_edit_password = serializers.BooleanField(required=True, label=_('Is Edit Password'))
|
||||
permissions = serializers.ListField(required=True, label=_('permissions'))
|
||||
|
|
@ -180,6 +192,11 @@ class UserManageSerializer(serializers.Serializer):
|
|||
max_length=20,
|
||||
default="LOCAL"
|
||||
)
|
||||
pending_activation = serializers.BooleanField(
|
||||
required=False,
|
||||
label="创建后待激活",
|
||||
default=True
|
||||
)
|
||||
|
||||
|
||||
def is_valid(self, *, raise_exception=True):
|
||||
|
|
@ -233,7 +250,10 @@ class UserManageSerializer(serializers.Serializer):
|
|||
email = self.data.get('email')
|
||||
is_active = self.data.get('is_active', None)
|
||||
source = self.data.get('source', None)
|
||||
query_set = QuerySet(User)
|
||||
unapproved_user_ids = UserActivationApplication.objects.filter(
|
||||
status__in=[ActivationStatus.PENDING, ActivationStatus.REJECTED]
|
||||
).values('user_id')
|
||||
query_set = QuerySet(User).exclude(id__in=unapproved_user_ids)
|
||||
if username is not None:
|
||||
query_set = query_set.filter(username__contains=username)
|
||||
if nick_name is not None:
|
||||
|
|
@ -331,8 +351,11 @@ class UserManageSerializer(serializers.Serializer):
|
|||
@transaction.atomic
|
||||
def save(self, instance, user_id, with_valid=True):
|
||||
if with_valid:
|
||||
self.UserInstance(data=instance).is_valid(raise_exception=True)
|
||||
serializer = self.UserInstance(data=instance)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
instance = {**instance, **serializer.validated_data}
|
||||
|
||||
pending_activation = bool(instance.get('pending_activation', True))
|
||||
user = User(
|
||||
id=uuid.uuid7(),
|
||||
email=instance.get('email'),
|
||||
|
|
@ -342,10 +365,20 @@ class UserManageSerializer(serializers.Serializer):
|
|||
password=password_encrypt(instance.get('password')),
|
||||
role=RoleConstants.USER.name,
|
||||
source=instance.get('source', 'LOCAL'),
|
||||
is_active=True
|
||||
is_active=not pending_activation
|
||||
)
|
||||
update_user_role(instance, user, user_id)
|
||||
user.save()
|
||||
if pending_activation:
|
||||
UserActivationApplication.objects.create(
|
||||
user=user,
|
||||
email=user.email or '',
|
||||
email_verified=False,
|
||||
status=ActivationStatus.PENDING
|
||||
)
|
||||
else:
|
||||
from users.serializers.user_manage_ext import send_activation_notice
|
||||
transaction.on_commit(lambda: send_activation_notice(user, True))
|
||||
return UserInstanceSerializer(user).data
|
||||
|
||||
class UserEditInstance(serializers.Serializer):
|
||||
|
|
@ -452,6 +485,8 @@ class UserManageSerializer(serializers.Serializer):
|
|||
raise AppApiException(1004, _('Unable to delete administrator'))
|
||||
|
||||
def edit(self, instance, user_id, with_valid=True):
|
||||
if 'role' in instance or 'role_setting' in instance:
|
||||
raise AppApiException(500, '请通过分配角色修改角色')
|
||||
if with_valid:
|
||||
self.is_valid(raise_exception=True)
|
||||
UserManageSerializer.UserEditInstance(data=instance).is_valid(user_id=self.data.get('id'),
|
||||
|
|
@ -459,7 +494,6 @@ class UserManageSerializer(serializers.Serializer):
|
|||
user = User.objects.filter(id=self.data.get('id')).first()
|
||||
self._check_admin_modification(user, instance)
|
||||
self._update_user_fields(user, instance)
|
||||
update_user_role(instance, user, user_id)
|
||||
user.save()
|
||||
return UserInstanceSerializer(user).data
|
||||
|
||||
|
|
@ -474,7 +508,7 @@ class UserManageSerializer(serializers.Serializer):
|
|||
|
||||
@staticmethod
|
||||
def _update_user_fields(user, instance):
|
||||
update_keys = ['email', 'nick_name', 'phone', 'is_active', 'role']
|
||||
update_keys = ['email', 'nick_name', 'phone', 'is_active']
|
||||
for key in update_keys:
|
||||
if key in instance and instance.get(key) is not None:
|
||||
setattr(user, key, instance.get(key))
|
||||
|
|
@ -531,7 +565,7 @@ class UserManageSerializer(serializers.Serializer):
|
|||
else:
|
||||
user_ids = User.objects.values_list('id', flat=True)
|
||||
|
||||
users = User.objects.filter(id__in=user_ids).values('id', 'nick_name')
|
||||
users = exclude_unactivated_users(User.objects.filter(id__in=user_ids)).values('id', 'nick_name')
|
||||
return list(users)
|
||||
|
||||
def get_user_members(self, workspace_id):
|
||||
|
|
@ -549,6 +583,8 @@ class UserManageSerializer(serializers.Serializer):
|
|||
.filter(workspace_id=workspace_id, role__type='USER')
|
||||
.select_related('role', 'user')
|
||||
)
|
||||
eligible_user_ids = exclude_unactivated_users(User.objects.all()).values_list('id', flat=True)
|
||||
user_role_relations = user_role_relations.filter(user_id__in=eligible_user_ids)
|
||||
user_dict = {}
|
||||
for relation in user_role_relations:
|
||||
user_id = relation.user.id
|
||||
|
|
@ -564,7 +600,7 @@ class UserManageSerializer(serializers.Serializer):
|
|||
|
||||
# 将字典值转换为列表形式
|
||||
return list(user_dict.values())
|
||||
user_list = User.objects.exclude(role=RoleConstants.ADMIN.name)
|
||||
user_list = exclude_unactivated_users(User.objects.exclude(role=RoleConstants.ADMIN.name))
|
||||
return [
|
||||
{
|
||||
'id': user.id,
|
||||
|
|
@ -587,7 +623,7 @@ class UserManageSerializer(serializers.Serializer):
|
|||
return True
|
||||
|
||||
def get_all_user_list(self):
|
||||
users = User.objects.all().values('id', 'nick_name', 'username')
|
||||
users = exclude_unactivated_users(User.objects.all()).values('id', 'nick_name', 'username')
|
||||
return list(users)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,418 @@
|
|||
from django.test import TestCase
|
||||
from django.conf import settings
|
||||
from django.core.cache import cache
|
||||
from unittest.mock import patch
|
||||
import json
|
||||
|
||||
# Create your tests here.
|
||||
from rest_framework.exceptions import ValidationError
|
||||
from rest_framework.test import APIRequestFactory
|
||||
|
||||
from common.constants.permission_constants import RoleConstants
|
||||
from common.constants.cache_version import Cache_Version
|
||||
from common.exception.app_exception import AppApiException
|
||||
from common.utils.common import password_encrypt
|
||||
from common.utils.rsa_util import encrypt, generate
|
||||
from users.models import User, UserActivationApplication, ActivationStatus, UserRoleAssignment
|
||||
from users.serializers.login import LoginSerializer
|
||||
from users.serializers.register import RegisterSerializer
|
||||
from users.serializers.user import UserManageSerializer
|
||||
from users.serializers.user_manage_ext import ActivationSerializer, RoleAssignmentSerializer, send_activation_notice
|
||||
from users.serializers.user import exclude_unactivated_users
|
||||
from system_manage.serializers.user_resource_permission import UserResourcePermissionSerializer, ResourceUserPermissionSerializer
|
||||
from unittest.mock import Mock
|
||||
from users.views.register import RegisterView
|
||||
from users.views.user_manage_ext import UserActivationApproveView
|
||||
|
||||
|
||||
@patch('users.serializers.user.DatabaseModelManage.get_model', return_value=None)
|
||||
class RegistrationTests(TestCase):
|
||||
def setUp(self):
|
||||
self.payload = {
|
||||
'username': 'signup_test', 'nick_name': '注册测试',
|
||||
'email': 'signup@example.com', 'phone': '',
|
||||
'password': 'Signup@123', 're_password': 'Signup@123',
|
||||
}
|
||||
self.admin = User.objects.create(
|
||||
username='review_admin', nick_name='审核员', email='review@example.com',
|
||||
password=password_encrypt('Review@123'), role=RoleConstants.ADMIN.name,
|
||||
)
|
||||
|
||||
def test_public_registration_forces_pending_local_user(self, _registry):
|
||||
response = RegisterView.as_view()(APIRequestFactory().post('/user/register', {
|
||||
**self.payload, 'is_active': True, 'pending_activation': False,
|
||||
'role': 'ADMIN', 'source': 'LDAP',
|
||||
'role_setting': [{'role_id': 'ADMIN', 'workspace_ids': ['default']}],
|
||||
}, format='json'))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
user = User.objects.get(username=self.payload['username'])
|
||||
self.assertFalse(user.is_active)
|
||||
self.assertEqual(user.role, 'USER')
|
||||
self.assertEqual(user.source, 'LOCAL')
|
||||
self.assertEqual(user.password, password_encrypt(self.payload['password']))
|
||||
self.assertEqual(user.activation_application.status, ActivationStatus.PENDING)
|
||||
self.assertFalse(UserRoleAssignment.objects.filter(user=user).exists())
|
||||
|
||||
def test_password_confirmation_is_required(self, _registry):
|
||||
with self.assertRaises(ValidationError):
|
||||
RegisterSerializer.register({**self.payload, 're_password': 'Other@123'})
|
||||
self.assertFalse(User.objects.filter(username=self.payload['username']).exists())
|
||||
|
||||
def test_encrypted_registration_credentials(self, _registry):
|
||||
key_pair = generate()
|
||||
credentials = {key: self.payload[key] for key in ('password', 're_password')}
|
||||
payload = {key: value for key, value in self.payload.items() if key not in credentials}
|
||||
payload['encryptedData'] = encrypt(json.dumps(credentials), public_key=key_pair['key'])
|
||||
with patch('common.utils.rsa_util.get_key_pair', return_value=key_pair):
|
||||
RegisterSerializer.register(payload)
|
||||
user = User.objects.get(username=self.payload['username'])
|
||||
self.assertEqual(user.password, password_encrypt(self.payload['password']))
|
||||
self.assertFalse(user.is_active)
|
||||
|
||||
def test_anonymous_user_cannot_approve(self, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
application = UserActivationApplication.objects.get()
|
||||
response = UserActivationApproveView.as_view()(
|
||||
APIRequestFactory().post('/activation/approve', {}, format='json'),
|
||||
application_id=str(application.id),
|
||||
)
|
||||
self.assertEqual(response.status_code, 401)
|
||||
application.refresh_from_db()
|
||||
self.assertEqual(application.status, ActivationStatus.PENDING)
|
||||
|
||||
def test_invalid_email_and_weak_password_are_rejected(self, _registry):
|
||||
for change in ({'email': 'invalid'}, {'password': '123456', 're_password': '123456'}):
|
||||
with self.subTest(change=list(change)):
|
||||
with self.assertRaises(ValidationError):
|
||||
RegisterSerializer.register({**self.payload, **change})
|
||||
|
||||
def test_duplicate_registration_does_not_create_another_application(self, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
with self.assertRaises(AppApiException):
|
||||
RegisterSerializer.register(self.payload)
|
||||
self.assertEqual(UserActivationApplication.objects.count(), 1)
|
||||
|
||||
@patch.object(LoginSerializer, 'get_auth_setting', return_value={'max_attempts': 1})
|
||||
def test_login_requires_approval(self, _settings, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
credentials = {'username': self.payload['username'], 'password': self.payload['password']}
|
||||
with self.assertRaises(AppApiException) as error:
|
||||
LoginSerializer.login(credentials.copy())
|
||||
self.assertIn('待审核', str(error.exception))
|
||||
application = UserActivationApplication.objects.get()
|
||||
ActivationSerializer.approve(str(application.id), str(self.admin.id))
|
||||
self.assertIn('token', LoginSerializer.login(credentials.copy()))
|
||||
application.refresh_from_db()
|
||||
self.assertEqual(application.status, ActivationStatus.APPROVED)
|
||||
self.assertEqual(application.audit_by_id, self.admin.id)
|
||||
self.assertTrue(UserRoleAssignment.objects.filter(user=application.user, role_id='USER').exists())
|
||||
with self.assertRaises(AppApiException):
|
||||
ActivationSerializer.approve(str(application.id), str(self.admin.id))
|
||||
|
||||
@patch.object(LoginSerializer, 'get_auth_setting', return_value={'max_attempts': -1})
|
||||
def test_rejected_registration_cannot_login(self, _settings, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
application = UserActivationApplication.objects.get()
|
||||
ActivationSerializer.reject(str(application.id), str(self.admin.id), '审核未通过')
|
||||
with self.assertRaises(AppApiException) as error:
|
||||
LoginSerializer.login({'username': self.payload['username'], 'password': self.payload['password']})
|
||||
self.assertIn('未通过', str(error.exception))
|
||||
application.user.refresh_from_db()
|
||||
self.assertFalse(application.user.is_active)
|
||||
|
||||
def test_admin_creation_can_activate_immediately(self, _registry):
|
||||
data = UserManageSerializer().save({**self.payload, 'pending_activation': False}, str(self.admin.id))
|
||||
self.assertTrue(data['is_active'])
|
||||
self.assertFalse(UserActivationApplication.objects.filter(user_id=data['id']).exists())
|
||||
|
||||
def test_admin_creation_can_require_approval(self, _registry):
|
||||
data = UserManageSerializer().save({**self.payload, 'pending_activation': True}, str(self.admin.id))
|
||||
self.assertFalse(data['is_active'])
|
||||
self.assertTrue(UserActivationApplication.objects.filter(user_id=data['id'], status='PENDING').exists())
|
||||
|
||||
def test_admin_creation_defaults_to_pending(self, _registry):
|
||||
data = UserManageSerializer().save(self.payload, str(self.admin.id))
|
||||
self.assertFalse(data['is_active'])
|
||||
self.assertTrue(UserActivationApplication.objects.filter(user_id=data['id'], status='PENDING').exists())
|
||||
|
||||
def test_anonymous_configuration_does_not_import_django_auth(self, _registry):
|
||||
self.assertIsNone(settings.REST_FRAMEWORK.get('UNAUTHENTICATED_USER', 'missing'))
|
||||
|
||||
def test_false_string_does_not_require_approval(self, _registry):
|
||||
data = UserManageSerializer().save({**self.payload, 'pending_activation': 'false'}, str(self.admin.id))
|
||||
self.assertTrue(data['is_active'])
|
||||
|
||||
def test_pending_user_hidden_from_management_list_and_page(self, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
query = UserManageSerializer.Query(data={'username': self.payload['username']})
|
||||
self.assertEqual(query.list(), [])
|
||||
page = query.page(1, 20, str(self.admin.id))
|
||||
self.assertEqual(page['total'], 0)
|
||||
self.assertEqual(page['records'], [])
|
||||
self.assertEqual(ActivationSerializer.page(1, 20)['total'], 1)
|
||||
|
||||
def test_approved_user_appears_enabled_in_management(self, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
application = UserActivationApplication.objects.get()
|
||||
ActivationSerializer.approve(str(application.id), str(self.admin.id))
|
||||
page = UserManageSerializer.Query(data={'username': self.payload['username']}).page(1, 20, str(self.admin.id))
|
||||
self.assertEqual(page['total'], 1)
|
||||
self.assertTrue(page['records'][0]['is_active'])
|
||||
self.assertEqual(ActivationSerializer.page(1, 20)['total'], 0)
|
||||
|
||||
def test_normal_disabled_account_remains_in_management(self, _registry):
|
||||
data = UserManageSerializer().save({**self.payload, 'pending_activation': False}, str(self.admin.id))
|
||||
User.objects.filter(id=data['id']).update(is_active=False)
|
||||
page = UserManageSerializer.Query(data={'username': self.payload['username'], 'is_active': False}).page(1, 20, str(self.admin.id))
|
||||
self.assertEqual(page['total'], 1)
|
||||
self.assertFalse(page['records'][0]['is_active'])
|
||||
|
||||
def test_rejection_preserves_account_and_allows_resubmission(self, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
application = UserActivationApplication.objects.get()
|
||||
ActivationSerializer.reject(str(application.id), str(self.admin.id), '资料不符')
|
||||
application.refresh_from_db()
|
||||
self.assertEqual(application.reject_reason, '资料不符')
|
||||
self.assertEqual(ActivationSerializer.page(1, 20)['total'], 0)
|
||||
self.assertEqual(ActivationSerializer.page(1, 20, status=ActivationStatus.REJECTED)['total'], 1)
|
||||
page = UserManageSerializer.Query(data={'username': self.payload['username']}).page(1, 20, str(self.admin.id))
|
||||
self.assertEqual(page['total'], 0)
|
||||
self.assertEqual(page['records'], [])
|
||||
user_id = application.user_id
|
||||
result = RegisterSerializer.register({**self.payload, 'nick_name': '重新提交姓名',
|
||||
'phone': '13800138009', 'email': 'reapply@example.com'})
|
||||
self.assertTrue(result['re_register'])
|
||||
application.refresh_from_db()
|
||||
self.assertEqual(application.user_id, user_id)
|
||||
self.assertEqual(application.status, ActivationStatus.PENDING)
|
||||
self.assertEqual(application.reject_reason, '')
|
||||
self.assertIsNone(application.audit_time)
|
||||
self.assertIsNone(application.audit_by_id)
|
||||
user = User.objects.get(id=user_id)
|
||||
self.assertFalse(user.is_active)
|
||||
self.assertEqual(user.nick_name, '重新提交姓名')
|
||||
self.assertEqual(user.phone, '13800138009')
|
||||
self.assertEqual(user.email, 'reapply@example.com')
|
||||
self.assertEqual(application.email, user.email)
|
||||
self.assertEqual(UserActivationApplication.objects.count(), 1)
|
||||
|
||||
|
||||
def test_activation_audit_keeps_pending_and_rejected_with_phone(self, _registry):
|
||||
for index, status in enumerate((ActivationStatus.PENDING, ActivationStatus.REJECTED, ActivationStatus.APPROVED)):
|
||||
user = User.objects.create(username=f'audit_{index}', nick_name=f'审核{index}', role='USER',
|
||||
phone=f'1380013800{index}', is_active=status == ActivationStatus.APPROVED)
|
||||
UserActivationApplication.objects.create(user=user, status=status,
|
||||
reject_reason='资料不符' if status == ActivationStatus.REJECTED else '')
|
||||
page = ActivationSerializer.page(1, 20, status='UNAPPROVED')
|
||||
self.assertEqual(page['total'], 2)
|
||||
self.assertEqual({row['status'] for row in page['records']}, {'PENDING', 'REJECTED'})
|
||||
self.assertEqual({row['phone'] for row in page['records']}, {'13800138000', '13800138001'})
|
||||
rejected = next(row for row in page['records'] if row['status'] == 'REJECTED')
|
||||
self.assertEqual(rejected['reject_reason'], '资料不符')
|
||||
filtered = ActivationSerializer.page(1, 20, keyword='13800138001', status='UNAPPROVED')
|
||||
self.assertEqual(filtered['total'], 1)
|
||||
self.assertEqual(filtered['records'][0]['status'], 'REJECTED')
|
||||
|
||||
def test_activation_audit_returns_empty_phone_when_not_provided(self, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
page = ActivationSerializer.page(1, 20, status='UNAPPROVED')
|
||||
self.assertEqual(page['records'][0]['phone'], '')
|
||||
|
||||
def test_profile_edit_cannot_change_roles(self, _registry):
|
||||
user = User.objects.create(username='profile_user', nick_name='资料用户', role='USER')
|
||||
for changes in ({'role': 'ADMIN'}, {'role_setting': [{'role_id': 'ADMIN'}]}):
|
||||
with self.subTest(changes=changes):
|
||||
with self.assertRaises(AppApiException):
|
||||
UserManageSerializer.Operate(data={'id': str(user.id)}).edit(changes, str(self.admin.id))
|
||||
user.refresh_from_db()
|
||||
self.assertEqual(user.role, 'USER')
|
||||
|
||||
def test_profile_edit_keeps_existing_role_assignment(self, _registry):
|
||||
user = User.objects.create(username='profile_admin', nick_name='资料管理员', role='ADMIN')
|
||||
assignment = UserRoleAssignment.objects.create(user=user, role_id='ADMIN', workspace_id='default')
|
||||
UserManageSerializer.Operate(data={'id': str(user.id)}).edit({'nick_name': '更新姓名'}, str(self.admin.id))
|
||||
user.refresh_from_db()
|
||||
self.assertEqual(user.nick_name, '更新姓名')
|
||||
self.assertEqual(user.role, 'ADMIN')
|
||||
self.assertTrue(UserRoleAssignment.objects.filter(id=assignment.id).exists())
|
||||
|
||||
def test_role_choices_are_user_and_admin(self, _registry):
|
||||
detail = RoleAssignmentSerializer.detail(str(self.admin.id))
|
||||
self.assertEqual(detail['available_roles'], [{'id': 'USER', 'name': '普通用户'}, {'id': 'ADMIN', 'name': '管理员'}])
|
||||
self.assertNotIn('workspaces', detail)
|
||||
|
||||
def test_dedicated_role_assignment_updates_role_and_invalidates_cache(self, _registry):
|
||||
user = User.objects.create(username='role_user', nick_name='授权用户', role='USER')
|
||||
for version in (Cache_Version.PERMISSION_LIST, Cache_Version.ROLE_LIST, Cache_Version.USER):
|
||||
cache.set(version.get_key(user_id=user.id), ['old'], version=version.get_version())
|
||||
RoleAssignmentSerializer.save(str(user.id), [{'role_id': 'ADMIN'}], str(self.admin.id))
|
||||
user.refresh_from_db()
|
||||
self.assertEqual(user.role, 'ADMIN')
|
||||
assignment = UserRoleAssignment.objects.get(user=user)
|
||||
self.assertEqual(assignment.role_id, 'ADMIN')
|
||||
self.assertEqual(assignment.granted_by_id, self.admin.id)
|
||||
self.assertEqual(assignment.workspace_id, 'default')
|
||||
for version in (Cache_Version.PERMISSION_LIST, Cache_Version.ROLE_LIST, Cache_Version.USER):
|
||||
self.assertIsNone(cache.get(version.get_key(user_id=user.id), version=version.get_version()))
|
||||
RoleAssignmentSerializer.save(str(user.id), [{'role_id': 'USER'}], str(self.admin.id))
|
||||
user.refresh_from_db()
|
||||
self.assertEqual(user.role, 'USER')
|
||||
self.assertEqual(UserRoleAssignment.objects.filter(user=user).count(), 1)
|
||||
|
||||
def test_invalid_role_assignment_leaves_existing_role_unchanged(self, _registry):
|
||||
user = User.objects.create(username='invalid_role', nick_name='角色校验', role='USER')
|
||||
assignment = UserRoleAssignment.objects.create(user=user, role_id='USER', workspace_id='default')
|
||||
for roles in ([{'role_id': 'WORKSPACE_MANAGE'}], [{'role_id': 'ADMIN'}, {'role_id': 'USER'}],
|
||||
[{'role_id': 'ADMIN', 'workspace_ids': ['other']}], []):
|
||||
with self.subTest(roles=roles):
|
||||
with self.assertRaises(AppApiException):
|
||||
RoleAssignmentSerializer.save(str(user.id), roles, str(self.admin.id))
|
||||
user.refresh_from_db()
|
||||
self.assertEqual(user.role, 'USER')
|
||||
self.assertTrue(UserRoleAssignment.objects.filter(id=assignment.id).exists())
|
||||
|
||||
def test_builtin_admin_role_cannot_be_downgraded(self, _registry):
|
||||
user = User.objects.create(id='f0dd8f71-e4ee-11ee-8c84-a8a1595801ab', username='builtin', nick_name='内置管理员', role='ADMIN')
|
||||
with self.assertRaises(AppApiException):
|
||||
RoleAssignmentSerializer.save(str(user.id), [{'role_id': 'USER'}], str(self.admin.id))
|
||||
user.refresh_from_db()
|
||||
self.assertEqual(user.role, 'ADMIN')
|
||||
|
||||
def test_approved_and_pending_cannot_reregister(self, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
app = UserActivationApplication.objects.get()
|
||||
for status in (ActivationStatus.PENDING, ActivationStatus.APPROVED):
|
||||
app.status = status
|
||||
app.save()
|
||||
with self.subTest(status=status), self.assertRaises(AppApiException):
|
||||
RegisterSerializer.register({**self.payload, 'phone': '13800138008'})
|
||||
self.assertEqual(User.objects.get(username=self.payload['username']).phone, '')
|
||||
|
||||
def test_rejected_requires_original_credentials(self, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
app = UserActivationApplication.objects.get()
|
||||
ActivationSerializer.reject(str(app.id), str(self.admin.id), '资料不符')
|
||||
for changed in ({'password': 'Other@123', 're_password': 'Other@123'}, {'username': 'other_name'}):
|
||||
with self.subTest(changed=changed), self.assertRaises(AppApiException):
|
||||
RegisterSerializer.register({**self.payload, **changed})
|
||||
app.refresh_from_db()
|
||||
self.assertEqual(app.status, ActivationStatus.REJECTED)
|
||||
self.assertEqual(app.reject_reason, '资料不符')
|
||||
|
||||
def test_reapply_does_not_overwrite_another_account(self, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
app = UserActivationApplication.objects.get()
|
||||
ActivationSerializer.reject(str(app.id), str(self.admin.id), '资料不符')
|
||||
other = User.objects.create(username='other', nick_name='其他姓名', email='other@example.com', role='USER')
|
||||
for changed in ({'nick_name': other.nick_name}, {'email': other.email}):
|
||||
with self.subTest(changed=changed), self.assertRaises(AppApiException):
|
||||
RegisterSerializer.register({**self.payload, **changed})
|
||||
app.refresh_from_db()
|
||||
self.assertEqual(app.status, ActivationStatus.REJECTED)
|
||||
|
||||
@patch.object(LoginSerializer, 'get_auth_setting', return_value={'max_attempts': -1})
|
||||
def test_rejected_login_includes_reason_only_with_correct_password(self, _settings, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
app = UserActivationApplication.objects.get()
|
||||
ActivationSerializer.reject(str(app.id), str(self.admin.id), '手机号与申请资料不一致')
|
||||
with self.assertRaises(AppApiException) as error:
|
||||
LoginSerializer.login({'username': self.payload['username'], 'password': self.payload['password']})
|
||||
self.assertIn('手机号与申请资料不一致', str(error.exception))
|
||||
with self.assertRaises(AppApiException) as error:
|
||||
LoginSerializer.login({'username': self.payload['username'], 'password': 'Wrong@123'})
|
||||
self.assertNotIn('手机号与申请资料不一致', str(error.exception))
|
||||
|
||||
def test_audit_notices_are_scheduled_after_commit(self, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
app = UserActivationApplication.objects.get()
|
||||
with patch('users.serializers.user_manage_ext.send_activation_notice') as notice:
|
||||
with self.captureOnCommitCallbacks(execute=True):
|
||||
ActivationSerializer.reject(str(app.id), str(self.admin.id), '资料不符')
|
||||
notice.assert_not_called()
|
||||
self.assertEqual(notice.call_args.args[1:], (False, '资料不符'))
|
||||
RegisterSerializer.register(self.payload)
|
||||
with patch('users.serializers.user_manage_ext.send_activation_notice') as notice:
|
||||
with self.captureOnCommitCallbacks(execute=True):
|
||||
ActivationSerializer.approve(str(app.id), str(self.admin.id))
|
||||
notice.assert_not_called()
|
||||
self.assertTrue(notice.call_args.args[1])
|
||||
|
||||
def test_notice_without_email_configuration_does_not_send(self, _registry):
|
||||
with patch('users.serializers.user_manage_ext.SystemSetting.objects') as setting, \
|
||||
patch('users.serializers.user_manage_ext.send_mail') as mail:
|
||||
setting.filter.return_value.first.return_value = None
|
||||
self.assertFalse(send_activation_notice(self.admin, True))
|
||||
mail.assert_not_called()
|
||||
|
||||
def test_notice_contains_result_and_reason(self, _registry):
|
||||
from types import SimpleNamespace
|
||||
with patch('users.serializers.user_manage_ext.SystemSetting.objects') as setting, \
|
||||
patch('users.serializers.user_manage_ext.EmailBackend'), \
|
||||
patch('users.serializers.user_manage_ext.send_mail', return_value=1) as mail:
|
||||
setting.filter.return_value.first.return_value = SimpleNamespace(meta={
|
||||
'email_host': 'smtp.example.invalid', 'email_port': 25, 'from_email': 'sender@example.com'})
|
||||
self.assertTrue(send_activation_notice(self.admin, False, '手机号不符'))
|
||||
self.assertIn('未通过', mail.call_args.args[0])
|
||||
self.assertIn('手机号不符', mail.call_args.args[1])
|
||||
self.assertEqual(mail.call_args.kwargs['recipient_list'], [self.admin.email])
|
||||
self.assertTrue(send_activation_notice(self.admin, True))
|
||||
self.assertIn('审核通过', mail.call_args.args[0])
|
||||
|
||||
def test_mail_failure_does_not_change_audit_outcome(self, _registry):
|
||||
from types import SimpleNamespace
|
||||
with patch('users.serializers.user_manage_ext.SystemSetting.objects') as setting, \
|
||||
patch('users.serializers.user_manage_ext.EmailBackend'), \
|
||||
patch('users.serializers.user_manage_ext.send_mail', side_effect=RuntimeError('mock SMTP error')):
|
||||
setting.filter.return_value.first.return_value = SimpleNamespace(meta={'email_host': 'smtp.example.invalid'})
|
||||
self.assertFalse(send_activation_notice(self.admin, True))
|
||||
|
||||
def test_resource_user_lists_exclude_unapproved_and_disabled(self, _registry):
|
||||
allowed = User.objects.create(username='allowed', nick_name='已通过', role='USER')
|
||||
UserActivationApplication.objects.create(user=allowed, status=ActivationStatus.APPROVED)
|
||||
direct = User.objects.create(username='direct', nick_name='直接激活', role='USER')
|
||||
for status in (ActivationStatus.PENDING, ActivationStatus.REJECTED):
|
||||
user = User.objects.create(username=status, nick_name=status, role='USER', is_active=True)
|
||||
UserActivationApplication.objects.create(user=user, status=status)
|
||||
User.objects.create(username='disabled', nick_name='停用', role='USER', is_active=False)
|
||||
members = UserManageSerializer().get_user_members('default')
|
||||
self.assertEqual({str(u['id']) for u in members}, {str(allowed.id), str(direct.id)})
|
||||
for entries in (UserManageSerializer().get_user_list('default'), UserManageSerializer().get_all_user_list()):
|
||||
self.assertEqual({str(u['id']) for u in entries}, {str(allowed.id), str(direct.id), str(self.admin.id)})
|
||||
|
||||
def test_resource_authorization_cannot_use_hidden_user_id(self, _registry):
|
||||
RegisterSerializer.register(self.payload)
|
||||
user = User.objects.get(username=self.payload['username'])
|
||||
for kind in ('APPLICATION', 'KNOWLEDGE', 'TOOL', 'MODEL'):
|
||||
with self.subTest(kind=kind), self.assertRaises(AppApiException):
|
||||
UserResourcePermissionSerializer(data={'workspace_id': 'default', 'user_id': str(user.id),
|
||||
'auth_target_type': kind}).is_valid(raise_exception=True)
|
||||
with self.subTest(kind=kind), self.assertRaises(AppApiException):
|
||||
ResourceUserPermissionSerializer(data={'workspace_id': 'default', 'target': 'test-target',
|
||||
'auth_target_type': kind}).edit([{'user_id': str(user.id), 'permission': 'VIEW'}])
|
||||
|
||||
def test_direct_activation_schedules_notice(self, _registry):
|
||||
with patch('users.serializers.user_manage_ext.send_activation_notice') as notice:
|
||||
with self.captureOnCommitCallbacks(execute=True):
|
||||
UserManageSerializer().save({**self.payload, 'pending_activation': False}, str(self.admin.id))
|
||||
notice.assert_not_called()
|
||||
self.assertTrue(notice.call_args.args[1])
|
||||
|
||||
def test_resource_user_sql_filters_all_four_modules(self, _registry):
|
||||
from django.db import connection
|
||||
from common.db.search import compiler_queryset
|
||||
allowed = User.objects.create(username='allowed_sql', nick_name='SQL已通过', role='USER')
|
||||
UserActivationApplication.objects.create(user=allowed, status=ActivationStatus.APPROVED)
|
||||
for status in (ActivationStatus.PENDING, ActivationStatus.REJECTED):
|
||||
user = User.objects.create(username='sql_'+status, nick_name='SQL'+status, role='USER')
|
||||
UserActivationApplication.objects.create(user=user, status=status)
|
||||
User.objects.create(username='disabled_sql', nick_name='SQL停用', role='USER', is_active=False)
|
||||
for kind in ('APPLICATION', 'KNOWLEDGE', 'TOOL', 'MODEL'):
|
||||
with self.subTest(kind=kind):
|
||||
serializer = ResourceUserPermissionSerializer(data={
|
||||
'workspace_id': 'default', 'target': 'test', 'auth_target_type': kind})
|
||||
serializer.is_valid(raise_exception=True)
|
||||
query = serializer.get_queryset({'permission': []}, False)['user_query_set']
|
||||
clause, params = compiler_queryset(query)
|
||||
with connection.cursor() as cursor:
|
||||
cursor.execute('SELECT u.id FROM "user" u ' + clause, params)
|
||||
ids = {str(row[0]).replace('-', '') for row in cursor.fetchall()}
|
||||
self.assertEqual(ids, {str(allowed.id).replace('-', '')})
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ app_name = "user"
|
|||
# @formatter:off
|
||||
urlpatterns = [
|
||||
path('user/login', views.LoginView.as_view(), name='login'),
|
||||
path('user/register', views.RegisterView.as_view(), name='register'),
|
||||
path('user/profile', views.UserProfileView.as_view(), name="user_profile"),
|
||||
path('user/captcha', views.CaptchaView.as_view(), name='captcha'),
|
||||
path('user/test', views.TestPermissionsUserView.as_view(), name="test"),
|
||||
|
|
@ -21,6 +22,12 @@ urlpatterns = [
|
|||
path('workspace/<str:workspace_id>/user_member',views.WorkspaceUserMemberView.as_view(), name="test_workspace_id_permission"),
|
||||
path('workspace/<str:workspace_id>/user/profile', views.TestWorkspacePermissionUserView.as_view(), name="test_workspace_id_permission"),
|
||||
path("user_manage", views.UserManage.as_view(), name="user_manage"),
|
||||
path("user_manage/activation/pending", views.UserActivationPendingView.as_view(), name="user_activation_pending"),
|
||||
path("user_manage/activation/<str:application_id>/approve", views.UserActivationApproveView.as_view(),
|
||||
name="user_activation_approve"),
|
||||
path("user_manage/activation/<str:application_id>/reject", views.UserActivationRejectView.as_view(),
|
||||
name="user_activation_reject"),
|
||||
path("user_manage/<str:user_id>/roles", views.UserRoleAssignmentView.as_view(), name="user_role_assignment"),
|
||||
path("user_manage/batch_delete", views.UserManage.BatchDelete.as_view()),
|
||||
path("user_manage/password", views.UserManage.Password.as_view()),
|
||||
path("user_manage/<str:user_id>", views.UserManage.Operate.as_view(), name="user_manage_operate"),
|
||||
|
|
|
|||
|
|
@ -8,3 +8,5 @@
|
|||
"""
|
||||
from .login import *
|
||||
from .user import *
|
||||
from .user_manage_ext import *
|
||||
from .register import RegisterView
|
||||
|
|
|
|||
2
main.py
2
main.py
|
|
@ -79,7 +79,7 @@ def dev():
|
|||
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ['HF_HOME'] = '/opt/maxkb-app/model/base'
|
||||
os.environ.setdefault('HF_HOME', '/opt/maxkb-app/model/base')
|
||||
parser = argparse.ArgumentParser(
|
||||
description="""
|
||||
qabot service control tools;
|
||||
|
|
|
|||
|
|
@ -304,6 +304,91 @@ const delMulTag: (knowledge_id: string, tags: any, loading?: Ref<boolean>) => Pr
|
|||
return put(`${prefix.value}/${knowledge_id}/tags/batch_delete`, tags, null, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 独立重建知识库索引
|
||||
*/
|
||||
const postRebuildKnowledgeIndex: (
|
||||
knowledge_id: string,
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (knowledge_id, loading) => {
|
||||
return post(`${prefix.value}/${knowledge_id}/rebuild`, undefined, undefined, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 重建任务列表
|
||||
*/
|
||||
const getRebuildTasks: (
|
||||
knowledge_id: string,
|
||||
page: pageRequest,
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (knowledge_id, page, loading) => {
|
||||
return get(`${prefix.value}/${knowledge_id}/rebuild`, page, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 重建任务详情
|
||||
*/
|
||||
const getRebuildTask: (
|
||||
knowledge_id: string,
|
||||
task_id: string,
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (knowledge_id, task_id, loading) => {
|
||||
return get(`${prefix.value}/${knowledge_id}/rebuild/${task_id}`, undefined, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 重试重建任务
|
||||
*/
|
||||
const postRetryRebuildTask: (
|
||||
knowledge_id: string,
|
||||
task_id: string,
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (knowledge_id, task_id, loading) => {
|
||||
return post(`${prefix.value}/${knowledge_id}/rebuild/${task_id}/retry`, undefined, undefined, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 知识库业务元数据
|
||||
*/
|
||||
const getKnowledgeMetadata: (
|
||||
knowledge_id: string,
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (knowledge_id, loading) => {
|
||||
return get(`${prefix.value}/${knowledge_id}/metadata`, undefined, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改知识库业务元数据
|
||||
*/
|
||||
const putKnowledgeMetadata: (
|
||||
knowledge_id: string,
|
||||
data: Record<string, string>,
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (knowledge_id, data, loading) => {
|
||||
return put(`${prefix.value}/${knowledge_id}/metadata`, data, undefined, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 知识库分段规则
|
||||
*/
|
||||
const getKnowledgeSegmentation: (
|
||||
knowledge_id: string,
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (knowledge_id, loading) => {
|
||||
return get(`${prefix.value}/${knowledge_id}/segmentation`, undefined, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改知识库分段规则
|
||||
*/
|
||||
const putKnowledgeSegmentation: (
|
||||
knowledge_id: string,
|
||||
data: { chunk_size: number; chunk_overlap: number },
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (knowledge_id, data, loading) => {
|
||||
return put(`${prefix.value}/${knowledge_id}/segmentation`, data, undefined, loading)
|
||||
}
|
||||
|
||||
export default {
|
||||
getKnowledgeList,
|
||||
getKnowledgeListPage,
|
||||
|
|
@ -326,5 +411,13 @@ export default {
|
|||
postTags,
|
||||
putTag,
|
||||
delTag,
|
||||
delMulTag
|
||||
delMulTag,
|
||||
postRebuildKnowledgeIndex,
|
||||
getRebuildTasks,
|
||||
getRebuildTask,
|
||||
postRetryRebuildTask,
|
||||
getKnowledgeMetadata,
|
||||
putKnowledgeMetadata,
|
||||
getKnowledgeSegmentation,
|
||||
putKnowledgeSegmentation
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,6 +91,60 @@ const getValid: (
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* 待激活注册申请分页
|
||||
*/
|
||||
const getActivationPending: (
|
||||
params: any,
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (params, loading) => {
|
||||
return get(`${prefix}/activation/pending`, params, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过待激活申请
|
||||
*/
|
||||
const approveActivation: (
|
||||
application_id: string,
|
||||
data: any,
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (application_id, data, loading) => {
|
||||
return post(`${prefix}/activation/${application_id}/approve`, data, undefined, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 拒绝待激活申请
|
||||
*/
|
||||
const rejectActivation: (
|
||||
application_id: string,
|
||||
data: any,
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (application_id, data, loading) => {
|
||||
return post(`${prefix}/activation/${application_id}/reject`, data, undefined, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看用户角色授权
|
||||
*/
|
||||
const getUserRoles: (user_id: string, loading?: Ref<boolean>) => Promise<Result<any>> = (
|
||||
user_id,
|
||||
loading,
|
||||
) => {
|
||||
return get(`${prefix}/${user_id}/roles`, undefined, loading)
|
||||
}
|
||||
|
||||
/**
|
||||
* 分配用户角色
|
||||
*/
|
||||
const putUserRoles: (
|
||||
user_id: string,
|
||||
data: any,
|
||||
loading?: Ref<boolean>,
|
||||
) => Promise<Result<any>> = (user_id, data, loading) => {
|
||||
return put(`${prefix}/${user_id}/roles`, data, undefined, loading)
|
||||
}
|
||||
|
||||
|
||||
export default {
|
||||
getUserManage,
|
||||
putUserManage,
|
||||
|
|
@ -99,5 +153,9 @@ export default {
|
|||
putUserManagePassword,
|
||||
getSystemDefaultPassword,
|
||||
getValid,
|
||||
|
||||
getActivationPending,
|
||||
approveActivation,
|
||||
rejectActivation,
|
||||
getUserRoles,
|
||||
putUserRoles,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,26 +44,11 @@ interface LoginRequest {
|
|||
}
|
||||
|
||||
interface RegisterRequest {
|
||||
/**
|
||||
* 用户名
|
||||
*/
|
||||
username: string
|
||||
/**
|
||||
* 密码
|
||||
*/
|
||||
password: string
|
||||
/**
|
||||
* 确定密码
|
||||
*/
|
||||
re_password: string
|
||||
/**
|
||||
* 邮箱
|
||||
*/
|
||||
nick_name: string
|
||||
email: string
|
||||
/**
|
||||
* 验证码
|
||||
*/
|
||||
code: string
|
||||
phone: string
|
||||
encryptedData: string
|
||||
}
|
||||
|
||||
interface CheckCodeRequest {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
import { Result } from '@/request/Result'
|
||||
import { get, post } from '@/request/index'
|
||||
import type { User, ResetPasswordRequest, CheckCodeRequest } from '@/api/type/user'
|
||||
import type { User, ResetPasswordRequest, CheckCodeRequest, RegisterRequest } from '@/api/type/user'
|
||||
import type { Ref } from 'vue'
|
||||
|
||||
const register = (request: RegisterRequest, loading?: Ref<boolean>): Promise<Result<{ status: string }>> => {
|
||||
return post('/user/register', request, undefined, loading)
|
||||
}
|
||||
/**
|
||||
* 获取用户基本信息
|
||||
* @param loading 接口加载器
|
||||
|
|
@ -90,6 +94,7 @@ const resetCurrentPassword: (
|
|||
}
|
||||
|
||||
export default {
|
||||
register,
|
||||
getUserProfile,
|
||||
getProfile,
|
||||
getUserList,
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { ref, nextTick, watch, computed, onMounted } from 'vue'
|
||||
import { ref, nextTick, watch, computed, onMounted, onBeforeUnmount } from 'vue'
|
||||
import { MsgError } from '@/utils/message'
|
||||
import { t } from '@/locales'
|
||||
defineOptions({ name: 'AppTable' })
|
||||
|
|
@ -94,7 +94,15 @@ const appTableRef = ref()
|
|||
const loading = ref(false)
|
||||
const showInput = ref(false)
|
||||
const inputValue = ref('')
|
||||
const tableHeight = ref(0)
|
||||
const getTableHeight = () => Math.max(160, window.innerHeight - props.maxTableHeight)
|
||||
const tableHeight = ref(getTableHeight())
|
||||
|
||||
function updateTableHeight() {
|
||||
tableHeight.value = getTableHeight()
|
||||
nextTick(() => appTableRef.value?.doLayout())
|
||||
}
|
||||
|
||||
watch(() => props.maxTableHeight, updateTableHeight)
|
||||
|
||||
watch(showInput, (bool) => {
|
||||
if (!bool) {
|
||||
|
|
@ -151,13 +159,11 @@ defineExpose({
|
|||
})
|
||||
|
||||
onMounted(() => {
|
||||
tableHeight.value = window.innerHeight - props.maxTableHeight
|
||||
window.onresize = () => {
|
||||
return (() => {
|
||||
tableHeight.value = window.innerHeight - props.maxTableHeight
|
||||
})()
|
||||
}
|
||||
updateTableHeight()
|
||||
window.addEventListener('resize', updateTableHeight)
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => window.removeEventListener('resize', updateTableHeight))
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -18,3 +18,12 @@ export enum modelType {
|
|||
TTV = 'views.model.modelType.TTV',
|
||||
ITV = 'views.model.modelType.ITV',
|
||||
}
|
||||
|
||||
export function modelTypeLabel(value: string) {
|
||||
const names: Record<string, string> = {
|
||||
LLM: '大语言模型', EMBEDDING: '向量模型', RERANKER: '重排模型',
|
||||
STT: '语音识别', TTS: '语音合成', IMAGE: '视觉模型', TTI: '图片生成',
|
||||
TTV: '文生视频', ITV: '图生视频',
|
||||
}
|
||||
return names[value] ? `${value} / ${names[value]}` : value
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,6 +58,15 @@
|
|||
{{ menuText.userManagement }}
|
||||
</router-link>
|
||||
|
||||
<router-link
|
||||
v-if="user.is_admin()"
|
||||
to="/system/mindmap"
|
||||
style="display: block; padding: 10px 16px; border-radius: 8px; text-decoration: none; color: #333; font-size: 14px;"
|
||||
:style="activeSystemMenu === '/system/mindmap' ? { backgroundColor: '#e6f0ff', color: '#1890ff' } : {}"
|
||||
>
|
||||
{{ menuText.mindmapManagement }}
|
||||
</router-link>
|
||||
|
||||
<div>
|
||||
<div
|
||||
style="display: flex; justify-content: space-between; align-items: center; padding: 10px 16px; border-radius: 8px; cursor: pointer;"
|
||||
|
|
@ -163,6 +172,7 @@ const menuText = computed(() => {
|
|||
return {
|
||||
aiApplication: 'AI Applications',
|
||||
mindmap: 'Mind Map',
|
||||
mindmapManagement: 'Mind Map Management',
|
||||
knowledge: 'Knowledge Base',
|
||||
toolManagement: 'Tool Management',
|
||||
modelManagement: 'Model Management',
|
||||
|
|
@ -178,6 +188,7 @@ const menuText = computed(() => {
|
|||
return {
|
||||
aiApplication: 'AI應用',
|
||||
mindmap: '思維導圖',
|
||||
mindmapManagement: '思維導圖管理',
|
||||
knowledge: '知識庫',
|
||||
toolManagement: '工具管理',
|
||||
modelManagement: '模型管理',
|
||||
|
|
@ -192,6 +203,7 @@ const menuText = computed(() => {
|
|||
return {
|
||||
aiApplication: 'AI应用',
|
||||
mindmap: '思维导图',
|
||||
mindmapManagement: '思维导图管理',
|
||||
knowledge: '知识库',
|
||||
toolManagement: '工具管理',
|
||||
modelManagement: '模型管理',
|
||||
|
|
@ -221,6 +233,7 @@ const activeMainMenu = computed(() => {
|
|||
|
||||
const activeSystemMenu = computed(() => {
|
||||
const path = route.path
|
||||
if (path === '/system/mindmap' || path === '/admin/system/mindmap') return '/system/mindmap'
|
||||
if (path.startsWith('/system/user') || path.startsWith('/admin/system/user')) return '/system/user'
|
||||
if (path.startsWith('/system/authorization') || path.startsWith('/admin/system/authorization')) {
|
||||
return path.replace('/admin', '')
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ router.beforeEach(
|
|||
}
|
||||
const { user, login, menuSetting } = useStore()
|
||||
|
||||
const notAuthRouteNameList = ['login', 'ForgotPassword', 'ResetPassword', 'Chat', 'UserLogin']
|
||||
const notAuthRouteNameList = ['login', 'Register', 'ForgotPassword', 'ResetPassword', 'Chat', 'UserLogin']
|
||||
if (!notAuthRouteNameList.includes(to.name ? to.name.toString() : '')) {
|
||||
if (to.query && to.query.token) {
|
||||
localStorage.setItem('token', to.query.token.toString())
|
||||
|
|
|
|||
|
|
@ -8,6 +8,21 @@ const systemRouter = {
|
|||
hidden: true,
|
||||
component: () => import('@/layout/layout-template/SystemMainLayout.vue'),
|
||||
children: [
|
||||
{
|
||||
path: '/system/mindmap',
|
||||
name: 'mindmapManagement',
|
||||
meta: {
|
||||
icon: 'app-document',
|
||||
iconActive: 'app-document',
|
||||
title: '思维导图管理',
|
||||
activeMenu: '/system',
|
||||
parentPath: '/system',
|
||||
parentName: 'system',
|
||||
sameRoute: 'mindmapManagement',
|
||||
permission: [RoleConst.ADMIN],
|
||||
},
|
||||
component: () => import('@/views/system/mindmap/index.vue'),
|
||||
},
|
||||
{
|
||||
path: '/system/user',
|
||||
name: 'user',
|
||||
|
|
|
|||
|
|
@ -60,6 +60,11 @@ export const routes: Array<RouteRecordRaw> = [
|
|||
name: 'login',
|
||||
component: () => import('@/views/login/index.vue'),
|
||||
},
|
||||
{
|
||||
path: '/register',
|
||||
name: 'Register',
|
||||
component: () => import('@/views/login/Register.vue'),
|
||||
},
|
||||
{
|
||||
path: '/forgot_password',
|
||||
name: 'ForgotPassword',
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<div class="set-rules__right">
|
||||
<el-scrollbar>
|
||||
<div class="left-height" @click.stop>
|
||||
<el-radio-group v-model="radio" class="card__radio">
|
||||
<el-radio-group v-model="radio" class="card__radio" :disabled="!rulesReady">
|
||||
<el-card shadow="never" class="mb-16" :class="radio === '1' ? 'active' : ''">
|
||||
<el-radio value="1" size="large">
|
||||
<p class="mb-4">{{ $t('views.document.setRules.intelligent.label') }}</p>
|
||||
|
|
@ -75,6 +75,19 @@
|
|||
:max="100000"
|
||||
/>
|
||||
</div>
|
||||
<div class="form-item mb-16">
|
||||
<div class="title mb-8">分段重叠(overlap)</div>
|
||||
<el-slider
|
||||
v-model="form.overlap"
|
||||
show-input
|
||||
:show-input-controls="false"
|
||||
:min="0"
|
||||
:max="Math.max(0, form.limit - 1)"
|
||||
/>
|
||||
<div style="margin-top: 4px">
|
||||
<el-text type="info">相邻分段保留的重叠字符数,0 表示不重叠</el-text>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-item mb-16">
|
||||
<div class="title mb-8">
|
||||
{{ $t('views.document.setRules.with_filter.label') }}
|
||||
|
|
@ -102,7 +115,7 @@
|
|||
</el-checkbox>
|
||||
</div>
|
||||
<div class="text-right mt-8">
|
||||
<el-button @click="splitDocument">
|
||||
<el-button @click="splitDocument" :disabled="!rulesReady">
|
||||
{{ $t('views.document.buttons.preview') }}</el-button
|
||||
>
|
||||
</div>
|
||||
|
|
@ -146,6 +159,7 @@ const apiType = computed(() => {
|
|||
})
|
||||
|
||||
const radio = ref('1')
|
||||
const rulesReady = ref(false)
|
||||
const loading = ref(false)
|
||||
const paragraphList = ref<any[]>([])
|
||||
const patternLoading = ref<boolean>(false)
|
||||
|
|
@ -156,14 +170,25 @@ const firstChecked = ref(true)
|
|||
const form = reactive<{
|
||||
patterns: Array<string>
|
||||
limit: number
|
||||
overlap: number
|
||||
with_filter: boolean
|
||||
[propName: string]: any
|
||||
}>({
|
||||
patterns: [],
|
||||
limit: 500,
|
||||
limit: 4096,
|
||||
overlap: 0,
|
||||
with_filter: true,
|
||||
})
|
||||
|
||||
watch(
|
||||
() => form.limit,
|
||||
(limit) => {
|
||||
if (form.overlap > limit - 1) {
|
||||
form.overlap = Math.max(0, limit - 1)
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
function changeHandle(val: boolean) {
|
||||
if (val && firstChecked.value) {
|
||||
paragraphList.value = paragraphList.value.map((item: any) => ({
|
||||
|
|
@ -183,6 +208,7 @@ function changeHandle(val: boolean) {
|
|||
}
|
||||
}
|
||||
function splitDocument() {
|
||||
if (!rulesReady.value) return
|
||||
loading.value = true
|
||||
const fd = new FormData()
|
||||
documentsFiles.value.forEach((item) => {
|
||||
|
|
@ -243,8 +269,18 @@ watch(radio, () => {
|
|||
}
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
splitDocument()
|
||||
onMounted(async () => {
|
||||
try {
|
||||
const res = await loadSharedApi({ type: 'knowledge', systemType: apiType.value })
|
||||
.getKnowledgeDetail(id, loading)
|
||||
const defaults = res.data?.meta?.segmentation || {}
|
||||
form.limit = defaults.chunk_size ?? 4096
|
||||
form.overlap = defaults.chunk_overlap ?? 0
|
||||
rulesReady.value = true
|
||||
splitDocument()
|
||||
} catch {
|
||||
// 默认规则加载失败时保留错误提示,不使用其他参数静默分段。
|
||||
}
|
||||
})
|
||||
|
||||
defineExpose({
|
||||
|
|
|
|||
|
|
@ -1,205 +1,416 @@
|
|||
<template>
|
||||
<div class="p-16-24">
|
||||
<h2 class="mb-16">{{ $t('common.setting') }}</h2>
|
||||
<div class="flex-between mb-16">
|
||||
<h2>{{ $t('common.setting') }}</h2>
|
||||
<el-button v-if="!route.path.includes('share/') && permissionPrecise.edit(id)" type="primary" :loading="saving" :disabled="!settingsReady" @click="submit">保存</el-button>
|
||||
</div>
|
||||
<el-card style="--el-card-padding: 0">
|
||||
<div class="knowledge-setting main-calc-height">
|
||||
<el-scrollbar>
|
||||
<div class="p-24" v-loading="loading">
|
||||
<h4 class="title-decoration-1 mb-16">
|
||||
{{ $t('common.info') }}
|
||||
</h4>
|
||||
<BaseForm ref="BaseFormRef" :data="detail" :apiType="apiType"/>
|
||||
<div class="p-24" v-loading="loading || saving">
|
||||
<el-card shadow="never" class="mb-16 w-full layout-bg">
|
||||
<el-descriptions :column="3" border class="creator-info-descriptions">
|
||||
<el-descriptions-item :label="$t('common.creator')" class="creator-info-item">
|
||||
<el-select v-model="selectedCreator" placeholder="请选择创建者" v-if="!route.path.includes('share/') && permissionPrecise.edit(id)" class="creator-select">
|
||||
<el-option v-for="user in user_options" :key="user.id" :label="user.nick_name" :value="user.id" />
|
||||
</el-select>
|
||||
<span v-else class="creator-text">{{ detail?.nick_name ? i18n_name(detail.nick_name) : detail?.create_user || $t('common.unknown') }}</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :label="$t('common.createTime')" class="creator-info-item">
|
||||
<span class="creator-text">{{ detail?.create_time ? new Date(detail.create_time).toLocaleString() : $t('common.unknown') }}</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :label="$t('common.updateTime')" class="creator-info-item">
|
||||
<span class="creator-text">{{ detail?.update_time ? new Date(detail.update_time).toLocaleString() : $t('common.unknown') }}</span>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
|
||||
<el-form
|
||||
ref="webFormRef"
|
||||
:rules="rules"
|
||||
:model="form"
|
||||
label-position="top"
|
||||
require-asterisk-position="right"
|
||||
>
|
||||
<el-form-item :label="$t('views.knowledge.knowledgeType.label')" required>
|
||||
<el-card
|
||||
shadow="never"
|
||||
class="mb-8 w-full layout-bg"
|
||||
style="line-height: 22px"
|
||||
v-if="detail?.type === 0"
|
||||
>
|
||||
<div class="flex align-center">
|
||||
<el-avatar class="mr-8 avatar-blue" shape="square" :size="32">
|
||||
<img src="@/assets/knowledge/icon_document.svg" style="width: 58%" alt=""/>
|
||||
</el-avatar>
|
||||
<div>
|
||||
<div>{{ $t('views.knowledge.knowledgeType.generalKnowledge') }}</div>
|
||||
<el-text type="info"
|
||||
>{{ $t('views.knowledge.knowledgeType.generalInfo') }}
|
||||
</el-text>
|
||||
<h4 class="title-decoration-1 mb-16">基本信息</h4>
|
||||
<BaseForm
|
||||
ref="BaseFormRef"
|
||||
:data="detail"
|
||||
:apiType="apiType"
|
||||
section="basic"
|
||||
:form-value="baseSettings"
|
||||
/>
|
||||
<el-form
|
||||
ref="webFormRef"
|
||||
:rules="rules"
|
||||
:model="form"
|
||||
label-position="top"
|
||||
require-asterisk-position="right"
|
||||
>
|
||||
<el-form-item :label="$t('views.knowledge.knowledgeType.label')" required>
|
||||
<el-card
|
||||
shadow="never"
|
||||
class="mb-8 w-full layout-bg"
|
||||
style="line-height: 22px"
|
||||
v-if="detail?.type === 0"
|
||||
>
|
||||
<div class="flex align-center">
|
||||
<el-avatar class="mr-8 avatar-blue" shape="square" :size="32">
|
||||
<img src="@/assets/knowledge/icon_document.svg" style="width: 58%" alt="" />
|
||||
</el-avatar>
|
||||
<div>
|
||||
<div>{{ $t('views.knowledge.knowledgeType.generalKnowledge') }}</div>
|
||||
<el-text type="info"
|
||||
>{{ $t('views.knowledge.knowledgeType.generalInfo') }}
|
||||
</el-text>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card
|
||||
shadow="never"
|
||||
class="mb-8 w-full layout-bg"
|
||||
style="line-height: 22px"
|
||||
</el-card>
|
||||
<el-card
|
||||
shadow="never"
|
||||
class="mb-8 w-full layout-bg"
|
||||
style="line-height: 22px"
|
||||
v-if="detail?.type === 1"
|
||||
>
|
||||
<div class="flex align-center">
|
||||
<el-avatar class="mr-8 avatar-purple" shape="square" :size="32">
|
||||
<img src="@/assets/knowledge/icon_web.svg" style="width: 58%" alt="" />
|
||||
</el-avatar>
|
||||
<div>
|
||||
<div>{{ $t('views.knowledge.knowledgeType.webKnowledge') }}</div>
|
||||
<el-text type="info">
|
||||
{{ $t('views.knowledge.knowledgeType.webInfo') }}
|
||||
</el-text>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card
|
||||
shadow="never"
|
||||
class="mb-8 w-full layout-bg"
|
||||
style="line-height: 22px"
|
||||
v-if="detail?.type === 2"
|
||||
>
|
||||
<div class="flex align-center">
|
||||
<el-avatar shape="square" :size="32" style="background: none">
|
||||
<img src="@/assets/knowledge/logo_lark.svg" style="width: 100%" alt="" />
|
||||
</el-avatar>
|
||||
<div>
|
||||
<p>
|
||||
<el-text>{{ $t('views.knowledge.knowledgeType.larkKnowledge') }}</el-text>
|
||||
</p>
|
||||
<el-text type="info"
|
||||
>{{ $t('views.knowledge.knowledgeType.larkInfo') }}
|
||||
</el-text>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
:label="$t('views.knowledge.form.source_url.label')"
|
||||
prop="source_url"
|
||||
v-if="detail?.type === 1"
|
||||
>
|
||||
<div class="flex align-center">
|
||||
<el-avatar class="mr-8 avatar-purple" shape="square" :size="32">
|
||||
<img src="@/assets/knowledge/icon_web.svg" style="width: 58%" alt=""/>
|
||||
</el-avatar>
|
||||
<div>
|
||||
<div>{{ $t('views.knowledge.knowledgeType.webKnowledge') }}</div>
|
||||
<el-text type="info">
|
||||
{{ $t('views.knowledge.knowledgeType.webInfo') }}
|
||||
</el-text>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card
|
||||
shadow="never"
|
||||
class="mb-8 w-full layout-bg"
|
||||
style="line-height: 22px"
|
||||
v-if="detail?.type === 2"
|
||||
<el-input
|
||||
v-model="form.source_url"
|
||||
:placeholder="$t('views.knowledge.form.source_url.placeholder')"
|
||||
@blur="form.source_url = form.source_url.trim()"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
:label="$t('views.knowledge.form.selector.label')"
|
||||
v-if="detail?.type === 1"
|
||||
>
|
||||
<div class="flex align-center">
|
||||
<el-avatar shape="square" :size="32" style="background: none">
|
||||
<img src="@/assets/knowledge/logo_lark.svg" style="width: 100%" alt=""/>
|
||||
</el-avatar>
|
||||
<div>
|
||||
<p>
|
||||
<el-text>{{ $t('views.knowledge.knowledgeType.larkKnowledge') }}</el-text>
|
||||
</p>
|
||||
<el-text type="info"
|
||||
>{{ $t('views.knowledge.knowledgeType.larkInfo') }}
|
||||
</el-text>
|
||||
<el-input
|
||||
v-model="form.selector"
|
||||
:placeholder="$t('views.knowledge.form.selector.placeholder')"
|
||||
@blur="form.selector = form.selector.trim()"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="App ID" prop="app_id" v-if="detail?.type === 2">
|
||||
<el-input
|
||||
v-model="form.app_id"
|
||||
:placeholder="
|
||||
$t('views.application.applicationAccess.larkSetting.appIdPlaceholder')
|
||||
"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="App Secret" prop="app_id" v-if="detail?.type === 2">
|
||||
<el-input
|
||||
v-model="form.app_secret"
|
||||
type="password"
|
||||
show-password
|
||||
:placeholder="
|
||||
$t('views.application.applicationAccess.larkSetting.appSecretPlaceholder')
|
||||
"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="Folder Token" prop="folder_token" v-if="detail?.type === 2">
|
||||
<el-input
|
||||
v-model="form.folder_token"
|
||||
:placeholder="
|
||||
$t('views.application.applicationAccess.larkSetting.folderTokenPlaceholder')
|
||||
"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
<el-card shadow="never" class="mb-16 w-full layout-bg document-settings">
|
||||
<h4 class="title-decoration-1 mb-16">文档处理</h4>
|
||||
<div class="flex-between mb-8">
|
||||
<h5>文档解析</h5>
|
||||
|
||||
</div>
|
||||
<el-select v-model="parserId" clearable placeholder="内置解析"
|
||||
><el-option v-for="p in parserOptions" :key="p.id" :label="p.name" :value="p.id"
|
||||
/></el-select>
|
||||
|
||||
<el-divider />
|
||||
<div class="flex-between mb-8">
|
||||
<h5>分段规则</h5>
|
||||
<div class="flex align-center">
|
||||
<span
|
||||
v-if="segmentation.updated_by"
|
||||
class="color-secondary"
|
||||
style="font-size: 12px; margin-right: 12px"
|
||||
>
|
||||
{{ segmentation.updated_by }} 更新于 {{ segmentation.updated_at }}
|
||||
</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<el-form label-position="top">
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="分段长度(chunk_size)">
|
||||
<el-input-number
|
||||
v-model="segmentation.chunk_size"
|
||||
:min="50"
|
||||
:max="100000"
|
||||
:step="100"
|
||||
style="width: 100%"
|
||||
/>
|
||||
<div class="color-secondary" style="font-size: 12px">
|
||||
50~100000;新建文档上传时默认使用该长度,上传时可覆盖
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="分段重叠(chunk_overlap)">
|
||||
<el-input-number
|
||||
v-model="segmentation.chunk_overlap"
|
||||
:min="0"
|
||||
:max="Math.max(0, (segmentation.chunk_size || 50) - 1)"
|
||||
:step="10"
|
||||
style="width: 100%"
|
||||
/>
|
||||
<div class="color-secondary" style="font-size: 12px">
|
||||
0 ≤ 重叠长度 < 分段长度;相邻分段按该长度重叠
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
|
||||
<el-form label-position="top">
|
||||
<div v-if="detail?.type === 0">
|
||||
<h5 class="mb-16">上传限制</h5>
|
||||
<el-form-item :label="$t('views.knowledge.form.file_count_limit.label')">
|
||||
<el-slider
|
||||
v-model="form.file_count_limit"
|
||||
show-input
|
||||
:show-input-controls="false"
|
||||
:min="1"
|
||||
:max="1000"
|
||||
class="custom-slider"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<template #label>
|
||||
<div class="flex align-center">
|
||||
<span class="mr-4"
|
||||
>{{ $t('views.knowledge.form.file_size_limit.label') }}
|
||||
</span>
|
||||
<el-tooltip
|
||||
effect="dark"
|
||||
:content="$t('views.knowledge.form.file_size_limit.placeholder')"
|
||||
placement="right"
|
||||
>
|
||||
<AppIcon iconName="app-warning" class="app-warning-icon"></AppIcon>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</template>
|
||||
<el-slider
|
||||
v-model="form.file_size_limit"
|
||||
show-input
|
||||
:show-input-controls="false"
|
||||
:min="1"
|
||||
:max="1000"
|
||||
class="custom-slider"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-form>
|
||||
</el-card>
|
||||
<el-card shadow="never" class="mb-16 w-full layout-bg">
|
||||
<div class="flex-between mb-16">
|
||||
<h4 class="title-decoration-1">索引管理</h4>
|
||||
</div>
|
||||
<BaseForm
|
||||
ref="ModelFormRef"
|
||||
:data="detail"
|
||||
:apiType="apiType"
|
||||
section="embedding"
|
||||
:form-value="baseSettings"
|
||||
/>
|
||||
<el-form label-position="top" class="mt-16">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="批处理数量">
|
||||
<el-input-number v-model="embeddingParams.batch_size" :min="1" :max="256" :precision="0" controls-position="right" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="输出归一化">
|
||||
<el-checkbox v-model="embeddingParams.normalize">启用</el-checkbox>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div class="flex-between mb-8">
|
||||
<span>可选参数</span>
|
||||
<el-button link type="primary" :disabled="optionalEmbeddingParams.length >= 50" @click="addEmbeddingParam">添加参数</el-button>
|
||||
</div>
|
||||
<div v-for="(param, index) in optionalEmbeddingParams" :key="index" class="flex mb-8" style="gap: 8px">
|
||||
<el-input v-model="param.key" placeholder="参数名称" :maxlength="64" style="width: 180px; flex-shrink: 0" />
|
||||
<el-input v-model="param.value" placeholder="参数值" :maxlength="2000" />
|
||||
<el-button link type="danger" @click="optionalEmbeddingParams.splice(index, 1)">删除</el-button>
|
||||
</div>
|
||||
</el-form>
|
||||
<template v-if="detail?.type === 0">
|
||||
<el-divider />
|
||||
<div class="flex-between mb-8">
|
||||
<div>
|
||||
<h5>索引重建</h5>
|
||||
<div
|
||||
class="color-secondary"
|
||||
style="font-size: 12px; line-height: 1.7; margin-top: 4px"
|
||||
>
|
||||
全量重建期间,检索可能暂不可用。
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
:label="$t('views.knowledge.form.source_url.label')"
|
||||
prop="source_url"
|
||||
v-if="detail?.type === 1"
|
||||
>
|
||||
<el-input
|
||||
v-model="form.source_url"
|
||||
:placeholder="$t('views.knowledge.form.source_url.placeholder')"
|
||||
@blur="form.source_url = form.source_url.trim()"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
:label="$t('views.knowledge.form.selector.label')"
|
||||
v-if="detail?.type === 1"
|
||||
>
|
||||
<el-input
|
||||
v-model="form.selector"
|
||||
:placeholder="$t('views.knowledge.form.selector.placeholder')"
|
||||
@blur="form.selector = form.selector.trim()"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="App ID" prop="app_id" v-if="detail?.type === 2">
|
||||
<el-input
|
||||
v-model="form.app_id"
|
||||
:placeholder="
|
||||
$t('views.application.applicationAccess.larkSetting.appIdPlaceholder')
|
||||
"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="App Secret" prop="app_id" v-if="detail?.type === 2">
|
||||
<el-input
|
||||
v-model="form.app_secret"
|
||||
type="password"
|
||||
show-password
|
||||
:placeholder="
|
||||
$t('views.application.applicationAccess.larkSetting.appSecretPlaceholder')
|
||||
"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="Folder Token" prop="folder_token" v-if="detail?.type === 2">
|
||||
<el-input
|
||||
v-model="form.folder_token"
|
||||
:placeholder="
|
||||
$t('views.application.applicationAccess.larkSetting.folderTokenPlaceholder')
|
||||
"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<div v-if="detail?.type === 0">
|
||||
<h4 class="title-decoration-1 mb-16">
|
||||
{{ $t('common.otherSetting') }}
|
||||
</h4>
|
||||
<el-form-item :label="$t('views.knowledge.form.file_count_limit.label')">
|
||||
<el-slider
|
||||
v-model="form.file_count_limit"
|
||||
show-input
|
||||
:show-input-controls="false"
|
||||
:min="1"
|
||||
:max="1000"
|
||||
class="custom-slider"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<template #label>
|
||||
<div class="flex align-center">
|
||||
<span class="mr-4"
|
||||
>{{ $t('views.knowledge.form.file_size_limit.label') }}
|
||||
</span>
|
||||
<el-tooltip
|
||||
effect="dark"
|
||||
:content="$t('views.knowledge.form.file_size_limit.placeholder')"
|
||||
placement="right"
|
||||
<el-button type="primary" plain :loading="rebuildLoading" @click="openRebuild">
|
||||
重建索引
|
||||
</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
:data="rebuildTasks"
|
||||
size="small"
|
||||
v-loading="rebuildLoading"
|
||||
@row-click="openTask"
|
||||
>
|
||||
<el-table-column label="状态" width="100">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="statusType(row.status)" size="small">{{
|
||||
row.status_label
|
||||
}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="文档(成功/总数)" width="150">
|
||||
<template #default="{ row }">
|
||||
{{ row.document_success }} / {{ row.document_total }}
|
||||
<span v-if="row.document_failed" class="color-danger"
|
||||
>(失败 {{ row.document_failed }})</span
|
||||
>
|
||||
<AppIcon iconName="app-warning" class="app-warning-icon"></AppIcon>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="created_at" label="提交时间" min-width="160" />
|
||||
<el-table-column label="操作" width="90">
|
||||
<template #default="{ row }">
|
||||
<el-button type="primary" text @click.stop="openTask(row)">查看</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template #empty>
|
||||
<el-empty description="暂无重建任务" :image-size="60" />
|
||||
</template>
|
||||
<el-slider
|
||||
v-model="form.file_size_limit"
|
||||
show-input
|
||||
:show-input-controls="false"
|
||||
:min="1"
|
||||
:max="1000"
|
||||
class="custom-slider"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-table>
|
||||
</template>
|
||||
</el-card>
|
||||
<el-card shadow="never" class="mb-16 w-full layout-bg metadata-panel">
|
||||
<div class="flex-between mb-8">
|
||||
<h4 class="title-decoration-1">元数据管理</h4>
|
||||
<div v-if="!route.path.includes('share/') && permissionPrecise.edit(id)">
|
||||
<el-button
|
||||
v-if="!metadataEditing"
|
||||
type="primary"
|
||||
plain
|
||||
:disabled="!metadataReady"
|
||||
@click="editMetadata"
|
||||
>修改</el-button
|
||||
>
|
||||
<template v-else>
|
||||
<el-button :disabled="metadataLoading" @click="metadataEditing = false"
|
||||
>取消</el-button
|
||||
>
|
||||
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
<div class="text-right">
|
||||
<el-button
|
||||
@click="submit"
|
||||
type="primary"
|
||||
v-if="!route.path.includes('share/') && permissionPrecise.edit(id)"
|
||||
>
|
||||
{{ $t('common.save') }}
|
||||
</el-button
|
||||
>
|
||||
</div>
|
||||
<el-descriptions :column="3" border class="creator-info-descriptions mb-16">
|
||||
<el-descriptions-item label="创建者">
|
||||
<el-select
|
||||
v-if="metadataEditing"
|
||||
v-model="metadataCreator"
|
||||
placeholder="请选择创建者"
|
||||
class="creator-select"
|
||||
filterable
|
||||
>
|
||||
<el-option
|
||||
v-for="candidate in metadata.creator_options || []"
|
||||
:key="candidate.id"
|
||||
:label="candidate.nick_name"
|
||||
:value="candidate.id"
|
||||
:disabled="candidate.disabled"
|
||||
/>
|
||||
</el-select>
|
||||
<span v-else>{{ metadata.creator_name || detail.nick_name || '—' }}</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="创建时间">{{
|
||||
metadata.create_time ||
|
||||
(detail.create_time ? new Date(detail.create_time).toLocaleString() : '—')
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="更新时间">{{
|
||||
metadata.update_time ||
|
||||
(detail.update_time ? new Date(detail.update_time).toLocaleString() : '—')
|
||||
}}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<template v-if="!metadataEditing">
|
||||
<el-descriptions v-if="metadata.fields?.length" :column="2" border size="small">
|
||||
<el-descriptions-item
|
||||
v-for="(field, index) in metadata.fields"
|
||||
:key="index"
|
||||
:label="field.name || field.label"
|
||||
>{{ field.value || '—' }}</el-descriptions-item
|
||||
>
|
||||
</el-descriptions>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-table :data="metadataForm" class="mb-8">
|
||||
<el-table-column label="名称" min-width="160"
|
||||
><template #default="{ row }"
|
||||
><el-input v-model="row.name" maxlength="64" placeholder="名称" /></template
|
||||
></el-table-column>
|
||||
<el-table-column label="值" min-width="220"
|
||||
><template #default="{ row }"
|
||||
><el-input v-model="row.value" maxlength="2000" placeholder="值" /></template
|
||||
></el-table-column>
|
||||
<el-table-column label="操作" width="70"
|
||||
><template #default="{ $index }"
|
||||
><el-button link type="danger" @click="metadataForm.splice($index, 1)"
|
||||
>删除</el-button
|
||||
></template
|
||||
></el-table-column
|
||||
>
|
||||
</el-table>
|
||||
<el-button
|
||||
:disabled="metadataForm.length >= 50"
|
||||
@click="metadataForm.push({ name: '', value: '' })"
|
||||
>新增元数据</el-button
|
||||
>
|
||||
</template>
|
||||
</el-card>
|
||||
|
||||
</div>
|
||||
</el-scrollbar>
|
||||
</div>
|
||||
</el-card>
|
||||
<RebuildTaskDrawer ref="RebuildTaskRef" @refresh="loadRebuildTasks" />
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import {ref, onMounted, reactive, computed} from 'vue'
|
||||
import {useRoute} from 'vue-router'
|
||||
import BaseForm from '@/views/knowledge/component/BaseForm.vue'
|
||||
import {MsgSuccess, MsgConfirm} from '@/utils/message'
|
||||
import RebuildTaskDrawer from '@/views/knowledge/component/RebuildTaskDrawer.vue'
|
||||
import knowledgeApi from '@/api/knowledge/knowledge'
|
||||
import { hubGet } from '@/api/ai-hub'
|
||||
import { get, put } from '@/request/index'
|
||||
import {MsgSuccess, MsgConfirm, MsgError} from '@/utils/message'
|
||||
import {t} from '@/locales'
|
||||
import {i18n_name} from '@/utils/common'
|
||||
import permissionMap from '@/permission'
|
||||
|
|
@ -209,6 +420,15 @@ import {loadSharedApi} from '@/utils/dynamics-api/shared-api'
|
|||
|
||||
const route = useRoute()
|
||||
const { user } = useStore()
|
||||
const parserId = ref(''), parserOptions = ref<any[]>([])
|
||||
const parserPath = () => `/workspace/${user.getWorkspaceId()}/knowledge/${id}/parser`
|
||||
async function loadParser() {
|
||||
const [options, current] = await Promise.all([hubGet('resources'), get(parserPath())])
|
||||
parserOptions.value = options.data.parsers
|
||||
parserId.value = current.data.parser_id || ''
|
||||
savedParserId.value = parserId.value
|
||||
parserReady.value = true
|
||||
}
|
||||
const {
|
||||
params: {id, folderId},
|
||||
} = route as any
|
||||
|
|
@ -233,11 +453,108 @@ const isShared = computed(() => {
|
|||
|
||||
const webFormRef = ref()
|
||||
const BaseFormRef = ref()
|
||||
const ModelFormRef = ref()
|
||||
const baseSettings = reactive({ name: '', desc: '', embedding_model_id: '' })
|
||||
const loading = ref(false)
|
||||
const saving = ref(false), parserReady = ref(false), segmentationReady = ref(false)
|
||||
const savedParserId = ref(''), savedSegmentation = ref('')
|
||||
const settingsReady = computed(() => !!detail.value.id && parserReady.value && segmentationReady.value)
|
||||
const detail = ref<any>({ })
|
||||
const cloneModelId = ref('')
|
||||
const embeddingParams = reactive({ batch_size: 10, normalize: false })
|
||||
const embeddingParamLabels: Record<string, string> = { query_prefix: '查询指令', document_prefix: '文档指令' }
|
||||
const embeddingParamKey = (name: string) => Object.keys(embeddingParamLabels).find(key => embeddingParamLabels[key] === name.trim()) || name.trim()
|
||||
const optionalEmbeddingParams = ref<Array<{ key: string; value: string }>>([])
|
||||
function addEmbeddingParam() {
|
||||
if (optionalEmbeddingParams.value.length < 50) optionalEmbeddingParams.value.push({ key: '', value: '' })
|
||||
}
|
||||
function effectiveEmbeddingParams(): Record<string, string | number | boolean> {
|
||||
return { ...Object.fromEntries(optionalEmbeddingParams.value.map(param => [embeddingParamKey(param.key), param.value])), ...embeddingParams }
|
||||
}
|
||||
const savedEmbeddingParams = ref('')
|
||||
const embeddingSignature = () => {
|
||||
const params = effectiveEmbeddingParams()
|
||||
return JSON.stringify({ normalize: params.normalize, query_prefix: params.query_prefix || '', document_prefix: params.document_prefix || '' })
|
||||
}
|
||||
const user_options = ref<any[]>([])
|
||||
const selectedCreator = ref('')
|
||||
const RebuildTaskRef = ref()
|
||||
const rebuildTasks = ref<any[]>([])
|
||||
const rebuildLoading = ref(false)
|
||||
const metadata = ref<any>({ fields: [], updated_by: '', updated_at: '' })
|
||||
const metadataEditing = ref(false)
|
||||
const metadataLoading = ref(false)
|
||||
const metadataForm = ref<Array<{name: string; value: string}>>([])
|
||||
const metadataCreator = ref('')
|
||||
const metadataReady = ref(false)
|
||||
const segmentation = ref<any>({ chunk_size: 4096, chunk_overlap: 0, updated_by: '', updated_at: '' })
|
||||
const segmentationLoading = ref(false)
|
||||
|
||||
function loadMetadata() {
|
||||
if (!id) return
|
||||
return knowledgeApi.getKnowledgeMetadata(id, metadataLoading).then((res: any) => {
|
||||
metadata.value = res.data || { fields: [] }
|
||||
metadataReady.value = true
|
||||
})
|
||||
}
|
||||
|
||||
function editMetadata() {
|
||||
metadataForm.value = (metadata.value.fields || []).map((field: any) => ({ name: field.name || field.label, value: field.value || '' }))
|
||||
metadataCreator.value = metadata.value.user_id || selectedCreator.value || ''
|
||||
metadataEditing.value = true
|
||||
}
|
||||
|
||||
function loadSegmentation() {
|
||||
if (!id) return
|
||||
return knowledgeApi.getKnowledgeSegmentation(id, segmentationLoading).then((res: any) => {
|
||||
segmentation.value = res.data || { chunk_size: 4096, chunk_overlap: 0 }
|
||||
savedSegmentation.value = JSON.stringify({ chunk_size: segmentation.value.chunk_size, chunk_overlap: segmentation.value.chunk_overlap })
|
||||
segmentationReady.value = true
|
||||
})
|
||||
}
|
||||
|
||||
function statusType(status: string) {
|
||||
const map: Record<string, string> = {
|
||||
PENDING: 'info',
|
||||
RUNNING: 'warning',
|
||||
SUCCESS: 'success',
|
||||
PARTIAL: 'warning',
|
||||
FAILED: 'danger',
|
||||
}
|
||||
return map[status] || 'info'
|
||||
}
|
||||
|
||||
function loadRebuildTasks() {
|
||||
if (!id) return
|
||||
knowledgeApi
|
||||
.getRebuildTasks(id, { current_page: 1, page_size: 5 }, rebuildLoading)
|
||||
.then((res: any) => {
|
||||
rebuildTasks.value = res.data?.records || []
|
||||
})
|
||||
}
|
||||
|
||||
function openRebuild() {
|
||||
MsgConfirm(
|
||||
'重建知识库索引',
|
||||
'重建期间该知识库检索可能不可用,完成后自动补建索引。确认发起全量重建?',
|
||||
{
|
||||
confirmButtonText: '确认重建',
|
||||
confirmButtonClass: 'danger',
|
||||
},
|
||||
)
|
||||
.then(() => {
|
||||
knowledgeApi.postRebuildKnowledgeIndex(id, rebuildLoading).then((res: any) => {
|
||||
MsgSuccess('重建任务已提交')
|
||||
loadRebuildTasks()
|
||||
RebuildTaskRef.value.open(res.data.id, id)
|
||||
})
|
||||
})
|
||||
.catch(() => {})
|
||||
}
|
||||
|
||||
function openTask(row: any) {
|
||||
RebuildTaskRef.value.open(row.id, id)
|
||||
}
|
||||
|
||||
const form = ref<any>({
|
||||
source_url: '',
|
||||
|
|
@ -281,100 +598,90 @@ const rules = reactive({
|
|||
})
|
||||
|
||||
async function submit() {
|
||||
if (await BaseFormRef.value?.validate()) {
|
||||
await webFormRef.value.validate((valid: any) => {
|
||||
if (valid) {
|
||||
const obj =
|
||||
detail.value.type === 1 || detail.value.type === 2
|
||||
? {
|
||||
meta: form.value,
|
||||
file_count_limit: form.value.file_count_limit,
|
||||
file_size_limit: form.value.file_size_limit,
|
||||
create_user: selectedCreator.value,
|
||||
user_id: selectedCreator.value,
|
||||
...BaseFormRef.value.form,
|
||||
}
|
||||
: {
|
||||
file_count_limit: form.value.file_count_limit,
|
||||
file_size_limit: form.value.file_size_limit,
|
||||
create_user: selectedCreator.value,
|
||||
user_id: selectedCreator.value,
|
||||
...BaseFormRef.value.form,
|
||||
}
|
||||
|
||||
if (cloneModelId.value !== BaseFormRef.value.form.embedding_model_id) {
|
||||
MsgConfirm(t('common.tip'), t('views.knowledge.tip.updateModeMessage'), {
|
||||
confirmButtonText: t('views.knowledge.setting.vectorization'),
|
||||
})
|
||||
.then(() => {
|
||||
if (detail.value.type === 2) {
|
||||
loadSharedApi({type: 'knowledge', systemType: apiType.value})
|
||||
.putLarkKnowledge(id, obj, loading)
|
||||
.then(() => {
|
||||
loadSharedApi({type: 'knowledge', systemType: apiType.value})
|
||||
.putReEmbeddingKnowledge(id)
|
||||
.then(() => {
|
||||
MsgSuccess(t('common.saveSuccess'))
|
||||
// 更新页面上显示的创建者信息
|
||||
const selectedUser = user_options.value.find(user => user.id === selectedCreator.value)
|
||||
if (selectedUser) {
|
||||
detail.value.create_user = selectedUser.id
|
||||
detail.value.user_id = selectedUser.id
|
||||
detail.value.nick_name = selectedUser.nick_name
|
||||
}
|
||||
})
|
||||
})
|
||||
} else {
|
||||
loadSharedApi({type: 'knowledge', systemType: apiType.value})
|
||||
.putKnowledge(id, obj, loading)
|
||||
.then(() => {
|
||||
loadSharedApi({type: 'knowledge', systemType: apiType.value})
|
||||
.putReEmbeddingKnowledge(id)
|
||||
.then(() => {
|
||||
MsgSuccess(t('common.saveSuccess'))
|
||||
// 更新页面上显示的创建者信息
|
||||
const selectedUser = user_options.value.find(user => user.id === selectedCreator.value)
|
||||
if (selectedUser) {
|
||||
detail.value.create_user = selectedUser.id
|
||||
detail.value.user_id = selectedUser.id
|
||||
detail.value.nick_name = selectedUser.nick_name
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
})
|
||||
} else {
|
||||
if (detail.value.type === 2) {
|
||||
loadSharedApi({type: 'knowledge', systemType: apiType.value})
|
||||
.putLarkKnowledge(id, obj, loading)
|
||||
.then(() => {
|
||||
MsgSuccess(t('common.saveSuccess'))
|
||||
// 更新页面上显示的创建者信息
|
||||
const selectedUser = user_options.value.find(user => user.id === selectedCreator.value)
|
||||
if (selectedUser) {
|
||||
detail.value.create_user = selectedUser.id
|
||||
detail.value.nick_name = selectedUser.nick_name
|
||||
}
|
||||
})
|
||||
} else {
|
||||
loadSharedApi({type: 'knowledge', systemType: apiType.value})
|
||||
.putKnowledge(id, obj, loading)
|
||||
.then(() => {
|
||||
MsgSuccess(t('common.saveSuccess'))
|
||||
// 更新页面上显示的创建者信息
|
||||
const selectedUser = user_options.value.find(user => user.id === selectedCreator.value)
|
||||
if (selectedUser) {
|
||||
detail.value.create_user = selectedUser.id
|
||||
detail.value.nick_name = selectedUser.nick_name
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
if (saving.value || !settingsReady.value) return
|
||||
saving.value = true
|
||||
try {
|
||||
if (!await BaseFormRef.value?.validate() || !await ModelFormRef.value?.validate() || !await webFormRef.value?.validate()) {
|
||||
saving.value = false
|
||||
return
|
||||
}
|
||||
} catch { saving.value = false; return }
|
||||
const rules = { chunk_size: segmentation.value.chunk_size, chunk_overlap: segmentation.value.chunk_overlap }
|
||||
if (!Number.isInteger(rules.chunk_size) || rules.chunk_size < 50 || rules.chunk_size > 100000 ||
|
||||
!Number.isInteger(rules.chunk_overlap) || rules.chunk_overlap < 0 || rules.chunk_overlap >= rules.chunk_size) {
|
||||
MsgError('请检查分段长度和重叠长度')
|
||||
saving.value = false
|
||||
return
|
||||
}
|
||||
const fields = metadataForm.value.map(field => ({ name: field.name.trim(), value: field.value }))
|
||||
if (metadataEditing.value && (fields.some(field => !field.name) ||
|
||||
new Set(fields.map(field => field.name.normalize('NFKC').toLowerCase())).size !== fields.length)) {
|
||||
MsgError('元数据名称不能为空或重复')
|
||||
saving.value = false
|
||||
return
|
||||
}
|
||||
const reserved = new Set(['创建者', '创建时间', '更新时间', 'creator', 'user_id', 'create_time', 'update_time', 'updated_at', 'updated_by'])
|
||||
if (metadataEditing.value && fields.some(field => reserved.has(field.name.normalize('NFKC').toLowerCase()))) {
|
||||
MsgError('不能使用固定属性名称')
|
||||
saving.value = false
|
||||
return
|
||||
}
|
||||
let savedAny = false, stage = 'settings'
|
||||
if (!Number.isInteger(embeddingParams.batch_size) || embeddingParams.batch_size < 1 || embeddingParams.batch_size > 256) {
|
||||
MsgError('批处理数量须为1~256的整数'); saving.value = false; return
|
||||
}
|
||||
const paramNames = optionalEmbeddingParams.value.map(param => embeddingParamKey(param.key).normalize('NFKC').toLowerCase())
|
||||
if (paramNames.some(name => !name || ['batch_size', 'normalize', '批处理数量', '输出归一化'].includes(name)) || new Set(paramNames).size !== paramNames.length) {
|
||||
MsgError('参数名称不能为空、重复或与固定项重名'); saving.value = false; return
|
||||
}
|
||||
const modelChanged = cloneModelId.value !== baseSettings.embedding_model_id || savedEmbeddingParams.value !== embeddingSignature()
|
||||
try {
|
||||
if (modelChanged) {
|
||||
try { await MsgConfirm(t('common.tip'), '向量模型或嵌入参数已变更,保存后将重建索引。', {
|
||||
confirmButtonText: t('views.knowledge.setting.vectorization'),
|
||||
}) } catch { return }
|
||||
}
|
||||
const obj = {
|
||||
...(detail.value.type === 1 || detail.value.type === 2 ? { meta: { ...form.value } } : {}),
|
||||
file_count_limit: form.value.file_count_limit, file_size_limit: form.value.file_size_limit,
|
||||
create_user: selectedCreator.value, user_id: selectedCreator.value, ...baseSettings,
|
||||
embedding_params: effectiveEmbeddingParams(),
|
||||
}
|
||||
const api = loadSharedApi({ type: 'knowledge', systemType: apiType.value })
|
||||
if (detail.value.type === 2) await api.putLarkKnowledge(id, obj)
|
||||
else await api.putKnowledge(id, obj)
|
||||
savedAny = true
|
||||
if (parserId.value !== savedParserId.value) {
|
||||
await put(parserPath(), { parser_id: parserId.value || '' })
|
||||
savedParserId.value = parserId.value
|
||||
}
|
||||
if (JSON.stringify(rules) !== savedSegmentation.value) {
|
||||
const r: any = await knowledgeApi.putKnowledgeSegmentation(id, rules)
|
||||
segmentation.value = r.data
|
||||
savedSegmentation.value = JSON.stringify(rules)
|
||||
}
|
||||
if (metadataEditing.value) {
|
||||
const r: any = await knowledgeApi.putKnowledgeMetadata(id, {
|
||||
fields, ...(metadataCreator.value ? { user_id: metadataCreator.value } : {}),
|
||||
})
|
||||
metadata.value = r.data
|
||||
selectedCreator.value = r.data.user_id || ''
|
||||
detail.value.user_id = r.data.user_id || null
|
||||
detail.value.create_user = r.data.user_id || null
|
||||
detail.value.nick_name = r.data.creator_name
|
||||
metadataEditing.value = false
|
||||
}
|
||||
if (modelChanged) { stage = 'rebuild'; await api.putReEmbeddingKnowledge(id) }
|
||||
cloneModelId.value = baseSettings.embedding_model_id
|
||||
savedEmbeddingParams.value = embeddingSignature()
|
||||
stage = 'refresh'
|
||||
await loadMetadata()
|
||||
MsgSuccess('保存成功')
|
||||
} catch {
|
||||
if (stage === 'rebuild') MsgError('设置已保存,索引重建未提交,请重新发起重建')
|
||||
else if (stage === 'refresh') MsgError('设置已保存,状态刷新失败,请刷新页面')
|
||||
else if (savedAny) MsgError('部分设置未保存,请重试')
|
||||
} finally { saving.value = false }
|
||||
}
|
||||
|
||||
function getDetail() {
|
||||
|
|
@ -383,12 +690,20 @@ function getDetail() {
|
|||
.then((res: any) => {
|
||||
detail.value = res.data
|
||||
cloneModelId.value = res.data?.embedding_model_id
|
||||
const params = res.data?.meta?.embedding_params || {}
|
||||
Object.assign(embeddingParams, { batch_size: params.batch_size ?? 10, normalize: params.normalize ?? false })
|
||||
optionalEmbeddingParams.value = Object.entries(params).filter(([key]) => !['batch_size', 'normalize'].includes(key))
|
||||
.map(([key, value]) => ({ key: embeddingParamLabels[key] || key, value: String(value ?? '') }))
|
||||
savedEmbeddingParams.value = embeddingSignature()
|
||||
// 优先使用user_id,如果不存在则使用create_user
|
||||
selectedCreator.value = res.data?.user_id || res.data?.create_user || ''
|
||||
if (detail.value?.type === 0) {
|
||||
form.value.file_count_limit = res.data.file_count_limit
|
||||
form.value.file_size_limit = res.data.file_size_limit
|
||||
loadRebuildTasks()
|
||||
}
|
||||
loadMetadata()
|
||||
loadSegmentation()
|
||||
if (detail.value?.type === 1 || detail.value?.type === 2) {
|
||||
form.value = res.data.meta
|
||||
}
|
||||
|
|
@ -418,6 +733,7 @@ function getUserList() {
|
|||
}
|
||||
|
||||
onMounted(() => {
|
||||
loadParser()
|
||||
getDetail()
|
||||
getUserList()
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,7 +7,11 @@
|
|||
require-asterisk-position="right"
|
||||
v-loading="loading"
|
||||
>
|
||||
<el-form-item :label="$t('views.knowledge.form.knowledgeName.label')" prop="name">
|
||||
<el-form-item
|
||||
v-if="section !== 'embedding'"
|
||||
:label="$t('views.knowledge.form.knowledgeName.label')"
|
||||
prop="name"
|
||||
>
|
||||
<el-input
|
||||
v-model="form.name"
|
||||
:placeholder="$t('views.knowledge.form.knowledgeName.placeholder')"
|
||||
|
|
@ -16,7 +20,11 @@
|
|||
@blur="form.name = form.name.trim()"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('views.knowledge.form.knowledgeDescription.label')" prop="desc">
|
||||
<el-form-item
|
||||
v-if="section !== 'embedding'"
|
||||
:label="$t('views.knowledge.form.knowledgeDescription.label')"
|
||||
prop="desc"
|
||||
>
|
||||
<el-input
|
||||
v-model="form.desc"
|
||||
type="textarea"
|
||||
|
|
@ -28,6 +36,7 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
v-if="section !== 'basic'"
|
||||
:label="$t('views.knowledge.form.EmbeddingModel.label')"
|
||||
prop="embedding_model_id"
|
||||
>
|
||||
|
|
@ -53,8 +62,10 @@ const props = defineProps<{
|
|||
default: () => null
|
||||
}
|
||||
apiType: 'systemShare' | 'workspace' | 'systemManage'
|
||||
section?: 'basic' | 'embedding'
|
||||
formValue?: knowledgeData
|
||||
}>()
|
||||
const form = ref<knowledgeData>({
|
||||
const form = ref<knowledgeData>(props.formValue || {
|
||||
name: '',
|
||||
desc: '',
|
||||
embedding_model_id: '',
|
||||
|
|
@ -98,7 +109,7 @@ watch(
|
|||
form.value.embedding_model_id = value.embedding_model_id
|
||||
workspace_id.value = value.workspace_id || ''
|
||||
// 重新刷新模型列表
|
||||
getSelectModel()
|
||||
if (props.section !== 'basic') getSelectModel()
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -139,7 +150,7 @@ function getSelectModel() {
|
|||
}
|
||||
|
||||
onMounted(() => {
|
||||
if (props.apiType !== 'systemManage') {
|
||||
if (props.apiType !== 'systemManage' && props.section !== 'basic') {
|
||||
getSelectModel()
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@
|
|||
>
|
||||
{{ $t('views.login.forgotPassword') }}?
|
||||
</el-button>
|
||||
<el-button link type="primary" @click="router.push('/register')">注册用户</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="showQrCodeTab">
|
||||
|
|
|
|||
|
|
@ -5,22 +5,62 @@
|
|||
</div>
|
||||
<div v-else class="mindmap-content">
|
||||
<iframe
|
||||
ref="frame"
|
||||
:src="mindmapUrl"
|
||||
style="width: 100%; height: 100%; border: none;"
|
||||
title="思维导图"
|
||||
@load="openRequestedArtifact"
|
||||
></iframe>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted } from 'vue'
|
||||
import { ref, onMounted, onBeforeUnmount } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import systemConfigApi from '@/api/system-settings/system-config'
|
||||
import { hubGet, hubPost } from '@/api/ai-hub'
|
||||
|
||||
const mindmapUrl = ref<string>('')
|
||||
const loading = ref(false)
|
||||
const route = useRoute()
|
||||
const frame = ref<HTMLIFrameElement>()
|
||||
const allowedKinds = new Set(['resources', 'tasks', 'artifacts'])
|
||||
function childOrigin() { try { return new URL(mindmapUrl.value, location.href).origin } catch { return '' } }
|
||||
async function openRequestedArtifact() {
|
||||
const id = route.query.artifact
|
||||
if (typeof id !== 'string' || !/^[a-f0-9-]{36}$/i.test(id)) return
|
||||
try {
|
||||
const response = await hubGet('artifacts', id)
|
||||
frame.value?.contentWindow?.postMessage({ type: 'ai-hub-open', artifact: response.data }, childOrigin())
|
||||
} catch {
|
||||
ElMessage.error('导图不存在或无权访问')
|
||||
}
|
||||
}
|
||||
async function handleBridge(event: MessageEvent) {
|
||||
if (event.source !== frame.value?.contentWindow || event.origin !== childOrigin() || event.data?.type !== 'ai-hub-request') return
|
||||
const { id, kind, recordId, method, data, file } = event.data
|
||||
if (typeof id !== 'string' || id.length > 128 || !allowedKinds.has(kind) || !['get', 'post'].includes(method) || (recordId && !/^[a-f0-9-]{36}$/i.test(recordId))) return
|
||||
try {
|
||||
let payload = data
|
||||
if (file) {
|
||||
if (!(file.content instanceof ArrayBuffer) || file.content.byteLength > 20 * 1024 * 1024 || typeof file.name !== 'string') throw new Error('文件无效')
|
||||
payload = new FormData(); payload.append('data', JSON.stringify(data)); payload.append('file', new Blob([file.content]), file.name)
|
||||
}
|
||||
const response = method === 'get' ? await hubGet(kind, recordId) : await hubPost(kind, payload, recordId)
|
||||
// Resource selectors do not need the administration user directory.
|
||||
const result = response.data
|
||||
if (kind === 'resources') delete result.users
|
||||
frame.value?.contentWindow?.postMessage({ type: 'ai-hub-response', id, data: result }, event.origin)
|
||||
} catch (error: any) {
|
||||
frame.value?.contentWindow?.postMessage({ type: 'ai-hub-response', id, error: error.message || '操作失败' }, event.origin)
|
||||
}
|
||||
}
|
||||
onBeforeUnmount(() => window.removeEventListener('message', handleBridge))
|
||||
|
||||
onMounted(() => {
|
||||
window.addEventListener('message', handleBridge)
|
||||
loading.value = true
|
||||
systemConfigApi.getSystemConfig(loading).then((res: any) => {
|
||||
if (res.data && res.data.mindmap_url) {
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@
|
|||
<el-option
|
||||
v-for="item in model_type_list"
|
||||
:key="item.value"
|
||||
:label="item.key"
|
||||
:label="modelTypeLabel(item.value)"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
|
|
@ -217,11 +217,14 @@
|
|||
</el-table-column>
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane v-if="providerValue?.provider === 'model_local_provider' && user.is_admin()" label="模型文件" name="local-files" lazy>
|
||||
<LocalModelFiles @use="useImportedModel" />
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
<template #footer>
|
||||
<span class="dialog-footer">
|
||||
<el-button @click="close">{{ $t('common.cancel') }}</el-button>
|
||||
<el-button type="primary" @click="submit" :loading="loading">
|
||||
<el-button v-if="activeName !== 'local-files'" type="primary" @click="submit" :loading="loading">
|
||||
{{ $t('common.save') }}
|
||||
</el-button>
|
||||
</span>
|
||||
|
|
@ -239,7 +242,8 @@ import type { FormField } from '@/components/dynamics-form/type'
|
|||
import DynamicsForm from '@/components/dynamics-form/index.vue'
|
||||
import type { FormRules } from 'element-plus'
|
||||
import { MsgError, MsgSuccess, MsgWarning } from '@/utils/message'
|
||||
import { PermissionType, PermissionDesc } from '@/enums/model'
|
||||
import { PermissionType, PermissionDesc, modelTypeLabel } from '@/enums/model'
|
||||
import LocalModelFiles from './LocalModelFiles.vue'
|
||||
import { input_type_list } from '@/components/dynamics-form/constructor/data'
|
||||
import AddParamDrawer from '@/views/model/component/AddParamDrawer.vue'
|
||||
import { t } from '@/locales'
|
||||
|
|
@ -314,7 +318,7 @@ const form_data = computed({
|
|||
},
|
||||
})
|
||||
|
||||
const getModelForm = (model_name: string) => {
|
||||
const getModelForm = (model_name: string, credentials?: Dict<any>) => {
|
||||
if (!form_data.value.model_type) {
|
||||
MsgWarning(t('views.model.modelForm.model_type.requiredMessage'))
|
||||
base_form_data.value.model_name = ''
|
||||
|
|
@ -328,7 +332,7 @@ const getModelForm = (model_name: string) => {
|
|||
).then((ok) => {
|
||||
model_form_field.value = ok.data
|
||||
// 渲染动态表单
|
||||
dynamicsFormRef.value?.render(model_form_field.value, undefined)
|
||||
dynamicsFormRef.value?.render(model_form_field.value, credentials)
|
||||
})
|
||||
|
||||
ProviderApi.listBaseModelParamsForm(
|
||||
|
|
@ -342,6 +346,16 @@ const getModelForm = (model_name: string) => {
|
|||
}
|
||||
}
|
||||
|
||||
async function useImportedModel(record: any) {
|
||||
if (!['EMBEDDING', 'RERANKER'].includes(base_form_data.value.model_type)) {
|
||||
base_form_data.value.model_type = 'EMBEDDING'
|
||||
}
|
||||
base_form_data.value.model_name = record.path
|
||||
if (!base_form_data.value.name) base_form_data.value.name = record.name.slice(0, 64)
|
||||
activeName.value = 'base-info'
|
||||
getModelForm(record.path, { cache_folder: record.path, cache_dir: record.path, device: 'cpu', normalize: true, batch_size: 10 })
|
||||
}
|
||||
|
||||
const open = (provider: Provider, model_type?: string) => {
|
||||
ProviderApi.listModelType(provider.provider, model_type_loading).then((ok) => {
|
||||
model_type_list.value = ok.data
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
</el-breadcrumb>
|
||||
</template>
|
||||
|
||||
<el-button v-if="providerValue?.provider === 'model_local_provider' && user.is_admin()" class="mb-16" @click="importVisible = true">模型文件</el-button>
|
||||
<DynamicsForm
|
||||
v-loading="formLoading"
|
||||
v-model="form_data"
|
||||
|
|
@ -63,7 +64,7 @@
|
|||
<el-option
|
||||
v-for="item in model_type_list"
|
||||
:key="item.value"
|
||||
:label="item.key"
|
||||
:label="modelTypeLabel(item.value)"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
|
|
@ -117,6 +118,9 @@
|
|||
</span>
|
||||
</template>
|
||||
</el-dialog>
|
||||
<el-dialog v-model="importVisible" title="模型文件" width="640px" append-to-body destroy-on-close>
|
||||
<LocalModelFiles @use="useImportedModel" />
|
||||
</el-dialog>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { ref, computed } from 'vue'
|
||||
|
|
@ -130,6 +134,11 @@ import type { FormRules } from 'element-plus'
|
|||
import { MsgSuccess } from '@/utils/message'
|
||||
import { t } from '@/locales'
|
||||
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
|
||||
import { modelTypeLabel } from '@/enums/model'
|
||||
import LocalModelFiles from './LocalModelFiles.vue'
|
||||
import useStore from '@/stores'
|
||||
const { user } = useStore()
|
||||
const importVisible = ref(false)
|
||||
|
||||
const route = useRoute()
|
||||
|
||||
|
|
@ -192,7 +201,7 @@ const form_data = computed({
|
|||
},
|
||||
})
|
||||
|
||||
const getModelForm = (model_name: string) => {
|
||||
const getModelForm = (model_name: string, credentials?: Dict<any>) => {
|
||||
if (providerValue.value) {
|
||||
ProviderApi.getModelCreateForm(
|
||||
providerValue.value.provider,
|
||||
|
|
@ -202,11 +211,16 @@ const getModelForm = (model_name: string) => {
|
|||
model_form_field.value = ok.data
|
||||
if (modelValue.value) {
|
||||
// 渲染动态表单
|
||||
dynamicsFormRef.value?.render(model_form_field.value, modelValue.value.credential)
|
||||
dynamicsFormRef.value?.render(model_form_field.value, credentials || modelValue.value.credential)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
function useImportedModel(record: any) {
|
||||
base_form_data.value.model_name = record.path
|
||||
importVisible.value = false
|
||||
getModelForm(record.path, { ...credential_form_data.value, cache_folder: record.path, cache_dir: record.path })
|
||||
}
|
||||
const list_base_model = (model_type: any, change?: boolean) => {
|
||||
if (change) {
|
||||
base_form_data.value.model_name = ''
|
||||
|
|
@ -243,6 +257,7 @@ const open = (provider: Provider, model: Model) => {
|
|||
}
|
||||
|
||||
const close = () => {
|
||||
importVisible.value = false
|
||||
base_form_data.value = { name: '', model_type: '', model_name: '' }
|
||||
dynamicsFormRef.value?.ruleFormRef?.resetFields()
|
||||
credential_form_data.value = {}
|
||||
|
|
|
|||
|
|
@ -71,6 +71,10 @@
|
|||
</el-button>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
<el-dropdown-item v-if="canManageLoading" @click.stop="ModelLoadingRef.open(model)">
|
||||
<el-icon class="color-secondary"><Download /></el-icon>
|
||||
模型载入
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item
|
||||
v-if="permissionPrecise.modify(model.id)"
|
||||
text
|
||||
|
|
@ -122,6 +126,7 @@
|
|||
</el-dropdown>
|
||||
</template>
|
||||
<EditModel ref="editModelRef" @submit="emit('change')"></EditModel>
|
||||
<ModelLoadingDialog ref="ModelLoadingRef" @change="emit('change')" />
|
||||
<ParamSettingDialog ref="paramSettingRef" />
|
||||
<AuthorizedWorkspace
|
||||
ref="AuthorizedWorkspaceDialogRef"
|
||||
|
|
@ -138,6 +143,8 @@
|
|||
import type { Provider, Model } from '@/api/type/model'
|
||||
import { computed, ref, onMounted, onBeforeUnmount } from 'vue'
|
||||
import EditModel from '@/views/model/component/EditModel.vue'
|
||||
import ModelLoadingDialog from './ModelLoadingDialog.vue'
|
||||
import useStore from '@/stores'
|
||||
import DownloadLoading from '@/components/loading/DownloadLoading.vue'
|
||||
import { MsgConfirm, MsgSuccess } from '@/utils/message'
|
||||
import { modelType } from '@/enums/model'
|
||||
|
|
@ -152,6 +159,8 @@ import { useRoute } from 'vue-router'
|
|||
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
|
||||
|
||||
const route = useRoute()
|
||||
const { user } = useStore()
|
||||
const ModelLoadingRef = ref()
|
||||
|
||||
const props = defineProps<{
|
||||
model: Model
|
||||
|
|
@ -161,6 +170,10 @@ const props = defineProps<{
|
|||
isSystemShare?: boolean | undefined
|
||||
apiType: 'systemShare' | 'workspace' | 'systemManage'
|
||||
}>()
|
||||
const canManageLoading = computed(() => user.is_admin() && !props.isShared && !props.isSystemShare && (
|
||||
(props.model.provider === 'model_local_provider' && ['EMBEDDING', 'RERANKER'].includes(props.model.model_type)) ||
|
||||
(props.model.provider === 'model_ollama_provider' && ['EMBEDDING', 'LLM'].includes(props.model.model_type))
|
||||
))
|
||||
|
||||
const isSystemShare = computed(() => {
|
||||
return props.apiType === 'systemShare'
|
||||
|
|
|
|||
|
|
@ -54,14 +54,11 @@
|
|||
<el-form-item label="默认密码" v-if="!isEdit">
|
||||
<span>{{ userForm.password }}</span>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('views.role.member.role')" prop="role" v-if="isEdit">
|
||||
<el-select v-model="userForm.role" :placeholder="$t('common.selectPlaceholder') + $t('views.role.member.role')">
|
||||
<el-option :label="$t('views.userManage.role.user')" value="USER" />
|
||||
<el-option :label="$t('views.userManage.role.admin')" value="ADMIN" />
|
||||
</el-select>
|
||||
<el-form-item label="是否激活" v-if="!isEdit">
|
||||
<el-checkbox v-model="directActivation" aria-label="是否激活" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<h4 class="title-decoration-1 mb-16 mt-8" v-if="user.isEE() || user.isPE()">
|
||||
<h4 class="title-decoration-1 mb-16 mt-8" v-if="!isEdit && (user.isEE() || user.isPE())">
|
||||
{{ $t('views.userManage.roleSetting') }}
|
||||
</h4>
|
||||
<MemberFormContent
|
||||
|
|
@ -71,7 +68,7 @@
|
|||
v-loading="memberFormContentLoading"
|
||||
keepOneLine
|
||||
:addText="$t('views.userManage.addRole')"
|
||||
v-if="user.isEE() || user.isPE()"
|
||||
v-if="!isEdit && (user.isEE() || user.isPE())"
|
||||
:deleteButtonDisabled="deleteButtonDisabled"
|
||||
/>
|
||||
<template #footer>
|
||||
|
|
@ -108,6 +105,13 @@ const userForm = ref<any>({
|
|||
password: '',
|
||||
phone: '',
|
||||
nick_name: '',
|
||||
pending_activation: true,
|
||||
})
|
||||
const directActivation = computed({
|
||||
get: () => !userForm.value.pending_activation,
|
||||
set: (value: boolean) => {
|
||||
userForm.value.pending_activation = !value
|
||||
},
|
||||
})
|
||||
|
||||
const list = ref<any[]>([])
|
||||
|
|
@ -282,6 +286,7 @@ watch(visible, (bool) => {
|
|||
password: '',
|
||||
phone: '',
|
||||
nick_name: '',
|
||||
pending_activation: true,
|
||||
}
|
||||
isEdit.value = false
|
||||
list.value = [{role_id: '', workspace_ids: []}]
|
||||
|
|
@ -297,11 +302,6 @@ const open = (data: any) => {
|
|||
userForm.value.password = data.password
|
||||
userForm.value.phone = data.phone
|
||||
userForm.value.nick_name = data.nick_name
|
||||
userForm.value.role = data.role
|
||||
list.value = data.role_setting?.map((item: any) => ({
|
||||
...item,
|
||||
workspace_ids: item.workspace_ids.includes('None') ? [] : item.workspace_ids,
|
||||
}))
|
||||
isEdit.value = true
|
||||
} else {
|
||||
userManageApi.getSystemDefaultPassword().then((res: any) => {
|
||||
|
|
@ -320,10 +320,10 @@ const submit = async (formEl: FormInstance | undefined) => {
|
|||
if (!formEl) return
|
||||
await formEl.validate(async (valid, fields) => {
|
||||
if (valid) {
|
||||
if (memberFormContentRef.value) {
|
||||
if (!isEdit.value && memberFormContentRef.value) {
|
||||
await memberFormContentRef.value?.validate()
|
||||
}
|
||||
if (user.isPE() || user.isEE()) {
|
||||
if (!isEdit.value && (user.isPE() || user.isEE())) {
|
||||
list.value = list.value.map((item) => {
|
||||
const isAdminRole = adminRoleList.value.find((item1) => item1.id === item.role_id)
|
||||
|
||||
|
|
@ -341,7 +341,11 @@ const submit = async (formEl: FormInstance | undefined) => {
|
|||
return item
|
||||
})
|
||||
}
|
||||
const params = {
|
||||
const params = isEdit.value ? {
|
||||
email: userForm.value.email,
|
||||
nick_name: userForm.value.nick_name,
|
||||
phone: userForm.value.phone,
|
||||
} : {
|
||||
...userForm.value,
|
||||
role_setting: list.value,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,23 @@
|
|||
<el-card class="user-manage__card" style="--el-card-padding: 0">
|
||||
<div class="user-manage__body p-24">
|
||||
<div class="user-manage__toolbar mb-16">
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="createUser"
|
||||
v-hasPermission="[RoleConst.ADMIN, PermissionConst.USER_CREATE]"
|
||||
>
|
||||
{{ $t('views.userManage.createUser') }}
|
||||
</el-button>
|
||||
<div class="user-manage__actions">
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="createUser"
|
||||
v-hasPermission="[RoleConst.ADMIN, PermissionConst.USER_CREATE]"
|
||||
>
|
||||
{{ $t('views.userManage.createUser') }}
|
||||
</el-button>
|
||||
<el-button
|
||||
plain
|
||||
type="primary"
|
||||
@click="openActivation"
|
||||
v-hasPermission="[RoleConst.ADMIN, PermissionConst.USER_EDIT]"
|
||||
>
|
||||
待激活审核
|
||||
</el-button>
|
||||
</div>
|
||||
<div class="complex-search user-manage__search">
|
||||
<el-select
|
||||
class="complex-search__left"
|
||||
|
|
@ -185,8 +195,9 @@
|
|||
{{ datetimeFormat(row.create_time) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('common.operation')" width="160" align="left" fixed="right">
|
||||
<el-table-column :label="$t('common.operation')" width="300" align="left" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<div class="user-manage__ops">
|
||||
<span @click.stop>
|
||||
<el-switch
|
||||
:disabled="row.role === 'ADMIN' || row.id === user.userInfo?.id"
|
||||
|
|
@ -197,6 +208,14 @@
|
|||
/>
|
||||
</span>
|
||||
<el-divider direction="vertical" />
|
||||
<el-button
|
||||
type="primary"
|
||||
text
|
||||
@click.stop="assignRole(row)"
|
||||
v-if="hasPermission([RoleConst.ADMIN, PermissionConst.USER_EDIT], 'OR')"
|
||||
>
|
||||
分配角色
|
||||
</el-button>
|
||||
<el-tooltip effect="dark" :content="$t('common.edit')" placement="top">
|
||||
<span class="mr-8">
|
||||
<el-button
|
||||
|
|
@ -239,6 +258,7 @@
|
|||
<AppIcon iconName="app-delete"></AppIcon>
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -259,6 +279,8 @@
|
|||
</el-card>
|
||||
<UserDrawer :title="title" ref="UserDrawerRef" @refresh="refresh" />
|
||||
<UserPwdDialog ref="UserPwdDialogRef" @refresh="refresh" />
|
||||
<ActivationAuditDrawer ref="ActivationAuditRef" @refresh="getList" />
|
||||
<RoleAssignDialog ref="RoleAssignRef" @refresh="getList" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -266,6 +288,8 @@
|
|||
import { onMounted, reactive, ref } from 'vue'
|
||||
import UserDrawer from './component/UserDrawer.vue'
|
||||
import UserPwdDialog from './component/UserPwdDialog.vue'
|
||||
import ActivationAuditDrawer from './component/ActivationAuditDrawer.vue'
|
||||
import RoleAssignDialog from './component/RoleAssignDialog.vue'
|
||||
import userManageApi from '@/api/system/user-manage'
|
||||
import { datetimeFormat } from '@/utils/time'
|
||||
import { MsgSuccess, MsgConfirm } from '@/utils/message'
|
||||
|
|
@ -292,6 +316,8 @@ const search_form = ref<{
|
|||
|
||||
const UserDrawerRef = ref()
|
||||
const UserPwdDialogRef = ref()
|
||||
const ActivationAuditRef = ref()
|
||||
const RoleAssignRef = ref()
|
||||
const loading = ref(false)
|
||||
|
||||
const paginationConfig = reactive({
|
||||
|
|
@ -359,6 +385,14 @@ function createUser() {
|
|||
UserDrawerRef.value.open()
|
||||
}
|
||||
|
||||
function openActivation() {
|
||||
ActivationAuditRef.value.open()
|
||||
}
|
||||
|
||||
function assignRole(row: any) {
|
||||
RoleAssignRef.value.open(row)
|
||||
}
|
||||
|
||||
function deleteUserManage(row: any) {
|
||||
MsgConfirm(
|
||||
`${t('views.userManage.delete.confirmTitle')}${row.nick_name} ?`,
|
||||
|
|
@ -430,6 +464,16 @@ onMounted(() => {
|
|||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.user-manage__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
|
||||
.el-button + .el-button {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.user-manage__search {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
@ -443,6 +487,12 @@ onMounted(() => {
|
|||
min-height: 0;
|
||||
}
|
||||
|
||||
.user-manage__ops {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.app-table__pagination {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<template>
|
||||
<LayoutContainer showCollapse resizable :isCollapse="true" class="tool-manage">
|
||||
<div class="tool-page">
|
||||
<el-tabs v-if="apiType === 'workspace'" v-model="view" class="tool-tabs"><el-tab-pane label="工具" name="tools" /><el-tab-pane label="文档解析" name="parsers" /></el-tabs>
|
||||
<LayoutContainer v-if="view === 'tools'" showCollapse resizable :isCollapse="true" class="tool-manage tool-layout">
|
||||
<template #left>
|
||||
<h4 class="p-12-16 pb-0 mt-12">{{ $t('views.tool.title') }}</h4>
|
||||
|
||||
|
|
@ -36,10 +38,13 @@
|
|||
</template>
|
||||
</ToolListContainer>
|
||||
</LayoutContainer>
|
||||
<ParserManager v-else />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { onMounted, ref, reactive, computed } from 'vue'
|
||||
import { onMounted, ref, reactive, computed, watch } from 'vue'
|
||||
import ParserManager from './component/ParserManager.vue'
|
||||
import ToolListContainer from '@/views/tool/component/ToolListContainer.vue'
|
||||
import { SourceTypeEnum } from '@/enums/common'
|
||||
import permissionMap from '@/permission'
|
||||
|
|
@ -47,6 +52,7 @@ import { useRoute } from 'vue-router'
|
|||
import useStore from '@/stores'
|
||||
import bus from '@/bus'
|
||||
const route = useRoute()
|
||||
const view = ref(route.query.view === 'parsers' && !route.path.includes('shared') && !route.path.includes('resource-management') ? 'parsers' : 'tools')
|
||||
const { folder, tool } = useStore()
|
||||
|
||||
const apiType = computed(() => {
|
||||
|
|
@ -95,8 +101,15 @@ function refreshFolder() {
|
|||
}
|
||||
|
||||
onMounted(() => {
|
||||
getFolder(folder.currentFolder?.id ? false : true)
|
||||
if (view.value === 'tools') getFolder(folder.currentFolder?.id ? false : true)
|
||||
})
|
||||
watch(view, value => { if (value === 'tools') getFolder(folder.currentFolder?.id ? false : true) })
|
||||
watch(apiType, () => { view.value = 'tools' })
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped></style>
|
||||
<style lang="scss" scoped>
|
||||
.tool-page { height: 100%; display: flex; flex-direction: column; min-height: 0; }
|
||||
.tool-tabs { padding: 0 24px; flex-shrink: 0; }
|
||||
.tool-tabs :deep(.el-tabs__header) { margin-bottom: 0; }
|
||||
.tool-layout { flex: 1; min-height: 0; }
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import { fileURLToPath, URL } from 'node:url'
|
||||
import type { ProxyOptions } from 'vite'
|
||||
import type { ProxyOptions, ViteDevServer } from 'vite'
|
||||
import { defineConfig, loadEnv } from 'vite'
|
||||
import vue from '@vitejs/plugin-vue'
|
||||
import vueJsx from '@vitejs/plugin-vue-jsx'
|
||||
|
|
@ -34,39 +34,40 @@ const renameHtmlPlugin = (outDir: string, entry: string) => {
|
|||
export default defineConfig((conf: any) => {
|
||||
const mode = conf.mode
|
||||
const ENV = loadEnv(mode, envDir)
|
||||
const backendUrl = process.env.VITE_BACKEND_URL || ENV.VITE_BACKEND_URL || 'http://localhost:8080'
|
||||
const proxyConf: Record<string, string | ProxyOptions> = {}
|
||||
proxyConf['/admin/api'] = {
|
||||
target: 'http://localhost:8080',
|
||||
target: backendUrl,
|
||||
changeOrigin: true,
|
||||
}
|
||||
proxyConf['/chat/api'] = {
|
||||
target: 'http://localhost:8080',
|
||||
target: backendUrl,
|
||||
changeOrigin: true,
|
||||
}
|
||||
proxyConf['/doc'] = {
|
||||
target: 'http://localhost:8080',
|
||||
target: backendUrl,
|
||||
changeOrigin: true,
|
||||
rewrite: (path: string) => path.replace(ENV.VITE_BASE_PATH, '/'),
|
||||
}
|
||||
proxyConf['/schema'] = {
|
||||
target: 'http://localhost:8080',
|
||||
target: backendUrl,
|
||||
changeOrigin: true,
|
||||
rewrite: (path: string) => path.replace(ENV.VITE_BASE_PATH, '/'),
|
||||
}
|
||||
proxyConf['/static'] = {
|
||||
target: 'http://localhost:8080',
|
||||
target: backendUrl,
|
||||
changeOrigin: true,
|
||||
rewrite: (path: string) => path.replace(ENV.VITE_BASE_PATH, '/'),
|
||||
}
|
||||
|
||||
// 前端静态资源转发到本身
|
||||
proxyConf[`^${ENV.VITE_BASE_PATH}.+\/oss\/file\/.*$`] = {
|
||||
target: `http://localhost:8080`,
|
||||
target: backendUrl,
|
||||
changeOrigin: true,
|
||||
}
|
||||
// 前端静态资源转发到本身
|
||||
proxyConf[`^${ENV.VITE_BASE_PATH}oss\/file\/.*$`] = {
|
||||
target: `http://localhost:8080`,
|
||||
target: backendUrl,
|
||||
changeOrigin: true,
|
||||
}
|
||||
// 前端静态资源转发到本身
|
||||
|
|
@ -85,6 +86,24 @@ export default defineConfig((conf: any) => {
|
|||
vue(),
|
||||
vueJsx(),
|
||||
DefineOptions(),
|
||||
{
|
||||
name: 'dev-app-entry',
|
||||
configureServer(server: ViteDevServer) {
|
||||
server.middlewares.use((req, _res, next) => {
|
||||
const pathname = (req.url || '/').split('?')[0]
|
||||
const prefix = ENV.VITE_BASE_PATH.replace(/\/$/, '')
|
||||
if (
|
||||
req.headers.accept?.includes('text/html') &&
|
||||
(pathname === prefix || pathname.startsWith(`${prefix}/`)) &&
|
||||
!pathname.startsWith(`${prefix}/api/`) &&
|
||||
!pathname.includes('.')
|
||||
) {
|
||||
req.url = `/${ENV.VITE_ENTRY}`
|
||||
}
|
||||
next()
|
||||
})
|
||||
},
|
||||
},
|
||||
createHtmlPlugin({ template: ENV.VITE_ENTRY }),
|
||||
renameHtmlPlugin(`dist${ENV.VITE_BASE_PATH}`, ENV.VITE_ENTRY),
|
||||
],
|
||||
|
|
|
|||
Loading…
Reference in New Issue