mirror of
https://github.com/father-bot/chatgpt_telegram_bot.git
synced 2026-06-13 20:14:58 +03:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6540b28437 | |||
| 00c5f66be5 |
+1
-1
@@ -429,7 +429,7 @@ async def message_handle(update: Update, context: CallbackContext, message=None,
|
||||
prev_answer = answer
|
||||
|
||||
# update user data
|
||||
new_dialog_message = {"user": _message, "bot": answer, "date": datetime.now()}
|
||||
new_dialog_message = {"user": [{"type": "text", "text": _message}], "bot": answer, "date": datetime.now()}
|
||||
|
||||
db.set_dialog_messages(
|
||||
user_id,
|
||||
|
||||
+18
-11
@@ -254,25 +254,32 @@ class ChatGPT:
|
||||
prompt = config.chat_modes[chat_mode]["prompt_start"]
|
||||
|
||||
messages = [{"role": "system", "content": prompt}]
|
||||
user_messages = {"role": "user", "content": []}
|
||||
|
||||
for dialog_message in dialog_messages:
|
||||
user_messages["content"].extend(dialog_message["user"])
|
||||
messages.append({"role": "user", "content": dialog_message["user"]})
|
||||
messages.append({"role": "assistant", "content": dialog_message["bot"]})
|
||||
|
||||
|
||||
user_messages["content"].append({"type": "text", "text": message})
|
||||
|
||||
|
||||
if image_buffer is not None:
|
||||
user_messages["content"].append(
|
||||
messages.append(
|
||||
{
|
||||
"type": "image",
|
||||
"image": self._encode_image(image_buffer),
|
||||
"role": "user",
|
||||
"content": [
|
||||
{
|
||||
"type": "text",
|
||||
"text": message,
|
||||
},
|
||||
{
|
||||
"type": "image",
|
||||
"image": self._encode_image(image_buffer),
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
)
|
||||
else:
|
||||
messages.append({"role": "user", "content": message})
|
||||
|
||||
response = messages + ([user_messages] if len(user_messages["content"]) > 0 else [])
|
||||
return response
|
||||
return messages
|
||||
|
||||
def _postprocess_answer(self, answer):
|
||||
answer = answer.strip()
|
||||
|
||||
Reference in New Issue
Block a user