From 519930bc1112cdf7881fecce907381ce6374e74c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 14 一月 2025 13:37:56 +0800
Subject: [PATCH] 文档出卷-未上传文件提示
---
app/service/v2/initialize_data.py | 183 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 174 insertions(+), 9 deletions(-)
diff --git a/app/service/v2/initialize_data.py b/app/service/v2/initialize_data.py
index 4929401..d6df64b 100644
--- a/app/service/v2/initialize_data.py
+++ b/app/service/v2/initialize_data.py
@@ -1,12 +1,23 @@
import json
-
+import time
+import os
from Log import logger
-from app.models import MenuCapacityModel, WebMenuModel, GroupModel, RoleModel
+from app.config.const import DIFY, ENV_CONF_PATH
+from app.models import MenuCapacityModel, WebMenuModel, GroupModel, RoleModel, DialogModel, UserModel, UserAppModel, \
+ cipher_suite
+from app.service.auth import UserAppDao
+from app.service.bisheng import BishengService
+from app.service.difyService import DifyService
+from app.service.ragflow import RagflowService
+from app.service.service_token import get_new_token
+from app.service.v2.app_register import AppRegisterDao
+from app.config.config import settings
+from app.utils.password_handle import generate_password
async def dialog_menu_sync(db):
menu_list = []
- with open("env_conf/menu_conf.json", 'r', encoding='utf-8') as file:
+ with open(os.path.join(ENV_CONF_PATH, "menu_conf.json") , 'r', encoding='utf-8') as file:
# 鍔犺浇JSON鏁版嵁
data = json.load(file)
menu_list = data.get("data", [])
@@ -17,17 +28,56 @@
for menu in menu_list:
# print(menu)
- agent = menu.pop("agent", [])
- for i in agent:
- capacity = MenuCapacityModel(menu_id=menu["id"], capacity_id=i, capacity_type=2)
- db.add(capacity)
dialog = menu.pop("dialog", [])
for i in dialog:
- capacity = MenuCapacityModel(menu_id=menu["id"], capacity_id=i, capacity_type=1)
+ capacity = MenuCapacityModel(menu_id=menu["id"], capacity_id=i["id"], capacity_type=i["agentType"],
+ chat_id=i["id"] if not i["chat_id"] else i["chat_id"],
+ chat_type=i["chat_type"])
db.add(capacity)
menu_obj = WebMenuModel(**menu)
db.add(menu_obj)
db.commit()
+
+
+async def create_menu_sync(db):
+ # json_file_path = "env_conf/menu_conf.json.template"
+ json_file_path = os.path.join(ENV_CONF_PATH, "menu_conf.json.template")
+ with open(json_file_path, 'r', encoding='utf-8') as file:
+ json_data = json.load(file).get("data", [])
+ # for menu in json_data:
+ # menu['dialog'].clear()
+ dialogs = db.query(DialogModel).all()
+
+ dialog_dict = {}
+ for dialog in dialogs:
+ if dialog.name not in dialog_dict:
+ dialog_dict[dialog.name] = []
+ dialog_dict[dialog.name].append({
+ 'id': dialog.id,
+ 'chat_id': dialog.id,
+ 'chat_type': '',
+ 'agentType': dialog.dialog_type
+ })
+
+ for menu in json_data:
+ # if menu['title'] in dialog_dict:
+ # for dialog in dialog_dict[menu['title']]:
+ # new_dialog_item = {
+ # 'id': dialog.id,
+ # 'chat_id': dialog.id,
+ # 'chat_type': '',
+ # 'agentType': dialog.dialog_type
+ # }
+ menu['dialog']= dialog_dict.get(menu['title'], [])
+ json_data = {"data": json_data}
+ new_file_name = f"menu_conf.json.template"
+ new_file_path = os.path.join(os.path.dirname(json_file_path), new_file_name)
+ with open(new_file_path, 'w', encoding='utf-8') as new_file:
+ json.dump(json_data, new_file, ensure_ascii=False, indent=4)
+ return {
+ "file_name": new_file_name,
+ "json_data": json_data
+ }
async def default_group_sync(db):
@@ -53,4 +103,119 @@
db.add(group)
db.commit()
except Exception as e:
- logger.error(e)
\ No newline at end of file
+ logger.error(e)
+
+
+async def app_register_sync(db):
+ app_dict = {}
+ with open(os.path.join(ENV_CONF_PATH, "app_register_conf.json"), 'r', encoding='utf-8') as file:
+ # 鍔犺浇JSON鏁版嵁
+ app_dict = json.load(file)
+ 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)
+
+
+async def basic_agent_sync(db):
+ agent_list = []
+ with open(os.path.join(ENV_CONF_PATH, "default_agent_conf.json"), 'r', encoding='utf-8') as file:
+ # 鍔犺浇JSON鏁版嵁
+ agent_dict = json.load(file)
+ agent_list = agent_dict.get("basic", [])
+ user = db.query(UserModel).filter_by(permission="admin").first()
+ for agent in agent_list:
+ dialog = db.query(DialogModel).filter(DialogModel.id == agent["id"]).first()
+ if dialog:
+ try:
+ dialog.name = agent["name"]
+ dialog.description = agent["description"]
+ dialog.icon = agent["icon"]
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ else:
+ try:
+ dialog = DialogModel(id=agent["id"], name=agent["name"], description=agent["description"],
+ icon=agent["icon"], tenant_id=user.id if user else "", dialog_type=agent["dialogType"], mode=agent["mode"])
+ db.add(dialog)
+ db.commit()
+ db.refresh(dialog)
+ except Exception as e:
+ print(e)
+ db.rollback()
+
+
+async def user_update_app(userid, db):
+ user = db.query(UserModel).filter(UserModel.id == userid).first()
+ if not user:
+ raise Exception("User id not found")
+ app_register = AppRegisterDao(db).get_apps()
+ register_dict = {}
+ token = ""
+ app_password = await generate_password(10)
+ crypt_password = UserAppModel.encrypted_password(app_password)
+ for app in app_register:
+ if app["id"] == 'ragflow_app':
+ user_rag_app = db.query(UserAppModel).filter(UserAppModel.user_id == userid,
+ UserAppModel.app_type == 'ragflow_app').all()
+ if not user_rag_app:
+ service = RagflowService(settings.fwr_base_url)
+
+ register_info = await register_app(service, app["id"], app_password, token)
+ if register_info:
+ register_dict[app["id"]] = register_info
+ app_name = register_info.get("name")
+ app_id = register_info.get("id")
+ app_email = register_info.get("email")
+ await save_db(db, app_name, crypt_password, app_email, user.id, app_id, "ragflow_app")
+ elif app["id"] == 'bisheng_app':
+ user_bs_app = db.query(UserAppModel).filter(UserAppModel.user_id == userid,
+ UserAppModel.app_type == 'bisheng_app').all()
+ if not user_bs_app:
+ service = BishengService(settings.sgb_base_url)
+
+ register_info = await register_app(service, app["id"], app_password, token)
+ if register_info:
+ register_dict[app["id"]] = register_info
+ app_name = register_info.get("name")
+ app_id = register_info.get("id")
+ app_email = register_info.get("email")
+ await save_db(db, app_name, crypt_password, app_email, user.id, app_id, "bisheng_app")
+ elif app["id"] == 'dify_app':
+ user_df_app = db.query(UserAppModel).filter(UserAppModel.user_id == userid,
+ UserAppModel.app_type == 'dify_app').all()
+ if not user_df_app:
+ admin_user = db.query(UserModel).filter(UserModel.permission == "admin").first()
+ token = await get_new_token(db, admin_user.id, DIFY)
+ if not token:
+ print("鐢ㄦ埛娉ㄥ唽鑾峰彇dftoken澶辫触锛�")
+ service = DifyService(settings.dify_base_url)
+ register_info = await register_app(service, app["id"], app_password, token)
+ if register_info:
+ register_dict[app["id"]] = register_info
+ app_name = register_info.get("name")
+ app_id = register_info.get("id")
+ app_email = register_info.get("email")
+ await save_db(db, app_name, crypt_password, app_email, user.id, app_id, "dify_app")
+ else:
+ raise Exception("鏈煡娉ㄥ唽搴旂敤---")
+
+
+async def register_app(service, app_id, app_password, token):
+ name = app_id + str(int(time.time()))
+ try:
+ register_info = await service.register(name, app_password, token)
+ return {"id": register_info.get("id"), "name": name, "email": register_info.get("email")}
+ except Exception as e:
+ print(f"Failed to register with {app_id}: {str(e)}")
+ return None
+
+
+async def save_db(db, username, password, email, user_id, app_id, app_type):
+ user_app_dao = UserAppDao(db)
+ user_id = await user_app_dao.insert_user_app_data(username, password, email, user_id, app_id, app_type)
+ if not user_id:
+ raise Exception("Failed to register with app")
+ print({"msg": "User registered successfully", "userFlag": user_id})
--
Gitblit v1.8.0