diff --git a/ModelMerge b/ModelMerge index dbe7048c..9bb6ce33 160000 --- a/ModelMerge +++ b/ModelMerge @@ -1 +1 @@ -Subproject commit dbe7048ce4e3d2e8bc2db5eee10cdcbc7b199b36 +Subproject commit 9bb6ce33c8052e0868a0f1a33c7b7f0187d33349 diff --git a/bot.py b/bot.py index b61c3773..74e5b268 100644 --- a/bot.py +++ b/bot.py @@ -187,6 +187,7 @@ async def getChatGPT(update, context, title, robot, message, chatid, messageid, image_has_send = 0 model_name = Users.get_config(convo_id, "engine") language = Users.get_config(convo_id, "language") + systemprompt = Users.get_config(convo_id, "systemprompt") Frequency_Modification = 20 if "gpt-4o" in model_name: @@ -206,7 +207,7 @@ async def getChatGPT(update, context, title, robot, message, chatid, messageid, )).message_id try: - async for data in robot.ask_stream(text, convo_id=convo_id, pass_history=pass_history, model=model_name, language=language, api_url=api_url, api_key=api_key): + async for data in robot.ask_stream(text, convo_id=convo_id, pass_history=pass_history, model=model_name, language=language, api_url=api_url, api_key=api_key, systemprompt=systemprompt): # for data in robot.ask_stream(text, convo_id=convo_id, pass_history=pass_history, model=model_name): if stop_event.is_set() and convo_id == target_convo_id and answer_messageid < reset_mess_id: return