Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

ci: enable Ruff TID252 (#44108)

Asuka Minato76f911c64fbd
diff --git a/api/.ruff.toml b/api/.ruff.toml
index 63c2a048fc3..004d9828e8f 100644
--- a/api/.ruff.toml
+++ b/api/.ruff.toml
@@ -77,7 +77,6 @@ ignore = [
"SIM105", # suppressible-exception
"SIM108", # if-else-block-instead-of-if-exp
"SIM117", # multiple-with-statements
- "TID252", # allow relative imports from parent modules
]
[lint.per-file-ignores]
diff --git a/api/controllers/console/app/app_import.py b/api/controllers/console/app/app_import.py
index 5ca4a94cdc4..a35922b5982 100644
--- a/api/controllers/console/app/app_import.py
+++ b/api/controllers/console/app/app_import.py
@@ -7,6 +7,7 @@ from werkzeug.exceptions import Forbidden
from controllers.common.rbac import PlainApp, RBACCheck, Workspace
from controllers.common.schema import register_enum_models, register_response_schema_models, register_schema_models
+from controllers.console import console_ns
from controllers.console.app.error import AppNotFoundError
from controllers.console.explore.error import RecommendedAppNotFoundError as RecommendedAppNotFoundHttpError
from controllers.console.flask_admission import console_account_admission
@@ -27,8 +28,6 @@ from services.entities.dsl_entities import AppImportParams, CheckDependenciesRes
from services.errors.base import NoPermissionError
from services.recommended_app_query_service import RecommendedAppNotFoundError
-from .. import console_ns
-
class AppImportPayload(AppImportParams):
pass
diff --git a/api/controllers/console/app/workflow_trigger.py b/api/controllers/console/app/workflow_trigger.py
index 9e33e0a01ae..1b9d1d0ebf1 100644
--- a/api/controllers/console/app/workflow_trigger.py
+++ b/api/controllers/console/app/workflow_trigger.py
@@ -11,16 +11,9 @@ from configs import dify_config
from controllers.common.rbac import PlainApp, RBACCheck
from controllers.common.schema import query_params_from_model, register_schema_models
from controllers.common.session import with_session
-from fields.base import ResponseModel
-from libs.helper import dump_response
-from libs.login import login_required
-from models.enums import AppTriggerStatus
-from models.model import App, AppMode
-from models.trigger import AppTrigger, WorkflowWebhookTrigger
-
-from .. import console_ns
-from ..app.wraps import get_app_model
-from ..wraps import (
+from controllers.console import console_ns
+from controllers.console.app.wraps import get_app_model
+from controllers.console.wraps import (
RBACPermission,
account_initialization_required,
edit_permission_required,
@@ -29,6 +22,12 @@ from ..wraps import (
setup_required,
with_current_tenant_id,
)
+from fields.base import ResponseModel
+from libs.helper import dump_response
+from libs.login import login_required
+from models.enums import AppTriggerStatus
+from models.model import App, AppMode
+from models.trigger import AppTrigger, WorkflowWebhookTrigger
logger = logging.getLogger(__name__)
diff --git a/api/controllers/console/auth/data_source_oauth.py b/api/controllers/console/auth/data_source_oauth.py
index d99756195fe..3ea9e45a112 100644
--- a/api/controllers/console/auth/data_source_oauth.py
+++ b/api/controllers/console/auth/data_source_oauth.py
@@ -17,6 +17,7 @@ from controllers.common.schema import (
register_response_schema_models,
register_schema_models,
)
+from controllers.console import console_ns
from controllers.console.flask_admission import console_account_admission
from core.rbac import RBACPermission
from extensions.ext_application_services import application_services
@@ -32,8 +33,6 @@ from services.data_source.oauth_service import (
InvalidDataSourceOAuthProviderError,
)
-from .. import console_ns
-
logger = logging.getLogger(__name__)
diff --git a/api/controllers/console/auth/email_register.py b/api/controllers/console/auth/email_register.py
index de6c3b90cfa..b035d15bfd6 100644
--- a/api/controllers/console/auth/email_register.py
+++ b/api/controllers/console/auth/email_register.py
@@ -15,6 +15,12 @@ from controllers.console.auth.error import (
NormalizedEmailAlreadyInUseError,
PasswordMismatchError,
)
+from controllers.console.error import (
+ AccountInFreezeError,
+ EmailDomainSuspendedError,
+ EmailSendIpLimitError,
+ SeatsLimitExceeded,
+)
from controllers.console.flask_admission import console_email_registration_admission
from controllers.console.wraps import model_validate
from extensions.ext_application_services import application_services
@@ -38,8 +44,6 @@ from services.account_errors import (
InvalidEmailRegistrationTokenError,
)
-from ..error import AccountInFreezeError, EmailDomainSuspendedError, EmailSendIpLimitError, SeatsLimitExceeded
-
class EmailRegisterSendPayload(BaseModel):
email: EmailStr = Field(..., description="Email address")
diff --git a/api/controllers/console/auth/oauth.py b/api/controllers/console/auth/oauth.py
index 5ff5a86c3d5..daef2d7f404 100644
--- a/api/controllers/console/auth/oauth.py
+++ b/api/controllers/console/auth/oauth.py
@@ -9,6 +9,7 @@ from configs import dify_config
from constants.languages import languages
from controllers.common.fields import RedirectResponse
from controllers.common.schema import query_params_from_model, register_response_schema_models, register_schema_models
+from controllers.console import console_ns
from controllers.console.error import AccountInFreezeError, EmailDomainSuspendedError
from controllers.console.wraps import model_validate, setup_required, social_oauth_login_enabled
from extensions.ext_application_services import application_services
@@ -44,8 +45,6 @@ from services.entities.account_oauth_entities import (
OAuthInvitationResult,
)
-from .. import console_ns
-
class OAuthLoginQuery(BaseModel):
invite_token: str | None = Field(default=None, description="Optional invitation token")
diff --git a/api/controllers/console/auth/oauth_server.py b/api/controllers/console/auth/oauth_server.py
index 501ee568379..03487a711f2 100644
--- a/api/controllers/console/auth/oauth_server.py
+++ b/api/controllers/console/auth/oauth_server.py
@@ -8,6 +8,7 @@ from pydantic import BaseModel, ValidationError, field_validator
from werkzeug.exceptions import BadRequest, NotFound, UnprocessableEntity
from controllers.common.schema import register_response_schema_models, register_schema_models
+from controllers.console import console_ns
from controllers.console.flask_admission import console_account_admission
from controllers.console.wraps import setup_required
from extensions.ext_application_services import application_services
@@ -20,8 +21,6 @@ from services.oauth_server_service import (
OAuthServerUnauthorizedError,
)
-from .. import console_ns
-
class OAuthClientPayload(BaseModel):
client_id: str
diff --git a/api/controllers/console/datasets/hit_testing.py b/api/controllers/console/datasets/hit_testing.py
index dff92c25da3..7307c50c68e 100644
--- a/api/controllers/console/datasets/hit_testing.py
+++ b/api/controllers/console/datasets/hit_testing.py
@@ -7,6 +7,7 @@ from sqlalchemy.orm import Session
from controllers.common.rbac import DatasetId, RBACCheck
from controllers.common.schema import register_response_schema_models, register_schema_models
+from controllers.console import console_ns
from controllers.console.app.error import (
CompletionRequestError,
ProviderModelCurrentlyNotSupportError,
@@ -14,22 +15,21 @@ from controllers.console.app.error import (
ProviderQuotaExceededError,
)
from controllers.console.app.wraps import with_session
-from controllers.console.wraps import RBACPermission, rbac_permission_required
-from fields.hit_testing_fields import HitTestingResponse
-from libs.external_api import error_responses
-from libs.helper import dump_response
-from libs.login import login_required
-from models import Account
-
-from .. import console_ns
-from ..datasets.hit_testing_base import DatasetsHitTestingBase, HitTestingPayload
-from ..wraps import (
+from controllers.console.datasets.hit_testing_base import DatasetsHitTestingBase, HitTestingPayload
+from controllers.console.wraps import (
+ RBACPermission,
account_initialization_required,
cloud_edition_billing_rate_limit_check,
+ rbac_permission_required,
setup_required,
with_current_tenant_id,
with_current_user,
)
+from fields.hit_testing_fields import HitTestingResponse
+from libs.external_api import error_responses
+from libs.helper import dump_response
+from libs.login import login_required
+from models import Account
register_schema_models(console_ns, HitTestingPayload)
register_response_schema_models(console_ns, HitTestingResponse)
diff --git a/api/controllers/console/explore/completion.py b/api/controllers/console/explore/completion.py
index 8e82a414cf0..b8a1e1b76b8 100644
--- a/api/controllers/console/explore/completion.py
+++ b/api/controllers/console/explore/completion.py
@@ -11,6 +11,7 @@ import services
from controllers.common.errors import InternalServerError, NotFoundError, UnauthorizedError
from controllers.common.fields import SimpleResultResponse
from controllers.common.schema import register_response_schema_models, register_schema_models
+from controllers.console import console_ns
from controllers.console.app.error import (
AppUnavailableError,
CompletionRequestError,
@@ -42,8 +43,6 @@ from services.errors.llm import InvokeRateLimitError
from services.installed_app_access_service import InstalledAppNotFoundError, InstalledAppRef
from services.installed_app_generation_service import InstalledAppNotChatError, InstalledAppNotCompletionError
-from .. import console_ns
-
logger = logging.getLogger(__name__)
diff --git a/api/controllers/console/explore/workflow.py b/api/controllers/console/explore/workflow.py
index 98d9200a85e..e14d135fb4a 100644
--- a/api/controllers/console/explore/workflow.py
+++ b/api/controllers/console/explore/workflow.py
@@ -8,6 +8,7 @@ from controllers.common.controller_schemas import WorkflowRunPayload
from controllers.common.errors import InternalServerError, UnauthorizedError
from controllers.common.fields import SimpleResultResponse
from controllers.common.schema import register_response_schema_models, register_schema_model
+from controllers.console import console_ns
from controllers.console.app.error import (
CompletionRequestError,
ProviderModelCurrentlyNotSupportError,
@@ -35,8 +36,6 @@ from services.errors.llm import InvokeRateLimitError
from services.installed_app_access_service import InstalledAppRef
from services.installed_app_generation_service import InstalledAppNotWorkflowError
-from .. import console_ns
-
logger = logging.getLogger(__name__)
register_schema_model(console_ns, WorkflowRunPayload)
diff --git a/api/controllers/console/extension.py b/api/controllers/console/extension.py
index 97a27b9f678..2b064daf855 100644
--- a/api/controllers/console/extension.py
+++ b/api/controllers/console/extension.py
@@ -6,6 +6,7 @@ from flask_restx import Resource
from pydantic import BaseModel, Field, RootModel, field_validator
from constants import HIDDEN_VALUE
+from controllers.common.schema import query_params_from_model, register_response_schema_models, register_schema_models
from controllers.console.flask_admission import console_account_admission
from extensions.ext_application_services import application_services
from fields.base import ResponseModel
@@ -20,7 +21,6 @@ from services.api_based_extension_application_service import (
)
from services.code_based_extension_service import CodeBasedExtensionService
-from ..common.schema import query_params_from_model, register_response_schema_models, register_schema_models
from . import console_ns
from .wraps import account_initialization_required, model_validate, setup_required
diff --git a/api/controllers/console/workspace/trigger_providers.py b/api/controllers/console/workspace/trigger_providers.py
index c9d6074aa44..59669940162 100644
--- a/api/controllers/console/workspace/trigger_providers.py
+++ b/api/controllers/console/workspace/trigger_providers.py
@@ -12,6 +12,18 @@ from controllers.common.errors import NotFoundError
from controllers.common.fields import SimpleResultResponse
from controllers.common.rbac import RBACCheck, Workspace
from controllers.common.schema import register_response_schema_models, register_schema_models
+from controllers.console import console_ns
+from controllers.console.wraps import (
+ RBACPermission,
+ account_initialization_required,
+ edit_permission_required,
+ is_admin_or_owner_required,
+ model_validate,
+ rbac_permission_required,
+ setup_required,
+ with_current_tenant_id,
+ with_current_user,
+)
from core.entities.provider_entities import ProviderConfig
from core.plugin.entities.plugin_daemon import CredentialType
from core.plugin.impl.oauth import OAuthHandler
@@ -34,19 +46,6 @@ from services.trigger.trigger_provider_service import TriggerProviderService
from services.trigger.trigger_subscription_builder_service import TriggerSubscriptionBuilderService
from services.trigger.trigger_subscription_operator_service import TriggerSubscriptionOperatorService
-from .. import console_ns
-from ..wraps import (
- RBACPermission,
- account_initialization_required,
- edit_permission_required,
- is_admin_or_owner_required,
- model_validate,
- rbac_permission_required,
- setup_required,
- with_current_tenant_id,
- with_current_user,
-)
-
logger = logging.getLogger(__name__)
diff --git a/api/controllers/web/audio.py b/api/controllers/web/audio.py
index deb38502174..183d35603f2 100644
--- a/api/controllers/web/audio.py
+++ b/api/controllers/web/audio.py
@@ -7,6 +7,7 @@ from werkzeug.exceptions import InternalServerError
import services
from controllers.common.controller_schemas import TextToAudioPayload as TextToAudioPayloadBase
+from controllers.common.schema import register_response_schema_models, register_schema_models
from controllers.common.session import with_session
from controllers.console.wraps import model_validate
from controllers.web import web_ns
@@ -39,8 +40,6 @@ from services.errors.audio import (
UnsupportedAudioTypeServiceError,
)
-from ..common.schema import register_response_schema_models, register_schema_models
-
class AudioToTextResponse(ResponseModel):
text: str
diff --git a/api/controllers/web/remote_files.py b/api/controllers/web/remote_files.py
index 9de22e2b12d..4e852b809aa 100644
--- a/api/controllers/web/remote_files.py
+++ b/api/controllers/web/remote_files.py
@@ -14,6 +14,7 @@ from controllers.common.errors import (
RemoteFileUrlBlockedError,
UnsupportedFileTypeError,
)
+from controllers.common.schema import register_response_schema_models, register_schema_models
from controllers.console.wraps import model_validate
from extensions.ext_application_services import application_services
from fields.file_fields import FileWithSignedUrl, RemoteFileInfo
@@ -31,7 +32,6 @@ from services.remote_file_service import RemoteFileNotFoundError as RemoteFileNo
from services.remote_file_service import RemoteFileUnavailableError as RemoteFileUnavailableServiceError
from services.remote_file_service import RemoteFileUrlBlockedError as RemoteFileUrlBlockedServiceError
-from ..common.schema import register_response_schema_models, register_schema_models
from . import web_ns
from .wraps import WebApiResource