shen/bot-on-anything
1
0
Fork 0
mirror of https://github.com/zhayujie/bot-on-anything.git synced 2026-03-03 08:34:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/RegimenArsenic/bot-on-anything

Browse Source
This commit is contained in:
RA
2023-03-26 18:01:22 +08:00
parent 916f711cf6 f6d7a203d8
commit 7342c7bb91
7 changed files with 42 additions and 18 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
from config import model_conf, common_conf_val
from common import const
from common import log
import openai
@@ -22,7 +22,8 @@ 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']
if query == '#清除记忆':
clear_memory_commands = common_conf_val('clear_memory_commands', ['#清除记忆'])
if query in clear_memory_commands:
Session.clear_session(from_user_id)
return '记忆已清除'
@@ -195,6 +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_num = model_conf(const.OPEN_AI).get('max_history_num', None)
if not max_tokens or max_tokens > 4000:
# default value
max_tokens = 1000
@@ -209,6 +211,11 @@ class Session(object):
session.pop(1)
session.pop(1)
if max_history_num is not None:
while len(session) > max_history_num * 2 + 1:
session.pop(1)
session.pop(1)
@staticmethod
def clear_session(user_id):
user_session[user_id] = []

5
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
from config import model_conf, common_conf_val
from common import const
from common import log
import openai
@@ -20,7 +20,8 @@ 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']
if query == '#清除记忆':
clear_memory_commands = common_conf_val('clear_memory_commands', ['#清除记忆'])
if query in clear_memory_commands:
Session.clear_session(from_user_id)
return '记忆已清除'