shen/bot-on-anything
1
0
Fork 0
mirror of https://github.com/zhayujie/bot-on-anything.git synced 2026-01-19 09:41:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

use "max_history_num" to limit conversation count

Browse Source
This commit is contained in:
Xun Cai
2023-03-25 16:09:36 +11:00
parent 5061a205f5
commit ba4b8cc154
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
model/openai/chatgpt_model.py
View File

@@ -1,7 +1,7 @@
# encoding:utf-8
from model.model import Model
from config import model_conf, settings_conf_val
from config import model_conf, common_conf_val
from common import const
from common import log
import openai
@@ -22,7 +22,7 @@ class ChatGPTModel(Model):
if not context or not context.get('type') or context.get('type') == 'TEXT':
log.info("[CHATGPT] query={}".format(query))
from_user_id = context['from_user_id']
clear_memory_commands = settings_conf_val('clear_memory_commands', ['#清除记忆'])
clear_memory_commands = common_conf_val('clear_memory_commands', ['#清除记忆'])
if query in clear_memory_commands:
Session.clear_session(from_user_id)
return '记忆已清除'
@@ -196,7 +196,7 @@ class Session(object):
@staticmethod
def save_session(query, answer, user_id, used_tokens=0):
max_tokens = model_conf(const.OPEN_AI).get('conversation_max_tokens')
max_history_per_session = model_conf(const.OPEN_AI).get('max_history_per_session', None)
max_history_num = model_conf(const.OPEN_AI).get('max_history_num', None)
if not max_tokens or max_tokens > 4000:
# default value
max_tokens = 1000
@@ -211,8 +211,9 @@ class Session(object):
session.pop(1)
session.pop(1)
if max_history_per_session is not None:
while len(session) > max_history_per_session + 1:
if max_history_num is not None:
while len(session) > max_history_num * 2 + 1:
session.pop(1)
session.pop(1)
@staticmethod

4
model/openai/open_ai_model.py
View File

@@ -1,7 +1,7 @@
# encoding:utf-8
from model.model import Model
from config import model_conf, settings_conf_val
from config import model_conf, common_conf_val
from common import const
from common import log
import openai
@@ -20,7 +20,7 @@ class OpenAIModel(Model):
if not context or not context.get('type') or context.get('type') == 'TEXT':
log.info("[OPEN_AI] query={}".format(query))
from_user_id = context['from_user_id']
clear_memory_commands = settings_conf_val('clear_memory_commands', ['#清除记忆'])
clear_memory_commands = common_conf_val('clear_memory_commands', ['#清除记忆'])
if query in clear_memory_commands:
Session.clear_session(from_user_id)
return '记忆已清除'