Skip to content

Commit 18dce66

Browse files
try flask_restful -> flask_restx (langgenius#24310)
Signed-off-by: -LAN- <laipz8200@outlook.com> Co-authored-by: -LAN- <laipz8200@outlook.com>
1 parent b84bb41 commit 18dce66

141 files changed

Lines changed: 176 additions & 168 deletions

File tree

Some content is hidden

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

api/controllers/common/fields.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flask_restful import fields
1+
from flask_restx import fields
22

33
from libs.helper import AppIconUrlField
44

api/controllers/console/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from functools import wraps
22

33
from flask import request
4-
from flask_restful import Resource, reqparse
4+
from flask_restx import Resource, reqparse
55
from sqlalchemy import select
66
from sqlalchemy.orm import Session
77
from werkzeug.exceptions import NotFound, Unauthorized

api/controllers/console/apikey.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from typing import Any, Optional
22

3-
import flask_restful
3+
import flask_restx
44
from flask_login import current_user
5-
from flask_restful import Resource, fields, marshal_with
5+
from flask_restx import Resource, fields, marshal_with
66
from sqlalchemy import select
77
from sqlalchemy.orm import Session
88
from werkzeug.exceptions import Forbidden
@@ -40,7 +40,7 @@ def _get_resource(resource_id, tenant_id, resource_model):
4040
).scalar_one_or_none()
4141

4242
if resource is None:
43-
flask_restful.abort(404, message=f"{resource_model.__name__} not found.")
43+
flask_restx.abort(404, message=f"{resource_model.__name__} not found.")
4444

4545
return resource
4646

@@ -81,7 +81,7 @@ def post(self, resource_id):
8181
)
8282

8383
if current_key_count >= self.max_keys:
84-
flask_restful.abort(
84+
flask_restx.abort(
8585
400,
8686
message=f"Cannot create more than {self.max_keys} API keys for this resource type.",
8787
code="max_keys_exceeded",
@@ -126,7 +126,7 @@ def delete(self, resource_id, api_key_id):
126126
)
127127

128128
if key is None:
129-
flask_restful.abort(404, message="API key not found")
129+
flask_restx.abort(404, message="API key not found")
130130

131131
db.session.query(ApiToken).where(ApiToken.id == api_key_id).delete()
132132
db.session.commit()

api/controllers/console/app/advanced_prompt_template.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flask_restful import Resource, reqparse
1+
from flask_restx import Resource, reqparse
22

33
from controllers.console import api
44
from controllers.console.wraps import account_initialization_required, setup_required

api/controllers/console/app/agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flask_restful import Resource, reqparse
1+
from flask_restx import Resource, reqparse
22

33
from controllers.console import api
44
from controllers.console.app.wraps import get_app_model

api/controllers/console/app/annotation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from flask import request
44
from flask_login import current_user
5-
from flask_restful import Resource, marshal, marshal_with, reqparse
5+
from flask_restx import Resource, marshal, marshal_with, reqparse
66
from werkzeug.exceptions import Forbidden
77

88
from controllers.common.errors import NoFileUploadedError, TooManyFilesError

api/controllers/console/app/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from typing import cast
33

44
from flask_login import current_user
5-
from flask_restful import Resource, inputs, marshal, marshal_with, reqparse
5+
from flask_restx import Resource, inputs, marshal, marshal_with, reqparse
66
from sqlalchemy import select
77
from sqlalchemy.orm import Session
88
from werkzeug.exceptions import BadRequest, Forbidden, abort

api/controllers/console/app/app_import.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import cast
22

33
from flask_login import current_user
4-
from flask_restful import Resource, marshal_with, reqparse
4+
from flask_restx import Resource, marshal_with, reqparse
55
from sqlalchemy.orm import Session
66
from werkzeug.exceptions import Forbidden
77

api/controllers/console/app/audio.py

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

33
from flask import request
4-
from flask_restful import Resource, reqparse
4+
from flask_restx import Resource, reqparse
55
from werkzeug.exceptions import InternalServerError
66

77
import services

api/controllers/console/app/completion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import flask_login
44
from flask import request
5-
from flask_restful import Resource, reqparse
5+
from flask_restx import Resource, reqparse
66
from werkzeug.exceptions import InternalServerError, NotFound
77

88
import services

0 commit comments

Comments
 (0)