From 5a57dad93c165c6c53528e639eedeb0809d848a8 Mon Sep 17 00:00:00 2001 From: Yeuoly Date: Tue, 24 Dec 2024 21:29:24 +0800 Subject: [PATCH] fix: linter --- api/core/agent/cot_agent_runner.py | 3 +-- api/core/tools/tool_file_manager.py | 2 +- api/models/account.py | 2 +- api/models/model.py | 4 +--- api/models/provider.py | 4 +++- api/models/source.py | 1 - api/models/task.py | 1 + api/models/web.py | 3 ++- api/services/entities/model_provider_entities.py | 5 +++-- api/services/workflow_run_service.py | 3 +-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/api/core/agent/cot_agent_runner.py b/api/core/agent/cot_agent_runner.py index 810c5f3893..9089ef47b5 100644 --- a/api/core/agent/cot_agent_runner.py +++ b/api/core/agent/cot_agent_runner.py @@ -1,8 +1,7 @@ import json from abc import ABC, abstractmethod from collections.abc import Generator, Mapping, Sequence -from typing import Optional -from typing import Any +from typing import Any, Optional from core.agent.base_agent_runner import BaseAgentRunner from core.agent.entities import AgentScratchpadUnit diff --git a/api/core/tools/tool_file_manager.py b/api/core/tools/tool_file_manager.py index 99f84ca274..967cddac6c 100644 --- a/api/core/tools/tool_file_manager.py +++ b/api/core/tools/tool_file_manager.py @@ -218,6 +218,6 @@ class ToolFileManager: # init tool_file_parser -from core.file.tool_file_parser import tool_file_manager # noqa: E402 +from core.file.tool_file_parser import tool_file_manager tool_file_manager["manager"] = ToolFileManager diff --git a/api/models/account.py b/api/models/account.py index 16e229192d..4f8ca0530f 100644 --- a/api/models/account.py +++ b/api/models/account.py @@ -2,10 +2,10 @@ import enum import json from flask_login import UserMixin +from sqlalchemy import func from sqlalchemy.orm import Mapped, mapped_column from models.base import Base -from sqlalchemy import func from .engine import db from .types import StringUUID diff --git a/api/models/model.py b/api/models/model.py index 8a707a59e5..39b091b5c9 100644 --- a/api/models/model.py +++ b/api/models/model.py @@ -14,15 +14,13 @@ if TYPE_CHECKING: from models.workflow import Workflow from enum import StrEnum -from typing import Any, Literal +from typing import TYPE_CHECKING, Any, Literal, cast import sqlalchemy as sa from flask import request from flask_login import UserMixin from sqlalchemy import Float, Index, PrimaryKeyConstraint, func, text from sqlalchemy.orm import Mapped, Session, mapped_column -from typing import TYPE_CHECKING, cast - from configs import dify_config from core.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType diff --git a/api/models/provider.py b/api/models/provider.py index b7889be8b5..567400702d 100644 --- a/api/models/provider.py +++ b/api/models/provider.py @@ -1,7 +1,9 @@ from enum import Enum -from models.base import Base + from sqlalchemy import func +from models.base import Base + from .engine import db from .types import StringUUID diff --git a/api/models/source.py b/api/models/source.py index 7f976b5ed4..b9d7d91346 100644 --- a/api/models/source.py +++ b/api/models/source.py @@ -5,7 +5,6 @@ from sqlalchemy.dialects.postgresql import JSONB from models.base import Base - from .engine import db from .types import StringUUID diff --git a/api/models/task.py b/api/models/task.py index b42af31855..d853c1dd9a 100644 --- a/api/models/task.py +++ b/api/models/task.py @@ -3,6 +3,7 @@ from datetime import UTC, datetime from celery import states # type: ignore from models.base import Base + from .engine import db diff --git a/api/models/web.py b/api/models/web.py index 2b8caf0492..fe2f0c47f8 100644 --- a/api/models/web.py +++ b/api/models/web.py @@ -1,7 +1,8 @@ -from models.base import Base from sqlalchemy import func from sqlalchemy.orm import Mapped, mapped_column +from models.base import Base + from .engine import db from .model import Message from .types import StringUUID diff --git a/api/services/entities/model_provider_entities.py b/api/services/entities/model_provider_entities.py index 91875dd2f2..1034bcfa1d 100644 --- a/api/services/entities/model_provider_entities.py +++ b/api/services/entities/model_provider_entities.py @@ -4,11 +4,12 @@ from typing import Optional from pydantic import BaseModel, ConfigDict from configs import dify_config -from core.entities.model_entities import ModelWithProviderEntity, ProviderModelWithStatusEntity -from core.entities.provider_entities import ProviderQuotaType, QuotaConfiguration from core.entities.model_entities import ( + ModelWithProviderEntity, + ProviderModelWithStatusEntity, SimpleModelProviderEntity, ) +from core.entities.provider_entities import ProviderQuotaType, QuotaConfiguration from core.model_runtime.entities.common_entities import I18nObject from core.model_runtime.entities.model_entities import ModelType from core.model_runtime.entities.provider_entities import ( diff --git a/api/services/workflow_run_service.py b/api/services/workflow_run_service.py index 80b29814ac..0ddd18ea27 100644 --- a/api/services/workflow_run_service.py +++ b/api/services/workflow_run_service.py @@ -1,8 +1,7 @@ import threading - -import contexts from typing import Optional +import contexts from extensions.ext_database import db from libs.infinite_scroll_pagination import InfiniteScrollPagination from models.enums import WorkflowRunTriggeredFrom