Fix htmx deprecation

src/data/loader.py

@@ -9,7 +9,7 @@
 from operator import attrgetter
 from pathlib import Path
 
-from litestar.contrib.htmx.request import HTMXRequest
+from litestar.plugins.htmx import HTMXRequest
 from packaging.version import Version
 
 from common import (

src/plugins/ffe/ffe.py

@@ -8,7 +8,7 @@
 from types import ModuleType
 from typing import Any, TYPE_CHECKING, Iterable, override
 
-from litestar.contrib.htmx.request import HTMXRequest
+from litestar.plugins.htmx import HTMXRequest
 from dateutil.relativedelta import relativedelta
 from packaging.version import Version
 
@@ -63,8 +63,7 @@ def static_name() -> str:
     @property
     def description(self) -> str:
         return _(
-            'French Federation specific features '
-            '(player search, leagues, Papi compatibility)'
+            'French Federation specific features (player search, leagues, Papi compatibility)'
         )
 
     @property

src/plugins/ffe/ffe_session_handler.py

@@ -1,4 +1,4 @@
-from litestar.contrib.htmx.request import HTMXRequest
+from litestar.plugins.htmx import HTMXRequest
 
 from plugins.ffe.utils import PlayerFFELicence
 

src/plugins/hookspec.py

@@ -3,7 +3,7 @@
 from collections.abc import Iterable
 from typing import Any, TYPE_CHECKING, Optional
 
-from litestar.contrib.htmx.request import HTMXRequest
+from litestar.plugins.htmx import HTMXRequest
 import pluggy  # type: ignore
 
 from common import APP_NAME

src/web/controllers/admin/base_admin_controller.py

@@ -5,7 +5,7 @@
 
 import requests
 import validators
-from litestar.contrib.htmx.request import HTMXRequest
+from litestar.plugins.htmx import HTMXRequest
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 

src/web/controllers/admin/base_event_admin_controller.py

@@ -1,8 +1,7 @@
 import logging
 from typing import Annotated, Any
 
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import HTMXTemplate
+from litestar.plugins.htmx import HTMXRequest, HTMXTemplate
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template

src/web/controllers/admin/client_controller_admin_controller.py

@@ -1,8 +1,7 @@
 from typing import Annotated, Any
 
 from litestar import post, get, patch, delete
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template

src/web/controllers/admin/event_admin_controller.py

@@ -3,9 +3,9 @@
 from typing import Annotated, Any, Iterable
 
 import xlsxwriter
+
 from litestar import get, patch, post, Response
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import HTMXTemplate
+from litestar.plugins.htmx import HTMXRequest, HTMXTemplate
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template, Redirect, File

src/web/controllers/admin/family_admin_controller.py

@@ -1,8 +1,7 @@
 from typing import Annotated, Any
 
 from litestar import post, get, patch, delete
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template

src/web/controllers/admin/index_admin_controller.py

@@ -5,8 +5,7 @@
 from database.access.access_database import access_driver, odbc_drivers
 
 from litestar import get, post, patch, delete
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import ClientRedirect, HTMXTemplate
+from litestar.plugins.htmx import HTMXRequest, HTMXTemplate, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template, Redirect

src/web/controllers/admin/pairings_admin_controller.py

@@ -3,8 +3,7 @@
 from typing import Annotated, Any
 
 from litestar import delete, get, patch, put, post
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template
@@ -624,8 +623,7 @@ async def htmx_admin_permute(
         )
 
     @put(
-        path='/admin/pairing/set-result-hotkey/'
-        '{event_uniq_id:str}/{tournament_id:int}/{round:int}',
+        path='/admin/pairing/set-result-hotkey/{event_uniq_id:str}/{tournament_id:int}/{round:int}',
         name='admin-event-set-result-hotkey',
         data=Body(media_type=RequestEncodingType.URL_ENCODED),
     )

src/web/controllers/admin/player_admin_controller.py

@@ -4,8 +4,7 @@
 from typing import Annotated, Any, Iterable
 
 from litestar import get, patch, delete, post
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template, Redirect

src/web/controllers/admin/rotator_admin_controller.py

@@ -1,8 +1,7 @@
 from typing import Annotated, Any
 
 from litestar import post, get, delete, patch
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template

src/web/controllers/admin/screen_admin_controller.py

@@ -3,8 +3,7 @@
 import requests
 import validators
 from litestar import post, get, delete, patch
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template

src/web/controllers/admin/timer_admin_controller.py

@@ -4,8 +4,7 @@
 from typing import Annotated, Any
 
 from litestar import post, get, delete, patch
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template

src/web/controllers/admin/tournament_admin_controller.py

@@ -6,9 +6,7 @@
 import urllib.parse
 
 from litestar import post, get, patch
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import HTMXTemplate
-from litestar.contrib.htmx.response import ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, HTMXTemplate, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template, File
@@ -101,7 +99,7 @@ def _admin_validate_tournament_update_data(
         rating: int | None = None
         start: float | None = None
         stop: float | None = None
-        if action == 'delete':
+        if action ==':
             if web_context.admin_tournament is None:
                 raise RuntimeError('admin_tournament not defined')
             if not uniq_id:
@@ -145,8 +143,7 @@ def _admin_validate_tournament_update_data(
                     assert tournament is not None
                     if rounds and rounds < tournament.current_round:
                         errors['rounds'] = _(
-                            'Impossible to set a round number '
-                            'lower than current round #{round}.'
+                            'Impossible to set a round number lower than current round #{round}.'
                         ).format(round=tournament.current_round)
                 rating = (
                     WebContext.form_data_to_int(data, field := 'rating')

src/web/controllers/background_controller.py

@@ -1,6 +1,6 @@
 import validators
 from litestar import get
-from litestar.contrib.htmx.request import HTMXRequest
+from litestar.plugins.htmx import HTMXRequest
 from litestar.enums import MediaType
 
 from common.background import inline_image_url

src/web/controllers/base_controller.py

@@ -9,8 +9,7 @@
 
 import phonenumbers
 from httpdate.httpdate import httpdate_to_unixtime, unixtime_to_httpdate
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import HTMXTemplate, ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, HTMXTemplate, ClientRedirect
 from litestar.controller import Controller
 from litestar.enums import RequestEncodingType
 from litestar.params import Body

src/web/controllers/index_controller.py

@@ -1,7 +1,6 @@
 from litestar import get
 from litestar.config.response_cache import CACHE_FOREVER
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import HTMXTemplate
+from litestar.plugins.htmx import HTMXRequest, HTMXTemplate
 from litestar.response import Redirect, Template
 
 from common.papi_web_config import PapiWebConfig

src/web/controllers/user/base_screen_user_controller.py

@@ -1,8 +1,7 @@
 from logging import Logger
 from typing import Annotated, Any, Iterable
 
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import HTMXTemplate, ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, HTMXTemplate, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template

src/web/controllers/user/base_user_controller.py

@@ -1,6 +1,6 @@
 from typing import Annotated, Any
 
-from litestar.contrib.htmx.request import HTMXRequest
+from litestar.plugins.htmx import HTMXRequest
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 

src/web/controllers/user/event_user_controller.py

@@ -2,8 +2,7 @@
 from typing import Annotated, Any
 
 from litestar import get
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import Reswap, HTMXTemplate, ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, HTMXTemplate, Reswap, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template

src/web/controllers/user/index_user_controller.py

@@ -1,6 +1,5 @@
 from litestar import get
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import HTMXTemplate, Reswap, ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, HTMXTemplate, Reswap, ClientRedirect
 from litestar.response import Template
 from litestar.status_codes import HTTP_304_NOT_MODIFIED
 

src/web/controllers/user/screen_user_controller.py

@@ -2,8 +2,7 @@
 from typing import Annotated
 
 from litestar import head, post, get
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import Reswap, ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, Reswap, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template

src/web/controllers/user/tournament_user_controller.py

@@ -5,8 +5,7 @@
 from zipfile import ZipInfo, ZipFile
 
 from litestar import patch, delete, put, Response, get
-from litestar.contrib.htmx.request import HTMXRequest
-from litestar.contrib.htmx.response import HTMXTemplate, ClientRedirect
+from litestar.plugins.htmx import HTMXRequest, HTMXTemplate, ClientRedirect
 from litestar.enums import RequestEncodingType
 from litestar.params import Body
 from litestar.response import Template, File

src/web/server_engine.py

@@ -8,7 +8,7 @@
 import requests
 import uvicorn
 from litestar import Litestar
-from litestar.contrib.htmx.request import HTMXRequest
+from litestar.plugins.htmx import HTMXRequest
 from litestar.logging import LoggingConfig
 
 from common import REQUEST_TIMEOUT

src/web/session.py

@@ -1,7 +1,7 @@
 import time
 from typing import TYPE_CHECKING
 
-from litestar.contrib.htmx.request import HTMXRequest
+from litestar.plugins.htmx import HTMXRequest
 
 from common.papi_web_config import PapiWebConfig
 from data.player import Federation, Club
@@ -304,7 +304,9 @@ def get_session_admin_players_filter_genders(
     ) -> list[PlayerGender]:
         return [
             PlayerGender(gender_value)
-            for gender_value in request.session.get(cls.ADMIN_PLAYERS_FILTER_GENDERS_KEY, [])
+            for gender_value in request.session.get(
+                cls.ADMIN_PLAYERS_FILTER_GENDERS_KEY, []
+            )
         ]
 
     ADMIN_PLAYERS_FILTER_CHECK_INS_KEY: str = 'admin_players_filter_check_ins'

src/web/templates/admin/event/event_modal.html

@@ -113,7 +113,7 @@ <h4>
                             {{ admin_macros.text_input(
                                 name='path',
                                 label=_('Default directory of the Papi files:'),
-                                placeholder=_('E.g.: c:\chess\tournaments'),
+                                placeholder=_('E.g.: c:\\chess\tournaments'),
                                 help_text=_('The default directory of the Papi files for the tournaments (absolute or relative path, by default %(dir)s).', dir=papi_web_config.default_papi_path),
                                 data=data, errors=errors
                             ) }}

src/web/urls.py

@@ -1,4 +1,4 @@
-from litestar.contrib.htmx.request import HTMXRequest
+from litestar.plugins.htmx import HTMXRequest
 
 
 def index_url(request: HTMXRequest) -> str: