Deployment optimisation

.gitignore

@@ -129,7 +129,6 @@ dmypy.json
 .pyre/
 
 # Custom
-config/config.yml
 config/config.env
 
 docker-compose.dev.yml

Dockerfile

@@ -1,20 +1,20 @@
-FROM python:3.8-slim
+FROM python:3.8-alpine
 
 ENV PYTHONFAULTHANDLER=1
 ENV PYTHONUNBUFFERED=1
 ENV PYTHONHASHSEED=random
-ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONDONTWRITEBYTECODE=1
 ENV PIP_NO_CACHE_DIR=off
 ENV PIP_DISABLE_PIP_VERSION_CHECK=on
 ENV PIP_DEFAULT_TIMEOUT=100
 
-RUN apt-get update
-RUN apt-get install -y python3 python3-pip python-dev build-essential python3-venv ffmpeg
+RUN apk add --no-cache python3-dev build-base libffi-dev openssl-dev ffmpeg
+RUN apk add --no-cache bash
 
 RUN mkdir -p /code
 ADD . /code
 WORKDIR /code
 
 RUN pip3 install -r requirements.txt
 
-CMD ["bash"]
+CMD ["python3", "bot/bot.py"]

README.md

@@ -20,6 +20,10 @@ This repo is ChatGPT re-created as Telegram Bot. **And it works great.**
 
 You can deploy your own bot, or use mine: [@chatgpt_karfly_bot](https://t.me/chatgpt_karfly_bot)
 
+
+[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/IG_WDs?referralCode=AkEaYM)
+
+
 ## Features
 - Low latency replies (it usually takes about 3-5 seconds)
 - No request limits
@@ -37,7 +41,7 @@ You can deploy your own bot, or use mine: [@chatgpt_karfly_bot](https://t.me/cha
 <p align="center">
   <img src="https://media.giphy.com/media/v1.Y2lkPTc5MGI3NjExYmM2ZWVjY2M4NWQ3ZThkYmQ3MDhmMTEzZGUwOGFmOThlMDIzZGM4YiZjdD1n/unx907h7GSiLAugzVX/giphy.gif" />
 </p>
-
+ 
 ---
 
 ## 🤑 Payments
@@ -75,13 +79,14 @@ If you want to add payments to your bot and create profitable business – write
 
 2. Get your Telegram bot token from [@BotFather](https://t.me/BotFather)
 
-3. Edit `config/config.example.yml` to set your tokens and run 2 commands below (*if you're advanced user, you can also edit* `config/config.example.env`):
+3. Edit `config/config.example.env` to set your tokens and run the command below:
     ```bash
-    mv config/config.example.yml config/config.yml
     mv config/config.example.env config/config.env
     ```
+
+4. You can edit the configs in config/config.yml to have the model behave differently. They already come with some opinionated default settings.
 
-4. 🔥 And now **run**:
+5. 🔥 And now **run**:
     ```bash
     docker-compose --env-file config/config.env up --build
     ```

bot/config.py

@@ -1,26 +1,30 @@
 import yaml
-import dotenv
+import os
 from pathlib import Path
+import ast
+
+from dotenv import load_dotenv
+
+
 
 config_dir = Path(__file__).parent.parent.resolve() / "config"
+load_dotenv(dotenv_path=config_dir / "config.env")
 
 # load yaml config
 with open(config_dir / "config.yml", 'r') as f:
     config_yaml = yaml.safe_load(f)
 
-# load .env config
-config_env = dotenv.dotenv_values(config_dir / "config.env")
-
 # config parameters
-telegram_token = config_yaml["telegram_token"]
-openai_api_key = config_yaml["openai_api_key"]
+openai_api_key = os.environ["OPENAI_API_KEY"]
+telegram_token = os.environ["TELEGRAM_TOKEN"]
 use_chatgpt_api = config_yaml.get("use_chatgpt_api", True)
-allowed_telegram_usernames = config_yaml["allowed_telegram_usernames"]
+env_allowed_users = os.environ.get('ALLOWED_TELEGRAM_USERNAMES', '')
+allowed_telegram_usernames = (lambda s: s.split(',') if s else [])(os.environ.get('ALLOWED_TELEGRAM_USERNAMES', ''))
 new_dialog_timeout = config_yaml["new_dialog_timeout"]
 enable_message_streaming = config_yaml.get("enable_message_streaming", True)
 return_n_generated_images = config_yaml.get("return_n_generated_images", 1)
 n_chat_modes_per_page = config_yaml.get("n_chat_modes_per_page", 5)
-mongodb_uri = f"mongodb://mongo:{config_env['MONGODB_PORT']}"
+mongodb_uri = os.environ["MONGO_URL"] if os.environ.get("MONGO_URL") else f"mongodb://mongo:{os.environ['MONGODB_PORT']}"
 
 # chat_modes
 with open(config_dir / "chat_modes.yml", 'r') as f:

config/config.example.env

@@ -1,3 +1,9 @@
+TELEGRAM_TOKEN=
+OPENAI_API_KEY=
+
+#comma separated, without spaces e.g. username_one,username_two
+ALLOWED_TELEGRAM_USERNAMES=
+
 # local path where to store MongoDB
 MONGODB_PATH=./mongodb
 # MongoDB port
@@ -8,4 +14,7 @@ MONGO_EXPRESS_PORT=8081
 # Mongo Express username
 MONGO_EXPRESS_USERNAME=username
 # Mongo Express password
-MONGO_EXPRESS_PASSWORD=password
+MONGO_EXPRESS_PASSWORD=password
+
+
+

config/config.yml

@@ -0,0 +1,10 @@
+use_chatgpt_api: true
+new_dialog_timeout: 600 # new dialog starts after timeout (in seconds)
+return_n_generated_images: 1
+n_chat_modes_per_page: 5
+enable_message_streaming: true # if set, messages will be shown to user word-by-word
+
+# prices
+chatgpt_price_per_1000_tokens: 0.002
+gpt_price_per_1000_tokens: 0.02
+whisper_price_per_1_min: 0.006