estel/dify
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: update saas billing hint. (#7760)

Browse Source
This commit is contained in:
Garfield Dai
2024-08-28 18:55:47 +08:00
committed by GitHub
parent 1262277714
commit 54b693d5b1
3 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/controllers/console/datasets/file.py
View File

@@ -39,7 +39,7 @@ class FileApi(Resource):
@login_required @login_required
@account_initialization_required @account_initialization_required
@marshal_with(file_fields) @marshal_with(file_fields)
@cloud_edition_billing_resource_check(resource="documents") @cloud_edition_billing_resource_check("documents")
def post(self): def post(self):
# get file from request # get file from request
file = request.files["file"] file = request.files["file"]

26
api/controllers/console/wraps.py
View File

@@ -46,9 +46,7 @@ def only_edition_self_hosted(view):
return decorated return decorated
def cloud_edition_billing_resource_check( def cloud_edition_billing_resource_check(resource: str):
resource: str, error_msg: str = "You have reached the limit of your subscription."
):
def interceptor(view): def interceptor(view):
@wraps(view) @wraps(view)
def decorated(*args, **kwargs): def decorated(*args, **kwargs):
@@ -60,22 +58,22 @@ def cloud_edition_billing_resource_check(
documents_upload_quota = features.documents_upload_quota documents_upload_quota = features.documents_upload_quota
annotation_quota_limit = features.annotation_quota_limit annotation_quota_limit = features.annotation_quota_limit
if resource == "members" and 0 < members.limit <= members.size: if resource == "members" and 0 < members.limit <= members.size:
abort(403, error_msg) abort(403, "The number of members has reached the limit of your subscription.")
elif resource == "apps" and 0 < apps.limit <= apps.size: elif resource == "apps" and 0 < apps.limit <= apps.size:
abort(403, error_msg) abort(403, "The number of apps has reached the limit of your subscription.")
elif resource == "vector_space" and 0 < vector_space.limit <= vector_space.size: elif resource == "vector_space" and 0 < vector_space.limit <= vector_space.size:
abort(403, error_msg) abort(403, "The capacity of the vector space has reached the limit of your subscription.")
elif resource == "documents" and 0 < documents_upload_quota.limit <= documents_upload_quota.size: elif resource == "documents" and 0 < documents_upload_quota.limit <= documents_upload_quota.size:
# The api of file upload is used in the multiple places, so we need to check the source of the request from datasets # The api of file upload is used in the multiple places, so we need to check the source of the request from datasets
source = request.args.get("source") source = request.args.get("source")
if source == "datasets": if source == "datasets":
abort(403, error_msg) abort(403, "The number of documents has reached the limit of your subscription.")
else: else:
return view(*args, **kwargs) return view(*args, **kwargs)
elif resource == "workspace_custom" and not features.can_replace_logo: elif resource == "workspace_custom" and not features.can_replace_logo:
abort(403, error_msg) abort(403, "The workspace custom feature has reached the limit of your subscription.")
elif resource == "annotation" and 0 < annotation_quota_limit.limit < annotation_quota_limit.size: elif resource == "annotation" and 0 < annotation_quota_limit.limit < annotation_quota_limit.size:
abort(403, error_msg) abort(403, "The annotation quota has reached the limit of your subscription.")
else: else:
return view(*args, **kwargs) return view(*args, **kwargs)
@@ -86,10 +84,7 @@ def cloud_edition_billing_resource_check(
return interceptor return interceptor
def cloud_edition_billing_knowledge_limit_check( def cloud_edition_billing_knowledge_limit_check(resource: str):
resource: str,
error_msg: str = "To unlock this feature and elevate your Dify experience, please upgrade to a paid plan.",
):
def interceptor(view): def interceptor(view):
@wraps(view) @wraps(view)
def decorated(*args, **kwargs): def decorated(*args, **kwargs):
@@ -97,7 +92,10 @@ def cloud_edition_billing_knowledge_limit_check(
if features.billing.enabled: if features.billing.enabled:
if resource == "add_segment": if resource == "add_segment":
if features.billing.subscription.plan == "sandbox": if features.billing.subscription.plan == "sandbox":
abort(403, error_msg) abort(
403,
"To unlock this feature and elevate your Dify experience, please upgrade to a paid plan.",
)
else: else:
return view(*args, **kwargs) return view(*args, **kwargs)

22
api/controllers/service_api/wraps.py
View File

@@ -83,9 +83,7 @@ def validate_app_token(view: Optional[Callable] = None, *, fetch_user_arg: Optio
return decorator(view) return decorator(view)
def cloud_edition_billing_resource_check( def cloud_edition_billing_resource_check(resource: str, api_token_type: str):
resource: str, api_token_type: str, error_msg: str = "You have reached the limit of your subscription."
):
def interceptor(view): def interceptor(view):
def decorated(*args, **kwargs): def decorated(*args, **kwargs):
api_token = validate_and_get_api_token(api_token_type) api_token = validate_and_get_api_token(api_token_type)
@@ -98,13 +96,13 @@ def cloud_edition_billing_resource_check(
documents_upload_quota = features.documents_upload_quota documents_upload_quota = features.documents_upload_quota
if resource == "members" and 0 < members.limit <= members.size: if resource == "members" and 0 < members.limit <= members.size:
raise Forbidden(error_msg) raise Forbidden("The number of members has reached the limit of your subscription.")
elif resource == "apps" and 0 < apps.limit <= apps.size: elif resource == "apps" and 0 < apps.limit <= apps.size:
raise Forbidden(error_msg) raise Forbidden("The number of apps has reached the limit of your subscription.")
elif resource == "vector_space" and 0 < vector_space.limit <= vector_space.size: elif resource == "vector_space" and 0 < vector_space.limit <= vector_space.size:
raise Forbidden(error_msg) raise Forbidden("The capacity of the vector space has reached the limit of your subscription.")
elif resource == "documents" and 0 < documents_upload_quota.limit <= documents_upload_quota.size: elif resource == "documents" and 0 < documents_upload_quota.limit <= documents_upload_quota.size:
raise Forbidden(error_msg) raise Forbidden("The number of documents has reached the limit of your subscription.")
else: else:
return view(*args, **kwargs) return view(*args, **kwargs)
@@ -115,11 +113,7 @@ def cloud_edition_billing_resource_check(
return interceptor return interceptor
def cloud_edition_billing_knowledge_limit_check( def cloud_edition_billing_knowledge_limit_check(resource: str, api_token_type: str):
resource: str,
api_token_type: str,
error_msg: str = "To unlock this feature and elevate your Dify experience, please upgrade to a paid plan.",
):
def interceptor(view): def interceptor(view):
@wraps(view) @wraps(view)
def decorated(*args, **kwargs): def decorated(*args, **kwargs):
@@ -128,7 +122,9 @@ def cloud_edition_billing_knowledge_limit_check(
if features.billing.enabled: if features.billing.enabled:
if resource == "add_segment": if resource == "add_segment":
if features.billing.subscription.plan == "sandbox": if features.billing.subscription.plan == "sandbox":
raise Forbidden(error_msg) raise Forbidden(
"To unlock this feature and elevate your Dify experience, please upgrade to a paid plan."
)
else: else:
return view(*args, **kwargs) return view(*args, **kwargs)