chore

Author: michael-yin

.env/.dev-sample

@@ -1,7 +1,7 @@
 FLASK_DEBUG=1
 FLASK_CONFIG=development
-DATABASE_URL=postgresql://flask_celery:flask_celery@db/flask_celery
+DATABASE_URL=postgresql+psycopg://flask_celery:flask_celery@db/flask_celery
 SECRET_KEY=my_precious
 CELERY_BROKER_URL=redis://redis:6379/0
 CELERY_RESULT_BACKEND=redis://redis:6379/0
-SOCKETIO_MESSAGE_QUEUE=redis://redis:6379/0
+SOCKETIO_MESSAGE_QUEUE=redis://redis:6379/0

.env/.prod-sample

@@ -1,6 +1,6 @@
 FLASK_DEBUG=0
 FLASK_CONFIG=production
-DATABASE_URL=postgresql://flask_celery:flask_celery@db/flask_celery
+DATABASE_URL=postgresql+psycopg://flask_celery:flask_celery@db/flask_celery
 SECRET_KEY=my_precious
 CELERY_BROKER_URL=amqp://admin:admin@rabbitmq:5672/
 CELERY_RESULT_BACKEND=redis://redis:6379/0

app.py

@@ -1,9 +1,13 @@
-import eventlet
-eventlet.monkey_patch()
+import os
+if not os.environ.get('FLASK_RUN_FROM_CLI'):
+    # avoid patching if running with flask shell
+    import eventlet
+    eventlet.monkey_patch()
 
 from project import create_app, ext_celery, socketio
 
 app = create_app()
+celery = ext_celery.celery
 
 
 @app.route("/")
@@ -16,5 +20,6 @@ def hello_world():
         app,
         debug=True,
         use_reloader=True,
-        host='0.0.0.0'
+        host='0.0.0.0',
+        allow_unsafe_werkzeug=True,
     )

compose/local/flask/Dockerfile

@@ -1,12 +1,12 @@
-FROM python:3.9-slim-buster
+FROM python:3.11-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
 
 RUN apt-get update \
   # dependencies for building Python packages
   && apt-get install -y build-essential \
-  # psycopg2 dependencies
+  # psycopg dependencies
   && apt-get install -y libpq-dev \
   # Additional dependencies
   && apt-get install -y telnet netcat \

compose/local/flask/entrypoint

@@ -11,7 +11,7 @@ postgres_ready() {
 python << END
 import sys
 
-import psycopg2
+import psycopg
 import urllib.parse as urlparse
 import os
 
@@ -23,14 +23,14 @@ host = url.hostname
 port = url.port
 
 try:
-    psycopg2.connect(
+    psycopg.connect(
         dbname=dbname,
         user=user,
         password=password,
         host=host,
         port=port
     )
-except psycopg2.OperationalError:
+except psycopg.OperationalError:
     sys.exit(-1)
 sys.exit(0)
 

compose/local/flask/start

@@ -6,4 +6,4 @@ set -o nounset
 
 flask db upgrade
 # flask run --host=0.0.0.0
-python app.py
+python app.py

compose/production/flask/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim-buster
+FROM python:3.11-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1

compose/production/flask/entrypoint

@@ -11,7 +11,7 @@ postgres_ready() {
 python << END
 import sys
 
-import psycopg2
+import psycopg
 import urllib.parse as urlparse
 import os
 
@@ -23,14 +23,14 @@ host = url.hostname
 port = url.port
 
 try:
-    psycopg2.connect(
+    psycopg.connect(
         dbname=dbname,
         user=user,
         password=password,
         host=host,
         port=port
     )
-except psycopg2.OperationalError:
+except psycopg.OperationalError:
     sys.exit(-1)
 sys.exit(0)
 

compose/production/nginx/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.23-alpine
+FROM nginx:1.27-alpine
 
 RUN rm /etc/nginx/conf.d/default.conf
 COPY nginx.conf /etc/nginx/conf.d

compose/production/nginx/nginx.conf

@@ -20,7 +20,7 @@ server {
         client_max_body_size 20M;
     }
     location /upload/ {
-        alias /app/upload/;
+        alias /app/uploadfiles/;
     }
 
     location /socket.io {

docker-compose.prod.yml

@@ -28,7 +28,7 @@ services:
       - db
 
   db:
-    image: postgres:14.0-alpine
+    image: postgres:16.0-alpine
     volumes:
       - postgres_data:/var/lib/postgresql/data/
     environment:
@@ -87,28 +87,28 @@ services:
       - redis
       - db
 
-#  prometheus:
-#    image: prom/prometheus
-#    ports:
-#      - 9090:9090
-#    command:
-#      - --config.file=/etc/prometheus/prometheus.yml
-#    volumes:
-#      - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
-#    depends_on:
-#      - cadvisor
-#
-#  cadvisor:
-#    image: gcr.io/cadvisor/cadvisor
-#    container_name: cadvisor
-#    volumes:
-#      - /:/rootfs:ro
-#      - /var/run:/var/run:rw
-#      - /sys:/sys:ro
-#      - /var/lib/docker/:/var/lib/docker:ro
-#      - /var/run/docker.sock:/var/run/docker.sock:ro
+  prometheus:
+    image: prom/prometheus
+    ports:
+      - 9090:9090
+    command:
+      - --config.file=/etc/prometheus/prometheus.yml
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+    depends_on:
+      - cadvisor
+
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor
+    container_name: cadvisor
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:rw
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
 
 volumes:
   postgres_data:
   mediafiles:
-  flower_db:
+  flower_db:

docker-compose.yml

@@ -23,7 +23,7 @@ services:
       - db
 
   db:
-    image: postgres:14-alpine
+    image: postgres:16-alpine
     volumes:
       - postgres_data:/var/lib/postgresql/data/
     environment:
@@ -45,7 +45,7 @@ services:
     env_file:
       - .env/.dev-sample
     environment:
-      - FLASK_APP=celery_app
+      - FLASK_APP=celery_app  # updated
     depends_on:
       - redis
       - db
@@ -61,7 +61,7 @@ services:
     env_file:
       - .env/.dev-sample
     environment:
-      - FLASK_APP=celery_app
+      - FLASK_APP=celery_app  # updated
     depends_on:
       - redis
       - db
@@ -77,7 +77,7 @@ services:
     env_file:
       - .env/.dev-sample
     environment:
-      - FLASK_APP=celery_app
+      - FLASK_APP=celery_app    # updated
     ports:
       - 5557:5555
     depends_on:

migrations/env.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import logging
 from logging.config import fileConfig
 
@@ -16,14 +14,29 @@
 fileConfig(config.config_file_name)
 logger = logging.getLogger('alembic.env')
 
+
+def get_engine():
+    try:
+        # this works with Flask-SQLAlchemy<3 and Alchemical
+        return current_app.extensions['migrate'].db.get_engine()
+    except (TypeError, AttributeError):
+        # this works with Flask-SQLAlchemy>=3
+        return current_app.extensions['migrate'].db.engine
+
+
+def get_engine_url():
+    try:
+        return get_engine().url.render_as_string(hide_password=False).replace(
+            '%', '%%')
+    except AttributeError:
+        return str(get_engine().url).replace('%', '%%')
+
+
 # add your model's MetaData object here
 # for 'autogenerate' support
 # from myapp import mymodel
 # target_metadata = mymodel.Base.metadata
-config.set_main_option(
-    'sqlalchemy.url',
-    str(current_app.extensions['migrate'].db.get_engine().url).replace(
-        '%', '%%'))
+config.set_main_option('sqlalchemy.url', get_engine_url())
 target_db = current_app.extensions['migrate'].db
 
 # other values from the config, defined by the needs of env.py,
@@ -77,14 +90,17 @@ def process_revision_directives(context, revision, directives):
                 directives[:] = []
                 logger.info('No changes in schema detected.')
 
-    connectable = current_app.extensions['migrate'].db.get_engine()
+    conf_args = current_app.extensions['migrate'].configure_args
+    if conf_args.get("process_revision_directives") is None:
+        conf_args["process_revision_directives"] = process_revision_directives
+
+    connectable = get_engine()
 
     with connectable.connect() as connection:
         context.configure(
             connection=connection,
             target_metadata=get_metadata(),
-            process_revision_directives=process_revision_directives,
-            **current_app.extensions['migrate'].configure_args
+            **conf_args
         )
 
         with context.begin_transaction():

migrations/versions/de643eb1222c_initial_migration.py renamed to migrations/versions/5d3d0f517ebc_initial_migration.py

@@ -1,16 +1,16 @@
 """Initial migration.
 
-Revision ID: de643eb1222c
+Revision ID: 5d3d0f517ebc
 Revises: 
-Create Date: 2022-12-16 22:47:33.117492
+Create Date: 2024-08-20 11:33:52.011904
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = 'de643eb1222c'
+revision = '5d3d0f517ebc'
 down_revision = None
 branch_labels = None
 depends_on = None

migrations/versions/bcb268967ba0_.py renamed to migrations/versions/68dbe8572338_.py

@@ -1,17 +1,17 @@
 """empty message
 
-Revision ID: bcb268967ba0
-Revises: de643eb1222c
-Create Date: 2022-12-19 03:32:06.930018
+Revision ID: 68dbe8572338
+Revises: 5d3d0f517ebc
+Create Date: 2024-08-22 03:33:55.691590
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = 'bcb268967ba0'
-down_revision = 'de643eb1222c'
+revision = '68dbe8572338'
+down_revision = '5d3d0f517ebc'
 branch_labels = None
 depends_on = None
 

project/__init__.py

@@ -4,7 +4,7 @@
 from flask_celeryext import FlaskCeleryExt
 from flask_migrate import Migrate
 from flask_sqlalchemy import SQLAlchemy
-from flask_socketio import SocketIO
+from flask_socketio import SocketIO     # new
 from flask_wtf.csrf import CSRFProtect
 
 from project.celery_utils import make_celery
@@ -16,7 +16,7 @@
 migrate = Migrate()
 ext_celery = FlaskCeleryExt(create_celery_app=make_celery)
 csrf = CSRFProtect()
-socketio = SocketIO()
+socketio = SocketIO(engineio_logger=True)  # new
 
 
 def create_app(config_name=None):
@@ -34,7 +34,7 @@ def create_app(config_name=None):
     migrate.init_app(app, db)
     ext_celery.init_app(app)
     csrf.init_app(app)
-    socketio.init_app(app, message_queue=app.config['SOCKETIO_MESSAGE_QUEUE'])
+    socketio.init_app(app, message_queue=app.config['SOCKETIO_MESSAGE_QUEUE'])  # new
 
     # register blueprints
     from project.users import users_blueprint

project/config.py

@@ -49,6 +49,7 @@ class BaseConfig:
     )
 
     CELERY_TASK_ROUTES = (route_task,)
+
     UPLOADS_DEFAULT_DEST = str(BASE_DIR / 'upload')
 
 
@@ -71,7 +72,7 @@ class TestingConfig(BaseConfig):
 
 
 config = {
-    "development": DevelopmentConfig,
-    "production": ProductionConfig,
+    'development': DevelopmentConfig,
+    'production': ProductionConfig,
     'testing': TestingConfig
 }

project/tdd/__init__.py

@@ -2,4 +2,4 @@
 
 tdd_blueprint = Blueprint('tdd', __name__, url_prefix='/tdd', template_folder='templates')
 
-from . import models, views  # noqa
+from . import models, views  # noq