diff --git a/api/apps/canvas_app.py b/api/apps/canvas_app.py index 16035f845..2e90c29c0 100644 --- a/api/apps/canvas_app.py +++ b/api/apps/canvas_app.py @@ -31,7 +31,8 @@ from api.db.services.user_service import TenantService from api.db.services.user_canvas_version import UserCanvasVersionService from common.constants import RetCode from common.misc_utils import get_uuid -from api.utils.api_utils import get_json_result, server_error_response, validate_request, get_data_error_result +from api.utils.api_utils import get_json_result, server_error_response, validate_request, get_data_error_result, \ + request_json from agent.canvas import Canvas from peewee import MySQLDatabase, PostgresqlDatabase from api.db.db_models import APIToken, Task @@ -55,7 +56,7 @@ def templates(): @validate_request("canvas_ids") @login_required async def rm(): - req = await request.json + req = await request_json() for i in req["canvas_ids"]: if not UserCanvasService.accessible(i, current_user.id): return get_json_result( @@ -69,7 +70,7 @@ async def rm(): @validate_request("dsl", "title") @login_required async def save(): - req = await request.json + req = await request_json() if not isinstance(req["dsl"], str): req["dsl"] = json.dumps(req["dsl"], ensure_ascii=False) req["dsl"] = json.loads(req["dsl"]) @@ -128,7 +129,7 @@ def getsse(canvas_id): @validate_request("id") @login_required async def run(): - req = await request.json + req = await request_json() query = req.get("query", "") files = req.get("files", []) inputs = req.get("inputs", {}) @@ -185,7 +186,7 @@ async def run(): @validate_request("id", "dsl", "component_id") @login_required async def rerun(): - req = await request.json + req = await request_json() doc = PipelineOperationLogService.get_documents_info(req["id"]) if not doc: return get_data_error_result(message="Document not found.") @@ -223,7 +224,7 @@ def cancel(task_id): @validate_request("id") @login_required async def reset(): - req = await request.json + req = await request_json() if not UserCanvasService.accessible(req["id"], current_user.id): return get_json_result( data=False, message='Only owner of canvas authorized for this operation.', @@ -342,7 +343,7 @@ def input_form(): @validate_request("id", "component_id", "params") @login_required async def debug(): - req = await request.json + req = await request_json() if not UserCanvasService.accessible(req["id"], current_user.id): return get_json_result( data=False, message='Only owner of canvas authorized for this operation.', @@ -374,7 +375,7 @@ async def debug(): @validate_request("db_type", "database", "username", "host", "port", "password") @login_required async def test_db_connect(): - req = await request.json + req = await request_json() try: if req["db_type"] in ["mysql", "mariadb"]: db = MySQLDatabase(req["database"], user=req["username"], host=req["host"], port=req["port"], @@ -519,7 +520,7 @@ def list_canvas(): @validate_request("id", "title", "permission") @login_required async def setting(): - req = await request.json + req = await request_json() req["user_id"] = current_user.id if not UserCanvasService.accessible(req["id"], current_user.id): diff --git a/api/apps/chunk_app.py b/api/apps/chunk_app.py index e96548041..7341e336a 100644 --- a/api/apps/chunk_app.py +++ b/api/apps/chunk_app.py @@ -26,7 +26,8 @@ from api.db.services.knowledgebase_service import KnowledgebaseService from api.db.services.llm_service import LLMBundle from api.db.services.search_service import SearchService from api.db.services.user_service import UserTenantService -from api.utils.api_utils import get_data_error_result, get_json_result, server_error_response, validate_request +from api.utils.api_utils import get_data_error_result, get_json_result, server_error_response, validate_request, \ + request_json from rag.app.qa import beAdoc, rmPrefix from rag.app.tag import label_question from rag.nlp import rag_tokenizer, search @@ -41,7 +42,7 @@ from api.apps import login_required, current_user @login_required @validate_request("doc_id") async def list_chunk(): - req = await request.json + req = await request_json() doc_id = req["doc_id"] page = int(req.get("page", 1)) size = int(req.get("size", 30)) @@ -122,7 +123,7 @@ def get(): @login_required @validate_request("doc_id", "chunk_id", "content_with_weight") async def set(): - req = await request.json + req = await request_json() d = { "id": req["chunk_id"], "content_with_weight": req["content_with_weight"]} @@ -179,7 +180,7 @@ async def set(): @login_required @validate_request("chunk_ids", "available_int", "doc_id") async def switch(): - req = await request.json + req = await request_json() try: e, doc = DocumentService.get_by_id(req["doc_id"]) if not e: @@ -199,7 +200,7 @@ async def switch(): @login_required @validate_request("chunk_ids", "doc_id") async def rm(): - req = await request.json + req = await request_json() try: e, doc = DocumentService.get_by_id(req["doc_id"]) if not e: @@ -223,7 +224,7 @@ async def rm(): @login_required @validate_request("doc_id", "content_with_weight") async def create(): - req = await request.json + req = await request_json() chunck_id = xxhash.xxh64((req["content_with_weight"] + req["doc_id"]).encode("utf-8")).hexdigest() d = {"id": chunck_id, "content_ltks": rag_tokenizer.tokenize(req["content_with_weight"]), "content_with_weight": req["content_with_weight"]} @@ -281,7 +282,7 @@ async def create(): @login_required @validate_request("kb_id", "question") async def retrieval_test(): - req = await request.json + req = await request_json() page = int(req.get("page", 1)) size = int(req.get("size", 30)) question = req["question"] diff --git a/api/apps/document_app.py b/api/apps/document_app.py index 7d97bfe25..7ec8c1587 100644 --- a/api/apps/document_app.py +++ b/api/apps/document_app.py @@ -36,7 +36,7 @@ from api.utils.api_utils import ( get_data_error_result, get_json_result, server_error_response, - validate_request, + validate_request, request_json, ) from api.utils.file_utils import filename_type, thumbnail from common.file_utils import get_project_base_directory @@ -153,7 +153,7 @@ async def web_crawl(): @login_required @validate_request("name", "kb_id") async def create(): - req = await request.json + req = await request_json() kb_id = req["kb_id"] if not kb_id: return get_json_result(data=False, message='Lack of "KB ID"', code=RetCode.ARGUMENT_ERROR) @@ -309,7 +309,7 @@ async def get_filter(): @manager.route("/infos", methods=["POST"]) # noqa: F821 @login_required async def doc_infos(): - req = await request.json + req = await request_json() doc_ids = req["doc_ids"] for doc_id in doc_ids: if not DocumentService.accessible(doc_id, current_user.id): @@ -381,7 +381,7 @@ async def change_status(): @login_required @validate_request("doc_id") async def rm(): - req = await request.json + req = await request_json() doc_ids = req["doc_id"] if isinstance(doc_ids, str): doc_ids = [doc_ids] @@ -402,7 +402,7 @@ async def rm(): @login_required @validate_request("doc_ids", "run") async def run(): - req = await request.json + req = await request_json() for doc_id in req["doc_ids"]: if not DocumentService.accessible(doc_id, current_user.id): return get_json_result(data=False, message="No authorization.", code=RetCode.AUTHENTICATION_ERROR) @@ -449,7 +449,7 @@ async def run(): @login_required @validate_request("doc_id", "name") async def rename(): - req = await request.json + req = await request_json() if not DocumentService.accessible(req["doc_id"], current_user.id): return get_json_result(data=False, message="No authorization.", code=RetCode.AUTHENTICATION_ERROR) try: @@ -539,7 +539,7 @@ async def download_attachment(attachment_id): @validate_request("doc_id") async def change_parser(): - req = await request.json + req = await request_json() if not DocumentService.accessible(req["doc_id"], current_user.id): return get_json_result(data=False, message="No authorization.", code=RetCode.AUTHENTICATION_ERROR) @@ -679,7 +679,7 @@ async def parse(): @login_required @validate_request("doc_id", "meta") async def set_meta(): - req = await request.json + req = await request_json() if not DocumentService.accessible(req["doc_id"], current_user.id): return get_json_result(data=False, message="No authorization.", code=RetCode.AUTHENTICATION_ERROR) try: diff --git a/api/apps/kb_app.py b/api/apps/kb_app.py index 96efcdc10..24d597635 100644 --- a/api/apps/kb_app.py +++ b/api/apps/kb_app.py @@ -29,7 +29,8 @@ from api.db.services.file_service import FileService from api.db.services.pipeline_operation_log_service import PipelineOperationLogService from api.db.services.task_service import TaskService, GRAPH_RAPTOR_FAKE_DOC_ID from api.db.services.user_service import TenantService, UserTenantService -from api.utils.api_utils import get_error_data_result, server_error_response, get_data_error_result, validate_request, not_allowed_parameters +from api.utils.api_utils import get_error_data_result, server_error_response, get_data_error_result, validate_request, not_allowed_parameters, \ + request_json from api.db import VALID_FILE_TYPES from api.db.services.knowledgebase_service import KnowledgebaseService from api.db.db_models import File @@ -47,7 +48,7 @@ from api.apps import login_required, current_user @login_required @validate_request("name") async def create(): - req = await request.json + req = await request_json() e, res = KnowledgebaseService.create_with_name( name = req.pop("name", None), tenant_id = current_user.id, @@ -71,7 +72,7 @@ async def create(): @validate_request("kb_id", "name", "description", "parser_id") @not_allowed_parameters("id", "tenant_id", "created_by", "create_time", "update_time", "create_date", "update_date", "created_by") async def update(): - req = await request.json + req = await request_json() if not isinstance(req["name"], str): return get_data_error_result(message="Dataset name must be string.") if req["name"].strip() == "": @@ -181,7 +182,7 @@ async def list_kbs(): else: desc = True - req = await request.get_json() + req = await request_json() owner_ids = req.get("owner_ids", []) try: if not owner_ids: @@ -208,7 +209,7 @@ async def list_kbs(): @login_required @validate_request("kb_id") async def rm(): - req = await request.json + req = await request_json() if not KnowledgebaseService.accessible4deletion(req["kb_id"], current_user.id): return get_json_result( data=False, @@ -285,7 +286,7 @@ def list_tags_from_kbs(): @manager.route('//rm_tags', methods=['POST']) # noqa: F821 @login_required async def rm_tags(kb_id): - req = await request.json + req = await request_json() if not KnowledgebaseService.accessible(kb_id, current_user.id): return get_json_result( data=False, @@ -305,7 +306,7 @@ async def rm_tags(kb_id): @manager.route('//rename_tag', methods=['POST']) # noqa: F821 @login_required async def rename_tags(kb_id): - req = await request.json + req = await request_json() if not KnowledgebaseService.accessible(kb_id, current_user.id): return get_json_result( data=False, @@ -427,7 +428,7 @@ async def list_pipeline_logs(): if create_date_to > create_date_from: return get_data_error_result(message="Create data filter is abnormal.") - req = await request.get_json() + req = await request_json() operation_status = req.get("operation_status", []) if operation_status: @@ -469,7 +470,7 @@ async def list_pipeline_dataset_logs(): if create_date_to > create_date_from: return get_data_error_result(message="Create data filter is abnormal.") - req = await request.get_json() + req = await request_json() operation_status = req.get("operation_status", []) if operation_status: @@ -491,7 +492,7 @@ async def delete_pipeline_logs(): if not kb_id: return get_json_result(data=False, message='Lack of "KB ID"', code=RetCode.ARGUMENT_ERROR) - req = await request.get_json() + req = await request_json() log_ids = req.get("log_ids", []) PipelineOperationLogService.delete_by_ids(log_ids) @@ -516,7 +517,7 @@ def pipeline_log_detail(): @manager.route("/run_graphrag", methods=["POST"]) # noqa: F821 @login_required async def run_graphrag(): - req = await request.json + req = await request_json() kb_id = req.get("kb_id", "") if not kb_id: @@ -585,7 +586,7 @@ def trace_graphrag(): @manager.route("/run_raptor", methods=["POST"]) # noqa: F821 @login_required async def run_raptor(): - req = await request.json + req = await request_json() kb_id = req.get("kb_id", "") if not kb_id: @@ -654,7 +655,7 @@ def trace_raptor(): @manager.route("/run_mindmap", methods=["POST"]) # noqa: F821 @login_required async def run_mindmap(): - req = await request.json + req = await request_json() kb_id = req.get("kb_id", "") if not kb_id: @@ -860,7 +861,7 @@ async def check_embedding(): def _clean(s: str) -> str: s = re.sub(r"]{0,12})?>", " ", s or "") return s if s else "None" - req = await request.json + req = await request_json() kb_id = req.get("kb_id", "") embd_id = req.get("embd_id", "") n = int(req.get("check_num", 5))