mirror of
https://github.com/langgenius/dify.git
synced 2026-03-02 06:16:39 +08:00
Signed-off-by: majiayu000 <1835304752@qq.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com> Signed-off-by: -LAN- <laipz8200@outlook.com> Signed-off-by: yihong0618 <zouzou0208@gmail.com> Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com> Co-authored-by: 盐粒 Yanli <yanli@dify.ai> Co-authored-by: wangxiaolei <fatelei@gmail.com> Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Cursx <33718736+Cursx@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: lif <1835304752@qq.com> Co-authored-by: 非法操作 <hjlarry@163.com> Co-authored-by: Asuka Minato <i@asukaminato.eu.org> Co-authored-by: fenglin <790872612@qq.com> Co-authored-by: qiaofenglin <qiaofenglin@baidu.com> Co-authored-by: -LAN- <laipz8200@outlook.com> Co-authored-by: TomoOkuyama <49631611+TomoOkuyama@users.noreply.github.com> Co-authored-by: Tomo Okuyama <tomo.okuyama@intersystems.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: zyssyz123 <916125788@qq.com> Co-authored-by: hj24 <mambahj24@gmail.com> Co-authored-by: Coding On Star <447357187@qq.com> Co-authored-by: CodingOnStar <hanxujiang@dify.ai> Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com> Co-authored-by: Xiangxuan Qu <fghpdf@outlook.com> Co-authored-by: fghpdf <fghpdf@users.noreply.github.com> Co-authored-by: coopercoder <whitetiger0127@163.com> Co-authored-by: zhaiguangpeng <zhaiguangpeng@didiglobal.com> Co-authored-by: Junyan Qin (Chin) <rockchinq@gmail.com> Co-authored-by: E.G <146701565+GlobalStar117@users.noreply.github.com> Co-authored-by: GlobalStar117 <GlobalStar117@users.noreply.github.com> Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com> Co-authored-by: CodingOnStar <hanxujiang@dify.com> Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com> Co-authored-by: heyszt <270985384@qq.com> Co-authored-by: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com> Co-authored-by: Yeuoly <45712896+Yeuoly@users.noreply.github.com> Co-authored-by: zxhlyh <jasonapring2015@outlook.com> Co-authored-by: moonpanda <chuanzegao@163.com> Co-authored-by: warlocgao <warlocgao@tencent.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: KVOJJJin <jzongcode@gmail.com> Co-authored-by: eux <euxx@users.noreply.github.com> Co-authored-by: bangjiehan <bangjiehan@gmail.com> Co-authored-by: FFXN <31929997+FFXN@users.noreply.github.com> Co-authored-by: Jyong <76649700+JohnJyong@users.noreply.github.com> Co-authored-by: Nie Ronghua <nieronghua@sf-express.com> Co-authored-by: JQSevenMiao <141806521+JQSevenMiao@users.noreply.github.com> Co-authored-by: jiasiqi <jiasiqi3@tal.com> Co-authored-by: Seokrin Taron Sung <sungsjade@gmail.com> Co-authored-by: CrabSAMA <40541269+CrabSAMA@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: yihong <zouzou0208@gmail.com> Co-authored-by: Joel <iamjoel007@gmail.com> Co-authored-by: Wu Tianwei <30284043+WTW0313@users.noreply.github.com> Co-authored-by: yessenia <yessenia.contact@gmail.com> Co-authored-by: Jax <anobaka@qq.com> Co-authored-by: niveshdandyan <155956228+niveshdandyan@users.noreply.github.com> Co-authored-by: OSS Contributor <oss-contributor@example.com> Co-authored-by: niveshdandyan <niveshdandyan@users.noreply.github.com> Co-authored-by: Sean Kenneth Doherty <Smaster7772@gmail.com>
245 lines
11 KiB
Python
245 lines
11 KiB
Python
import logging
|
|
import time
|
|
from collections.abc import Callable, Sequence
|
|
|
|
import click
|
|
from celery import shared_task
|
|
|
|
from configs import dify_config
|
|
from core.db.session_factory import session_factory
|
|
from core.entities.document_task import DocumentTask
|
|
from core.indexing_runner import DocumentIsPausedError, IndexingRunner
|
|
from core.rag.pipeline.queue import TenantIsolatedTaskQueue
|
|
from enums.cloud_plan import CloudPlan
|
|
from libs.datetime_utils import naive_utc_now
|
|
from models.dataset import Dataset, Document
|
|
from services.feature_service import FeatureService
|
|
from tasks.generate_summary_index_task import generate_summary_index_task
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
@shared_task(queue="dataset")
|
|
def document_indexing_task(dataset_id: str, document_ids: list):
|
|
"""
|
|
Async process document
|
|
:param dataset_id:
|
|
:param document_ids:
|
|
|
|
.. warning:: TO BE DEPRECATED
|
|
This function will be deprecated and removed in a future version.
|
|
Use normal_document_indexing_task or priority_document_indexing_task instead.
|
|
|
|
Usage: document_indexing_task.delay(dataset_id, document_ids)
|
|
"""
|
|
logger.warning("document indexing legacy mode received: %s - %s", dataset_id, document_ids)
|
|
_document_indexing(dataset_id, document_ids)
|
|
|
|
|
|
def _document_indexing(dataset_id: str, document_ids: Sequence[str]):
|
|
"""
|
|
Process document for tasks
|
|
:param dataset_id:
|
|
:param document_ids:
|
|
|
|
Usage: _document_indexing(dataset_id, document_ids)
|
|
"""
|
|
documents = []
|
|
start_at = time.perf_counter()
|
|
|
|
with session_factory.create_session() as session:
|
|
dataset = session.query(Dataset).where(Dataset.id == dataset_id).first()
|
|
if not dataset:
|
|
logger.info(click.style(f"Dataset is not found: {dataset_id}", fg="yellow"))
|
|
return
|
|
# check document limit
|
|
features = FeatureService.get_features(dataset.tenant_id)
|
|
try:
|
|
if features.billing.enabled:
|
|
vector_space = features.vector_space
|
|
count = len(document_ids)
|
|
batch_upload_limit = int(dify_config.BATCH_UPLOAD_LIMIT)
|
|
if features.billing.subscription.plan == CloudPlan.SANDBOX and count > 1:
|
|
raise ValueError("Your current plan does not support batch upload, please upgrade your plan.")
|
|
if count > batch_upload_limit:
|
|
raise ValueError(f"You have reached the batch upload limit of {batch_upload_limit}.")
|
|
if 0 < vector_space.limit <= vector_space.size:
|
|
raise ValueError(
|
|
"Your total number of documents plus the number of uploads have over the limit of "
|
|
"your subscription."
|
|
)
|
|
except Exception as e:
|
|
for document_id in document_ids:
|
|
document = (
|
|
session.query(Document).where(Document.id == document_id, Document.dataset_id == dataset_id).first()
|
|
)
|
|
if document:
|
|
document.indexing_status = "error"
|
|
document.error = str(e)
|
|
document.stopped_at = naive_utc_now()
|
|
session.add(document)
|
|
session.commit()
|
|
return
|
|
|
|
for document_id in document_ids:
|
|
logger.info(click.style(f"Start process document: {document_id}", fg="green"))
|
|
|
|
document = (
|
|
session.query(Document).where(Document.id == document_id, Document.dataset_id == dataset_id).first()
|
|
)
|
|
|
|
if document:
|
|
document.indexing_status = "parsing"
|
|
document.processing_started_at = naive_utc_now()
|
|
documents.append(document)
|
|
session.add(document)
|
|
session.commit()
|
|
|
|
try:
|
|
indexing_runner = IndexingRunner()
|
|
indexing_runner.run(documents)
|
|
end_at = time.perf_counter()
|
|
logger.info(click.style(f"Processed dataset: {dataset_id} latency: {end_at - start_at}", fg="green"))
|
|
|
|
# Trigger summary index generation for completed documents if enabled
|
|
# Only generate for high_quality indexing technique and when summary_index_setting is enabled
|
|
# Re-query dataset to get latest summary_index_setting (in case it was updated)
|
|
dataset = session.query(Dataset).where(Dataset.id == dataset_id).first()
|
|
if not dataset:
|
|
logger.warning("Dataset %s not found after indexing", dataset_id)
|
|
return
|
|
|
|
if dataset.indexing_technique == "high_quality":
|
|
summary_index_setting = dataset.summary_index_setting
|
|
if summary_index_setting and summary_index_setting.get("enable"):
|
|
# expire all session to get latest document's indexing status
|
|
session.expire_all()
|
|
# Check each document's indexing status and trigger summary generation if completed
|
|
for document_id in document_ids:
|
|
# Re-query document to get latest status (IndexingRunner may have updated it)
|
|
document = (
|
|
session.query(Document)
|
|
.where(Document.id == document_id, Document.dataset_id == dataset_id)
|
|
.first()
|
|
)
|
|
if document:
|
|
logger.info(
|
|
"Checking document %s for summary generation: status=%s, doc_form=%s, need_summary=%s",
|
|
document_id,
|
|
document.indexing_status,
|
|
document.doc_form,
|
|
document.need_summary,
|
|
)
|
|
if (
|
|
document.indexing_status == "completed"
|
|
and document.doc_form != "qa_model"
|
|
and document.need_summary is True
|
|
):
|
|
try:
|
|
generate_summary_index_task.delay(dataset.id, document_id, None)
|
|
logger.info(
|
|
"Queued summary index generation task for document %s in dataset %s "
|
|
"after indexing completed",
|
|
document_id,
|
|
dataset.id,
|
|
)
|
|
except Exception:
|
|
logger.exception(
|
|
"Failed to queue summary index generation task for document %s",
|
|
document_id,
|
|
)
|
|
# Don't fail the entire indexing process if summary task queuing fails
|
|
else:
|
|
logger.info(
|
|
"Skipping summary generation for document %s: "
|
|
"status=%s, doc_form=%s, need_summary=%s",
|
|
document_id,
|
|
document.indexing_status,
|
|
document.doc_form,
|
|
document.need_summary,
|
|
)
|
|
else:
|
|
logger.warning("Document %s not found after indexing", document_id)
|
|
else:
|
|
logger.info(
|
|
"Summary index generation skipped for dataset %s: summary_index_setting.enable=%s",
|
|
dataset.id,
|
|
summary_index_setting.get("enable") if summary_index_setting else None,
|
|
)
|
|
else:
|
|
logger.info(
|
|
"Summary index generation skipped for dataset %s: indexing_technique=%s (not 'high_quality')",
|
|
dataset.id,
|
|
dataset.indexing_technique,
|
|
)
|
|
except DocumentIsPausedError as ex:
|
|
logger.info(click.style(str(ex), fg="yellow"))
|
|
except Exception:
|
|
logger.exception("Document indexing task failed, dataset_id: %s", dataset_id)
|
|
|
|
|
|
def _document_indexing_with_tenant_queue(
|
|
tenant_id: str, dataset_id: str, document_ids: Sequence[str], task_func: Callable[[str, str, Sequence[str]], None]
|
|
):
|
|
try:
|
|
_document_indexing(dataset_id, document_ids)
|
|
except Exception:
|
|
logger.exception(
|
|
"Error processing document indexing %s for tenant %s: %s",
|
|
dataset_id,
|
|
tenant_id,
|
|
document_ids,
|
|
exc_info=True,
|
|
)
|
|
finally:
|
|
tenant_isolated_task_queue = TenantIsolatedTaskQueue(tenant_id, "document_indexing")
|
|
|
|
# Check if there are waiting tasks in the queue
|
|
# Use rpop to get the next task from the queue (FIFO order)
|
|
next_tasks = tenant_isolated_task_queue.pull_tasks(count=dify_config.TENANT_ISOLATED_TASK_CONCURRENCY)
|
|
|
|
logger.info("document indexing tenant isolation queue %s next tasks: %s", tenant_id, next_tasks)
|
|
|
|
if next_tasks:
|
|
for next_task in next_tasks:
|
|
document_task = DocumentTask(**next_task)
|
|
# Process the next waiting task
|
|
# Keep the flag set to indicate a task is running
|
|
tenant_isolated_task_queue.set_task_waiting_time()
|
|
task_func.delay( # type: ignore
|
|
tenant_id=document_task.tenant_id,
|
|
dataset_id=document_task.dataset_id,
|
|
document_ids=document_task.document_ids,
|
|
)
|
|
else:
|
|
# No more waiting tasks, clear the flag
|
|
tenant_isolated_task_queue.delete_task_key()
|
|
|
|
|
|
@shared_task(queue="dataset")
|
|
def normal_document_indexing_task(tenant_id: str, dataset_id: str, document_ids: Sequence[str]):
|
|
"""
|
|
Async process document
|
|
:param tenant_id:
|
|
:param dataset_id:
|
|
:param document_ids:
|
|
|
|
Usage: normal_document_indexing_task.delay(tenant_id, dataset_id, document_ids)
|
|
"""
|
|
logger.info("normal document indexing task received: %s - %s - %s", tenant_id, dataset_id, document_ids)
|
|
_document_indexing_with_tenant_queue(tenant_id, dataset_id, document_ids, normal_document_indexing_task)
|
|
|
|
|
|
@shared_task(queue="priority_dataset")
|
|
def priority_document_indexing_task(tenant_id: str, dataset_id: str, document_ids: Sequence[str]):
|
|
"""
|
|
Priority async process document
|
|
:param tenant_id:
|
|
:param dataset_id:
|
|
:param document_ids:
|
|
|
|
Usage: priority_document_indexing_task.delay(tenant_id, dataset_id, document_ids)
|
|
"""
|
|
logger.info("priority document indexing task received: %s - %s - %s", tenant_id, dataset_id, document_ids)
|
|
_document_indexing_with_tenant_queue(tenant_id, dataset_id, document_ids, priority_document_indexing_task)
|