diff --git a/api/controllers/console/billing/compliance.py b/api/controllers/console/billing/compliance.py index d3648e1ad5..10a11e8ca0 100644 --- a/api/controllers/console/billing/compliance.py +++ b/api/controllers/console/billing/compliance.py @@ -1,4 +1,3 @@ - from flask import request from flask_login import current_user # type: ignore from flask_restful import Resource, reqparse # type: ignore @@ -8,8 +7,7 @@ from libs.login import login_required from services.billing_service import BillingService from .. import api -from ..wraps import (account_initialization_required, only_edition_cloud, - setup_required) +from ..wraps import account_initialization_required, only_edition_cloud, setup_required class ComplianceListApi(Resource): @@ -37,13 +35,10 @@ class ComplianceApi(Resource): ip_address = extract_remote_ip(request) device_info = request.headers.get("User-Agent", "Unknown device") - current_user_id = current_user.id - current_tenant_id = current_user.current_tenant_id - return BillingService.get_compliance_download_link( doc_name=args.doc_name, - account_id=current_user_id, - tenant_id=current_tenant_id, + account_id=current_user.id, + tenant_id=current_user.current_tenant_id, ip=ip_address, device_info=device_info, ) diff --git a/api/services/billing_service.py b/api/services/billing_service.py index 920c8e0974..ad141035cc 100644 --- a/api/services/billing_service.py +++ b/api/services/billing_service.py @@ -2,8 +2,7 @@ import os from typing import Literal, Optional import httpx -from tenacity import (retry, retry_if_exception_type, stop_before_delay, - wait_fixed) +from tenacity import retry, retry_if_exception_type, stop_before_delay, wait_fixed from extensions.ext_database import db from libs.helper import RateLimiter @@ -96,11 +95,6 @@ class BillingService: json = {"email": email, "feedback": feedback} return cls._send_request("POST", "/account/delete-feedback", json=json) - @classmethod - def list_compliance_files(cls, tenant_id: str, account_id: str): - params = {"account_id": account_id, "tenant_id": tenant_id} - return cls._send_request("GET", "/compliance/list", params=params) - @classmethod def get_compliance_download_link( cls, @@ -113,6 +107,7 @@ class BillingService: limiter_key = f"{account_id}:{tenant_id}" if cls.compliance_download_rate_limiter.is_rate_limited(limiter_key): from controllers.console.error import CompilanceRateLimitError + raise CompilanceRateLimitError() json = {