From c456f2e51bc2bf59233f75eeb5ed517ce9d7ba68 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期三, 18 十二月 2024 16:00:41 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway --- app/api/v2/public_api.py | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/api/v2/public_api.py b/app/api/v2/public_api.py index ee02589..633db26 100644 --- a/app/api/v2/public_api.py +++ b/app/api/v2/public_api.py @@ -1,7 +1,7 @@ import json from fastapi import APIRouter, Depends - +from fastapi.responses import JSONResponse from Log import logger from app.api import Response from app.api.auth import login @@ -10,7 +10,7 @@ from app.models.public_api_model import DfToken, AppRegister from app.service.v2.api_token import DfTokenDao from app.service.v2.app_register import AppRegisterDao -from app.service.v2.initialize_data import dialog_menu_sync, user_update_app +from app.service.v2.initialize_data import dialog_menu_sync, create_menu_sync, user_update_app from app.task.sync_resources import sync_knowledge, sync_dialog, sync_agent, sync_llm, sync_resource public_api = APIRouter() @@ -38,7 +38,6 @@ try: for app_id, status in app_dict.items(): - AppRegisterDao(db).update_and_insert_app(app_id, status) except Exception as e: logger.error(e) @@ -48,7 +47,7 @@ @public_api.get("/sync/resource", response_model=Response) -async def sync_resource_data(resource_type:int, db=Depends(get_db)): +async def sync_resource_data(resource_type: int, db=Depends(get_db)): if resource_type == 1: await sync_knowledge() elif resource_type == 2: @@ -74,6 +73,15 @@ return Response(code=200, msg="success", data={}) +@public_api.get("/sync/create/dialog_menu", response_model=Response) +async def get_dialog_menu(db=Depends(get_db)): + try: + result = await create_menu_sync(db) + return JSONResponse(content={"code": 200, "msg": "", "data": result}) + except Exception as e: + return JSONResponse(content={"code": 500, "msg": str(e), "data": {"error": "Failed to create menu"}}) + + @public_api.post("/sync/update_app", response_model=Response) async def sync_update_app(userid, db=Depends(get_db)): try: -- Gitblit v1.8.0