diff --git a/api/apps/sdk/chat.py b/api/apps/sdk/chat.py index 9c436e7b3..aae20f9fb 100644 --- a/api/apps/sdk/chat.py +++ b/api/apps/sdk/chat.py @@ -14,10 +14,7 @@ # limitations under the License. # import logging - -import trio from quart import request - from api.db.services.dialog_service import DialogService from api.db.services.knowledgebase_service import KnowledgebaseService from api.db.services.tenant_llm_service import TenantLLMService @@ -254,7 +251,6 @@ async def delete(tenant_id): temp_dict = {"status": StatusEnum.INVALID.value} DialogService.update_by_id(id, temp_dict) success_count += 1 - await trio.sleep(1) if errors: if success_count > 0: diff --git a/api/utils/api_utils.py b/api/utils/api_utils.py index 508dae6e6..0c6698762 100644 --- a/api/utils/api_utils.py +++ b/api/utils/api_utils.py @@ -213,28 +213,32 @@ def construct_json_result(code: RetCode = RetCode.SUCCESS, message="success", da def token_required(func): def get_tenant_id(**kwargs): if os.environ.get("DISABLE_SDK"): - return get_json_result(data=False, message="`Authorization` can't be empty") + return False, get_json_result(data=False, message="`Authorization` can't be empty") authorization_str = request.headers.get("Authorization") if not authorization_str: - return get_json_result(data=False, message="`Authorization` can't be empty") + return False, get_json_result(data=False, message="`Authorization` can't be empty") authorization_list = authorization_str.split() if len(authorization_list) < 2: - return get_json_result(data=False, message="Please check your authorization format.") + return False, get_json_result(data=False, message="Please check your authorization format.") token = authorization_list[1] objs = APIToken.query(token=token) if not objs: - return get_json_result(data=False, message="Authentication error: API key is invalid!", code=RetCode.AUTHENTICATION_ERROR) + return False, get_json_result(data=False, message="Authentication error: API key is invalid!", code=RetCode.AUTHENTICATION_ERROR) kwargs["tenant_id"] = objs[0].tenant_id - return kwargs + return True, kwargs @wraps(func) def decorated_function(*args, **kwargs): - kwargs = get_tenant_id(**kwargs) + e, kwargs = get_tenant_id(**kwargs) + if not e: + return kwargs return func(*args, **kwargs) @wraps(func) async def adecorated_function(*args, **kwargs): - kwargs = get_tenant_id(**kwargs) + e, kwargs = get_tenant_id(**kwargs) + if not e: + return kwargs return await func(*args, **kwargs) if inspect.iscoroutinefunction(func):