diff --git a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py index 898ed416c0..d00be3a573 100644 --- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py +++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py @@ -39,7 +39,7 @@ from libs import helper from libs.helper import TimestampField, uuid_value from libs.login import current_user, login_required from models.account import Account -from models.dataset import Document, Pipeline +from models.dataset import Pipeline from models.model import EndUser from services.errors.app import WorkflowHashNotEqualError from services.errors.llm import InvokeRateLimitError diff --git a/api/models/dataset.py b/api/models/dataset.py index 89a736745f..2c03a0c30c 100644 --- a/api/models/dataset.py +++ b/api/models/dataset.py @@ -10,7 +10,7 @@ import re import time from datetime import datetime from json import JSONDecodeError -from typing import Any, cast, Optional +from typing import Any, Optional, cast import sqlalchemy as sa from sqlalchemy import DateTime, String, func, select diff --git a/api/models/workflow.py b/api/models/workflow.py index 97e1790e19..bb7ea2c074 100644 --- a/api/models/workflow.py +++ b/api/models/workflow.py @@ -3,7 +3,7 @@ import logging from collections.abc import Mapping, Sequence from datetime import datetime from enum import StrEnum -from typing import TYPE_CHECKING, Any, Union, cast, Optional +from typing import TYPE_CHECKING, Any, Optional, Union, cast from uuid import uuid4 import sqlalchemy as sa diff --git a/api/services/rag_pipeline/pipeline_generate_service.py b/api/services/rag_pipeline/pipeline_generate_service.py index 796d3ee3ae..51e03d11c7 100644 --- a/api/services/rag_pipeline/pipeline_generate_service.py +++ b/api/services/rag_pipeline/pipeline_generate_service.py @@ -112,4 +112,4 @@ class PipelineGenerateService: if document: document.indexing_status = "waiting" db.session.add(document) - db.session.commit() \ No newline at end of file + db.session.commit() diff --git a/api/services/rag_pipeline/rag_pipeline.py b/api/services/rag_pipeline/rag_pipeline.py index 2da61c828c..99c192d709 100644 --- a/api/services/rag_pipeline/rag_pipeline.py +++ b/api/services/rag_pipeline/rag_pipeline.py @@ -7,7 +7,6 @@ from collections.abc import Callable, Generator, Mapping, Sequence from datetime import UTC, datetime from typing import Any, Optional, Union, cast from uuid import uuid4 -import uuid from flask_login import current_user from sqlalchemy import func, or_, select @@ -15,7 +14,6 @@ from sqlalchemy.orm import Session, sessionmaker import contexts from configs import dify_config -from core.app.apps.pipeline.pipeline_config_manager import PipelineConfigManager from core.app.apps.pipeline.pipeline_generator import PipelineGenerator from core.app.entities.app_invoke_entities import InvokeFrom from core.datasource.entities.datasource_entities import ( @@ -57,7 +55,14 @@ from core.workflow.workflow_entry import WorkflowEntry from extensions.ext_database import db from libs.infinite_scroll_pagination import InfiniteScrollPagination from models.account import Account -from models.dataset import Dataset, Document, DocumentPipelineExecutionLog, Pipeline, PipelineCustomizedTemplate, PipelineRecommendedPlugin # type: ignore +from models.dataset import ( # type: ignore + Dataset, + Document, + DocumentPipelineExecutionLog, + Pipeline, + PipelineCustomizedTemplate, + PipelineRecommendedPlugin, +) from models.enums import WorkflowRunTriggeredFrom from models.model import EndUser from models.workflow import ( @@ -1320,8 +1325,11 @@ class RagPipelineService: """ Retry error document """ - document_pipeline_excution_log = db.session.query(DocumentPipelineExecutionLog).filter( - DocumentPipelineExecutionLog.document_id == document.id).first() + document_pipeline_excution_log = ( + db.session.query(DocumentPipelineExecutionLog) + .filter(DocumentPipelineExecutionLog.document_id == document.id) + .first() + ) if not document_pipeline_excution_log: raise ValueError("Document pipeline execution log not found") pipeline = db.session.query(Pipeline).filter(Pipeline.id == document_pipeline_excution_log.pipeline_id).first()