From 6846a4c98a793e74ae17b47f04a0ff8b210aeb24 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 01 四月 2025 16:52:51 +0800
Subject: [PATCH] 授权license
---
app/service/v2/initialize_data.py | 75 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 21 deletions(-)
diff --git a/app/service/v2/initialize_data.py b/app/service/v2/initialize_data.py
index eacdefa..28a9961 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")
@@ -161,8 +162,9 @@
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:
@@ -171,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:
@@ -185,6 +188,15 @@
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):
@@ -391,25 +403,46 @@
for i in complex_list:
user_token = db.query(ApiTokenModel).filter(ApiTokenModel.app_id == i.id).first()
if not user_token:
- 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")
+ 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: 鏇存柊鎴愬姛锛�")
+ 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()
\ 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 = 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