From f6a0aa15269cae87737d1564ad7a33063f1d94de Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 18 二月 2025 13:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway into develop_2.1

---
 main.py |   66 ++++++++++++++++++++++++++++++---
 1 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/main.py b/main.py
index 2c8564f..3351960 100644
--- a/main.py
+++ b/main.py
@@ -1,36 +1,78 @@
 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
 from app.api.agent import router as agent_router
+from app.api.dialog import dialog_router
 from app.api.excel import router as excel_router
 from app.api.files import router as files_router
+from app.api.knowledge import knowledge_router
+from app.api.label import label_router
+from app.api.llm import llm_router
+from app.api.organization import dept_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.fetch_agent import sync_agents, initialize_agents
+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, \
+    sync_resources_from_json
+from app.init_config.init_run_data import sync_default_data
+from app.task.sync_account_token import sync_token, start_sync_token_task
+
+init_db()
 
 
 # 浣跨敤 Lifespan 浜嬩欢澶勭悊绋嬪簭
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     # 鍒濆鍖栦唬鐞�
-    initialize_agents()
-    # 鍦ㄥ簲鐢ㄥ惎鍔ㄦ椂鍚屾浠g悊
-    sync_agents()
+    # initialize_agents()
+    # # 鍦ㄥ簲鐢ㄥ惎鍔ㄦ椂鍚屾浠g悊
+    # sync_agents()
+
+
+    await sync_default_data()
+    sync_agents_v2()
+    sync_knowledge()
+    sync_resources_from_json()
     yield
     # 鍦ㄥ簲鐢ㄥ叧闂椂鎵ц娓呯悊鎿嶄綔锛堝鏋滈渶瑕侊級
     pass
 
-init_db()
+
 app = FastAPI(
     title="basic_rag_gateway",
     version="0.1",
     description="",
     lifespan=lifespan
 )
+
+# 璁剧疆 CORS 涓棿浠�
+# app.add_middleware(
+#     CORSMiddleware,
+#     allow_origins=["*"],
+#     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(start_sync_token_task, 'interval', minutes=5, id="sync_token_1")
+# scheduler.add_job(delete_file_after_delay, 'interval', minutes=10, id="delete_file_after_delay")
+scheduler.start()
 
 app.include_router(auth_router, prefix='/api/auth', tags=["auth"])
 app.include_router(chat_router, prefix='/api/chat', tags=["chat"])
@@ -40,7 +82,19 @@
 app.include_router(report_router, prefix='/api/report', tags=["report"])
 app.include_router(user_router, prefix='/api/user', tags=["user"])
 app.include_router(group_router, prefix='/api/group', tags=["group"])
+app.include_router(role_router, prefix='/api/role', tags=["role"])
+app.include_router(dept_router, prefix='/api/dept', tags=["dept"])
+app.include_router(menu_router, prefix='/api/menu', tags=["menu"])
+app.include_router(knowledge_router, prefix='/api/knowledge', tags=["knowledge"])
+app.include_router(llm_router, prefix='/api/llm', tags=["llm"])
+app.include_router(dialog_router, prefix='/api/dialog', tags=["dialog"])
+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.mount("/static", StaticFiles(directory="app/images"), name="static")
 
 if __name__ == "__main__":
     import uvicorn
+
     uvicorn.run(app, host="0.0.0.0", port=9201)

--
Gitblit v1.8.0