Lint fixes, fix opm query comments and docs

freezing/web/__init__.py

@@ -1,6 +1,3 @@
-import os
-import os.path
-
 from flask import Flask, session, g
 
 from freezing.model import init_model, meta
@@ -25,7 +22,6 @@
     alt_scoring,
     tribes,
 )
-from freezing.web.utils import auth
 
 # Register our blueprints
 

freezing/web/data.py

@@ -8,7 +8,6 @@
 
 from instagram import InstagramAPIError, InstagramClientError
 
-from polyline.codec import PolylineCodec
 
 from sqlalchemy import and_
 from geoalchemy import WKTSpatialElement
@@ -30,7 +29,7 @@
     Team,
 )
 
-from freezing.web import app, config
+from freezing.web import config
 from freezing.web.autolog import log
 from freezing.web.exc import (
     InvalidAuthorizationToken,

freezing/web/utils/dates.py

@@ -1,9 +1,6 @@
-import pytz
-
-from datetime import datetime
 from dateutil import parser as date_parser
 
-from freezing.web import app, config
+from freezing.web import config
 
 
 def parse_competition_timestamp(ts):

freezing/web/utils/genericboard.py

@@ -1,13 +1,11 @@
 import decimal
 import os
-import enum
 from datetime import datetime
 from typing import List, Dict, Any, Tuple
 
 import yaml
 
 from marshmallow import fields
-from marshmallow_enum import EnumField
 
 from freezing.model import meta
 from freezing.model.msg import BaseSchema, BaseMessage

freezing/web/utils/gviz_api.py

@@ -42,8 +42,6 @@
 class DataTableException(Exception):
     """The general exception object thrown by DataTable."""
 
-    pass
-
 
 class DataTableJSONEncoder(json.JSONEncoder):
     """JSON encoder that handles date/time/datetime objects correctly."""

freezing/web/utils/hashboard.py

@@ -1,4 +1,3 @@
-import decimal
 import os
 from typing import List
 

freezing/web/utils/insta.py

@@ -7,7 +7,7 @@
 import shutil
 
 from instagram.client import InstagramAPI
-from freezing.web import app, exc
+from freezing.web import exc
 from freezing.web.config import config
 
 THUMBNAIL_DIMS = (150, 150)

freezing/web/utils/wktutils.py

@@ -1,5 +1,4 @@
 import re
-from decimal import Decimal
 from collections import namedtuple
 
 _point_rx = re.compile("^POINT\((.+)\)$")

freezing/web/views/api.py

@@ -3,19 +3,17 @@
 import json
 
 import arrow
-import geojson
 from flask import Blueprint, jsonify, request
 import pytz
 from sqlalchemy import text
-from stravalib import unithelper as uh
 
 from freezing.model import meta
 from freezing.model.orm import RidePhoto, Ride, RideTrack, Athlete
 
-from freezing.web import app, config
+from freezing.web import config
 from freezing.web.autolog import log
 from freezing.web.serialize import RidePhotoSchema
-from freezing.web.utils import auth, dates
+from freezing.web.utils import auth
 from freezing.web.utils.wktutils import parse_linestring
 
 blueprint = Blueprint("api", __name__)

freezing/web/views/chartdata.py

@@ -9,7 +9,7 @@
 from collections import defaultdict
 from datetime import datetime, timedelta
 
-from flask import current_app, request, Blueprint, jsonify
+from flask import current_app, Blueprint, jsonify
 
 from sqlalchemy import text
 from dateutil import rrule

freezing/web/views/general.py

@@ -4,8 +4,6 @@
 @author: hans
 """
 
-from datetime import timedelta
-
 from flask import (
     render_template,
     redirect,

freezing/web/views/people.py

@@ -1,4 +1,4 @@
-from datetime import date, timedelta
+from datetime import timedelta
 from datetime import datetime
 
 from flask import render_template, Blueprint, abort

freezing/web/views/photos.py

@@ -1,12 +1,9 @@
 import math
-from datetime import date, timedelta
-from datetime import datetime
 
-from flask import render_template, Blueprint, app, send_file, request
-from sqlalchemy import text
+from flask import render_template, Blueprint, send_file, request
 
 from freezing.model import meta
-from freezing.model.orm import Team, Athlete, RidePhoto, Ride
+from freezing.model.orm import RidePhoto, Ride
 
 from freezing.web import config
 from freezing.web.utils import insta

freezing/web/views/pointless.py

@@ -1,12 +1,10 @@
-import os
 import operator
-from datetime import date, datetime, timezone
+from datetime import datetime, timezone
 from collections import defaultdict
 import re
 
-from flask import render_template, Blueprint, abort, redirect, url_for
+from flask import render_template, Blueprint, abort
 from sqlalchemy import text
-import yaml
 
 from freezing.model import meta
 from freezing.web.config import config
@@ -280,7 +278,7 @@ def ross_hill_loop():
 @blueprint.route("/coffeeride")
 def coffeeride():
     year = datetime.now().year
-    tdata = _get_hashtag_tdata("coffeeride".format(year), "coffeeride", 2)
+    tdata = _get_hashtag_tdata("coffeeride{}".format(year), "coffeeride", 2)
     return render_template(
         "pointless/coffeeride.html", data={"tdata": tdata, "year": year}
     )

freezing/web/views/shared_sql.py

@@ -8,113 +8,113 @@
 def team_sleaze_query():
     return text(
         """
-                select T.id, T.name as team_name, count(*) as num_sleaze_days
-                from daily_scores D
-                join lbd_athletes A on A.id = D.athlete_id
-                join teams T on T.id = A.team_id
-                where D.distance >= 1 and D.distance < 2
-                group by T.id, T.name
-                order by num_sleaze_days desc
-                ;
-            """
+        select T.id, T.name as team_name, count(*) as num_sleaze_days
+        from daily_scores D
+        join lbd_athletes A on A.id = D.athlete_id
+        join teams T on T.id = A.team_id
+        where D.distance >= 1 and D.distance < 2
+        group by T.id, T.name
+        order by num_sleaze_days desc
+        ;
+    """
     )
 
 
 def indiv_sleaze_query():
     return text(
         """
-                select D.athlete_id, A.display_name as athlete_name, count(*) as num_sleaze_days
-                from daily_scores D
-                join lbd_athletes A on A.id = D.athlete_id
-                where D.distance >= 1 and D.distance < 2
-                group by D.athlete_id, athlete_name
-                order by num_sleaze_days desc
-                ;
-            """
+        select D.athlete_id, A.display_name as athlete_name, count(*) as num_sleaze_days
+        from daily_scores D
+        join lbd_athletes A on A.id = D.athlete_id
+        where D.distance >= 1 and D.distance < 2
+        group by D.athlete_id, athlete_name
+        order by num_sleaze_days desc
+        ;
+    """
     )
 
 
 def indiv_freeze_query():
     return text(
         """
-				select athlete_id, athlete_name, SUM(max_daily_freeze_points) as freeze_points_total
-				from (
-					select athlete_id, athlete_name, ride_date, MAX(freeze_points) as max_daily_freeze_points
-					from (
-						select R.athlete_id, A.display_name as athlete_name, date(R.start_date) as ride_date, (11*(ATAN((R.distance+4)-2*PI())+1.4)-2.66)*(1.2+ATAN((32-W.ride_temp_start)/5)) as freeze_points
-						from rides R
-						join ride_weather W on W.ride_id = R.id
-						join lbd_athletes A on A.id = R.athlete_id
-					) FP
-					group by athlete_id, athlete_name, ride_date
-				) FPMax
-				group by athlete_id, athlete_name
-				order by freeze_points_total desc
-                ;
-            """
+        select athlete_id, athlete_name, SUM(max_daily_freeze_points) as freeze_points_total
+        from (
+            select athlete_id, athlete_name, ride_date, MAX(freeze_points) as max_daily_freeze_points
+            from (
+                select R.athlete_id, A.display_name as athlete_name, date(R.start_date) as ride_date, (11*(ATAN((R.distance+4)-2*PI())+1.4)-2.66)*(1.2+ATAN((32-W.ride_temp_start)/5)) as freeze_points
+                from rides R
+                join ride_weather W on W.ride_id = R.id
+                join lbd_athletes A on A.id = R.athlete_id
+            ) FP
+            group by athlete_id, athlete_name, ride_date
+        ) FPMax
+        group by athlete_id, athlete_name
+        order by freeze_points_total desc
+        ;
+    """
     )
 
 
 def indiv_segment_query(join_miles=False):
     if join_miles:
         return text(
             """
-					select aa.id, aa.athlete_name, aa.segment_rides, bb.dist from (select A.id, A.display_name as athlete_name, count(E.id) as segment_rides
-					from lbd_athletes A
-					join rides R on R.athlete_id = A.id
-					join ride_efforts E on E.ride_id = R.id
-					where E.segment_id = :segment_id
-					group by A.id, A.display_name) aa
-					join
-					(select athlete_id, sum(distance) as dist from rides R group by athlete_id) bb
-					on aa.id = bb.athlete_id
-					order by aa.segment_rides desc;
-	            """
+            select aa.id, aa.athlete_name, aa.segment_rides, bb.dist from (select A.id, A.display_name as athlete_name, count(E.id) as segment_rides
+            from lbd_athletes A
+            join rides R on R.athlete_id = A.id
+            join ride_efforts E on E.ride_id = R.id
+            where E.segment_id = :segment_id
+            group by A.id, A.display_name) aa
+            join
+            (select athlete_id, sum(distance) as dist from rides R group by athlete_id) bb
+            on aa.id = bb.athlete_id
+            order by aa.segment_rides desc;
+        """
         )
     else:
         return text(
             """
-	                select A.id, A.display_name as athlete_name, count(E.id) as segment_rides
-	                from lbd_athletes A
-	                join rides R on R.athlete_id = A.id
-	                join ride_efforts E on E.ride_id = R.id
-	                where E.segment_id = :segment_id
-	                group by A.id, A.display_name
-	                order by segment_rides desc
-	                ;
-	            """
+            select A.id, A.display_name as athlete_name, count(E.id) as segment_rides
+            from lbd_athletes A
+            join rides R on R.athlete_id = A.id
+            join ride_efforts E on E.ride_id = R.id
+            where E.segment_id = :segment_id
+            group by A.id, A.display_name
+            order by segment_rides desc
+            ;
+        """
         )
 
 
 def team_segment_query():
     return text(
         """
-                select T.id, T.name as team_name, count(E.id) as segment_rides
-                from rides R
-                join lbd_athletes A on A.id = R.athlete_id
-                join teams T on T.id = A.team_id
-                join ride_efforts E on E.ride_id = R.id
-                where E.segment_id = :segment_id and T.leaderboard_exclude=0
-                group by T.id, T.name
-                order by segment_rides desc
-                ;
-            """
+        select T.id, T.name as team_name, count(E.id) as segment_rides
+        from rides R
+        join lbd_athletes A on A.id = R.athlete_id
+        join teams T on T.id = A.team_id
+        join ride_efforts E on E.ride_id = R.id
+        where E.segment_id = :segment_id and T.leaderboard_exclude=0
+        group by T.id, T.name
+        order by segment_rides desc
+        ;
+    """
     )
 
 
 def team_leaderboard_query():
     return text(
         """
-                select
-                  T.id as team_id,
-                  T.name as team_name,
-                  sum(DS.points) as total_score,
-                  sum(DS.distance) as total_distance
-                from
-                  daily_scores DS join teams T on T.id = DS.team_id
-                where not T.leaderboard_exclude
-                group by T.id, T.name
-                order by total_score desc
-                ;
-                """
+        select
+          T.id as team_id,
+          T.name as team_name,
+          sum(DS.points) as total_score,
+          sum(DS.distance) as total_distance
+        from
+          daily_scores DS join teams T on T.id = DS.team_id
+        where not T.leaderboard_exclude
+        group by T.id, T.name
+        order by total_score desc
+        ;
+    """
     )

leaderboards/opmdays.yml

@@ -3,7 +3,7 @@ title: Michigander - You call THAT a snow day?! - Prize
 description: |
   <p>Riders who have ridden on the most offcial OPM snow days, or if no snow days are declared, on Michigan Day (Monday, January 18th). Ties to be broken by total mileage.</p>
   <!-- <p>Current official snow days: None</p> -->
-  <p>Current official snow days: Jan 16</p>
+  <p>Current official snow days: Tuesday, January 16th</p>
 fields:
   - name: athlete_id
     visible: false
@@ -26,7 +26,7 @@ query: |
   2024 had an OPM snow day on Jan 16, so disable this for now.
 
   where date(R.start_date) in (makedate(year(now()), 18))
-  /*
+  */
   where date(R.start_date) in ('2024-01-16')
   group by athlete_id, athlete_name
   order by days desc, distance desc;

requirements.txt

@@ -6,6 +6,7 @@ SQLAlchemy==1.3.24
 # Thanks https://stackoverflow.com/a/77214086/424301 - Flask did not pin Werkzeug dep
 Werkzeug==3.0.1
 arrow==0.15.5
+autoflake==2.2.1
 beautifulsoup4==4.8.2
 colorlog==4.1.0
 envparse==0.2.0