Переглянути джерело

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

Signed-off-by: Yongtao Huang <yongtaoh2022@gmail.com>
tags/1.7.2
Yongtao Huang 3 місяці тому
джерело
коміт
76d123fe19
Аккаунт користувача з таким Email не знайдено
1 змінених файлів з 7 додано та 7 видалено
  1. 7
    7
      api/services/dataset_service.py

+ 7
- 7
api/services/dataset_service.py Переглянути файл

) )
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)
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)
) )
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)
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()


# 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:

Завантаження…
Відмінити
Зберегти