Merge pull request #273 from flask-dashboard/fix_main

Fix main

flask_monitoringdashboard/controllers/requests.py

@@ -61,9 +61,7 @@ def get_status_code_distribution(db_session, endpoint_id):
     requests. 8% of the requests returned a 404 status code.
     """
     status_code_counts = get_all_request_status_code_counts(db_session, endpoint_id)
-
     total_count = sum(frequency for (_, frequency) in status_code_counts)
-
     return {status_code: frequency / total_count for (status_code, frequency) in status_code_counts}
 
 
@@ -96,13 +94,12 @@ def get_error_requests(db_session, endpoint_id, *criterion):
     :return:
     """
 
-    criteria = [
+    criteria = and_(
         Request.endpoint_id == endpoint_id,
         Request.status_code.isnot(None),
         Request.status_code >= 400,
         Request.status_code <= 599,
-    ]
-
+    )
     return db_session.query(Request).filter(criteria, *criterion).all()
 
 

flask_monitoringdashboard/main.py

@@ -5,22 +5,18 @@
     Note: This is not used when the flask_monitoring_dashboard
     is attached to your flask application.
 """
-from random import random
-import datetime
 import time
+from random import random, randint
 
 from flask import Flask
 
 import flask_monitoringdashboard as dashboard
-from flask_monitoringdashboard.database import session_scope
 
 app = Flask(__name__)
 
 dashboard.config.version = '3.2'
 dashboard.config.group_by = '2'
 dashboard.config.database_name = 'sqlite:///data.db'
-
-
 # dashboard.config.database_name = 'mysql+pymysql://user:password@localhost:3306/db1'
 # dashboard.config.database_name = 'postgresql://user:password@localhost:5432/mydb'
 
@@ -30,7 +26,6 @@ def on_the_minute():
 
 
 minute_schedule = {'second': 00}
-
 dashboard.add_graph("On Half Minute", on_the_minute, "cron", **minute_schedule)
 
 
@@ -39,14 +34,14 @@ def every_ten_seconds():
 
 
 every_ten_seconds_schedule = {'seconds': 10}
-
 dashboard.add_graph("Every 10 Seconds", every_ten_seconds, "interval", **every_ten_seconds_schedule)
-
 dashboard.bind(app)
 
 
 @app.route('/endpoint')
 def endpoint():
+    # if session_scope is imported at the top of the file, the database config won't take effect
+    from flask_monitoringdashboard.database import session_scope
     with session_scope() as db_session:
         print(db_session.bind.dialect.name)
 
@@ -62,7 +57,7 @@ def endpoint2():
 
 @app.route('/endpoint3')
 def endpoint3():
-    if random.randint(0, 1) == 0:
+    if randint(0, 1) == 0:
         time.sleep(0.1)
     else:
         time.sleep(0.2)
@@ -86,4 +81,5 @@ def my_func():
     return 33.3
 
 
-app.run()
+if __name__ == "__main__":
+    app.run()

flask_monitoringdashboard/views/endpoint.py

@@ -160,7 +160,6 @@ def endpoint_status_code_summary(endpoint_id):
                 row2dict(row) for row in get_error_requests(db_session, endpoint_id)
             ],
         }
-
         return jsonify(result)
 
 

flask_monitoringdashboard/views/reporting.py

@@ -1,12 +1,11 @@
-from flask_monitoringdashboard.controllers.requests import get_status_code_frequencies_in_interval
-from flask_monitoringdashboard.core.auth import secure
 from datetime import datetime
+
 from flask import request
 
 from flask_monitoringdashboard import blueprint
+from flask_monitoringdashboard.core.auth import secure
 from flask_monitoringdashboard.core.date_interval import DateInterval
 from flask_monitoringdashboard.core.reporting.questions.average_latency import AverageLatency
-
 from flask_monitoringdashboard.core.reporting.questions.status_code_distribution import StatusCodeDistribution
 from flask_monitoringdashboard.database import session_scope
 from flask_monitoringdashboard.database.endpoint import get_endpoints