mirror of
https://github.com/1Panel-dev/MaxKB.git
synced 2025-12-26 01:33:05 +00:00
fix: update file URL paths to use relative references
This commit is contained in:
parent
da0be4b0ce
commit
aa901c7fc7
|
|
@ -130,7 +130,7 @@ class BaseImageUnderstandNode(IImageUnderstandNode):
|
|||
file_id_list = [image.get('file_id') for image in image_list]
|
||||
return HumanMessage(content=[
|
||||
{'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)
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ def handle_sheet(file_name, sheet, image_dict):
|
|||
content = str(content.value)
|
||||
image = image_dict.get(content, None)
|
||||
if image is not None:
|
||||
content = f''
|
||||
content = f''
|
||||
paragraph_list.append({'title': title[0:255],
|
||||
'content': content[0:102400],
|
||||
'problem_list': problem_list})
|
||||
|
|
|
|||
|
|
@ -98,12 +98,12 @@ def get_image_list(result_list: list, zip_files: List[str]):
|
|||
else:
|
||||
image_file_list.append({'source_file': image_path,
|
||||
'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
|
||||
else:
|
||||
image_file_list.append({'source_file': image_path,
|
||||
'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
|
||||
|
||||
return image_file_list
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class XlsxParseTableHandle(BaseParseTableHandle):
|
|||
|
||||
image = image_dict.get(cell_value, None)
|
||||
if image is not None:
|
||||
cell_value = f''
|
||||
cell_value = f''
|
||||
|
||||
# 使用标题作为键,单元格的值作为值存入字典
|
||||
row_data[headers[col_idx]] = cell_value
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
image = File(id=image_uuid, file_name=part.filename, meta={'debug': False, 'content': part.blob})
|
||||
images_list.append(image)
|
||||
return f''
|
||||
return f''
|
||||
return None
|
||||
return None
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ from common.utils.logger import maxkb_logger
|
|||
def post_cell(image_dict, cell_value):
|
||||
image = image_dict.get(cell_value, None)
|
||||
if image is not None:
|
||||
return f''
|
||||
return f''
|
||||
return cell_value.replace('\n', '<br>').replace('|', '|')
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -92,12 +92,12 @@ def get_image_list(result_list: list, zip_files: List[str]):
|
|||
else:
|
||||
image_file_list.append({'source_file': image_path,
|
||||
'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
|
||||
else:
|
||||
image_file_list.append({'source_file': image_path,
|
||||
'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
|
||||
|
||||
return image_file_list
|
||||
|
|
|
|||
|
|
@ -167,8 +167,8 @@ def write_image(zip_path: str, image_list: List[str]):
|
|||
search = re.search("\(.*\)", image)
|
||||
if search:
|
||||
text = search.group()
|
||||
if text.startswith('(/oss/file/'):
|
||||
r = text.replace('(/oss/file/', '').replace(')', '')
|
||||
if text.startswith('(./oss/file/'):
|
||||
r = text.replace('(./oss/file/', '').replace(')', '')
|
||||
r = r.strip().split(" ")[0]
|
||||
if not is_valid_uuid(r):
|
||||
break
|
||||
|
|
|
|||
|
|
@ -452,7 +452,7 @@ class ToolSerializer(serializers.Serializer):
|
|||
)
|
||||
file.save(self.data.get('image').read())
|
||||
|
||||
tool.icon = f'/oss/file/{file_id}'
|
||||
tool.icon = f'./oss/file/{file_id}'
|
||||
tool.save()
|
||||
|
||||
return tool.icon
|
||||
|
|
@ -475,14 +475,7 @@ class ToolSerializer(serializers.Serializer):
|
|||
Q(scope=ToolScope.INTERNAL) &
|
||||
Q(is_active=True)
|
||||
)
|
||||
# 处理动态url
|
||||
prefix = CONFIG.get_admin_path()
|
||||
return [
|
||||
{
|
||||
**tool,
|
||||
'icon': tool['icon'].replace('/admin', prefix),
|
||||
} for tool in ToolModelSerializer(query_set, many=True).data
|
||||
]
|
||||
return ToolModelSerializer(query_set, many=True).data
|
||||
|
||||
class AddInternalTool(serializers.Serializer):
|
||||
user_id = serializers.UUIDField(required=True, label=_("User ID"))
|
||||
|
|
|
|||
Loading…
Reference in New Issue