Skip to content

Commit cc9e741

Browse files
improve: introduce isort for linting Python imports (langgenius#1983)
1 parent cca9edc commit cc9e741

File tree

413 files changed

+1614
-1885
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

413 files changed

+1614
-1885
lines changed

.github/linters/.isort.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[settings]
2+
line_length=120

api/app.py

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,29 @@
1313
import langchain
1414
langchain.verbose = True
1515

16-
import time
17-
import logging
1816
import json
17+
import logging
1918
import threading
19+
import time
20+
import warnings
2021

21-
from flask import Flask, request, Response
22-
from flask_cors import CORS
23-
24-
from extensions import ext_celery, ext_sentry, ext_redis, ext_login, ext_migrate, \
25-
ext_database, ext_storage, ext_mail, ext_code_based_extension, ext_hosting_provider
22+
from commands import register_commands
23+
from config import CloudEditionConfig, Config
24+
from events import event_handlers
25+
from extensions import (ext_celery, ext_code_based_extension, ext_database, ext_hosting_provider, ext_login, ext_mail,
26+
ext_migrate, ext_redis, ext_sentry, ext_storage)
2627
from extensions.ext_database import db
2728
from extensions.ext_login import login_manager
28-
29+
from flask import Flask, Response, request
30+
from flask_cors import CORS
31+
from libs.passport import PassportService
2932
# DO NOT REMOVE BELOW
30-
from models import model, account, dataset, web, task, source, tool
31-
from events import event_handlers
33+
from models import account, dataset, model, source, task, tool, web
34+
from services.account_service import AccountService
35+
3236
# DO NOT REMOVE ABOVE
3337

34-
from config import Config, CloudEditionConfig
35-
from commands import register_commands
36-
from services.account_service import AccountService
37-
from libs.passport import PassportService
3838

39-
import warnings
4039
warnings.simplefilter("ignore", ResourceWarning)
4140

4241
# fix windows platform
@@ -136,10 +135,10 @@ def unauthorized_handler():
136135

137136
# register blueprint routers
138137
def register_blueprints(app):
139-
from controllers.service_api import bp as service_api_bp
140-
from controllers.web import bp as web_bp
141138
from controllers.console import bp as console_app_bp
142139
from controllers.files import bp as files_bp
140+
from controllers.service_api import bp as service_api_bp
141+
from controllers.web import bp as web_bp
143142

144143
CORS(service_api_bp,
145144
allow_headers=['Content-Type', 'Authorization', 'X-App-Code'],

api/commands.py

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
1+
import base64
12
import datetime
23
import json
34
import math
45
import random
6+
import secrets
57
import string
68
import threading
79
import time
810
import uuid
911

1012
import click
1113
import qdrant_client
12-
from qdrant_client.http.models import TextIndexParams, TextIndexType, TokenizerType
13-
from tqdm import tqdm
14-
from flask import current_app, Flask
15-
from werkzeug.exceptions import NotFound
16-
1714
from core.embedding.cached_embedding import CacheEmbedding
1815
from core.index.index import IndexBuilder
1916
from core.model_manager import ModelManager
2017
from core.model_runtime.entities.model_entities import ModelType
21-
from libs.password import password_pattern, valid_password, hash_password
22-
from libs.helper import email as email_validate
2318
from extensions.ext_database import db
19+
from flask import Flask, current_app
20+
from libs.helper import email as email_validate
21+
from libs.password import hash_password, password_pattern, valid_password
2422
from libs.rsa import generate_key_pair
2523
from models.account import InvitationCode, Tenant, TenantAccountJoin
26-
from models.dataset import Dataset, DatasetQuery, Document, DatasetCollectionBinding
27-
from models.model import Account, AppModelConfig, App, MessageAnnotation, Message
28-
import secrets
29-
import base64
30-
31-
from models.provider import Provider, ProviderType, ProviderQuotaType, ProviderModel
24+
from models.dataset import Dataset, DatasetCollectionBinding, DatasetQuery, Document
25+
from models.model import Account, App, AppModelConfig, Message, MessageAnnotation
26+
from models.provider import Provider, ProviderModel, ProviderQuotaType, ProviderType
27+
from qdrant_client.http.models import TextIndexParams, TextIndexType, TokenizerType
28+
from tqdm import tqdm
29+
from werkzeug.exceptions import NotFound
3230

3331

3432
@click.command('reset-password', help='Reset the account password.')
@@ -362,7 +360,7 @@ def create_qdrant_indexes():
362360
model_provider=model_provider)
363361
embeddings = CacheEmbedding(embedding_model)
364362

365-
from core.index.vector_index.qdrant_vector_index import QdrantVectorIndex, QdrantConfig
363+
from core.index.vector_index.qdrant_vector_index import QdrantConfig, QdrantVectorIndex
366364

367365
index = QdrantVectorIndex(
368366
dataset=dataset,
@@ -433,7 +431,7 @@ def update_qdrant_indexes():
433431
model_provider=model_provider)
434432
embeddings = CacheEmbedding(embedding_model)
435433

436-
from core.index.vector_index.qdrant_vector_index import QdrantVectorIndex, QdrantConfig
434+
from core.index.vector_index.qdrant_vector_index import QdrantConfig, QdrantVectorIndex
437435

438436
index = QdrantVectorIndex(
439437
dataset=dataset,
@@ -558,7 +556,7 @@ def deal_dataset_vector(flask_app: Flask, dataset: Dataset, normalization_count:
558556
db.session.add(dataset_collection_binding)
559557
db.session.commit()
560558

561-
from core.index.vector_index.qdrant_vector_index import QdrantVectorIndex, QdrantConfig
559+
from core.index.vector_index.qdrant_vector_index import QdrantConfig, QdrantVectorIndex
562560

563561
index = QdrantVectorIndex(
564562
dataset=dataset,

api/config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
import dotenv
55

6-
76
dotenv.load_dotenv()
87

98
DEFAULTS = {

api/constants/model_template.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import json
22

3-
from models.model import AppModelConfig, App
3+
from models.model import App, AppModelConfig
44

55
model_templates = {
66
# completion default mode

api/controllers/console/__init__.py

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
11
from flask import Blueprint
2-
32
from libs.external_api import ExternalApi
43

54
bp = Blueprint('console', __name__, url_prefix='/console/api')
65
api = ExternalApi(bp)
76

87
# Import other controllers
9-
from . import extension, setup, version, apikey, admin, feature
10-
8+
from . import admin, apikey, extension, feature, setup, version
119
# Import app controllers
12-
from .app import advanced_prompt_template, app, site, completion, model_config, statistic, conversation, message, generator, audio, annotation
13-
10+
from .app import (advanced_prompt_template, annotation, app, audio, completion, conversation, generator, message,
11+
model_config, site, statistic)
1412
# Import auth controllers
15-
from .auth import login, oauth, data_source_oauth, activate
16-
13+
from .auth import activate, data_source_oauth, login, oauth
14+
from .billing import billing
1715
# Import datasets controllers
18-
from .datasets import datasets, datasets_document, datasets_segments, file, hit_testing, data_source
19-
20-
# Import workspace controllers
21-
from .workspace import workspace, members, model_providers, account, tool_providers, models
22-
16+
from .datasets import data_source, datasets, datasets_document, datasets_segments, file, hit_testing
2317
# Import explore controllers
24-
from .explore import installed_app, recommended_app, completion, conversation, message, parameter, saved_message, audio
25-
18+
from .explore import audio, completion, conversation, installed_app, message, parameter, recommended_app, saved_message
2619
# Import universal chat controllers
27-
from .universal_chat import chat, conversation, message, parameter, audio
28-
29-
from .billing import billing
20+
from .universal_chat import audio, chat, conversation, message, parameter
21+
# Import workspace controllers
22+
from .workspace import account, members, model_providers, models, tool_providers, workspace

api/controllers/console/admin.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import os
22
from functools import wraps
33

4-
from flask import request
5-
from flask_restful import Resource, reqparse
6-
from werkzeug.exceptions import NotFound, Unauthorized
7-
84
from controllers.console import api
95
from controllers.console.wraps import only_edition_cloud
106
from extensions.ext_database import db
7+
from flask import request
8+
from flask_restful import Resource, reqparse
119
from libs.helper import supported_language
12-
from models.model import RecommendedApp, App, InstalledApp
10+
from models.model import App, InstalledApp, RecommendedApp
11+
from werkzeug.exceptions import NotFound, Unauthorized
1312

1413

1514
def admin_required(view):

api/controllers/console/apikey.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
from flask_login import current_user
2-
from libs.login import login_required
31
import flask_restful
4-
from flask_restful import Resource, fields, marshal_with
5-
from werkzeug.exceptions import Forbidden
6-
72
from extensions.ext_database import db
8-
from models.model import App, ApiToken
3+
from flask_login import current_user
4+
from flask_restful import Resource, fields, marshal_with
5+
from libs.helper import TimestampField
6+
from libs.login import login_required
97
from models.dataset import Dataset
8+
from models.model import ApiToken, App
9+
from werkzeug.exceptions import Forbidden
1010

1111
from . import api
1212
from .setup import setup_required
1313
from .wraps import account_initialization_required
14-
from libs.helper import TimestampField
1514

1615
api_key_fields = {
1716
'id': fields.String,

api/controllers/console/app/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
from flask_login import current_user
2-
from werkzeug.exceptions import NotFound
3-
41
from controllers.console.app.error import AppUnavailableError
52
from extensions.ext_database import db
3+
from flask_login import current_user
64
from models.model import App
5+
from werkzeug.exceptions import NotFound
76

87

98
def _get_app(app_id, mode=None):

api/controllers/console/app/advanced_prompt_template.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from flask_restful import Resource, reqparse
2-
31
from controllers.console import api
42
from controllers.console.setup import setup_required
53
from controllers.console.wraps import account_initialization_required
4+
from flask_restful import Resource, reqparse
65
from libs.login import login_required
76
from services.advanced_prompt_template_service import AdvancedPromptTemplateService
87

8+
99
class AdvancedPromptTemplateList(Resource):
1010

1111
@setup_required

0 commit comments

Comments
 (0)