From 9683aeeafa2f1067ef061b34124a1c362df07e5e Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 03 四月 2025 14:10:13 +0800
Subject: [PATCH] rg配置修改
---
app/service/v2/initialize_data.py | 100 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 96 insertions(+), 4 deletions(-)
diff --git a/app/service/v2/initialize_data.py b/app/service/v2/initialize_data.py
index 1f05cab..28a9961 100644
--- a/app/service/v2/initialize_data.py
+++ b/app/service/v2/initialize_data.py
@@ -7,12 +7,12 @@
from Log import logger
-from app.config.agent_base_url import RG_APP_TOKEN_LIST, RG_APP_NEW_TOKEN
+from app.config.agent_base_url import RG_APP_TOKEN_LIST, RG_APP_NEW_TOKEN, DF_CHAT_API_KEY
# from app.api import pwd_context
from app.config.const import DIFY, ENV_CONF_PATH, RAGFLOW, smart_server, chat_server, workflow_server, TMP_DICT, \
- rg_api_token
+ rg_api_token, Dialog_STATSU_ON, SYSTEM_ID
from app.models import MenuCapacityModel, WebMenuModel, GroupModel, RoleModel, DialogModel, UserModel, UserAppModel, \
- cipher_suite, UserTokenModel, ApiTokenModel
+ cipher_suite, UserTokenModel, ApiTokenModel, ComplexChatModel, SystemDataModel
from app.service.auth import UserAppDao
from app.service.bisheng import BishengService
from app.service.difyService import DifyService
@@ -21,6 +21,8 @@
from app.service.v2.app_driver.chat_data import ChatBaseApply
from app.service.v2.app_register import AppRegisterDao
from app.config.config import settings
+from app.service.v2.chat import get_app_token
+from app.utils.common import get_machine_id
from app.utils.password_handle import generate_password, password_encrypted, password_decrypted
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
@@ -131,10 +133,12 @@
async def basic_agent_sync(db):
agent_list = []
+ complex_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", [])
+ complex_list = agent_dict.get("complex", [])
user = db.query(UserModel).filter_by(permission="admin").first()
for agent in agent_list:
dialog = db.query(DialogModel).filter(DialogModel.id == agent["id"]).first()
@@ -158,6 +162,41 @@
except Exception as e:
print(e)
db.rollback()
+ now_complex_list = []
+ for agent in complex_list:
+ now_complex_list.append(agent["id"])
+ dialog = db.query(ComplexChatModel).filter(ComplexChatModel.id == agent["id"]).first()
+ if dialog:
+ try:
+ dialog.name = agent["name"]
+ dialog.description = agent["description"]
+ dialog.icon = agent["icon"]
+ dialog.mode = agent["mode"]
+ dialog.chat_mode = agent["chat_mode"]
+ dialog.status = Dialog_STATSU_ON
+ # dialog.parameters = json.dumps(agent["parameters"])
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ else:
+ try:
+ dialog = ComplexChatModel(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"],chat_mode = agent["chat_mode"])
+ db.add(dialog)
+ db.commit()
+ db.refresh(dialog)
+ except Exception as e:
+ print(e)
+ db.rollback()
+
+ for i in db.query(ComplexChatModel).filter(ComplexChatModel.status == "1").all():
+ if i.id not in now_complex_list:
+ try:
+ db.query(ComplexChatModel).filter(ComplexChatModel.id==i.id).update(({"status": "0"}))
+ db.commit()
+ except:
+ ...
+
async def user_update_app(userid, db):
@@ -353,4 +392,57 @@
except Exception as e:
print(e)
- db.rollback()
\ No newline at end of file
+ db.rollback()
+
+
+
+async def sync_complex_api_token(db):
+ token = ""
+ try:
+ complex_list = db.query(ComplexChatModel).all()
+ for i in complex_list:
+ user_token = db.query(ApiTokenModel).filter(ApiTokenModel.app_id == i.id).first()
+ if not user_token:
+ try:
+ chat = ChatBaseApply()
+ url = settings.dify_base_url + DF_CHAT_API_KEY.format(i.id)
+ access_token = await get_app_token(db, workflow_server)
+ param = await chat.chat_get(url, {}, await chat.get_headers(access_token))
+ if param and param.get("data"):
+ token = param.get("data", [{}])[0].get("token")
+ token_id = param.get("data", [{}])[0].get("id")
+ # dialog.parameters = json.dumps(param)
+ else:
+ param = await chat.chat_post(url, {}, await chat.get_headers(access_token))
+ if param:
+ token = param.get("token")
+ token_id = param.get("id")
+
+ if token:
+ db.add(ApiTokenModel(id=token_id, app_id=i.id, type="app", token=token))
+ db.commit()
+ print("df_api_token: 鏇存柊鎴愬姛锛�")
+ except Exception as e:
+ print(e)
+
+
+ except Exception as e:
+ print(e)
+ db.rollback()
+
+
+async def system_license_sync(db):
+ with open(os.path.join(ENV_CONF_PATH, "system.yaml") , 'r', encoding='utf-8') as file:
+ # 鍔犺浇JSON鏁版嵁
+ config = json.load(file)
+ try:
+ system = db.query(SystemDataModel).filter_by(id=SYSTEM_ID).first()
+ if system:
+ system.version = config["smart_system"].get("version")
+ else:
+ system = SystemDataModel(id=SYSTEM_ID, version=config["smart_system"].get("version"), title=config["smart_system"].get("title"), desc=config["smart_system"].get("desc"), machine_id=get_machine_id())
+ db.add(system)
+ db.commit()
+ except Exception as e:
+ print(e)
+ db.rollback()
--
Gitblit v1.8.0