docker-compose.yml

@@ -16,8 +16,10 @@ services:
       - i18n:/i18n
     env_file: .env
     environment:
-      - SS_TYPE=redis
+      - SS_TYPE=memory  # redis currently is broken
       - SS_REDIS_HOST=redis
+      - SS_REDIS_PORT=6379
+      - SS_REDIS_PASSWORD=bot
 
   redis:
     image: redis
@@ -25,4 +27,4 @@ services:
     volumes:
       - redis-config:/etc/redis
       - redis-data:/data
-    command: redis-server --save 20 1
+    command: redis-server --save 20 1 --loglevel warning --requirepass bot

migrations/env.py

@@ -5,7 +5,7 @@ from sqlalchemy import pool
 
 from alembic import context
 
-from mybot.config import load_config
+from mybot.config import Config as AppConfig
 from mybot.database import Base
 import mybot.database.models  # do not delete this
 
@@ -19,7 +19,7 @@ if config.config_file_name is not None:
 target_metadata = Base.metadata
 
 # set sqlalchemy.url since it can not be set in alembic.ini file
-app_config = load_config()
+app_config = AppConfig.from_env()
 config.set_main_option("sqlalchemy.url", app_config.database.url)
 
 

mybot/config.py

@@ -72,10 +72,10 @@ class I18NConfig:
 @dataclass
 class StateStorageConfig:
     type: str
-    redis_host: Optional[str]
+    redis_host: str
     redis_port: int
     redis_db: int
-    redis_pass: Optional[str]
+    redis_pass: str
 
     @classmethod
     def from_env(cls):

requirements.txt

@@ -3,7 +3,6 @@ pyyaml
 sqlalchemy
 alembic
 psycopg
-pymysql[rsa]
+pymysql
 flask
 gunicorn
-redis