From ac9373fd6f0db53c983d87c4790cb627e82759e9 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 25 二月 2025 17:25:39 +0800
Subject: [PATCH] merge
---
app/api/v2/public_api.py | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/app/api/v2/public_api.py b/app/api/v2/public_api.py
index ee02589..98aba70 100644
--- a/app/api/v2/public_api.py
+++ b/app/api/v2/public_api.py
@@ -1,16 +1,18 @@
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
-from app.config.const import IMAGE_TO_TEXT, DOCUMENT_TO_CLEANING, DOCUMENT_TO_REPORT, DIFY, BISHENG, RAGFLOW
+
+from app.config.const import IMAGE_TO_TEXT, DOCUMENT_TO_CLEANING, DOCUMENT_TO_REPORT, DIFY, BISHENG, RAGFLOW, \
+ DOCUMENT_IA_QUESTIONS, DOCUMENT_TO_REPORT_TITLE, DOCUMENT_TO_TITLE, DOCUMENT_TO_PAPER, \
+ DOCUMENT_IA_QUESTIONS_EQUIPMENT
+
from app.models.base_model import get_db
-from app.models.public_api_model import DfToken, AppRegister
+from app.models.public_api_model import DfToken
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()
@@ -18,7 +20,8 @@
@public_api.post("/sync/df_token", response_model=Response)
async def sync_df_token(df: DfToken, db=Depends(get_db)):
- token_dict = {IMAGE_TO_TEXT: df.image, DOCUMENT_TO_CLEANING: df.clean, DOCUMENT_TO_REPORT: df.report}
+ token_dict = {IMAGE_TO_TEXT: df.image, DOCUMENT_TO_CLEANING: df.clean,DOCUMENT_IA_QUESTIONS_EQUIPMENT: df.equipment,
+ DOCUMENT_IA_QUESTIONS: df.doc, DOCUMENT_TO_REPORT_TITLE: df.report,DOCUMENT_TO_TITLE: df.title,DOCUMENT_TO_PAPER: df.paper}
try:
for api_id, token in token_dict.items():
@@ -32,23 +35,22 @@
return Response(code=200, msg="successfully", data={})
-@public_api.post("/sync/app_register", response_model=Response)
-async def sync_app_register(apr: AppRegister, db=Depends(get_db)):
- app_dict = {RAGFLOW: apr.rg, BISHENG: apr.bs, DIFY: apr.df}
-
- 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)
- return Response(code=500, msg="failed", data={})
-
- return Response(code=200, msg="successfully", data={})
+# @public_api.post("/sync/app_register", response_model=Response)
+# async def sync_app_register(apr: AppRegister, db=Depends(get_db)):
+# app_dict = {RAGFLOW: apr.rg, BISHENG: apr.bs, DIFY: apr.df}
+#
+# 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)
+# return Response(code=500, msg="failed", data={})
+#
+# return Response(code=200, msg="successfully", data={})
@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 +76,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