Use unidecode for accent-less word comparison; latest requirements

requirements-server.txt

@@ -2,97 +2,108 @@
 #    uv pip compile requirements-server.in
 annotated-types==0.7.0
     # via pydantic
-anyio==4.6.2.post1
+anyio==4.11.0
     # via
     #   httpx
     #   starlette
     #   watchfiles
-certifi==2024.8.30
+certifi==2025.8.3
     # via
     #   httpcore
     #   httpx
-click==8.1.7
+click==8.3.0
     # via
+    #   rich-toolkit
     #   typer
     #   uvicorn
-dnspython==2.7.0
+dnspython==2.8.0
     # via email-validator
-email-validator==2.2.0
+email-validator==2.3.0
     # via fastapi
-fastapi==0.115.5
+fastapi==0.117.1
     # via -r requirements.in
-fastapi-cli==0.0.5
+fastapi-cli==0.0.13
     # via fastapi
 gunicorn==23.0.0
     # via -r requirements-server.in
-h11==0.14.0
+h11==0.16.0
     # via
     #   httpcore
     #   uvicorn
-httpcore==1.0.7
+httpcore==1.0.9
     # via httpx
 httptools==0.6.4
     # via uvicorn
-httpx==0.27.2
+httpx==0.28.1
     # via fastapi
 idna==3.10
     # via
     #   anyio
     #   email-validator
     #   httpx
-jinja2==3.1.4
+jinja2==3.1.6
     # via fastapi
-markdown-it-py==3.0.0
+markdown-it-py==4.0.0
     # via rich
 markupsafe==3.0.2
     # via jinja2
 mdurl==0.1.2
     # via markdown-it-py
-packaging==24.2
+packaging==25.0
     # via gunicorn
-pydantic==2.10.1
+pydantic==2.11.9
     # via
     #   fastapi
     #   pydantic-settings
-pydantic-core==2.27.1
+pydantic-core==2.33.2
     # via pydantic
-pydantic-settings==2.6.1
+pydantic-settings==2.10.1
     # via -r requirements.in
-pygments==2.18.0
+pygments==2.19.2
     # via rich
-python-dotenv==1.0.1
+python-dotenv==1.1.1
     # via
     #   pydantic-settings
     #   uvicorn
-python-multipart==0.0.17
+python-multipart==0.0.20
     # via fastapi
 pyyaml==6.0.2
     # via uvicorn
-rich==13.9.4
+rich==14.1.0
-    # via typer
+    # via
+    #   rich-toolkit
+    #   typer
+rich-toolkit==0.15.1
+    # via fastapi-cli
 shellingham==1.5.4
     # via typer
 sniffio==1.3.1
-    # via
+    # via anyio
-    #   anyio
+starlette==0.48.0
-    #   httpx
-starlette==0.41.3
     # via fastapi
-typer==0.13.1
+typer==0.19.2
     # via fastapi-cli
-typing-extensions==4.12.2
+typing-extensions==4.15.0
     # via
     #   fastapi
     #   pydantic
     #   pydantic-core
+    #   rich-toolkit
     #   typer
-uvicorn==0.32.1
+    #   typing-inspection
+typing-inspection==0.4.1
+    # via
+    #   pydantic
+    #   pydantic-settings
+unidecode==1.4.0
+    # via -r requirements.in
+uvicorn==0.37.0
     # via
     #   fastapi
     #   fastapi-cli
 uvloop==0.21.0
     # via uvicorn
-watchfiles==0.24.0
+watchfiles==1.1.0
     # via uvicorn
-websockets==14.1
+websockets==15.0.1
     # via uvicorn

requirements.in

@@ -1,2 +1,5 @@
-fastapi[standard]
+fastapi[standard-no-fastapi-cloud-cli]
 pydantic-settings
+
+# Normalise strings so we can compare without accents
+unidecode

requirements.txt

@@ -2,93 +2,104 @@
 #    uv pip compile requirements.in
 annotated-types==0.7.0
     # via pydantic
-anyio==4.6.2.post1
+anyio==4.11.0
     # via
     #   httpx
     #   starlette
     #   watchfiles
-certifi==2024.8.30
+certifi==2025.8.3
     # via
     #   httpcore
     #   httpx
-click==8.1.7
+click==8.3.0
     # via
+    #   rich-toolkit
     #   typer
     #   uvicorn
-dnspython==2.7.0
+dnspython==2.8.0
     # via email-validator
-email-validator==2.2.0
+email-validator==2.3.0
     # via fastapi
-fastapi==0.115.5
+fastapi==0.117.1
     # via -r requirements.in
-fastapi-cli==0.0.5
+fastapi-cli==0.0.13
     # via fastapi
-h11==0.14.0
+h11==0.16.0
     # via
     #   httpcore
     #   uvicorn
-httpcore==1.0.7
+httpcore==1.0.9
     # via httpx
 httptools==0.6.4
     # via uvicorn
-httpx==0.27.2
+httpx==0.28.1
     # via fastapi
 idna==3.10
     # via
     #   anyio
     #   email-validator
     #   httpx
-jinja2==3.1.4
+jinja2==3.1.6
     # via fastapi
-markdown-it-py==3.0.0
+markdown-it-py==4.0.0
     # via rich
 markupsafe==3.0.2
     # via jinja2
 mdurl==0.1.2
     # via markdown-it-py
-pydantic==2.10.1
+pydantic==2.11.9
     # via
     #   fastapi
     #   pydantic-settings
-pydantic-core==2.27.1
+pydantic-core==2.33.2
     # via pydantic
-pydantic-settings==2.6.1
+pydantic-settings==2.10.1
     # via -r requirements.in
-pygments==2.18.0
+pygments==2.19.2
     # via rich
-python-dotenv==1.0.1
+python-dotenv==1.1.1
     # via
     #   pydantic-settings
     #   uvicorn
-python-multipart==0.0.17
+python-multipart==0.0.20
     # via fastapi
 pyyaml==6.0.2
     # via uvicorn
-rich==13.9.4
+rich==14.1.0
-    # via typer
+    # via
+    #   rich-toolkit
+    #   typer
+rich-toolkit==0.15.1
+    # via fastapi-cli
 shellingham==1.5.4
     # via typer
 sniffio==1.3.1
-    # via
+    # via anyio
-    #   anyio
+starlette==0.48.0
-    #   httpx
-starlette==0.41.3
     # via fastapi
-typer==0.13.1
+typer==0.19.2
     # via fastapi-cli
-typing-extensions==4.12.2
+typing-extensions==4.15.0
     # via
     #   fastapi
     #   pydantic
     #   pydantic-core
+    #   rich-toolkit
     #   typer
-uvicorn==0.32.1
+    #   typing-inspection
+typing-inspection==0.4.1
+    # via
+    #   pydantic
+    #   pydantic-settings
+unidecode==1.4.0
+    # via -r requirements.in
+uvicorn==0.37.0
     # via
     #   fastapi
     #   fastapi-cli
 uvloop==0.21.0
     # via uvicorn
-watchfiles==0.24.0
+watchfiles==1.1.0
     # via uvicorn
-websockets==14.1
+websockets==15.0.1
     # via uvicorn

src/alfagok/main.py

@@ -2,6 +2,7 @@
 import logging
 from datetime import date, datetime, timezone
 from typing import Union
+from zoneinfo import ZoneInfo
 
 from fastapi import FastAPI, Request, HTTPException
 from fastapi.responses import HTMLResponse
@@ -9,9 +10,11 @@ from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from pydantic import DirectoryPath, FilePath
 from pydantic_settings import BaseSettings
+from unidecode import unidecode
 
+VERSION = '0.3.3'
 
-VERSION = '0.3.0'
+AMSTERDAM = ZoneInfo('Europe/Amsterdam')
 
 
 class Settings(BaseSettings):
@@ -54,15 +57,15 @@ if settings.debug:
 
 def get_game_id():
     """Calculate the index for the game/word we are handling today."""
-    today = datetime.now(timezone.utc).date()
+    today = datetime.now(tz=AMSTERDAM).date()
     # Calculate the amount of days since the start of the games so we know which word is used today
     return (today - settings.start_date).days
 
 
 def get_game_deadline():
     """Calculate the amount of time left for the current game."""
-    this_moment = datetime.now(timezone.utc)
+    this_moment = datetime.now(tz=AMSTERDAM)
-    midnight = datetime.now(timezone.utc).replace(hour=23, minute=59, second=59, microsecond=0)
+    midnight = datetime.now(tz=AMSTERDAM).replace(hour=23, minute=59, second=59, microsecond=0)
     # Calculate the amount of time left till midnight (and the start of the next game)
     return midnight - this_moment
 
@@ -97,9 +100,9 @@ def handle_guess(word: Union[str, None] = None):
         return {'error': 'Word not in dictionary'}
 
     hint = 'it'
-    if word_of_the_day < word:
+    if word_of_the_day < unidecode(word):
         hint = 'before'
-    if word_of_the_day > word:
+    if word_of_the_day > unidecode(word):
         hint = 'after'
 
     logger.info('Guess: %s for game %d (%s), goal is %s', word, current_game_id, word_of_the_day, hint)

src/alfagok/static/game.css

@@ -39,6 +39,7 @@ a.title {
 
 .guessesheading, .guessesbefore, .guessesafter {
     text-align: center;
+    clear: both;
 }
 
 input[type="text"] {

src/alfagok/static/game.js

@@ -30,7 +30,7 @@ document.addEventListener('alpine:init', () => {
             /** Initialise the application after loading */
             await this.getGameID();
             setInterval(() => {
-                // Update counter to next game (midnight UTC, fetched from API) every second
+                // Update counter to the next game (midnight UTC, fetched from API) every second
                 this.countDownTimer();
             }, 1000);
         },
@@ -58,7 +58,7 @@ document.addEventListener('alpine:init', () => {
             /** Handle the newly entered guess */
             this.guessError = null;
 
-            /* Normalise on lowercase, and strip whitespace from begin and end, just in case */
+            /* Normalise on lowercase, and strip whitespace from start and end, just in case */
             this.guessValue = this.guessValue.toLowerCase().trim();
 
             if (this.guessValue === '') {
@@ -132,7 +132,7 @@ document.addEventListener('alpine:init', () => {
             this.resultTimeTaken = '';
         },
         getFormattedTime(milliseconds) {
-            /** Nicely format time for 'time played' */
+            /** Format the time for 'time played' nicely */
             if (!Number.isInteger(milliseconds)) {
                 return '';
             }
@@ -195,3 +195,10 @@ document.addEventListener('alpine:init', () => {
     /* On AlpineJS completely loaded, do all this */
     // Alpine.store('alfagok').getGameID();
 // })
+
+document.onvisibilitychange = () => {
+  if (!document.hidden) {
+      /* Tab/window is shown again, possibly after a long time, check if game is still current, otherwise re-load */
+      Alpine.store('alfagok').getGameID();
+  }
+};