diff --git a/bot.py b/bot.py index e663e371..446e2e67 100644 --- a/bot.py +++ b/bot.py @@ -4,10 +4,10 @@ import logging import traceback import utils.decorators as decorators -from md2tgmd import escape -from ModelMerge.utils.prompt import translator_en2zh_prompt, translator_prompt, claude3_doc_assistant_prompt -from ModelMerge.utils.scripts import Document_extract, claude_replace, get_image_message +from md2tgmd.src.md2tgmd import escape +from ModelMerge.src.ModelMerge.utils.prompt import translator_en2zh_prompt, translator_prompt, claude3_doc_assistant_prompt +from ModelMerge.src.ModelMerge.utils.scripts import Document_extract, claude_replace, get_image_message import config from config import ( diff --git a/config.py b/config.py index 8d83c715..c897a4e9 100644 --- a/config.py +++ b/config.py @@ -5,8 +5,8 @@ from utils.i18n import strings from datetime import datetime -from ModelMerge.utils import prompt -from ModelMerge.models import chatgpt, claude, groq, claude3, gemini, PLUGINS +from ModelMerge.src.ModelMerge.utils import prompt +from ModelMerge.src.ModelMerge.models import chatgpt, claude, groq, claude3, gemini, PLUGINS from telegram import InlineKeyboardButton NICK = os.environ.get('NICK', None) diff --git a/requirements.txt b/requirements.txt index c7e84e23..786c1385 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,13 @@ --index-url https://pypi.python.org/simple/ python-dotenv -md2tgmd==0.2.4 -ModelMerge==0.7.10 -python-telegram-bot[webhooks,rate-limiter]==21.0.1 \ No newline at end of file +python-telegram-bot[webhooks,rate-limiter]==21.0.1 + +lxml +pytz +PyExecJS +requests +pdfminer.six +beautifulsoup4 +tiktoken==0.6.0 +duckduckgo-search==5.3.1 +google-api-python-client==2.128.0 \ No newline at end of file diff --git a/setup.sh b/setup.sh index 4e7a3961..fc53ad49 100755 --- a/setup.sh +++ b/setup.sh @@ -1,5 +1,5 @@ #!/bin/bash set -eu rm -rf /home/ChatGPT-Telegram-Bot -git clone --depth 1 -b main https://github.com/yym68686/ChatGPT-Telegram-Bot.git +git clone --recurse-submodules --depth 1 -b main https://github.com/yym68686/ChatGPT-Telegram-Bot.git python -u /home/ChatGPT-Telegram-Bot/bot.py \ No newline at end of file