Skip to content

Commit e6bf5e4

Browse files
committed
reformat
1 parent 99a0178 commit e6bf5e4

File tree

4 files changed

+34
-28
lines changed

4 files changed

+34
-28
lines changed

api/controllers/console/auth/login.py

+17-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
from typing import cast
22

33
import flask_login # type: ignore
4+
from flask import request
5+
from flask_restful import Resource, reqparse # type: ignore
6+
47
import services
58
from constants.languages import languages
69
from controllers.console import api
7-
from controllers.console.auth.error import (EmailCodeError,
8-
EmailOrPasswordMismatchError,
9-
EmailPasswordLoginLimitError,
10-
InvalidEmailError,
11-
InvalidTokenError)
12-
from controllers.console.error import (AccountBannedError, AccountNotFound,
13-
EmailSendIpLimitError,
14-
NotAllowedCreateWorkspace)
10+
from controllers.console.auth.error import (
11+
EmailCodeError,
12+
EmailOrPasswordMismatchError,
13+
EmailPasswordLoginLimitError,
14+
InvalidEmailError,
15+
InvalidTokenError,
16+
)
17+
from controllers.console.error import (
18+
AccountBannedError,
19+
AccountNotFound,
20+
EmailSendIpLimitError,
21+
NotAllowedCreateWorkspace,
22+
)
1523
from controllers.console.wraps import setup_required
1624
from events.tenant_event import tenant_was_created
17-
from flask import request
18-
from flask_restful import Resource, reqparse # type: ignore
1925
from libs.helper import email, extract_remote_ip
2026
from libs.password import valid_password
2127
from models.account import Account
22-
from services.account_service import (AccountService, RegisterService,
23-
TenantService)
28+
from services.account_service import AccountService, RegisterService, TenantService
2429
from services.errors.workspace import WorkSpaceNotAllowedCreateError
2530
from services.feature_service import FeatureService
2631

api/controllers/console/workspace/account.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
import datetime
22

33
import pytz
4+
from flask import request
5+
from flask_login import current_user # type: ignore
6+
from flask_restful import Resource, fields, marshal_with, reqparse # type: ignore
7+
48
from configs import dify_config
59
from constants.languages import supported_language
610
from controllers.console import api
711
from controllers.console.workspace.error import (
8-
AccountAlreadyInitedError, CurrentPasswordIncorrectError,
9-
InvalidAccountDeletionCodeError, InvalidInvitationCodeError,
10-
RepeatPasswordNotMatchError)
11-
from controllers.console.wraps import (account_initialization_required,
12-
enterprise_license_required,
13-
setup_required)
12+
AccountAlreadyInitedError,
13+
CurrentPasswordIncorrectError,
14+
InvalidAccountDeletionCodeError,
15+
InvalidInvitationCodeError,
16+
RepeatPasswordNotMatchError,
17+
)
18+
from controllers.console.wraps import account_initialization_required, enterprise_license_required, setup_required
1419
from extensions.ext_database import db
1520
from fields.member_fields import account_fields
16-
from flask import request
17-
from flask_login import current_user # type: ignore
18-
from flask_restful import (Resource, fields, marshal_with, # type: ignore
19-
reqparse)
2021
from libs.helper import TimestampField, timezone
2122
from libs.login import login_required
2223
from models import AccountIntegrate, InvitationCode
2324
from services.account_service import AccountService
2425
from services.billing_service import BillingService
25-
from services.errors.account import \
26-
CurrentPasswordIncorrectError as ServiceCurrentPasswordIncorrectError
26+
from services.errors.account import CurrentPasswordIncorrectError as ServiceCurrentPasswordIncorrectError
2727

2828

2929
class AccountInitApi(Resource):

api/libs/helper.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
from typing import Any, Optional, Union, cast
1313
from zoneinfo import available_timezones
1414

15+
from flask import Response, stream_with_context
16+
from flask_restful import fields # type: ignore
17+
1518
from configs import dify_config
1619
from core.app.features.rate_limiting.rate_limit import RateLimitGenerator
1720
from core.file import helpers as file_helpers
1821
from extensions.ext_redis import redis_client
19-
from flask import Response, stream_with_context
20-
from flask_restful import fields # type: ignore
2122
from models.account import Account
2223

2324

api/services/billing_service.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
from typing import Optional
33

44
import httpx
5+
from tenacity import retry, retry_if_exception_type, stop_before_delay, wait_fixed
6+
57
from extensions.ext_database import db
68
from models.account import TenantAccountJoin, TenantAccountRole
7-
from tenacity import (retry, retry_if_exception_type, stop_before_delay,
8-
wait_fixed)
99

1010

1111
class BillingService:

0 commit comments

Comments
 (0)