Skip to content

Commit d6faf47

Browse files
liuhaoran1212root
authored and
jiangzhijie
committed
fix issues:Image file not deleted when a doc is removed langgenius#9541 (langgenius#10465)
Signed-off-by: root <[email protected]> Co-authored-by: root <[email protected]>
1 parent 512ec5c commit d6faf47

File tree

3 files changed

+38
-0
lines changed

3 files changed

+38
-0
lines changed

api/core/tools/utils/web_reader_tool.py

+16
Original file line numberDiff line numberDiff line change
@@ -356,3 +356,19 @@ def content_digest(element):
356356
digest.update(child.encode("utf-8"))
357357
digest = digest.hexdigest()
358358
return digest
359+
360+
361+
def get_image_upload_file_ids(content):
362+
pattern = r"!\[image\]\((http?://.*?(file-preview|image-preview))\)"
363+
matches = re.findall(pattern, content)
364+
image_upload_file_ids = []
365+
for match in matches:
366+
if match[1] == "file-preview":
367+
content_pattern = r"files/([^/]+)/file-preview"
368+
else:
369+
content_pattern = r"files/([^/]+)/image-preview"
370+
content_match = re.search(content_pattern, match[0])
371+
if content_match:
372+
image_upload_file_id = content_match.group(1)
373+
image_upload_file_ids.append(image_upload_file_id)
374+
return image_upload_file_ids

api/tasks/clean_dataset_task.py

+11
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from celery import shared_task
66

77
from core.rag.index_processor.index_processor_factory import IndexProcessorFactory
8+
from core.tools.utils.web_reader_tool import get_image_upload_file_ids
89
from extensions.ext_database import db
910
from extensions.ext_storage import storage
1011
from models.dataset import (
@@ -67,6 +68,16 @@ def clean_dataset_task(
6768
db.session.delete(document)
6869

6970
for segment in segments:
71+
image_upload_file_ids = get_image_upload_file_ids(segment.content)
72+
for upload_file_id in image_upload_file_ids:
73+
image_file = db.session.query(UploadFile).filter(UploadFile.id == upload_file_id).first()
74+
try:
75+
storage.delete(image_file.key)
76+
except Exception:
77+
logging.exception(
78+
"Delete image_files failed when storage deleted, \
79+
image_upload_file_is: {}".format(upload_file_id)
80+
)
7081
db.session.delete(segment)
7182

7283
db.session.query(DatasetProcessRule).filter(DatasetProcessRule.dataset_id == dataset_id).delete()

api/tasks/clean_document_task.py

+11
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from celery import shared_task
77

88
from core.rag.index_processor.index_processor_factory import IndexProcessorFactory
9+
from core.tools.utils.web_reader_tool import get_image_upload_file_ids
910
from extensions.ext_database import db
1011
from extensions.ext_storage import storage
1112
from models.dataset import Dataset, DocumentSegment
@@ -40,6 +41,16 @@ def clean_document_task(document_id: str, dataset_id: str, doc_form: str, file_i
4041
index_processor.clean(dataset, index_node_ids)
4142

4243
for segment in segments:
44+
image_upload_file_ids = get_image_upload_file_ids(segment.content)
45+
for upload_file_id in image_upload_file_ids:
46+
image_file = db.session.query(UploadFile).filter(UploadFile.id == upload_file_id).first()
47+
try:
48+
storage.delete(image_file.key)
49+
except Exception:
50+
logging.exception(
51+
"Delete image_files failed when storage deleted, \
52+
image_upload_file_is: {}".format(upload_file_id)
53+
)
4354
db.session.delete(segment)
4455

4556
db.session.commit()

0 commit comments

Comments
 (0)