zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update file URL paths to use relative references

Browse Source
This commit is contained in:
CaptainB 2025-07-02 22:44:39 +08:00
parent da0be4b0ce
commit aa901c7fc7
9 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/application/flow/step_node/image_understand_step_node/impl/base_image_understand_node.py
View File

@ -130,7 +130,7 @@ class BaseImageUnderstandNode(IImageUnderstandNode):
file_id_list = [image.get('file_id') for image in image_list] file_id_list = [image.get('file_id') for image in image_list]
return HumanMessage(content=[ return HumanMessage(content=[
{'type': 'text', 'text': data['question']}, {'type': 'text', 'text': data['question']},
*[{'type': 'image_url', 'image_url': {'url': f'/oss/file/{file_id}'}} for file_id in file_id_list] *[{'type': 'image_url', 'image_url': {'url': f'./oss/file/{file_id}'}} for file_id in file_id_list]
]) ])
return HumanMessage(content=chat_record.problem_text) return HumanMessage(content=chat_record.problem_text)

2
apps/common/handle/impl/qa/xlsx_parse_qa_handle.py
View File

@ -39,7 +39,7 @@ def handle_sheet(file_name, sheet, image_dict):
content = str(content.value) content = str(content.value)
image = image_dict.get(content, None) image = image_dict.get(content, None)
if image is not None: if image is not None:
content = f'![](/oss/file/{image.id})' content = f'![](./oss/file/{image.id})'
paragraph_list.append({'title': title[0:255], paragraph_list.append({'title': title[0:255],
'content': content[0:102400], 'content': content[0:102400],
'problem_list': problem_list}) 'problem_list': problem_list})

4
apps/common/handle/impl/qa/zip_parse_qa_handle.py
View File

@ -98,12 +98,12 @@ def get_image_list(result_list: list, zip_files: List[str]):
else: else:
image_file_list.append({'source_file': image_path, image_file_list.append({'source_file': image_path,
'image_id': new_image_id}) 'image_id': new_image_id})
content = content.replace(source_image_path, f'/oss/file/{new_image_id}') content = content.replace(source_image_path, f'./oss/file/{new_image_id}')
p['content'] = content p['content'] = content
else: else:
image_file_list.append({'source_file': image_path, image_file_list.append({'source_file': image_path,
'image_id': new_image_id}) 'image_id': new_image_id})
content = content.replace(source_image_path, f'/oss/file/{new_image_id}') content = content.replace(source_image_path, f'./oss/file/{new_image_id}')
p['content'] = content p['content'] = content
return image_file_list return image_file_list

2
apps/common/handle/impl/table/xlsx_parse_table_handle.py
View File

@ -43,7 +43,7 @@ class XlsxParseTableHandle(BaseParseTableHandle):
image = image_dict.get(cell_value, None) image = image_dict.get(cell_value, None)
if image is not None: if image is not None:
cell_value = f'![](/oss/file/{image.id})' cell_value = f'![](./oss/file/{image.id})'
# 使用标题作为键，单元格的值作为值存入字典 # 使用标题作为键，单元格的值作为值存入字典
row_data[headers[col_idx]] = cell_value row_data[headers[col_idx]] = cell_value

2
apps/common/handle/impl/text/doc_split_handle.py
View File

@ -44,7 +44,7 @@ def image_to_mode(image, doc: Document, images_list, get_image_id):
if len([i for i in images_list if i.id == image_uuid]) == 0: if len([i for i in images_list if i.id == image_uuid]) == 0:
image = File(id=image_uuid, file_name=part.filename, meta={'debug': False, 'content': part.blob}) image = File(id=image_uuid, file_name=part.filename, meta={'debug': False, 'content': part.blob})
images_list.append(image) images_list.append(image)
return f'![](/oss/file/{image_uuid})' return f'![](./oss/file/{image_uuid})'
return None return None
return None return None

2
apps/common/handle/impl/text/xlsx_split_handle.py
View File

@ -20,7 +20,7 @@ from common.utils.logger import maxkb_logger
def post_cell(image_dict, cell_value): def post_cell(image_dict, cell_value):
image = image_dict.get(cell_value, None) image = image_dict.get(cell_value, None)
if image is not None: if image is not None:
return f'![](/oss/file/{image.id})' return f'![](./oss/file/{image.id})'
return cell_value.replace('\n', '<br>').replace('|', '&#124;') return cell_value.replace('\n', '<br>').replace('|', '&#124;')

4
apps/common/handle/impl/text/zip_split_handle.py
View File

@ -92,12 +92,12 @@ def get_image_list(result_list: list, zip_files: List[str]):
else: else:
image_file_list.append({'source_file': image_path, image_file_list.append({'source_file': image_path,
'image_id': new_image_id}) 'image_id': new_image_id})
content = content.replace(source_image_path, f'/oss/file/{new_image_id}') content = content.replace(source_image_path, f'./oss/file/{new_image_id}')
p['content'] = content p['content'] = content
else: else:
image_file_list.append({'source_file': image_path, image_file_list.append({'source_file': image_path,
'image_id': new_image_id}) 'image_id': new_image_id})
content = content.replace(source_image_path, f'/oss/file/{new_image_id}') content = content.replace(source_image_path, f'./oss/file/{new_image_id}')
p['content'] = content p['content'] = content
return image_file_list return image_file_list

4
apps/knowledge/serializers/common.py
View File

@ -167,8 +167,8 @@ def write_image(zip_path: str, image_list: List[str]):
search = re.search("\(.*\)", image) search = re.search("\(.*\)", image)
if search: if search:
text = search.group() text = search.group()
if text.startswith('(/oss/file/'): if text.startswith('(./oss/file/'):
r = text.replace('(/oss/file/', '').replace(')', '') r = text.replace('(./oss/file/', '').replace(')', '')
r = r.strip().split(" ")[0] r = r.strip().split(" ")[0]
if not is_valid_uuid(r): if not is_valid_uuid(r):
break break

11
apps/tools/serializers/tool.py
View File

@ -452,7 +452,7 @@ class ToolSerializer(serializers.Serializer):
) )
file.save(self.data.get('image').read()) file.save(self.data.get('image').read())
tool.icon = f'/oss/file/{file_id}' tool.icon = f'./oss/file/{file_id}'
tool.save() tool.save()
return tool.icon return tool.icon
@ -475,14 +475,7 @@ class ToolSerializer(serializers.Serializer):
Q(scope=ToolScope.INTERNAL) & Q(scope=ToolScope.INTERNAL) &
Q(is_active=True) Q(is_active=True)
) )
# 处理动态url return ToolModelSerializer(query_set, many=True).data
prefix = CONFIG.get_admin_path()
return [
{
**tool,
'icon': tool['icon'].replace('/admin', prefix),
} for tool in ToolModelSerializer(query_set, many=True).data
]
class AddInternalTool(serializers.Serializer): class AddInternalTool(serializers.Serializer):
user_id = serializers.UUIDField(required=True, label=_("User ID")) user_id = serializers.UUIDField(required=True, label=_("User ID"))