pengjunjie/ragflow
1
0
Fork 1
mirror of https://github.com/infiniflow/ragflow.git synced 2025-12-08 20:42:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor api util (#2849)

Browse Source 
### What problem does this PR solve?


### Type of change

- [x] Refactoring
This commit is contained in:
Kevin Hu
2024-10-15 16:11:26 +08:00
committed by GitHub
parent ce495e4e3e
commit c8783672d7
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
api/utils/api_utils.py
View File

@ -29,6 +29,7 @@ from flask import (
Response, jsonify, send_file, make_response,
request as flask_request,
)
from itsdangerous import URLSafeTimedSerializer
from werkzeug.http import HTTP_STATUS_CODES
from api.db.db_models import APIToken
@ -37,7 +38,7 @@ from api.settings import (
stat_logger, CLIENT_AUTHENTICATION, HTTP_APP_KEY, SECRET_KEY
)
from api.settings import RetCode
from api.utils import CustomJSONEncoder
from api.utils import CustomJSONEncoder, get_uuid
from api.utils import json_dumps
requests.models.complexjson.dumps = functools.partial(
@ -52,7 +53,7 @@ def request(**kwargs):
k.replace(
'_',
'-').upper(): v for k,
v in kwargs.get(
v in kwargs.get(
'headers',
{}).items()}
prepped = requests.Request(**kwargs).prepare()
@ -269,6 +270,7 @@ def token_required(func):
return decorated_function
def get_result(retcode=RetCode.SUCCESS, retmsg='error', data=None):
if retcode == 0:
if data is not None:
@ -276,10 +278,11 @@ def get_result(retcode=RetCode.SUCCESS, retmsg='error', data=None):
else:
response = {"code": retcode}
else:
response = {"code": retcode, "message": retmsg}
response = {"code": retcode, "message": retmsg}
return jsonify(response)
def get_error_data_result(retmsg='Sorry! Data missing!',retcode=RetCode.DATA_ERROR,
def get_error_data_result(retmsg='Sorry! Data missing!', retcode=RetCode.DATA_ERROR,
):
import re
result_dict = {
@ -295,4 +298,9 @@ def get_error_data_result(retmsg='Sorry! Data missing!',retcode=RetCode.DATA_ERR
continue
else:
response[key] = value
return jsonify(response)
return jsonify(response)
def generate_confirmation_token(tenent_id):
serializer = URLSafeTimedSerializer(tenent_id)
return "ragflow-" + serializer.dumps(get_uuid(), salt=tenent_id)[2:34]