From abb91124a4372b0efe5ab1b7aa25859c635d30eb Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 10 四月 2025 13:49:37 +0800
Subject: [PATCH] merge
---
app/service/v2/initialize_data.py | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/app/service/v2/initialize_data.py b/app/service/v2/initialize_data.py
index 9fb5792..270978c 100644
--- a/app/service/v2/initialize_data.py
+++ b/app/service/v2/initialize_data.py
@@ -10,9 +10,9 @@
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, ComplexChatModel
+ cipher_suite, UserTokenModel, ApiTokenModel, ComplexChatModel, SystemDataModel
from app.service.auth import UserAppDao
from app.service.bisheng import BishengService
from app.service.difyService import DifyService
@@ -22,6 +22,7 @@
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")
@@ -172,6 +173,7 @@
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:
@@ -179,7 +181,7 @@
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"])
+ icon=agent["icon"], tenant_id=user.id if user else "", dialog_type=agent["dialogType"], mode=agent["mode"],chat_mode = agent["chat_mode"],chat_model = agent.get("chat_model"),chat_model_ds = agent.get("chat_model_ds"),chat_provider = agent.get("chat_provider"))
db.add(dialog)
db.commit()
db.refresh(dialog)
@@ -426,4 +428,22 @@
except Exception as e:
print(e)
- db.rollback()
\ No newline at end of file
+ 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 = yaml.safe_load(file)
+ try:
+ system = db.query(SystemDataModel).filter_by(id=SYSTEM_ID).first()
+ if system:
+ system.version = config["smart_system"].get("version")
+ system.machine_id = get_machine_id()
+ 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