From a996c1d90c93d29c1c688c1872561e7b7b4a1c9d Mon Sep 17 00:00:00 2001 From: zxhlyh Date: Tue, 29 Jul 2025 15:45:01 +0800 Subject: [PATCH] merge main --- api/core/rag/extractor/firecrawl/firecrawl_web_extractor.py | 1 - api/core/rag/extractor/jina_reader_extractor.py | 1 - api/core/rag/extractor/watercrawl/extractor.py | 1 - api/services/rag_pipeline/rag_pipeline_transform_service.py | 4 ---- api/services/website_service.py | 1 - 5 files changed, 8 deletions(-) diff --git a/api/core/rag/extractor/firecrawl/firecrawl_web_extractor.py b/api/core/rag/extractor/firecrawl/firecrawl_web_extractor.py index f655ba94a0..09babaa8ce 100644 --- a/api/core/rag/extractor/firecrawl/firecrawl_web_extractor.py +++ b/api/core/rag/extractor/firecrawl/firecrawl_web_extractor.py @@ -1,4 +1,3 @@ -from typing import Optional from core.rag.extractor.extractor_base import BaseExtractor from core.rag.models.document import Document diff --git a/api/core/rag/extractor/jina_reader_extractor.py b/api/core/rag/extractor/jina_reader_extractor.py index 096b34bb87..a3b9075136 100644 --- a/api/core/rag/extractor/jina_reader_extractor.py +++ b/api/core/rag/extractor/jina_reader_extractor.py @@ -1,4 +1,3 @@ -from typing import Optional from core.rag.extractor.extractor_base import BaseExtractor from core.rag.models.document import Document diff --git a/api/core/rag/extractor/watercrawl/extractor.py b/api/core/rag/extractor/watercrawl/extractor.py index 31c0c62799..f3663397d7 100644 --- a/api/core/rag/extractor/watercrawl/extractor.py +++ b/api/core/rag/extractor/watercrawl/extractor.py @@ -1,4 +1,3 @@ -from typing import Optional from core.rag.extractor.extractor_base import BaseExtractor from core.rag.models.document import Document diff --git a/api/services/rag_pipeline/rag_pipeline_transform_service.py b/api/services/rag_pipeline/rag_pipeline_transform_service.py index 025aaa68aa..6c79bd88c4 100644 --- a/api/services/rag_pipeline/rag_pipeline_transform_service.py +++ b/api/services/rag_pipeline/rag_pipeline_transform_service.py @@ -1,7 +1,6 @@ import json from datetime import UTC, datetime from pathlib import Path -from pydoc import doc from uuid import uuid4 import yaml @@ -9,15 +8,12 @@ from flask_login import current_user from constants import DOCUMENT_EXTENSIONS from core.plugin.entities.plugin import PluginInstallationSource -from core.plugin.impl.datasource import PluginDatasourceManager from core.plugin.impl.plugin import PluginInstaller -from core.tools.tool_manager import ToolManager from extensions.ext_database import db from factories import variable_factory from models.dataset import Dataset, Document, DocumentPipelineExecutionLog, Pipeline from models.model import UploadFile from models.workflow import Workflow, WorkflowType -from services.auth import firecrawl from services.entities.knowledge_entities.rag_pipeline_entities import KnowledgeConfiguration, RetrievalSetting from services.plugin.plugin_migration import PluginMigration diff --git a/api/services/website_service.py b/api/services/website_service.py index 5b14d11054..dcbbbb725a 100644 --- a/api/services/website_service.py +++ b/api/services/website_service.py @@ -11,7 +11,6 @@ from core.rag.extractor.firecrawl.firecrawl_app import FirecrawlApp from core.rag.extractor.watercrawl.provider import WaterCrawlProvider from extensions.ext_redis import redis_client from extensions.ext_storage import storage -from services.auth.api_key_auth_service import ApiKeyAuthService from services.datasource_provider_service import DatasourceProviderService