Merge pull request #262 from dwreeves/main

Switch to new Hobolink API

Author: dwreeves

.env.example

@@ -1,16 +1,24 @@
-FLASK_ENV=development
-FLASK_APP="app.main:create_app"
+#FLASK_APP="app.main:create_app"
 
-HOBOLINK_USERNAME=replace_me
-HOBOLINK_PASSWORD=replace_me
-HOBOLINK_TOKEN=replace_me
+FLASK_DEBUG=true
+TESTING=true
+PREFERRED_URL_SCHEME=http
+
+HOBOLINK_LOGGERS=21949833
+#HOBOLINK_BEARER_TOKEN=replace_me
+HOBOLINK_EXCLUDE_SENSORS=21113095-1
 
 BASIC_AUTH_USERNAME=admin
 BASIC_AUTH_PASSWORD=password
 
-MAPBOX_ACCESS_TOKEN=replace_me
+CACHE_DEFAULT_TIMEOUT=60
+
+PGADMIN_DEFAULT_EMAIL=admin@example.com
+PGADMIN_DEFAULT_PASSWORD=admin
+
+#MAPBOX_ACCESS_TOKEN=replace_me
 
-SENTRY_DSN=replace_me
-SENTRY_ENVIRONMENT=replace_me
+#SENTRY_DSN=replace_me
+#SENTRY_ENVIRONMENT=replace_me
 
 USE_MOCK_DATA=false

app/admin/main.py

@@ -32,9 +32,7 @@ def auth_protect_admin_pages():
         """Authorize all paths that start with /admin/."""
         if re.match("^/admin(?:$|/+)", request.path):
             # Force HTTPS
-            if app.config["ENV"] == "development":
-                pass
-            elif not request.is_secure:
+            if not request.is_secure:
                 url = request.url.replace("http://", "https://", 1)
                 return redirect(url)
 

app/admin/views/data.py

@@ -1,6 +1,8 @@
 import io
+from datetime import datetime
 
 import pandas as pd
+import pytz
 from flask import Response
 from flask import abort
 from flask import current_app
@@ -26,7 +28,6 @@
 from app.data.celery import predict_v4_task
 from app.data.celery import update_db_task
 from app.data.database import execute_sql
-from app.data.database import get_current_time
 
 
 def send_csv_attachment_of_dataframe(
@@ -54,7 +55,7 @@ def send_csv_attachment_of_dataframe(
 
     # Set the file name:
     if date_prefix:
-        now = get_current_time()
+        now = datetime.now(pytz.timezone("US/Eastern"))
         todays_date = now.strftime("%Y-%m-%d")
         filename = f"{todays_date}-{filename}"
 
@@ -127,7 +128,7 @@ def download_from_db(self, sql_table_name: str):
 
     @expose("/csv/src/hobolink_source")
     def source_hobolink(self):
-        async_result = live_hobolink_data_task.delay(export_name="code_for_boston_export_90d")
+        async_result = live_hobolink_data_task.delay(days_ago=90)
         return redirect(
             url_for("admin_downloadview.csv_wait", task_id=async_result.id, data_source="hobolink")
         )
@@ -148,43 +149,35 @@ def source_usgs_b(self):
 
     @expose("/csv/src/processed_data_v1_source")
     def source_combine_data_v1(self):
-        async_result = combine_data_v1_task.delay(
-            export_name="code_for_boston_export_90d", days_ago=90
-        )
+        async_result = combine_data_v1_task.delay(days_ago=90)
         return redirect(
             url_for("admin_downloadview.csv_wait", task_id=async_result.id, data_source="combined")
         )
 
     @expose("/csv/src/processed_data_v2_source")
     def source_combine_data_v2(self):
-        async_result = combine_data_v2_task.delay(
-            export_name="code_for_boston_export_90d", days_ago=90
-        )
+        async_result = combine_data_v2_task.delay(days_ago=90)
         return redirect(
             url_for("admin_downloadview.csv_wait", task_id=async_result.id, data_source="combined")
         )
 
     @expose("/csv/src/processed_data_v3_source")
     def source_combine_data_v3(self):
-        async_result = combine_data_v3_task.delay(
-            export_name="code_for_boston_export_90d", days_ago=90
-        )
+        async_result = combine_data_v3_task.delay(days_ago=90)
         return redirect(
             url_for("admin_downloadview.csv_wait", task_id=async_result.id, data_source="combined")
         )
 
     @expose("/csv/src/processed_data_v4_source")
     def source_combine_data_v4(self):
-        async_result = combine_data_v4_task.delay(
-            export_name="code_for_boston_export_90d", days_ago=90
-        )
+        async_result = combine_data_v4_task.delay(days_ago=90)
         return redirect(
             url_for("admin_downloadview.csv_wait", task_id=async_result.id, data_source="combined")
         )
 
     @expose("/csv/src/prediction_v1_source")
     def source_prediction_v1(self):
-        async_result = predict_v1_task.delay(export_name="code_for_boston_export_90d", days_ago=90)
+        async_result = predict_v1_task.delay(days_ago=90)
         return redirect(
             url_for(
                 "admin_downloadview.csv_wait", task_id=async_result.id, data_source="prediction"
@@ -193,7 +186,7 @@ def source_prediction_v1(self):
 
     @expose("/csv/src/prediction_v2_source")
     def source_prediction_v2(self):
-        async_result = predict_v2_task.delay(export_name="code_for_boston_export_90d", days_ago=90)
+        async_result = predict_v2_task.delay(days_ago=90)
         return redirect(
             url_for(
                 "admin_downloadview.csv_wait", task_id=async_result.id, data_source="prediction"
@@ -202,7 +195,7 @@ def source_prediction_v2(self):
 
     @expose("/csv/src/prediction_v3_source")
     def source_prediction_v3(self):
-        async_result = predict_v3_task.delay(export_name="code_for_boston_export_90d", days_ago=90)
+        async_result = predict_v3_task.delay(days_ago=90)
         return redirect(
             url_for(
                 "admin_downloadview.csv_wait", task_id=async_result.id, data_source="prediction"
@@ -211,7 +204,7 @@ def source_prediction_v3(self):
 
     @expose("/csv/src/prediction_v4_source")
     def source_prediction_v4(self):
-        async_result = predict_v4_task.delay(export_name="code_for_boston_export_90d", days_ago=90)
+        async_result = predict_v4_task.delay(days_ago=90)
         return redirect(
             url_for(
                 "admin_downloadview.csv_wait", task_id=async_result.id, data_source="prediction"
@@ -269,56 +262,56 @@ def sync_source_usgs_b(self):
 
     @expose("/csv/src_sync/processed_data_v1_source")
     def sync_source_combine_data_v1(self):
-        df = combine_data_v1_task.run(days_ago=90, export_name="code_for_boston_export_90d")
+        df = combine_data_v1_task.run(days_ago=90)
         return send_csv_attachment_of_dataframe(
             df=pd.DataFrame(df), filename="model_processed_data.csv"
         )
 
     @expose("/csv/src_sync/processed_data_v2_source")
     def sync_source_combine_data_v2(self):
-        df = combine_data_v2_task.run(days_ago=90, export_name="code_for_boston_export_90d")
+        df = combine_data_v2_task.run(days_ago=90)
         return send_csv_attachment_of_dataframe(
             df=pd.DataFrame(df), filename="model_processed_data.csv"
         )
 
     @expose("/csv/src_sync/processed_data_v3_source")
     def sync_source_combine_data_v3(self):
-        df = combine_data_v3_task.run(days_ago=90, export_name="code_for_boston_export_90d")
+        df = combine_data_v3_task.run(days_ago=90)
         return send_csv_attachment_of_dataframe(
             df=pd.DataFrame(df), filename="model_processed_data.csv"
         )
 
     @expose("/csv/src_sync/processed_data_v4_source")
     def sync_source_combine_data_v4(self):
-        df = combine_data_v4_task.run(days_ago=90, export_name="code_for_boston_export_90d")
+        df = combine_data_v4_task.run(days_ago=90)
         return send_csv_attachment_of_dataframe(
             df=pd.DataFrame(df), filename="model_processed_data.csv"
         )
 
     @expose("/csv/src_sync/prediction_v1_source")
     def sync_source_prediction_v1(self):
-        df = predict_v1_task.run(days_ago=90, export_name="code_for_boston_export_90d")
+        df = predict_v1_task.run(days_ago=90)
         return send_csv_attachment_of_dataframe(
             df=pd.DataFrame(df), filename="prediction_source.csv"
         )
 
     @expose("/csv/src_sync/prediction_v2_source")
     def sync_source_prediction_v2(self):
-        df = predict_v2_task.run(days_ago=90, export_name="code_for_boston_export_90d")
+        df = predict_v2_task.run(days_ago=90)
         return send_csv_attachment_of_dataframe(
             df=pd.DataFrame(df), filename="prediction_source.csv"
         )
 
     @expose("/csv/src_sync/prediction_v3_source")
     def sync_source_prediction_v3(self):
-        df = predict_v3_task.run(days_ago=90, export_name="code_for_boston_export_90d")
+        df = predict_v3_task.run(days_ago=90)
         return send_csv_attachment_of_dataframe(
             df=pd.DataFrame(df), filename="prediction_source.csv"
         )
 
     @expose("/csv/src_sync/prediction_v4_source")
     def sync_source_prediction_v4(self):
-        df = predict_v4_task.run(days_ago=90, export_name="code_for_boston_export_90d")
+        df = predict_v4_task.run(days_ago=90)
         return send_csv_attachment_of_dataframe(
             df=pd.DataFrame(df), filename="prediction_source.csv"
         )

app/blueprints/api_v1.py

@@ -1,3 +1,6 @@
+from datetime import UTC
+from datetime import datetime
+
 from flasgger import LazyString
 from flasgger import Swagger
 from flasgger import swag_from
@@ -9,7 +12,6 @@
 from flask import url_for
 
 from app.data.database import execute_sql
-from app.data.database import get_current_time
 from app.data.globals import boathouses
 from app.data.globals import cache
 from app.data.globals import reaches
@@ -36,7 +38,7 @@ def predictive_model_api():
     return jsonify(
         {
             "model_version": DEFAULT_MODEL_VERSION,
-            "time_returned": get_current_time(),
+            "time_returned": datetime.now(UTC),
             "is_boating_season": website_options.boating_season,
             "model_outputs": [
                 {

app/blueprints/frontend.py

@@ -1,3 +1,5 @@
+from datetime import UTC
+from datetime import datetime
 from typing import Any
 from typing import Dict
 
@@ -7,7 +9,6 @@
 from flask import flash
 from flask import render_template
 
-from app.data.database import get_current_time
 from app.data.globals import boathouses
 from app.data.globals import cache
 from app.data.globals import reaches
@@ -22,7 +23,7 @@
 @cache.cached()  # <-- needs to be here. some issues occur if you exclude it.
 def before_request():
     last_pred_time = get_latest_prediction_time()
-    current_time = get_current_time()
+    current_time = datetime.now(UTC)
     # Calculate difference between now and latest prediction time
     # If model_outputs has zero rows, we raise the following error:
     # > TypeError: unsupported operand type(s) for -: 'Timestamp' and 'NoneType'
@@ -33,8 +34,8 @@ def before_request():
         diff = None
 
     # If more than 48 hours, flash message.
-    if current_app.config["ENV"] == "demo":
-        flash("This website is currently in demo mode. It is not using live data.")
+    if current_app.config["USE_MOCK_DATA"]:
+        flash("This website is currently in MOCK_DATA=true mode. It is not using live data.")
     elif diff is None:
         flash(
             "A unknown error occurred. It is likely that the database does not "