From 0650b889a36d9b9fd42415b9b9819676f839ae9b Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 08 四月 2025 09:54:09 +0800
Subject: [PATCH] 首页会话-模型修改
---
app/config/env_conf/default_agent_conf.json | 112 ++++++++-------
app/models/postgresql_base_model.py | 5
app/service/v2/chat.py | 176 +++++++++++++++++++-----
app/init_config/init_run_data.py | 1
main.py | 2
app/api/v2/chat.py | 23 +++
app/service/v2/app_driver/chat_base.py | 6
app/service/v2/initialize_data.py | 5
app/config/agent_base_url.py | 5
app/config/env_conf/system.yaml | 2
app/models/v2/chat.py | 38 +++--
app/service/v2/app_driver/chat_data.py | 10 +
12 files changed, 273 insertions(+), 112 deletions(-)
diff --git a/app/api/v2/chat.py b/app/api/v2/chat.py
index f9bbb11..bdc0f05 100644
--- a/app/api/v2/chat.py
+++ b/app/api/v2/chat.py
@@ -10,12 +10,12 @@
complex_knowledge_chat_deep, complex_knowledge_chat
from app.models import UserModel
from app.models.base_model import get_db
-from app.models.v2.chat import RetrievalRequest, ChatDataRequest, ComplexChatDao
+from app.models.v2.chat import RetrievalRequest, ChatDataRequest, ComplexChatDao, SetModelRequest
from app.models.v2.session_model import ChatData
from app.service.v2.chat import service_chat_dialog, get_chat_info, service_chat_basic, \
service_chat_workflow, service_chat_parameters, service_chat_sessions, service_chat_upload, \
service_chat_sessions_list, service_chat_session_log, service_chunk_retrieval, service_complex_chat, \
- service_complex_upload
+ service_complex_upload, service_complex_model, service_get_complex_model
chat_router_v2 = APIRouter()
@@ -166,3 +166,22 @@
return Response(data, media_type="application/json", status_code=status_code)
+@chat_router_v2.put("/complex/model")
+async def api_complex_model(chatModel:SetModelRequest, current_user: UserModel = Depends(get_current_user), db: Session = Depends(get_db)): # current_user: UserModel = Depends(get_current_user)
+ status_code = http_200
+ data = await service_complex_model(db, chatModel.chatType, chatModel.modelType, chatModel.modelName, chatModel.modelProvider)
+ if data:
+ status_code = http_500
+ return Response(data, media_type="application/json", status_code=status_code)
+
+
+@chat_router_v2.get("/complex/model")
+async def api_get_complex_model(current_user: UserModel = Depends(get_current_user), db: Session = Depends(get_db)): # current_user: UserModel = Depends(get_current_user)
+ status_code = http_200
+ data = await service_get_complex_model(db)
+ if data:
+ status_code = http_500
+ return Response(data, media_type="application/json", status_code=status_code)
+
+
+
diff --git a/app/config/agent_base_url.py b/app/config/agent_base_url.py
index 48a35f1..57239a9 100644
--- a/app/config/agent_base_url.py
+++ b/app/config/agent_base_url.py
@@ -7,6 +7,7 @@
RG_USER_LOGIN= "/v1/user/login"
RG_PING= "/v1/system/version"
RG_ORIGINAL_URL = "/api/v1/retrieval"
+RG_CHAT_UPDATE_URL = "/api/v1/chats/{}"
### ----------
DF_CHAT_AGENT= "/v1/chat-messages"
@@ -15,4 +16,6 @@
DF_CHAT_API_KEY= "/console/api/apps/{}/api-keys"
DF_USER_LOGIN= "/console/api/login"
DF_PING = "/console/api/workspaces"
-DF_UPLOAD_FILE = "/v1/files/upload"
\ No newline at end of file
+DF_UPLOAD_FILE = "/v1/files/upload"
+DF_WORKFLOW_DRAFT = "/console/api/apps/{}/workflows/draft"
+DF_WORKFLOW_PUBLISH = "/console/api/apps/{}/workflows/publish"
\ No newline at end of file
diff --git a/app/config/env_conf/default_agent_conf.json b/app/config/env_conf/default_agent_conf.json
index 84d7c40..c804d38 100644
--- a/app/config/env_conf/default_agent_conf.json
+++ b/app/config/env_conf/default_agent_conf.json
@@ -11,27 +11,27 @@
"enabled": false
},
"user_input_form": [
- {
- "file-list": {
- "allowed_file_extensions": [
- "xlsx"
- ],
- "allowed_file_types": [
- "document"
- ],
- "allowed_file_upload_methods": [
- "local_file"
- ],
- "label": "鏂囨。瑙ｆ瀽绔�",
- "max_length": 30,
- "options": [],
- "required": true,
- "type": "file-list",
- "variable": "file_list"
+ {
+ "file-list": {
+ "allowed_file_extensions": [
+ "xlsx"
+ ],
+ "allowed_file_types": [
+ "document"
+ ],
+ "allowed_file_upload_methods": [
+ "local_file"
+ ],
+ "label": "鏂囨。瑙ｆ瀽绔�",
+ "max_length": 30,
+ "options": [],
+ "required": true,
+ "type": "file-list",
+ "variable": "file_list"
+ }
}
- }
],
- "file_upload":{
+ "file_upload": {
"enabled": false
}
},
@@ -50,34 +50,37 @@
},
"user_input_form": [
{
- "file-list": {
- "allowed_file_extensions": [
- "xlsx", "xls","csv","db"
- ],
- "allowed_file_types": [
- "document"
- ],
- "allowed_file_upload_methods": [
- "local_file"
- ],
- "label": "涓婁紶鏂囨。",
- "max_length": 30,
- "options": [],
- "required": true,
- "type": "file-list",
- "variable": "file_list",
- "fileUploadConfig": {
- "file_size_limit": 30,
- "batch_count_limit": 5,
- "image_file_size_limit": 10,
- "video_file_size_limit": 100,
- "audio_file_size_limit": 50,
- "workflow_file_upload_limit": 100
+ "file-list": {
+ "allowed_file_extensions": [
+ "xlsx",
+ "xls",
+ "csv",
+ "db"
+ ],
+ "allowed_file_types": [
+ "document"
+ ],
+ "allowed_file_upload_methods": [
+ "local_file"
+ ],
+ "label": "涓婁紶鏂囨。",
+ "max_length": 30,
+ "options": [],
+ "required": true,
+ "type": "file-list",
+ "variable": "file_list",
+ "fileUploadConfig": {
+ "file_size_limit": 30,
+ "batch_count_limit": 5,
+ "image_file_size_limit": 10,
+ "video_file_size_limit": 100,
+ "audio_file_size_limit": 50,
+ "workflow_file_upload_limit": 100
}
}
}
],
- "file_upload":{
+ "file_upload": {
"enabled": false
}
},
@@ -95,7 +98,7 @@
"enabled": true
},
"user_input_form": [],
- "file_upload":{
+ "file_upload": {
"enabled": false
}
},
@@ -113,7 +116,7 @@
"enabled": true
},
"user_input_form": [],
- "file_upload":{
+ "file_upload": {
"enabled": false
}
},
@@ -131,7 +134,7 @@
"enabled": true
},
"user_input_form": [],
- "file_upload":{
+ "file_upload": {
"enabled": false
}
},
@@ -141,7 +144,7 @@
],
"complex": [
{
- "id": "9992ba72fff111ef8d890242ac120004",
+ "id": "b436d1ae135311f0add70242ac1a0006",
"name": "鐭ヨ瘑搴撲笓瀹�",
"description": "鐭ヨ瘑搴撲笓瀹�",
"icon": "intellFrame4",
@@ -149,7 +152,9 @@
"parameters": {
},
"dialogType": "1",
- "mode": "complex-chat"
+ "mode": "complex-chat",
+ "chat_model": "qwen-32b-awq___OpenAI-API",
+ "chat_provider": "OpenAI-API-Compatible"
},
{
"id": "ad127cb5-a1ef-49a3-82ed-6467a670fd10",
@@ -160,7 +165,10 @@
"parameters": {
},
"dialogType": "4",
- "mode": "complex-chat"
+ "mode": "complex-chat",
+ "chat_model": "qwen-32b-awq",
+ "chat_model_ds": "qwq-32b-awq",
+ "chat_provider": "openai_api_compatible"
},
{
"id": "c6a9fda3-bfb8-40ef-9510-545766c7d6a0",
@@ -229,7 +237,7 @@
"mode": "complex-chat"
},
{
- "id": "8f3e8d9c0bab11f0896e0242ac120006",
+ "id": "c964acd6135311f0bf5b0242ac1a0006",
"name": "鐭ヨ瘑搴撲笓瀹�-娣卞害",
"description": "鐭ヨ瘑搴撲笓瀹�",
"icon": "intellFrame4",
@@ -237,7 +245,9 @@
"parameters": {
},
"dialogType": "1",
- "mode": "complex-chat"
+ "mode": "complex-chat",
+ "chat_model_ds": "qwq-32b-awq___OpenAI-API",
+ "chat_provider": "OpenAI-API-Compatible"
}
]
}
\ No newline at end of file
diff --git a/app/config/env_conf/system.yaml b/app/config/env_conf/system.yaml
index 9cfb9f1..f588c6a 100644
--- a/app/config/env_conf/system.yaml
+++ b/app/config/env_conf/system.yaml
@@ -1,4 +1,4 @@
smart_system:
title: SmartAI澶фā鍨嬪钩鍙�
desc: SmartAI澶фā鍨嬪钩鍙�
- version: 1.0.3
+ version: 1.0.4
\ No newline at end of file
diff --git a/app/init_config/init_run_data.py b/app/init_config/init_run_data.py
index e735889..59c5856 100644
--- a/app/init_config/init_run_data.py
+++ b/app/init_config/init_run_data.py
@@ -16,7 +16,6 @@
await sync_token() # 璐﹀彿token鐧诲綍
await sync_complex_api_token(db) # 璐﹀彿token鐧诲綍
await system_license_sync(db) # 鍚屾绯荤粺license
-
except Exception as e:
print(e)
finally:
diff --git a/app/models/postgresql_base_model.py b/app/models/postgresql_base_model.py
index f6caf45..4a35f66 100644
--- a/app/models/postgresql_base_model.py
+++ b/app/models/postgresql_base_model.py
@@ -17,5 +17,6 @@
# yield session
try:
yield session
- finally:
- session.close()
\ No newline at end of file
+ except Exception as e:
+ ...
+ # session.close()
\ No newline at end of file
diff --git a/app/models/v2/chat.py b/app/models/v2/chat.py
index 1ee30d2..2f3a484 100644
--- a/app/models/v2/chat.py
+++ b/app/models/v2/chat.py
@@ -46,6 +46,13 @@
+class SetModelRequest(BaseModel):
+ chatType: int
+ modelType: int
+ modelName: str
+ modelProvider: str
+
+
class ComplexChatModel(Base):
__tablename__ = 'complex_chat'
@@ -64,6 +71,9 @@
mode = Column(String(36))
parameters = Column(Text)
chat_mode = Column(Integer) #1= 鏅�氬璇濓紝2=鑱旂綉锛�3=鐭ヨ瘑搴�,4=娣卞害
+ chat_model = Column(String(255)) # 妯″瀷
+ chat_model_ds = Column(String(255)) # 妯″瀷
+ chat_provider = Column(String(255)) # 妯″瀷鎻愪緵鍟�
def to_json(self):
return {
@@ -99,24 +109,20 @@
session = self.db.query(ComplexChatModel).filter_by(id=chat_id).first()
return session
- async def update_complex_chat_by_id(self, chat_id: str, session, message: dict, conversation_id=None) -> ComplexChatModel | None:
- if not session:
- session = await self.get_complex_chat_by_id(chat_id)
- if session:
- try:
- # TODO
- session.update_date = current_time()
- self.db.commit()
- self.db.refresh(session)
- except Exception as e:
- # logger.error(e)
- self.db.rollback()
- return session
+ async def update_complex_chat_by_id(self, chat_id: str, kwargs:dict) -> None:
+
+ try:
+ self.db.query(ComplexChatModel).filter_by(id=chat_id).update(kwargs)
+ self.db.commit()
+ except Exception as e:
+ # logger.error(e)
+ self.db.rollback()
+
async def update_or_insert_by_id(self, chat_id: str, **kwargs) -> ComplexChatModel:
existing_session = await self.get_complex_chat_by_id(chat_id)
if existing_session:
- return await self.update_complex_chat_by_id(chat_id, existing_session, kwargs.get("message"))
+ return await self.update_complex_chat_by_id(chat_id, kwargs)
existing_session = await self.create_complex_chat(chat_id, **kwargs)
return existing_session
@@ -142,6 +148,10 @@
return session
+ async def aget_complex_chat(self) -> List:
+ return self.db.query(ComplexChatModel).filter(ComplexChatModel.status!=Dialog_STATSU_DELETE).all()
+
+
class ComplexChatSessionModel(Base):
__tablename__ = "complex_chat_sessions"
diff --git a/app/service/v2/app_driver/chat_base.py b/app/service/v2/app_driver/chat_base.py
index 47211d0..ee23911 100644
--- a/app/service/v2/app_driver/chat_base.py
+++ b/app/service/v2/app_driver/chat_base.py
@@ -32,6 +32,12 @@
return response
@staticmethod
+ async def http_put(url, data, headers, timeout=300):
+ async with httpx.AsyncClient(timeout=timeout) as client:
+ response = await client.put(url, json=data, headers=headers)
+ return response
+
+ @staticmethod
async def http_upload_file(url, data, files, headers, timeout=300):
async with httpx.AsyncClient(timeout=timeout) as client:
response = await client.post(url, headers=headers, files=files, data=data)
diff --git a/app/service/v2/app_driver/chat_data.py b/app/service/v2/app_driver/chat_data.py
index d642748..be966eb 100644
--- a/app/service/v2/app_driver/chat_data.py
+++ b/app/service/v2/app_driver/chat_data.py
@@ -1,5 +1,6 @@
import json
+from Log import logger
from app.config.config import settings
# from Log import logger
from app.service.v2.app_driver.chat_base import ChatBase
@@ -24,6 +25,15 @@
else:
return {}
+ async def chat_put(self, url, data, headers):
+
+ res = await self.http_put(url, data, headers)
+ if res.status_code == 200 or res.status_code == 201:
+ return res.json()
+ else:
+ logger.error(res.text)
+ return {}
+
async def chat_ping(self, url, params, headers):
res = await self.http_get(url, params, headers)
# print(res.text)
diff --git a/app/service/v2/chat.py b/app/service/v2/chat.py
index 9f83c63..ec8b5a2 100644
--- a/app/service/v2/chat.py
+++ b/app/service/v2/chat.py
@@ -1,4 +1,5 @@
import asyncio
+import datetime
import io
import json
import time
@@ -10,7 +11,7 @@
from Log import logger
from app.config.agent_base_url import RG_CHAT_DIALOG, DF_CHAT_AGENT, DF_CHAT_PARAMETERS, RG_CHAT_SESSIONS, \
- DF_CHAT_WORKFLOW, DF_UPLOAD_FILE, RG_ORIGINAL_URL
+ DF_CHAT_WORKFLOW, DF_UPLOAD_FILE, RG_ORIGINAL_URL, RG_CHAT_UPDATE_URL, DF_WORKFLOW_DRAFT, DF_WORKFLOW_PUBLISH
from app.config.config import settings
from app.config.const import *
from app.models import DialogModel, ApiTokenModel, UserTokenModel, ComplexChatSessionDao, ChatDataRequest, \
@@ -34,7 +35,7 @@
async def add_session_log(db, session_id: str, question: str, chat_id: str, user_id, event_type: str,
- conversation_id: str, agent_type, query: dict=None):
+ conversation_id: str, agent_type, query: dict = None):
try:
session = await ChatSessionDao(db).update_or_insert_by_id(
session_id=session_id,
@@ -65,6 +66,10 @@
return app_token.token
return ""
+async def get_workflow_token(db):
+ user_token = db.query(UserTokenModel).filter(UserTokenModel.id == workflow_server).first()
+ return user_token.access_token if user_token else ""
+
async def add_chat_token(db, data):
try:
@@ -88,7 +93,6 @@
return ChatAgent(), url
-
async def get_user_kb(db, user_id: int, kb_ids: list) -> list:
res = []
user = db.query(UserModel).filter(UserModel.id == user_id).first()
@@ -97,11 +101,12 @@
query = db.query(KnowledgeModel)
if user.permission != "admin":
klg_list = [j.id for i in user.groups for j in i.knowledges]
- for i in db.query(KnowledgeUserModel).filter(KnowledgeUserModel.user_id == user_id, KnowledgeUserModel.status == 1).all():
+ for i in db.query(KnowledgeUserModel).filter(KnowledgeUserModel.user_id == user_id,
+ KnowledgeUserModel.status == 1).all():
if i.kb_id not in klg_list:
klg_list.append(i.kb_id)
query = query.filter(or_(KnowledgeModel.id.in_(klg_list), KnowledgeModel.tenant_id == str(user_id)))
- kb_list= query.all()
+ kb_list = query.all()
for kb in kb_list:
if kb.id in kb_ids:
if kb.permission == "team":
@@ -120,7 +125,8 @@
kb_id = await get_user_kb(db, user_id, kb_ids)
if not kb_id:
yield "data: " + json.dumps({"message": smart_message_error,
- "error": "\n**ERROR**: The agent has no knowledge base to work with!", "status": http_400},
+ "error": "\n**ERROR**: The agent has no knowledge base to work with!",
+ "status": http_400},
ensure_ascii=False) + "\n\n"
return
chat = ChatDialog()
@@ -285,15 +291,11 @@
"error": error}, conversation_id)
-
-
async def service_chat_basic(db, chat_id: str, chat_data: ChatData, session_id: str, user_id, mode: str):
-
if chat_id == basic_report_talk:
complex_chat = await ComplexChatDao(db).get_complex_chat_by_mode(chat_data.report_mode)
if complex_chat:
...
-
async def service_chat_parameters(db, chat_id, user_id):
@@ -328,9 +330,8 @@
session_log = await ChatSessionDao(db).get_session_by_id(session_id)
if not session_log:
return {}
- log_info =session_log.log_to_json()
- if session_log.event_type == complex_chat:
-
+ log_info = session_log.log_to_json()
+ if session_log.event_type == complex_chat:
total, message_list = await ComplexChatSessionDao(db).get_session_list(session_id)
log_info["message"] = [message.log_to_json() for message in message_list[::-1]]
@@ -478,7 +479,8 @@
return records
-async def add_complex_log(db, message_id, chat_id, session_id, chat_mode, query, user_id, mode, agent_type, message_type, conversation_id="", node_data=None, query_data=None):
+async def add_complex_log(db, message_id, chat_id, session_id, chat_mode, query, user_id, mode, agent_type,
+ message_type, conversation_id="", node_data=None, query_data=None):
if not node_data:
node_data = []
if not query_data:
@@ -493,22 +495,23 @@
if session:
conversation_id = session.conversation_id
await complex_log.create_session(message_id,
- chat_id=chat_id,
- session_id=session_id,
- chat_mode=chat_mode,
- message_type=message_type,
- content=query,
- event_type=mode,
- tenant_id=user_id,
- conversation_id=conversation_id,
- node_data=json.dumps(node_data),
- query=json.dumps(query_data),
- agent_type=agent_type)
+ chat_id=chat_id,
+ session_id=session_id,
+ chat_mode=chat_mode,
+ message_type=message_type,
+ content=query,
+ event_type=mode,
+ tenant_id=user_id,
+ conversation_id=conversation_id,
+ node_data=json.dumps(node_data),
+ query=json.dumps(query_data),
+ agent_type=agent_type)
return conversation_id, True
except Exception as e:
logger.error(e)
return conversation_id, False
+
async def add_query_files(db, message_id):
query = {}
@@ -516,6 +519,7 @@
if complex_log:
query = json.loads(complex_log.query)
return query.get("files", [])
+
async def service_complex_chat(db, chat_id, mode, user_id, chat_request: ChatDataRequest):
answer_event = ""
@@ -527,7 +531,7 @@
task_id = ""
error = ""
node_list = []
- reference= {}
+ reference = {}
conversation_id = ""
query_data = chat_request.to_dict()
new_message_id = str(uuid.uuid4())
@@ -539,9 +543,12 @@
if not files and chat_request.parentId:
files = await add_query_files(db, chat_request.parentId)
if chat_request.chatMode != complex_content_optimization_chat:
- await add_session_log(db, chat_request.sessionId, chat_request.query if chat_request.query else "鏈懡鍚嶄細璇�", chat_id, user_id,
- mode, "", DF_TYPE)
- conversation_id, message = await add_complex_log(db, new_message_id, chat_id, chat_request.sessionId, chat_request.chatMode, chat_request.query, user_id, mode, DF_TYPE, 1, query_data=query_data)
+ await add_session_log(db, chat_request.sessionId, chat_request.query if chat_request.query else "鏈懡鍚嶄細璇�",
+ chat_id, user_id,
+ mode, "", DF_TYPE)
+ conversation_id, message = await add_complex_log(db, new_message_id, chat_id, chat_request.sessionId,
+ chat_request.chatMode, chat_request.query, user_id, mode,
+ DF_TYPE, 1, query_data=query_data)
if not message:
yield "data: " + json.dumps({"message": smart_message_error,
"error": "\n**ERROR**: 鍒涘缓浼氳瘽澶辫触锛�", "status": http_500},
@@ -555,7 +562,7 @@
session = await service_chat_sessions(db, chat_id, chat_request.query)
# print(session)
if not session or session.get("code") != 0:
- yield "data: " + json.dumps(
+ yield "data: " + json.dumps(
{"message": smart_message_error, "error": "\n**ERROR**: chat agent error", "status": http_500})
return
conversation_id = session.get("data", {}).get("id")
@@ -563,7 +570,9 @@
url = settings.fwr_base_url + RG_CHAT_DIALOG.format(chat_id)
chat = ChatDialog()
try:
- async for ans in chat.chat_completions(url, await chat.complex_request_data(chat_request.query, chat_request.knowledgeId, conversation_id),
+ async for ans in chat.chat_completions(url, await chat.complex_request_data(chat_request.query,
+ chat_request.knowledgeId,
+ conversation_id),
await chat.get_headers(token)):
data = {}
error = ""
@@ -587,9 +596,9 @@
reference = data.get("reference", {})
event = smart_message_cover
message_str = "data: " + json.dumps(
- {"event": event, "data": data, "error": error, "status": status, "message_id":message_id,
- "parent_id": new_message_id,
- "session_id": chat_request.sessionId},
+ {"event": event, "data": data, "error": error, "status": status, "message_id": message_id,
+ "parent_id": new_message_id,
+ "session_id": chat_request.sessionId},
ensure_ascii=False) + "\n\n"
for i in range(0, len(message_str), max_chunk_size):
chunk = message_str[i:i + max_chunk_size]
@@ -608,7 +617,9 @@
token = await get_chat_token(db, chat_id)
chat, url = await get_chat_object(mode)
async for ans in chat.chat_completions(url,
- await chat.complex_request_data(chat_request.query, conversation_id, str(user_id), files=files, inputs=inputs),
+ await chat.complex_request_data(chat_request.query, conversation_id,
+ str(user_id), files=files,
+ inputs=inputs),
await chat.get_headers(token)):
# print(ans)
data = {}
@@ -662,7 +673,8 @@
continue
yield "data: " + json.dumps(
- {"event": event, "data": data, "error": error, "status": status, "task_id": task_id, "message_id":message_id,
+ {"event": event, "data": data, "error": error, "status": status, "task_id": task_id,
+ "message_id": message_id,
"parent_id": new_message_id,
"session_id": chat_request.sessionId},
ensure_ascii=False) + "\n\n"
@@ -682,7 +694,11 @@
# "node_list": node_list, "task_id": task_id, "id": message_id,
# "error": error}, conversation_id)
if message_id:
- await add_complex_log(db, message_id, chat_id, chat_request.sessionId, chat_request.chatMode, answer_event or answer_agent or answer_workflow or answer_dialog or error, user_id, mode, DF_TYPE, 2, conversation_id, node_data=node_list or reference, query_data=query_data)
+ await add_complex_log(db, message_id, chat_id, chat_request.sessionId, chat_request.chatMode,
+ answer_event or answer_agent or answer_workflow or answer_dialog or error, user_id,
+ mode, DF_TYPE, 2, conversation_id, node_data=node_list or reference,
+ query_data=query_data)
+
async def service_complex_upload(db, chat_id, file, user_id):
files = []
@@ -706,6 +722,92 @@
logger.error(e)
return json.dumps(files) if files else ""
+
+async def service_complex_model(db, chat_type, model_type, model_name, model_provider):
+ if chat_type == 1 and model_type == 1:
+ return await set_dialog_model(db, complex_knowledge_chat, model_name)
+ elif chat_type == 1 and model_type == 2:
+ return await set_dialog_model(db, complex_knowledge_chat_deep, model_name, model_provider)
+ else:
+ if model_type == 1:
+ chats = [complex_dialog_chat, complex_network_chat, complex_mindmap_chat, complex_content_optimization_chat]
+ else:
+ chats = [complex_dialog_chat, complex_network_chat]
+ return await set_workflow_model(db,chats
+ , # , complex_network_chat, complex_mindmap_chat, complex_content_optimization_chat
+ model_type, model_name, model_provider)
+
+
+async def set_dialog_model(db, chat_mode, model_name, model_provider):
+ chat = await ComplexChatDao(db).get_complex_chat_by_mode(chat_mode)
+ if chat:
+ access_token = await get_chat_token(db, rg_api_token)
+ url = settings.fwr_base_url + RG_CHAT_UPDATE_URL.format(chat.id)
+ chat_base = ChatBaseApply()
+ payload = {
+ "name": chat.name,
+ "llm": {
+ "model_name": model_name
+ }
+ }
+ response = await chat_base.chat_put(url, payload, await chat_base.get_headers(access_token))
+ # print(response)
+ if not response:
+ return "鏈嶅姟寮傚父,淇敼澶辫触锛�"
+ await ComplexChatDao(db).update_complex_chat_by_id(chat.id, {"chat_model": model_name, "chat_model_ds": model_name, "chat_provider": model_provider, "update_date": datetime.datetime.now()})
+ return ""
+
+async def set_workflow_model(db, chat_modes, model_type, model_name, model_provider):
+ chat_base = ChatBaseApply()
+ token = await get_workflow_token(db)
+ for chat_mode in chat_modes:
+ chat = await ComplexChatDao(db).get_complex_chat_by_mode(chat_mode)
+ if chat:
+
+ get_draft_url = settings.dify_base_url + DF_WORKFLOW_DRAFT.format(chat.id)
+ draft_data = await chat_base.chat_get(get_draft_url, {}, await chat_base.get_headers(token))
+ if draft_data:
+ graph = draft_data.get("graph")
+ for node in graph.get("nodes"):
+ if node.get("data", {}).get("type") == "llm":
+ if model_type == 1 and "娣卞害鎼滅储" not in node.get("data", {}).get("title"):
+ node["data"]["model"]["name"] = model_name
+ node["data"]["model"]["provider"] = model_provider
+ elif model_type == 2 and "娣卞害鎼滅储" in node.get("data", {}).get("title"):
+ node["data"]["model"]["name"] = model_name
+ node["data"]["model"]["provider"] = model_provider
+
+ draft_data_query = {"conversation_variables": draft_data.get("conversation_variables"),
+ "environment_variables": draft_data.get("environment_variables"),
+ "hash": draft_data.get("hash"),
+ "features": draft_data.get("features"),
+ "graph": graph}
+ set_draft_data = await chat_base.chat_post(get_draft_url, draft_data_query, await chat_base.get_headers(token))
+ if set_draft_data and set_draft_data.get("result") == "success":
+ publish_url = settings.dify_base_url + DF_WORKFLOW_PUBLISH.format(chat.id)
+ publish_data = await chat_base.chat_post(publish_url, {}, await chat_base.get_headers(token))
+ if publish_data and publish_data.get("result") == "success":
+ update_kwargs = {"chat_provider": model_provider, "update_date": datetime.datetime.now()}
+ if model_type == 1:
+ update_kwargs["chat_model"] = model_name
+ else:
+ update_kwargs["chat_model_ds"] = model_name
+ await ComplexChatDao(db).update_complex_chat_by_id(chat.id, update_kwargs)
+
+
+async def service_get_complex_model(db):
+ res = {}
+ for complexs in await ComplexChatDao(db).aget_complex_chat():
+ if complexs.chat_mode == complex_knowledge_chat:
+ res["dialog"] = {"modelName": complexs.chat_model, "modelProvider": complexs.chat_provider}
+ elif complexs.chat_mode == complex_knowledge_chat_deep:
+ res["dialog_ds"] = {"modelName": complexs.chat_model_ds, "modelProvider": complexs.chat_provider}
+ else:
+ res["workflow"] = {"modelName": complexs.chat_model, "modelProvider": complexs.chat_provider}
+ res["workflow_ds"] = {"modelName": complexs.chat_model_ds, "modelProvider": complexs.chat_provider}
+
+ return json.dumps(res)
+
if __name__ == "__main__":
q = json.dumps({"query": "璁惧", "dataset_ids": ["fc68db52f43111efb94a0242ac120004"]})
top_k = 2
diff --git a/app/service/v2/initialize_data.py b/app/service/v2/initialize_data.py
index 28a9961..c8e6a1e 100644
--- a/app/service/v2/initialize_data.py
+++ b/app/service/v2/initialize_data.py
@@ -181,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)
@@ -434,7 +434,8 @@
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)
+ config = yaml.safe_load(file)
+
try:
system = db.query(SystemDataModel).filter_by(id=SYSTEM_ID).first()
if system:
diff --git a/main.py b/main.py
index 1743d2c..ccaefda 100644
--- a/main.py
+++ b/main.py
@@ -57,7 +57,7 @@
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(sync_resource, 'interval', minutes=5, id="sync_resource_1")
+scheduler.add_job(sync_resource, 'interval', minutes=30, id="sync_resource_1")
scheduler.start()
--
Gitblit v1.8.0