Merge pull request #21 from pamelafox/pamela-style

Style improvements to Flask sample

Author: vmagelo

app.py

@@ -1,24 +1,24 @@
-from datetime import datetime
 import os
+from datetime import datetime
 
-from flask import Flask, render_template, request, redirect, url_for, send_from_directory
-from flask_sqlalchemy import SQLAlchemy
+from flask import Flask, redirect, render_template, request, send_from_directory, url_for
 from flask_migrate import Migrate
+from flask_sqlalchemy import SQLAlchemy
 from flask_wtf.csrf import CSRFProtect
 
 
 app = Flask(__name__, static_folder='static')
 csrf = CSRFProtect(app)
 
 # WEBSITE_HOSTNAME exists only in production environment
-if not 'WEBSITE_HOSTNAME' in os.environ:
-   # local development, where we'll use environment variables
-   print("Loading config.development and environment variables from .env file.")
-   app.config.from_object('azureproject.development')
+if 'WEBSITE_HOSTNAME' not in os.environ:
+    # local development, where we'll use environment variables
+    print("Loading config.development and environment variables from .env file.")
+    app.config.from_object('azureproject.development')
 else:
-   # production
-   print("Loading config.production.")
-   app.config.from_object('azureproject.production')
+    # production
+    print("Loading config.production.")
+    app.config.from_object('azureproject.production')
 
 app.config.update(
     SQLALCHEMY_DATABASE_URI=app.config.get('DATABASE_URI'),
@@ -37,13 +37,13 @@
 @app.route('/', methods=['GET'])
 def index():
     print('Request for index page received')
-    restaurants = Restaurant.query.all()    
+    restaurants = Restaurant.query.all()
     return render_template('index.html', restaurants=restaurants)
 
 @app.route('/<int:id>', methods=['GET'])
 def details(id):
     restaurant = Restaurant.query.where(Restaurant.id == id).first()
-    reviews = Review.query.where(Review.restaurant==id)
+    reviews = Review.query.where(Review.restaurant == id)
     return render_template('details.html', restaurant=restaurant, reviews=reviews)
 
 @app.route('/create', methods=['GET'])
@@ -94,21 +94,21 @@ def add_review(id):
         review.review_text = review_text
         db.session.add(review)
         db.session.commit()
-                
-    return redirect(url_for('details', id=id))        
+
+    return redirect(url_for('details', id=id))
 
 @app.context_processor
 def utility_processor():
     def star_rating(id):
-        reviews = Review.query.where(Review.restaurant==id)
+        reviews = Review.query.where(Review.restaurant == id)
 
         ratings = []
-        review_count = 0;        
+        review_count = 0
         for review in reviews:
             ratings += [review.rating]
             review_count += 1
 
-        avg_rating = sum(ratings)/len(ratings) if ratings else 0
+        avg_rating = sum(ratings) / len(ratings) if ratings else 0
         stars_percent = round((avg_rating / 5.0) * 100) if review_count > 0 else 0
         return {'avg_rating': avg_rating, 'review_count': review_count, 'stars_percent': stars_percent}
 
@@ -120,4 +120,4 @@ def favicon():
                                'favicon.ico', mimetype='image/vnd.microsoft.icon')
 
 if __name__ == '__main__':
-   app.run()
+    app.run()

azureproject/development.py

@@ -1,5 +1,5 @@
-from pathlib import Path
 import os
+from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent

azureproject/production.py

@@ -4,7 +4,7 @@
 SECRET_KEY = os.getenv('SECRET_KEY', 'flask-insecure-7ppocbnx@w71dcuinn*t^_mzal(t@o01v3fee27g%rg18fc5d@')
 
 ALLOWED_HOSTS = [os.environ['WEBSITE_HOSTNAME']] if 'WEBSITE_HOSTNAME' in os.environ else []
-CSRF_TRUSTED_ORIGINS = ['https://'+ os.environ['WEBSITE_HOSTNAME']] if 'WEBSITE_HOSTNAME' in os.environ else []
+CSRF_TRUSTED_ORIGINS = ['https://' + os.environ['WEBSITE_HOSTNAME']] if 'WEBSITE_HOSTNAME' in os.environ else []
 
 # Configure Postgres database; the full username for PostgreSQL flexible server is
 # username (not @sever-name).

models.py

@@ -1,4 +1,4 @@
-from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
+from sqlalchemy import Column, DateTime, ForeignKey, Integer, String
 from sqlalchemy.orm import validates
 
 from app import db
@@ -10,6 +10,7 @@ class Restaurant(db.Model):
     name = Column(String(50))
     street_address = Column(String(50))
     description = Column(String(250))
+
     def __str__(self):
         return self.name
 
@@ -28,4 +29,4 @@ def validate_rating(self, key, value):
         return value
 
     def __str__(self):
-        return self.restaurant.name + " (" + self.review_date.strftime("%x") +")"
+        return f"{self.restaurant.name} ({self.review.date:%x})"