estel/dify
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix segment query tenant bug and variable naming typo (#23321)

Browse Source 
Signed-off-by: Yongtao Huang <yongtaoh2022@gmail.com>
This commit is contained in:
Yongtao Huang
2025-08-03 18:30:09 +08:00
committed by GitHub
parent 20f0238aab
commit 76d123fe19
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/services/dataset_service.py
View File

@@ -2372,7 +2372,7 @@ class SegmentService:
) )
if not segments: if not segments:
return return
real_deal_segmment_ids = [] real_deal_segment_ids = []
for segment in segments: for segment in segments:
indexing_cache_key = f"segment_{segment.id}_indexing" indexing_cache_key = f"segment_{segment.id}_indexing"
cache_result = redis_client.get(indexing_cache_key) cache_result = redis_client.get(indexing_cache_key)
@@ -2382,10 +2382,10 @@ class SegmentService:
segment.disabled_at = None segment.disabled_at = None
segment.disabled_by = None segment.disabled_by = None
db.session.add(segment) db.session.add(segment)
real_deal_segmment_ids.append(segment.id) real_deal_segment_ids.append(segment.id)
db.session.commit() db.session.commit()
enable_segments_to_index_task.delay(real_deal_segmment_ids, dataset.id, document.id) enable_segments_to_index_task.delay(real_deal_segment_ids, dataset.id, document.id)
elif action == "disable": elif action == "disable":
segments = ( segments = (
db.session.query(DocumentSegment) db.session.query(DocumentSegment)
@@ -2399,7 +2399,7 @@ class SegmentService:
) )
if not segments: if not segments:
return return
real_deal_segmment_ids = [] real_deal_segment_ids = []
for segment in segments: for segment in segments:
indexing_cache_key = f"segment_{segment.id}_indexing" indexing_cache_key = f"segment_{segment.id}_indexing"
cache_result = redis_client.get(indexing_cache_key) cache_result = redis_client.get(indexing_cache_key)
@@ -2409,10 +2409,10 @@ class SegmentService:
segment.disabled_at = datetime.datetime.now(datetime.UTC).replace(tzinfo=None) segment.disabled_at = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
segment.disabled_by = current_user.id segment.disabled_by = current_user.id
db.session.add(segment) db.session.add(segment)
real_deal_segmment_ids.append(segment.id) real_deal_segment_ids.append(segment.id)
db.session.commit() db.session.commit()
disable_segments_from_index_task.delay(real_deal_segmment_ids, dataset.id, document.id) disable_segments_from_index_task.delay(real_deal_segment_ids, dataset.id, document.id)
else: else:
raise InvalidActionError() raise InvalidActionError()
@@ -2670,7 +2670,7 @@ class SegmentService:
# check segment # check segment
segment = ( segment = (
db.session.query(DocumentSegment) db.session.query(DocumentSegment)
.where(DocumentSegment.id == segment_id, DocumentSegment.tenant_id == user_id) .where(DocumentSegment.id == segment_id, DocumentSegment.tenant_id == tenant_id)
.first() .first()
) )
if not segment: if not segment: