From 49bb15fae15981dbfbc43b1503a9f0767f1705ed Mon Sep 17 00:00:00 2001 From: Dongyu Li <544104925@qq.com> Date: Tue, 24 Jun 2025 17:14:31 +0800 Subject: [PATCH] feat(datasource): add datasource content preview api --- api/controllers/console/__init__.py | 2 +- .../datasets/rag_pipeline/datasource_content_preview.py | 7 ++++--- api/services/rag_pipeline/rag_pipeline.py | 8 +++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/api/controllers/console/__init__.py b/api/controllers/console/__init__.py index 9d9023f59c..22ac835904 100644 --- a/api/controllers/console/__init__.py +++ b/api/controllers/console/__init__.py @@ -85,11 +85,11 @@ from .datasets import ( ) from .datasets.rag_pipeline import ( datasource_auth, + datasource_content_preview, rag_pipeline, rag_pipeline_datasets, rag_pipeline_import, rag_pipeline_workflow, - datasource_content_preview ) # Import explore controllers diff --git a/api/controllers/console/datasets/rag_pipeline/datasource_content_preview.py b/api/controllers/console/datasets/rag_pipeline/datasource_content_preview.py index 30836b3da1..18885f0dc4 100644 --- a/api/controllers/console/datasets/rag_pipeline/datasource_content_preview.py +++ b/api/controllers/console/datasets/rag_pipeline/datasource_content_preview.py @@ -3,12 +3,13 @@ from flask_restful import ( # type: ignore reqparse, ) from werkzeug.exceptions import Forbidden + +from controllers.console import api from controllers.console.datasets.wraps import get_rag_pipeline -from controllers.console.wraps import setup_required, account_initialization_required -from libs.login import login_required, current_user +from controllers.console.wraps import account_initialization_required, setup_required +from libs.login import current_user, login_required from models import Account from models.dataset import Pipeline -from controllers.console import api from services.rag_pipeline.rag_pipeline import RagPipelineService diff --git a/api/services/rag_pipeline/rag_pipeline.py b/api/services/rag_pipeline/rag_pipeline.py index 842676e29a..6427c526d6 100644 --- a/api/services/rag_pipeline/rag_pipeline.py +++ b/api/services/rag_pipeline/rag_pipeline.py @@ -3,9 +3,9 @@ import logging import re import threading import time -from collections.abc import Callable, Generator, Sequence +from collections.abc import Callable, Generator, Mapping, Sequence from datetime import UTC, datetime -from typing import Any, Optional, cast, Mapping +from typing import Any, Optional, cast from uuid import uuid4 from flask_login import current_user @@ -16,9 +16,11 @@ import contexts from configs import dify_config from core.app.entities.app_invoke_entities import InvokeFrom from core.datasource.entities.datasource_entities import ( + DatasourceMessage, DatasourceProviderType, + GetOnlineDocumentPageContentRequest, OnlineDocumentPagesMessage, - WebsiteCrawlMessage, DatasourceMessage, GetOnlineDocumentPageContentRequest, + WebsiteCrawlMessage, ) from core.datasource.online_document.online_document_plugin import OnlineDocumentDatasourcePlugin from core.datasource.website_crawl.website_crawl_plugin import WebsiteCrawlDatasourcePlugin