Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion api/.ruff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ ignore = [
"SIM108", # if-else-block-instead-of-if-exp
"SIM113", # enumerate-for-loop
"SIM117", # multiple-with-statements
"TID252", # allow relative imports from parent modules
]

[lint.per-file-ignores]
Expand Down
3 changes: 1 addition & 2 deletions api/controllers/console/app/app_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

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
Expand All @@ -27,8 +28,6 @@
from services.errors.base import NoPermissionError
from services.recommended_app_query_service import RecommendedAppNotFoundError

from .. import console_ns


class AppImportPayload(AppImportParams):
pass
Expand Down
19 changes: 9 additions & 10 deletions api/controllers/console/app/workflow_trigger.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,9 @@
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,
Expand All @@ -29,6 +22,12 @@
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__)

Expand Down
3 changes: 1 addition & 2 deletions api/controllers/console/auth/data_source_oauth.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
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
Expand All @@ -32,8 +33,6 @@
InvalidDataSourceOAuthProviderError,
)

from .. import console_ns

logger = logging.getLogger(__name__)


Expand Down
8 changes: 6 additions & 2 deletions api/controllers/console/auth/email_register.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
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
Expand All @@ -38,8 +44,6 @@
InvalidEmailRegistrationTokenError,
)

from ..error import AccountInFreezeError, EmailDomainSuspendedError, EmailSendIpLimitError, SeatsLimitExceeded


class EmailRegisterSendPayload(BaseModel):
email: EmailStr = Field(..., description="Email address")
Expand Down
3 changes: 1 addition & 2 deletions api/controllers/console/auth/oauth.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
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
Expand Down Expand Up @@ -44,8 +45,6 @@
OAuthInvitationResult,
)

from .. import console_ns


class OAuthLoginQuery(BaseModel):
invite_token: str | None = Field(default=None, description="Optional invitation token")
Expand Down
3 changes: 1 addition & 2 deletions api/controllers/console/auth/oauth_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
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
Expand All @@ -20,8 +21,6 @@
OAuthServerUnauthorizedError,
)

from .. import console_ns


class OAuthClientPayload(BaseModel):
client_id: str
Expand Down
20 changes: 10 additions & 10 deletions api/controllers/console/datasets/hit_testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@

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,
ProviderNotInitializeError,
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)
Expand Down
3 changes: 1 addition & 2 deletions api/controllers/console/explore/completion.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
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,
Expand Down Expand Up @@ -42,8 +43,6 @@
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__)


Expand Down
3 changes: 1 addition & 2 deletions api/controllers/console/explore/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
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,
Expand Down Expand Up @@ -35,8 +36,6 @@
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)
Expand Down
2 changes: 1 addition & 1 deletion api/controllers/console/extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
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
Expand All @@ -20,7 +21,6 @@
)
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

Expand Down
25 changes: 12 additions & 13 deletions api/controllers/console/workspace/trigger_providers.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@
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
Expand All @@ -34,19 +46,6 @@
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__)


Expand Down
3 changes: 1 addition & 2 deletions api/controllers/web/audio.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

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
Expand Down Expand Up @@ -39,8 +40,6 @@
UnsupportedAudioTypeServiceError,
)

from ..common.schema import register_response_schema_models, register_schema_models


class AudioToTextResponse(ResponseModel):
text: str
Expand Down
2 changes: 1 addition & 1 deletion api/controllers/web/remote_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
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
Expand All @@ -31,7 +32,6 @@
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

Expand Down
Loading