Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions apps/worker/app/core/tasks/kb_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -644,26 +644,6 @@ def _parse(job_id: str, user_id: str | None):
metadata_service.update_metadata(job_id, processing_timing_updates)
job_metadata.update(processing_timing_updates)

# 1.5. Garbage Collection: Remove redundant local media files
try:
from shared.services.retrieval.publication_service import RetrievalPublicationService

with get_sync_db_context() as db:
job_record = db.execute(select(Job).where(Job.job_id == job_id)).scalar_one_or_none()
if job_record:
gc_namespace = JobMetadataHelper.get_field(job_metadata, "namespace") or "default"
chunks, dedup_stats = RetrievalPublicationService.garbage_collect_and_dedup_local_media(
db,
job_id=job_id,
user_id=str(job_record.user_id),
namespace=gc_namespace,
add_dir=str(add_dir) if add_dir else "",
chunks=chunks,
)
except Exception as e:
logger.error(f"[{job_id}] GC failed (non-fatal): {e}")
dedup_stats = None

# Generate ZIP package
zip_service = ZipResultService()
zip_file_path, checksum, statistics, zip_size = (
Expand Down Expand Up @@ -696,6 +676,33 @@ def _parse(job_id: str, user_id: str | None):
)
result_s3_key = result_bundle.zip_key

publication_chunks = chunks
dedup_stats = None
try:
from shared.services.retrieval.publication_service import RetrievalPublicationService

with get_sync_db_context() as db:
job_record = db.execute(
select(Job).where(Job.job_id == job_id)
).scalar_one_or_none()
if job_record:
gc_namespace = (
JobMetadataHelper.get_field(job_metadata, "namespace")
or "default"
)
publication_chunks, dedup_stats = (
RetrievalPublicationService.garbage_collect_and_dedup_local_media(
db,
job_id=job_id,
user_id=str(job_record.user_id),
namespace=gc_namespace,
add_dir=str(add_dir) if add_dir else "",
chunks=chunks,
)
)
except Exception as e:
logger.error(f"[{job_id}] GC failed (non-fatal): {e}")

stored_count = 0

lifecycle_service.update_progress(
Expand All @@ -706,6 +713,7 @@ def _parse(job_id: str, user_id: str | None):
lifecycle_service.finalize_job_success(
job_id=job_id,
chunks=chunks,
publication_chunks=publication_chunks,
result_s3_key=result_s3_key,
checksum=checksum_value,
zip_size=zip_size,
Expand Down
Loading
Loading