From 370120fd4154ce6c5f69d16a4a343a016cf2e816 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期二, 04 三月 2025 09:53:17 +0800 Subject: [PATCH] 完善问题 --- main.py | 34 ++++++++++++---------------------- 1 files changed, 12 insertions(+), 22 deletions(-) diff --git a/main.py b/main.py index 6b28b99..d0ba8d6 100644 --- a/main.py +++ b/main.py @@ -1,9 +1,7 @@ from contextlib import asynccontextmanager from apscheduler.schedulers.background import BackgroundScheduler from fastapi import FastAPI -from fastapi.middleware.cors import CORSMiddleware from starlette.staticfiles import StaticFiles - from app.api.auth import router as auth_router from app.api.canvas import canvas_router from app.api.chat import router as chat_router @@ -15,19 +13,19 @@ from app.api.label import label_router from app.api.llm import llm_router from app.api.organization import dept_router +from app.api.system import system_router +from app.api.v2.chat import chat_router_v2 from app.api.v2.public_api import public_api from app.api.report import router as report_router from app.api.resource import menu_router -# from app.api.sync_data import sync_router from app.api.user import user_router from app.api.group import group_router from app.api.role import role_router from app.models.base_model import init_db -from app.task.delete_execl_file import delete_file_after_delay -# from app.models.base_model import init_db -from app.task.fetch_agent import sync_agents, initialize_agents, sync_agents_v2, sync_knowledge, \ +from app.task.fetch_agent import sync_agents_v2, sync_knowledge, \ sync_resources_from_json from app.init_config.init_run_data import sync_default_data +from app.task.sync_account_token import start_sync_token_task init_db() @@ -35,14 +33,10 @@ # 浣跨敤 Lifespan 浜嬩欢澶勭悊绋嬪簭 @asynccontextmanager async def lifespan(app: FastAPI): - # 鍒濆鍖栦唬鐞� - # initialize_agents() - # # 鍦ㄥ簲鐢ㄥ惎鍔ㄦ椂鍚屾浠g悊 - # sync_agents() - await sync_default_data() - sync_agents_v2() - sync_knowledge() + await sync_default_data() # Todo + sync_agents_v2() # 鏅鸿兘浣� + sync_knowledge() # 鐭ヨ瘑搴� sync_resources_from_json() yield # 鍦ㄥ簲鐢ㄥ叧闂椂鎵ц娓呯悊鎿嶄綔锛堝鏋滈渶瑕侊級 @@ -56,18 +50,12 @@ lifespan=lifespan ) -# 璁剧疆 CORS 涓棿浠� -# app.add_middleware( -# CORSMiddleware, -# allow_origins=["http://192.168.20.119:9303", "http://192.168.20.119:9301", "http://smartai.com:8293","http://localhost:9303", "http://127.0.0.1:9303","http://localhost:5173","http://192.168.20.158:5173"], -# allow_credentials=True, -# allow_methods=["*"], # 鍏佽鎵�鏈夋柟娉� -# allow_headers=["*"], # 鍏佽鎵�鏈夊ご閮� -# ) + # 鍒涘缓璋冨害鍣� scheduler = BackgroundScheduler() scheduler.add_job(sync_agents_v2, 'interval', minutes=60, id="sync_resource_data") -scheduler.add_job(delete_file_after_delay, 'interval', minutes=10, id="delete_file_after_delay") +scheduler.add_job(start_sync_token_task, 'interval', minutes=5, id="sync_token_1") + scheduler.start() app.include_router(auth_router, prefix='/api/auth', tags=["auth"]) @@ -87,6 +75,8 @@ app.include_router(canvas_router, prefix='/api/canvas', tags=["canvas"]) app.include_router(label_router, prefix='/api/label', tags=["label"]) app.include_router(public_api, prefix='/v1/api', tags=["public_api"]) +app.include_router(chat_router_v2, prefix='/api/v1', tags=["chat1"]) +app.include_router(system_router, prefix='/api/system', tags=["system"]) app.mount("/static", StaticFiles(directory="app/images"), name="static") if __name__ == "__main__": -- Gitblit v1.8.0