pass ruff?

Author: Mole1424

auth/api.py

@@ -281,9 +281,7 @@ def create_api_key_ui() -> Response:
     return redirect(url_for("auth_ui.get_api_keys_ui"))
 
 
-def handle_api_key_action(
-    action: Callable[[int], APIKey | None], verb: str
-) -> Response:
+def handle_api_key_action(action: Callable[[int], APIKey | None], verb: str) -> Response:
     key_id = request.form.get("id")
     if not key_id:
         flash("API key ID is required", "error")

auth/oauth.py

@@ -93,7 +93,7 @@ def logout() -> Response:
         session.clear()
         return redirect(
             "https://auth.uwcs.co.uk/realms/uwcs/protocol/openid-connect/logout"
-            + f"?post_logout_redirect_uri={url_for('index', _external=True, _scheme=scheme)}"  # noqa: E501
+            + f"?post_logout_redirect_uri={url_for('index', _external=True, _scheme=scheme)}"
             + f"&id_token_hint={id_token}"
         )
     # if no id token, just clear session and redirect to index

events/api.py

@@ -24,9 +24,7 @@
 events_api_bp = Blueprint("events_api", __name__, url_prefix="/api/events")
 
 
-@events_api_bp.route(
-    "/<int:year>/<int:term>/<sint:week>/<string:slug>/", methods=["GET"]
-)
+@events_api_bp.route("/<int:year>/<int:term>/<sint:week>/<string:slug>/", methods=["GET"])
 def get_event(year: int, term: int, week: int, slug: str) -> tuple[Response, int]:
     """Get a specific event by year, term, week, and slug.
     ---
@@ -98,9 +96,7 @@ def get_event_by_id_api(event_id: int) -> tuple[Response, int]:
 @events_api_bp.route("/<int:year>/<int:term>/<sint:week>/", methods=["GET"])
 @events_api_bp.route("/<int:year>/<int:term>/", methods=["GET"])
 @events_api_bp.route("/<int:year>/", methods=["GET"])
-def get_events(
-    year: int, term: int | None = None, week: int | None = None
-) -> tuple[Response, int]:
+def get_events(year: int, term: int | None = None, week: int | None = None) -> tuple[Response, int]:
     """Get all events for a specific year, term, and week.
     ---
     parameters:
@@ -318,7 +314,7 @@ def create_event_api() -> tuple[Response, int]:  # noqa: PLR0911
             description: Bad request, missing or invalid data.
         403:
             description: Forbidden.
-    """  # noqa: E501
+    """
     data = request.get_json()
     if not data:
         return jsonify({"error": "No data provided"}), 400
@@ -443,7 +439,7 @@ def create_repeat_event_api() -> tuple[Response, int]:  # noqa: PLR0911
             description: Bad request, missing or invalid data.
         403:
             description: Forbidden.
-    """  # noqa: E501
+    """
     data = request.get_json()
     if not data:
         return jsonify({"error": "No data provided"}), 400
@@ -694,9 +690,7 @@ def get_tags() -> tuple[Response, int]:
             description: No tags found.
     """
     query_string = request.args.get("query", "").lower()
-    tags = (
-        get_tags_by_string(query_string, limit=-1) if query_string else get_all_tags()
-    )
+    tags = get_tags_by_string(query_string, limit=-1) if query_string else get_all_tags()
     if not tags:
         return jsonify({"error": "No tags found"}), 404
     return jsonify([tag.to_dict() for tag in tags]), 200

events/ui.py

@@ -39,18 +39,14 @@ def get_event_from_form(form_data: ImmutableMultiDict) -> dict:
         "description": form_data["description"],
         "draft": "draft" in form_data,
         "location": form_data["location"],
-        "location_url": (
-            form_data["location_url"] if form_data["location_url"] != "" else None
-        ),
+        "location_url": (form_data["location_url"] if form_data["location_url"] != "" else None),
         "icon": form_data["icon"] if form_data["icon"] != "" else None,
-        "text_colour": (
-            form_data["text_colour"] if form_data["text_colour"] != "" else None
-        ),
-        "color_colour": (
-            form_data["color_colour"] if form_data["color_colour"] != "" else None
-        ),
+        "text_colour": (form_data["text_colour"] if form_data["text_colour"] != "" else None),
+        "color_colour": (form_data["color_colour"] if form_data["color_colour"] != "" else None),
         "times": zip(
-            form_data.getlist("start_time[]"), form_data.getlist("end_time[]")
+            form_data.getlist("start_time[]"),
+            form_data.getlist("end_time[]"),
+            strict=True,
         ),
         "duration": (form_data["duration"] if form_data["duration"] != "" else None),
         "tags": [tag for tag in form_data.getlist("tags[]") if tag],
@@ -61,14 +57,10 @@ def parse_form_data(form_data: ImmutableMultiDict) -> dict | str:
     """Parse event from form data"""
     # parse colour
     text_colour = (
-        form_data["text_colour"].strip().lower()
-        if form_data["text_colour"] != ""
-        else None
+        form_data["text_colour"].strip().lower() if form_data["text_colour"] != "" else None
     )
     color_colour = (
-        form_data["color_colour"].strip().lower()
-        if form_data["color_colour"] != ""
-        else None
+        form_data["color_colour"].strip().lower() if form_data["color_colour"] != "" else None
     )
 
     if (error := validate_colour(text_colour, color_colour)) is not None:
@@ -78,9 +70,7 @@ def parse_form_data(form_data: ImmutableMultiDict) -> dict | str:
     colour = text_colour if text_colour else color_colour
 
     # parse start and end times
-    start_times = [
-        get_datetime_from_string(t) for t in form_data.getlist("start_time[]")
-    ]
+    start_times = [get_datetime_from_string(t) for t in form_data.getlist("start_time[]")]
     for start_time in start_times:
         if isinstance(start_time, str):
             return start_time
@@ -99,9 +89,7 @@ def parse_form_data(form_data: ImmutableMultiDict) -> dict | str:
         "description": form_data["description"],
         "draft": "draft" in form_data,
         "location": form_data["location"],
-        "location_url": (
-            form_data["location_url"] if form_data["location_url"] != "" else None
-        ),
+        "location_url": (form_data["location_url"] if form_data["location_url"] != "" else None),
         "icon": form_data["icon"] if form_data["icon"] != "" else None,
         "colour": colour,
         "tags": tags,
@@ -153,10 +141,7 @@ def create() -> str | Response:
         )
 
     # attempt to create the event
-    if "start_time" in data:
-        event = create_event(**data)
-    else:
-        event = create_repeat_event(**data)
+    event = create_event(**data) if "start_time" in data else create_repeat_event(**data)
 
     # if failed, return the form with an error
     if isinstance(event, str):
@@ -258,9 +243,7 @@ def edit(year: int, term: int, week: int, slug: str) -> str | Response:
     )
 
 
-@events_ui_bp.route(
-    "/<int:year>/<int:term>/<sint:week>/<string:slug>/delete/", methods=["POST"]
-)
+@events_ui_bp.route("/<int:year>/<int:term>/<sint:week>/<string:slug>/delete/", methods=["POST"])
 @is_exec_wrapper
 def delete(year: int, term: int, week: int, slug: str) -> Response:
     """Delete an event by its year, term, week, and, slug"""
@@ -307,9 +290,7 @@ def view_list(year: int, term: int | None = None, week: int | None = None) -> st
 
     events = group_events(events)
 
-    return render_template(
-        "events/list.html", events=events, year=year, term=term, week=week
-    )
+    return render_template("events/list.html", events=events, year=year, term=term, week=week)
 
 
 @events_ui_bp.route("/stardust/front/")

events/utils.py

@@ -16,6 +16,7 @@
 
 LONDON = timezone("Europe/London")
 
+
 def get_datetime_from_string(date_str: str) -> datetime | str:
     """
     Convert datetime str in the format 'YYYY-MM-DDTHH:MM'
@@ -250,7 +251,7 @@ def create_repeat_event(  # noqa: PLR0913
 ) -> list[Event] | str:
     """Create multiple events at once"""
     events = []  # the created events
-    for start_time, end_time in zip(start_times, end_times):
+    for start_time, end_time in zip(start_times, end_times, strict=True):
         # iterate through start_times and create events
         event = create_event(
             name,
@@ -305,9 +306,9 @@ def get_event_by_id(event_id: int) -> Event | None:
 def get_event_by_slug(year: int, term: int, week: int, slug: str) -> Event | None:
     """Get an event by slug"""
     return Event.query.filter(
-            Event.week.has(academic_year=year, term=term, week=week),
-            Event.slug == slug,  # type: ignore
-        ).first()
+        Event.week.has(academic_year=year, term=term, week=week),
+        Event.slug == slug,  # type: ignore
+    ).first()
 
 
 # shamelessly stolen from docs (https://python-markdown.github.io/extensions/api/#example_3)
@@ -405,9 +406,7 @@ def group_events(events: list[Event]) -> list[dict]:
                             "events": [prepare_event(event) for event in day_events],
                         }
                     )
-                week_list.append(
-                    {"week": week, "days": day_list, "start_date": start_date}
-                )
+                week_list.append({"week": week, "days": day_list, "start_date": start_date})
             term_list.append({"term": term, "weeks": week_list})
         year_list.append({"year": year, "terms": term_list})
     return year_list
@@ -430,9 +429,8 @@ def get_events_by_time(
         query = query.filter(Event.draft.is_(False))  # type: ignore
 
     # order by start_time, end_time, and name
-    return query.order_by(
-            Event.start_time, Event.end_time, Event.name  # type: ignore
-        ).all()
+    return query.order_by(Event.start_time, Event.end_time, Event.name).all()  # type: ignore
+
 
 def get_upcoming_events(include_drafts: bool = False) -> list[Event]:
     """Get all events in this week, and future weeks"""
@@ -447,9 +445,7 @@ def get_upcoming_events(include_drafts: bool = False) -> list[Event]:
     if not include_drafts:
         query = query.filter(Event.draft.is_(False))  # type: ignore
 
-    return query.order_by(
-                Event.start_time, Event.end_time, Event.name  # type: ignore
-            ).all()
+    return query.order_by(Event.start_time, Event.end_time, Event.name).all()  # type: ignore
 
 
 def get_all_events(include_drafts: bool = False) -> list[Event]:
@@ -459,9 +455,7 @@ def get_all_events(include_drafts: bool = False) -> list[Event]:
     if not include_drafts:
         query = query.filter(Event.draft.is_(False))  # type: ignore
 
-    return query.order_by(
-        Event.start_time, Event.end_time, Event.name  # type: ignore
-    ).all()
+    return query.order_by(Event.start_time, Event.end_time, Event.name).all()  # type: ignore
 
 
 def get_week_events() -> list[Event]:
@@ -538,9 +532,7 @@ def edit_event(  # noqa: PLR0913
     event.description = description if description is not _KEEP else event.description
     event.draft = draft if draft is not _KEEP else event.draft
     event.location = location if location is not _KEEP else event.location
-    event.location_url = (
-        location_url if location_url is not _KEEP else event.location_url
-    )
+    event.location_url = location_url if location_url is not _KEEP else event.location_url
 
     if icon is not _KEEP:
         event.icon = icon.lower() if icon is not None else event.icon  # type: ignore

exec/publicity.py

@@ -85,9 +85,7 @@ def poisson_disc_samples(
             if not (0 <= new_point[0] < width and 0 <= new_point[1] < height):
                 continue
 
-            grid_x, grid_y = int(new_point[0] // cell_size), int(
-                new_point[1] // cell_size
-            )
+            grid_x, grid_y = int(new_point[0] // cell_size), int(new_point[1] // cell_size)
             too_close = False
 
             for i in range(max(0, grid_x - 2), min(grid_width, grid_x + 3)):
@@ -229,9 +227,7 @@ def num(num: str) -> float | int:
         elif cmd in "Aa":
             # arc commands have boolean parameters
             rx, ry, angle, la, sw, px, py = params
-            path_data.append(
-                command_map[cmd](rx, ry, angle, bool(la), bool(sw), px, py)
-            )
+            path_data.append(command_map[cmd](rx, ry, angle, bool(la), bool(sw), px, py))
         else:
             path_data.append(command_map[cmd](*params))
 
@@ -259,9 +255,7 @@ def get_events(start: Week, end: Week) -> list[dict]:
     return group_events(events)
 
 
-def backtrack(
-    groups: list[tuple[int, list[int]]], grid: list[list[int]]
-) -> list[list[int]] | None:
+def backtrack(groups: list[tuple[int, list[int]]], grid: list[list[int]]) -> list[list[int]] | None:
     """backtracking algorithm to fit items into grid"""
 
     # base case, just return grid, we good :)
@@ -277,9 +271,7 @@ def backtrack(
         for col in range(num_cols - width + 1):
             # check if space is free
             is_free = all(
-                grid[i][j] == -1
-                for i in range(row, row + height)
-                for j in range(col, col + width)
+                grid[i][j] == -1 for i in range(row, row + height) for j in range(col, col + width)
             )
 
             # try again if not free
@@ -385,9 +377,7 @@ def get_event_circle(event: dict) -> svg.G:
     title_size = CIRCLE_SIZE / 8 if len(title) == 1 else CIRCLE_SIZE / 10
     location_size = CIRCLE_SIZE / 13 if len(location) == 1 else CIRCLE_SIZE / 16
     time_size = location_size
-    font_sizes = (
-        [title_size] * len(title) + [location_size] * len(location) + [time_size]
-    )
+    font_sizes = [title_size] * len(title) + [location_size] * len(location) + [time_size]
 
     elements: list[svg.Element] = [svg.Circle(cx=0, cy=0, r=radius, fill=colour)]
 
@@ -415,7 +405,7 @@ def get_event_circle(event: dict) -> svg.G:
 
     lines = title + location + [time_str]
     current_y = text_top
-    for line, size in zip(lines, font_sizes):
+    for line, size in zip(lines, font_sizes, strict=True):
         elements.append(
             svg.Text(
                 text=line,
@@ -472,10 +462,8 @@ def get_socials(width: float, height: float) -> svg.G:
             class_=["title"],
         ),
     ]
-    for i, (icon, social_text) in enumerate(zip(icons, text), start=2):
-        path, icon_width, icon_height, min_x, min_y = convert_path_to_list(
-            icon_paths[icon]
-        )
+    for i, (icon, social_text) in enumerate(zip(icons, text, strict=True), start=2):
+        path, icon_width, icon_height, min_x, min_y = convert_path_to_list(icon_paths[icon])
         scale = desired_icon_width / icon_width
         cx = (min_x + icon_width / 2) * scale
         cy = (min_y + icon_height / 2) * scale
@@ -550,9 +538,7 @@ def create_single_week(  # noqa: PLR0912, PLR0915
     num_rows, num_cols = len(grid), len(grid[0])
 
     # find position and sizing of grid
-    grid_height = (
-        (POST_HEIGHT / 1.5) if num_rows < 3 else (POST_HEIGHT / 1.35)  # noqa: PLR2004
-    )
+    grid_height = (POST_HEIGHT / 1.5) if num_rows < 3 else (POST_HEIGHT / 1.35)  # noqa: PLR2004
     grid_width = POST_WIDTH
     grid_top = POST_HEIGHT / 4 + (POST_HEIGHT - POST_HEIGHT / 4 - grid_height) / 2
 
@@ -639,9 +625,7 @@ def create_single_week(  # noqa: PLR0912, PLR0915
 
                 # work out extra translation required
                 translate_x = base_x + row * cell_width + cell_width / 2
-                translate_y = (
-                    base_y + col * cell_height + cell_height / 2 + DAY_TEXT_HEIGHT / 2
-                )
+                translate_y = base_y + col * cell_height + cell_height / 2 + DAY_TEXT_HEIGHT / 2
 
                 # if spanning multiple columns, pull towards centre
                 pull_y = 0 if col_width == 1 else pull_factor
@@ -682,7 +666,7 @@ def create_multi_week(events: list[dict], start: Week, end: Week) -> list[svg.El
     ]
 
     # find the list of weeks in term
-    term_weeks = events[start.academic_year]["terms"][0]["weeks"]
+    term_weeks = events[start.academic_year]["terms"][0]["weeks"]  # noqa: F841
 
     return elements
 
@@ -788,8 +772,4 @@ def create_svg(start: Week, end: Week) -> str:
     else:
         elements.extend(create_multi_week(events, start, end))
 
-    return str(
-        svg.SVG(
-            elements=elements, viewBox=svg.ViewBoxSpec(0, 0, POST_WIDTH, POST_HEIGHT)
-        )
-    )
+    return str(svg.SVG(elements=elements, viewBox=svg.ViewBoxSpec(0, 0, POST_WIDTH, POST_HEIGHT)))

exec/ui.py

@@ -38,17 +38,13 @@ def publicity() -> str:
             messgae += "end "
         messgae += "week"
         flash(messgae, "danger")
-        return render_template(
-            "exec/publicity.html", year=year, term=term, years=get_years()
-        )
+        return render_template("exec/publicity.html", year=year, term=term, years=get_years())
 
     try:
         svg = create_svg(start_week, end_week)
     except ValueError as e:
         flash(f"Error creating publicity SVG: {e}", "danger")
-        return render_template(
-            "exec/publicity.html", year=year, term=term, years=get_years()
-        )
+        return render_template("exec/publicity.html", year=year, term=term, years=get_years())
 
     return render_template(
         "exec/publicity.html",