Merge branch 'main' into feature/support-functions

# Conflicts:
#	translations.json
This commit is contained in:
ned
2023-07-03 22:31:15 +02:00
2 changed files with 16 additions and 16 deletions

View File

@@ -221,7 +221,7 @@ class OpenAIHelper:
try: try:
summary = await self.__summarise(self.conversations[chat_id][:-1]) summary = await self.__summarise(self.conversations[chat_id][:-1])
logging.debug(f'Summary: {summary}') logging.debug(f'Summary: {summary}')
self.reset_chat_history(chat_id) self.reset_chat_history(chat_id, self.conversations[chat_id][0]['content'])
self.__add_to_history(chat_id, role="assistant", content=summary) self.__add_to_history(chat_id, role="assistant", content=summary)
self.__add_to_history(chat_id, role="user", content=query) self.__add_to_history(chat_id, role="user", content=query)
except Exception as e: except Exception as e:

View File

@@ -474,19 +474,19 @@
}, },
"zh-tw": { "zh-tw": {
"help_description":"顯示幫助訊息", "help_description":"顯示幫助訊息",
"reset_description":"重對話。可以選擇傳遞高級指示(例如 /reset 你是一個樂於助人的助手)", "reset_description":"重對話。可以選擇傳遞進階指令(例如 /reset 你是一個樂於助人的助手)",
"image_description":"根據提示生成圖(例如 /image 貓)", "image_description":"根據提示生成圖(例如 /image 貓)",
"stats_description":"取得當前使用統計", "stats_description":"取得當前使用統計",
"resend_description":"重最後一訊息", "resend_description":"重新傳送最後一訊息",
"chat_description":"與機器人聊天!", "chat_description":"與機器人聊天!",
"disallowed":"抱歉,您不允許使用此機器人。查看原始碼https://github.com/n3d1117/chatgpt-telegram-bot", "disallowed":"抱歉,您不允許使用此機器人。你可以在以下網址檢視原始碼https://github.com/n3d1117/chatgpt-telegram-bot",
"budget_limit":"抱歉,已達到用量上限。", "budget_limit":"抱歉,已達到用量上限。",
"help_text":["我是一個 ChatGPT 機器人,跟我聊天吧!", "傳送語音訊息或檔案給我,我會為您進行轉錄", "開放原始碼https://github.com/n3d1117/chatgpt-telegram-bot"], "help_text":["我是一個 ChatGPT 機器人,跟我聊天吧!", "傳送語音訊息或檔案給我,我會為您進行轉錄", "開放原始碼https://github.com/n3d1117/chatgpt-telegram-bot"],
"stats_conversation":["當前對話", "聊天訊息錄", "聊天 Token 錄"], "stats_conversation":["目前的對話", "聊天訊息錄", "聊天 Token 錄"],
"usage_today":"今日用量", "usage_today":"今日用量",
"usage_month":"本月用量", "usage_month":"本月用量",
"stats_tokens":"Token 已使用", "stats_tokens":"Token 已使用",
"stats_images":"圖已生成", "stats_images":"圖已生成",
"stats_transcribe":["分", "秒已轉錄"], "stats_transcribe":["分", "秒已轉錄"],
"stats_total":"💰 總計金額 $", "stats_total":"💰 總計金額 $",
"stats_budget":"剩餘預算", "stats_budget":"剩餘預算",
@@ -494,25 +494,25 @@
"daily":"今日", "daily":"今日",
"all-time":"", "all-time":"",
"stats_openai":"本月您的 OpenAI 帳戶總共計費 $", "stats_openai":"本月您的 OpenAI 帳戶總共計費 $",
"resend_failed":"沒有訊息可以重", "resend_failed":"沒有訊息可以重新傳送",
"reset_done":"重完成!", "reset_done":"重完成!",
"image_no_prompt":"請輸入提示!(例如 /image 貓)", "image_no_prompt":"請輸入提示!(例如 /image 貓)",
"image_fail":"無法生成圖像", "image_fail":"圖片生成失敗",
"media_download_fail":["無法下載音檔案", "請確保檔案大小不超過 20MB"], "media_download_fail":["下載音檔案失敗", "請確保檔案大小不超過 20MB"],
"media_type_fail":"不支援的檔案類型", "media_type_fail":"不支援的檔案類型",
"transcript":"轉錄", "transcript":"轉錄",
"answer":"回答", "answer":"回答",
"transcribe_fail":"無法轉錄文字", "transcribe_fail":"轉錄文字失敗",
"chat_fail":"無法取得回應", "chat_fail":"無法取得回應",
"prompt":"提示", "prompt":"提示",
"completion":"填充", "completion":"填充",
"openai_rate_limit":"OpenAI 請求超出限制", "openai_rate_limit":"OpenAI 請求數量已超過上限",
"openai_invalid":"OpenAI 無效請求", "openai_invalid":"OpenAI 的請求無效",
"error":"發生錯誤", "error":"發生錯誤",
"try_again":"請稍後重試", "try_again":"請稍後重試",
"answer_with_chatgpt":"使用 ChatGPT 回答", "answer_with_chatgpt":"使用 ChatGPT 回答",
"ask_chatgpt":"詢問 ChatGPT", "ask_chatgpt":"詢問 ChatGPT",
"loading":"載入中", "loading":"載入中...",
"function_unavailable_in_inline_mode": "此功能在內嵌模式下不可用" "function_unavailable_in_inline_mode": "此功能在內嵌模式下不可用"
}, },
"vi": { "vi": {