Merge remote-tracking branch 'chapter-11/vol-3' into vol-3

Author: shalabhaggarwal

Diff for: generate_profile.py

@@ -1,4 +1,4 @@
-from werkzeug.contrib.profiler import ProfilerMiddleware
+from werkzeug.middleware.profiler import ProfilerMiddleware
 from my_app import app
 
 app.wsgi_app = ProfilerMiddleware(app.wsgi_app, restrictions = [10])

Diff for: my_app/__init__.py

@@ -2,7 +2,7 @@
 newrelic.agent.initialize('newrelic.ini')
 
 import os
-from flask import Flask
+from flask import Flask, g
 from flask_sqlalchemy import SQLAlchemy
 from flask_babel import Babel
 import sentry_sdk
@@ -23,43 +23,65 @@
     integrations=[FlaskIntegration()]
 )
 
-app = Flask(__name__)
-app.config['UPLOAD_FOLDER'] = '/Users/shalabhaggarwal/workspace/mydev/flask_test_uploads'
-app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////tmp/test.db'
-app.config['WTF_CSRF_SECRET_KEY'] = 'random key for form'
-app.config['AWS_ACCESS_KEY'] = 'Amazon Access Key'
-app.config['AWS_SECRET_KEY'] = 'Amazon Secret Key'
-app.config['AWS_BUCKET'] = 'flask-cookbook'
-db = SQLAlchemy(app)
-
-app.config['LOG_FILE'] = '/tmp/application.log'
-
-
-if not app.debug:
-    import logging
-    logging.basicConfig(level=logging.INFO)
-    from logging import FileHandler, Formatter
-    from logging.handlers import SMTPHandler
-    file_handler = FileHandler(app.config['LOG_FILE'])
-    app.logger.addHandler(file_handler)
-    mail_handler = SMTPHandler(
-        ("smtp.gmail.com", 587), '[email protected]', RECEPIENTS,
-        'Error occurred in your application',
-        ('[email protected]', 'some_gmail_password'), secure=())
-    mail_handler.setLevel(logging.ERROR)
-    # app.logger.addHandler(mail_handler)
-    for handler in [file_handler, mail_handler]:
-        handler.setFormatter(Formatter(
-            '%(asctime)s %(levelname)s: %(message)s '
-            '[in %(pathname)s:%(lineno)d]'
-        ))
+db = SQLAlchemy()
 
+def create_app(alt_config={}):
+    app = Flask(
+        __name__,
+        template_folder=alt_config.get('TEMPLATE_FOLDER', 'templates')
+    )
 
-babel = Babel(app)
+    app.config['UPLOAD_FOLDER'] = os.path.realpath('.') + '/my_app/static/uploads'
+    app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////tmp/test.db'
+    app.config['WTF_CSRF_SECRET_KEY'] = 'random key for form'
+    app.config['LOG_FILE'] = 'application.log'
+    app.config['AWS_ACCESS_KEY'] = 'Amazon Access Key'
+    app.config['AWS_SECRET_KEY'] = 'Amazon Secret Key'
+    app.config['AWS_BUCKET'] = 'flask-cookbook'
+    app.config['LOG_FILE'] = '/tmp/application.log'
+
+    app.config.update(alt_config)
+
+    if not app.debug:
+        import logging
+        from logging import FileHandler, Formatter
+        from logging.handlers import SMTPHandler
+        file_handler = FileHandler(app.config['LOG_FILE'])
+        app.logger.setLevel(logging.INFO)
+        app.logger.addHandler(file_handler)
+        mail_handler = SMTPHandler(
+            ("smtp.gmail.com", 587), '[email protected]', RECEPIENTS,
+            'Error occurred in your application',
+            ('[email protected]', 'some_gmail_password'), secure=())
+        mail_handler.setLevel(logging.ERROR)
+        # app.logger.addHandler(mail_handler)
+        for handler in [file_handler, mail_handler]:
+            handler.setFormatter(Formatter(
+                '%(asctime)s %(levelname)s: %(message)s '
+                '[in %(pathname)s:%(lineno)d]'
+            ))
+
+    app.secret_key = 'some_random_key'
+
+    return app
+
+def create_db(app):
+    db.init_app(app)
+    with app.app_context():
+        db.create_all()
 
-app.secret_key = 'some_random_key'
+    return db
+
+
+def get_locale():
+    return g.get('current_lang', 'en')
+
+
+app = create_app()
+babel = Babel(app)
+babel.init_app(app, locale_selector=get_locale)
 
 from my_app.catalog.views import catalog
 app.register_blueprint(catalog)
 
-db.create_all()
+db = create_db(app)

Diff for: my_app/catalog/models.py

@@ -1,9 +1,10 @@
 from decimal import Decimal
 from flask_wtf import FlaskForm
 from flask_wtf.file import FileField, FileRequired
-from wtforms import TextField, DecimalField, SelectField
+from wtforms import StringField, DecimalField, SelectField
 from wtforms.validators import InputRequired, NumberRange, ValidationError
-from wtforms.widgets import html_params, Select, HTMLString
+from wtforms.widgets import html_params, Select
+from markupsafe import Markup
 from flask_wtf import Form
 from flask_babel import lazy_gettext as _
 from my_app import db
@@ -43,7 +44,7 @@ def __repr__(self):
 
 
 class NameForm(FlaskForm):
-    name = TextField(_('Name'), validators=[InputRequired()])
+    name = StringField(_('Name'), validators=[InputRequired()])
 
 
 class CustomCategoryInput(Select):
@@ -59,7 +60,7 @@ def __call__(self, field, **kwargs):
                     ), label
                 )
             )
-        return HTMLString(' '.join(html))
+        return Markup(' '.join(html))
 
 
 class CategoryField(SelectField):
@@ -106,6 +107,6 @@ def _check_duplicate(form, field):
 
 
 class CategoryForm(NameForm):
-    name = TextField(_('Name'), validators=[
+    name = StringField(_('Name'), validators=[
         InputRequired(), check_duplicate_category()
     ])

Diff for: my_app/catalog/views.py

@@ -1,11 +1,11 @@
 import os
 from functools import wraps
-from werkzeug import secure_filename
+from werkzeug.utils import secure_filename
 from flask import request, Blueprint, render_template, jsonify, flash, \
-    redirect, url_for as flask_url_for, g, abort
-from my_app import db, app, ALLOWED_EXTENSIONS, babel
+    redirect, url_for as flask_url_for, g, abort, current_app
+from my_app import db, ALLOWED_EXTENSIONS, babel
 from my_app.catalog.models import Product, Category, ProductForm, CategoryForm
-from sqlalchemy.orm.util import join
+from sqlalchemy.orm import join
 from flask_babel import lazy_gettext as _
 import geoip2.database
 from geoip2.errors import AddressNotFoundError
@@ -14,14 +14,14 @@
 catalog = Blueprint('catalog', __name__)
 
 
-@app.before_request
+@catalog.before_request
 def before():
     if request.view_args and 'lang' in request.view_args:
         g.current_lang = request.view_args['lang']
         request.view_args.pop('lang')
 
 
-@app.context_processor
+@catalog.context_processor
 def inject_url_for():
     return {
         'url_for': lambda endpoint, **kwargs: flask_url_for(
@@ -33,11 +33,6 @@ def inject_url_for():
 url_for = inject_url_for()['url_for']
 
 
-@babel.localeselector
-def get_locale():
-    return g.get('current_lang', 'en')
-
-
 def template_or_json(template=None):
     """"Return a dict from your view and this will either
     pass it to a template or render json. Use like:
@@ -48,7 +43,7 @@ def decorated(f):
         @wraps(f)
         def decorated_fn(*args, **kwargs):
             ctx = f(*args, **kwargs)
-            if request.is_xhr or not template:
+            if request.headers.get("X-Requested-With") == "XMLHttpRequest" or not template:
                 return jsonify(ctx)
             else:
                 return render_template(template, **ctx)
@@ -61,9 +56,9 @@ def allowed_file(filename):
             filename.lower().rsplit('.', 1)[1] in ALLOWED_EXTENSIONS
 
 
-@app.errorhandler(404)
+@catalog.errorhandler(404)
 def page_not_found(e):
-    app.logger.error(e)
+    current_app.logger.error(e)
     return render_template('404.html'), 404
 
 
@@ -73,7 +68,7 @@ def page_not_found(e):
 @template_or_json('home.html')
 def home():
     products = Product.query.all()
-    app.logger.info(
+    current_app.logger.info(
         'Home page with total of %d products' % len(products)
     )
     return {'count': len(products)}
@@ -83,15 +78,15 @@ def home():
 def product(id):
     product = Product.query.filter_by(id=id).first()
     if not product:
-        app.logger.warning('Requested product not found.')
+        current_app.logger.warning('Requested product not found.')
         abort(404)
     return render_template('product.html', product=product)
 
 
 @catalog.route('/<lang>/products')
 @catalog.route('/<lang>/products/<int:page>')
 def products(page=1):
-    products = Product.query.paginate(page, 10)
+    products = Product.query.paginate(page=page, per_page=10)
     return render_template('products.html', products=products)
 
 
@@ -110,25 +105,25 @@ def create_product():
         if image and allowed_file(image.filename):
             filename = secure_filename(image.filename)
             session = boto3.Session(
-                aws_access_key_id=app.config['AWS_ACCESS_KEY'],
-                aws_secret_access_key=app.config['AWS_SECRET_KEY']
+                aws_access_key_id=current_app.config['AWS_ACCESS_KEY'],
+                aws_secret_access_key=current_app.config['AWS_SECRET_KEY']
             )
             s3 = session.resource('s3')
-            bucket = s3.Bucket(app.config['AWS_BUCKET'])
+            bucket = s3.Bucket(current_app.config['AWS_BUCKET'])
             if bucket not in list(s3.buckets.all()):
                 bucket = s3.create_bucket(
-                    Bucket=app.config['AWS_BUCKET'],
+                    Bucket=current_app.config['AWS_BUCKET'],
                     CreateBucketConfiguration={
                         'LocationConstraint': 'ap-south-1'
                     },
                 )
             bucket.upload_fileobj(
                 image, filename,
                 ExtraArgs={'ACL': 'public-read'})
-        reader = geoip2.database.Reader('GeoLite2-City_20190416/GeoLite2-City.mmdb')
+        reader = geoip2.database.Reader('GeoLite2-City_20230113/GeoLite2-City.mmdb')
         try:
             match = reader.city(request.remote_addr)
-        except AddressNotFoundError:
+        except geoip2.errors.AddressNotFoundError:
             match = None
 
         product = Product(
@@ -168,7 +163,7 @@ def product_search(page=1):
             Category.name.like('%' + category + '%')
         )
     return render_template(
-        'products.html', products=products.paginate(page, 10)
+        'products.html', products=products.paginate(page=page, per_page=10)
     )