From d22e8619f777165a87ddb166bd902148792805e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Blond=20Daugaard?= Date: Sat, 18 Apr 2026 11:50:03 -0400 Subject: [PATCH 1/8] Require POST logout flow ahead of Django 5. --- templates/master.html | 7 ++++++- users/templates/users/account.html | 5 ++++- users/tests.py | 8 ++++---- users/urls.py | 3 +-- users/views.py | 9 ++++++++- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/templates/master.html b/templates/master.html index 51c9fd2..fb70204 100644 --- a/templates/master.html +++ b/templates/master.html @@ -74,7 +74,12 @@ {% if user.is_authenticated %}
  • Rules Chat Sessions
  • Manage Account
    • -
  • Log out
    • +
  • +
    + {% csrf_token %} + +
    +
    • {% else %}
  • Sign in diff --git a/users/templates/users/account.html b/users/templates/users/account.html index 7d5d429..651e2e3 100644 --- a/users/templates/users/account.html +++ b/users/templates/users/account.html @@ -78,7 +78,10 @@

    Manage Account

    Change Password
    - Log out +
    + {% csrf_token %} + +
    diff --git a/users/tests.py b/users/tests.py index 23506e9..3a76d58 100644 --- a/users/tests.py +++ b/users/tests.py @@ -142,18 +142,18 @@ def test_get_account_page_after_login(self): response = self.client.get("/users/account") self.assertEqual(response.status_code, 200) - def test_get_logout_page(self): - response = self.client.get("/users/logout") + def test_post_logout_page(self): + response = self.client.post("/users/logout") self.assertEqual(response.status_code, 302) self.assertRedirects(response, "/") - def test_get_logout_page_after_login(self): + def test_post_logout_page_after_login(self): User.objects.create_user(username="testuser", email="test", password="test") self.client.login(username="testuser", password="test") response = self.client.get("/users/account") self.assertEqual(response.status_code, 200) - response = self.client.get("/users/logout") + response = self.client.post("/users/logout") self.assertEqual(response.status_code, 302) self.assertRedirects(response, "/") diff --git a/users/urls.py b/users/urls.py index 1f6f526..45f640b 100644 --- a/users/urls.py +++ b/users/urls.py @@ -1,4 +1,3 @@ -from django.contrib.auth.views import LogoutView from django.urls import path from . import views @@ -10,5 +9,5 @@ path("login", views.login_view, name="login"), path("account", views.account_view, name="account"), path("change-password", views.change_password_view, name="change-password"), - path("logout", LogoutView.as_view(), name="logout"), + path("logout", views.logout_view, name="logout"), ] diff --git a/users/views.py b/users/views.py index 73f2abb..f6c9284 100644 --- a/users/views.py +++ b/users/views.py @@ -1,7 +1,8 @@ -from django.contrib.auth import authenticate, login +from django.contrib.auth import authenticate, login, logout from django.contrib.auth.models import User from django.shortcuts import redirect, render from django.urls import reverse +from django.views.decorators.http import require_POST from users.forms import ChangePasswordForm, LoginForm, SignupForm @@ -115,3 +116,9 @@ def change_password_view(request): return render( request, "users/change_password.html", {"user": request.user, "form": form} ) + + +@require_POST +def logout_view(request): + logout(request) + return redirect("/") From a26fb1d70f87988a4ff041da25bd9a2ce195bba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Blond=20Daugaard?= Date: Sat, 18 Apr 2026 11:54:21 -0400 Subject: [PATCH 2/8] Update form error assertions for Django 5 compatibility. --- users/tests.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/users/tests.py b/users/tests.py index 3a76d58..1c203f1 100644 --- a/users/tests.py +++ b/users/tests.py @@ -42,7 +42,9 @@ def test_post_signup_page_with_existing_username(self): ) self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, "users/sign_up.html") - self.assertFormError(response, "form", "username", "Username already exists") + self.assertFormError( + response.context["form"], "username", "Username already exists" + ) def test_post_signup_page_with_existing_email(self): User.objects.create_user( @@ -59,7 +61,7 @@ def test_post_signup_page_with_existing_email(self): ) self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, "users/sign_up.html") - self.assertFormError(response, "form", "email", "Email already exists") + self.assertFormError(response.context["form"], "email", "Email already exists") def test_post_signup_page_with_non_matching_password(self): response = self.client.post( @@ -74,7 +76,7 @@ def test_post_signup_page_with_non_matching_password(self): self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, "users/sign_up.html") self.assertFormError( - response, "form", "confirm_password", "Passwords do not match" + response.context["form"], "confirm_password", "Passwords do not match" ) def test_signup_user_cannot_access_admin(self): @@ -201,7 +203,9 @@ def test_post_change_password_page_with_wrong_current_password(self): ) self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, "users/change_password.html") - self.assertFormError(response, "form", "current_password", "Incorrect password") + self.assertFormError( + response.context["form"], "current_password", "Incorrect password" + ) def test_post_change_password_page_with_non_matching_passwords(self): User.objects.create_user(username="testuser", email="test", password="test") @@ -217,8 +221,7 @@ def test_post_change_password_page_with_non_matching_passwords(self): self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, "users/change_password.html") self.assertFormError( - response, - "form", + response.context["form"], "confirm_new_password", "Passwords do not match", ) From d010d76cef5627df8b7939447050428e8b29d1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Blond=20Daugaard?= Date: Sat, 18 Apr 2026 11:56:50 -0400 Subject: [PATCH 3/8] Switch user forms to div renderer for Django 5. --- users/templates/users/change_password.html | 2 +- users/templates/users/login.html | 2 +- users/templates/users/sign_up.html | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/users/templates/users/change_password.html b/users/templates/users/change_password.html index aa0cc9b..38d21ee 100644 --- a/users/templates/users/change_password.html +++ b/users/templates/users/change_password.html @@ -15,7 +15,7 @@

    Changing password for {{ user.username }}

    Change Password

    {% csrf_token %} - {{ form }} + {{ form.as_div }}
    diff --git a/users/templates/users/login.html b/users/templates/users/login.html index 16826e0..556809f 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -16,7 +16,7 @@

    Welcome back

    {% csrf_token %} - {{ form }} + {{ form.as_div }}
    diff --git a/users/templates/users/sign_up.html b/users/templates/users/sign_up.html index ccde783..3eac6e5 100644 --- a/users/templates/users/sign_up.html +++ b/users/templates/users/sign_up.html @@ -16,9 +16,8 @@

    Join us today!

    {% csrf_token %} - {{ form }} + {{ form.as_div }}
    - Date: Sat, 18 Apr 2026 11:57:23 -0400 Subject: [PATCH 4/8] Move default storage config to STORAGES. --- rulesbot/settings.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rulesbot/settings.py b/rulesbot/settings.py index 449158e..77e503d 100644 --- a/rulesbot/settings.py +++ b/rulesbot/settings.py @@ -154,7 +154,14 @@ AWS_SECRET_ACCESS_KEY = env("AWS_SECRET_ACCESS_KEY") AWS_STORAGE_BUCKET_NAME = env("AWS_STORAGE_BUCKET_NAME") -DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" +STORAGES = { + "default": { + "BACKEND": "storages.backends.s3boto3.S3Boto3Storage", + }, + "staticfiles": { + "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage", + }, +} MEDIA_URL = "/mediafiles/" MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") From 469143752ce6e9c4a2a27d708e9b8c72c60ea467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Blond=20Daugaard?= Date: Sat, 18 Apr 2026 11:58:12 -0400 Subject: [PATCH 5/8] Update queryset assertions for Django 5.1. --- games/tests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/games/tests.py b/games/tests.py index eff03f0..55ed2bf 100644 --- a/games/tests.py +++ b/games/tests.py @@ -23,7 +23,7 @@ def test_no_games(self): response = self.client.get(reverse("games:index")) self.assertEqual(response.status_code, 200) self.assertContains(response, "No games are available.") - self.assertQuerysetEqual(response.context["games"], []) + self.assertQuerySetEqual(response.context["games"], []) def test_one_game(self): """ @@ -33,7 +33,7 @@ def test_one_game(self): response = self.client.get(reverse("games:index")) self.assertEqual(response.status_code, 200) self.assertContains(response, "Test Game") - self.assertQuerysetEqual(response.context["games"], [game]) + self.assertQuerySetEqual(response.context["games"], [game]) def test_many_games(self): games = [ @@ -42,7 +42,7 @@ def test_many_games(self): response = self.client.get(reverse("games:index")) self.assertEqual(response.status_code, 200) self.assertContains(response, "Test Game 0") - self.assertQuerysetEqual(response.context["games"], games) + self.assertQuerySetEqual(response.context["games"], games) def test_many_games_some_not_ingested(self): games = [ @@ -55,7 +55,7 @@ def test_many_games_some_not_ingested(self): response = self.client.get(reverse("games:index")) self.assertEqual(response.status_code, 200) self.assertContains(response, "Test Game 0") - self.assertQuerysetEqual(response.context["games"], games) + self.assertQuerySetEqual(response.context["games"], games) class GameDetailViewTests(TestCase): From 8231a5e314cffb20924517a3bfc203aee06ee1a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Blond=20Daugaard?= Date: Sat, 18 Apr 2026 11:58:47 -0400 Subject: [PATCH 6/8] Add ruby toolchain version. --- .tool-versions | 1 + 1 file changed, 1 insertion(+) diff --git a/.tool-versions b/.tool-versions index e2a1032..ce94088 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1,2 @@ nodejs 23.3.0 +ruby 4.0.2 From f5e748998f4649ff4297823ed008ec7f7877034c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Blond=20Daugaard?= Date: Sat, 18 Apr 2026 12:00:59 -0400 Subject: [PATCH 7/8] Stabilize setup page ingestion test ordering. --- games/tests.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/games/tests.py b/games/tests.py index 55ed2bf..f26bfff 100644 --- a/games/tests.py +++ b/games/tests.py @@ -159,10 +159,15 @@ def test_ingest_setup_pages(self): results = game.vector_store.index.similarity_search("Setup instructions") self.assertEqual(len(results), 3) # Both pages - plus a setup page - self.assertEqual(results[0].metadata["page"], 1) - self.assertEqual(results[0].metadata["game_id"], game.id) - self.assertEqual(results[0].metadata["document_id"], document.id) - self.assertTrue("Page 2" in results[0].page_content) + self.assertTrue( + any( + result.metadata["page"] == 1 + and result.metadata["game_id"] == game.id + and result.metadata["document_id"] == document.id + and "Page 2" in result.page_content + for result in results + ) + ) class GameVectorStoreTest(TestCase): From 964e1ba655a53cc8b7ed71f1156f8a416c116ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Blond=20Daugaard?= Date: Sat, 18 Apr 2026 12:04:44 -0400 Subject: [PATCH 8/8] Upgrade Django to 5.2. --- poetry.lock | 12 ++++++------ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index 19635d4..8ecd2b0 100644 --- a/poetry.lock +++ b/poetry.lock @@ -511,18 +511,18 @@ files = [ [[package]] name = "django" -version = "4.2.23" +version = "5.2.13" description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." category = "main" optional = false -python-versions = ">=3.8" +python-versions = ">=3.10" files = [ - {file = "django-4.2.23-py3-none-any.whl", hash = "sha256:dafbfaf52c2f289bd65f4ab935791cb4fb9a198f2a5ba9faf35d7338a77e9803"}, - {file = "django-4.2.23.tar.gz", hash = "sha256:42fdeaba6e6449d88d4f66de47871015097dc6f1b87910db00a91946295cfae4"}, + {file = "django-5.2.13-py3-none-any.whl", hash = "sha256:5788fce61da23788a8ce6f02583765ab060d396720924789f97fa42119d37f7a"}, + {file = "django-5.2.13.tar.gz", hash = "sha256:a31589db5188d074c63f0945c3888fad104627dfcc236fb2b97f71f89da33bc4"}, ] [package.dependencies] -asgiref = ">=3.6.0,<4" +asgiref = ">=3.8.1" sqlparse = ">=0.3.1" tzdata = {version = "*", markers = "sys_platform == \"win32\""} @@ -2890,4 +2890,4 @@ cffi = ["cffi (>=1.17)"] [metadata] lock-version = "2.0" python-versions = ">=3.11.6,<3.15" -content-hash = "b46823a615104cb500609274a7a4ef4ad8b8cfb14443b8239f00911f796f8b9e" +content-hash = "248ea80d6cae543022074d5ffbc7a0ac161c5b6e1a211a8532c42b04db5a3a45" diff --git a/pyproject.toml b/pyproject.toml index c0c38ee..9b3ce19 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ readme = "README.md" [tool.poetry.dependencies] python = ">=3.11.6,<3.15" -Django = "^4.2.4" +Django = "^5" pypdf = "^3.15.0" langchain = "^0.3.0" openai = "^1.0"