Use basedpyright refactor

folkugat_web/dal/sql/playlists/query.py

@@ -1,19 +1,27 @@
 from collections.abc import Iterator
-from typing import Optional
+from typing import TypedDict
 
 from folkugat_web.dal.sql import Connection, get_connection
+from folkugat_web.dal.sql.sessions import conversion as sessions_conversion
 from folkugat_web.model import playlists as model
+from folkugat_web.model.sessions import Session
 
-from ._conversion import row_to_playlist_entry
+from . import conversion
+
+
+class QueryData(TypedDict, total=False):
+    id: int
+    set_id: int
+    session_id: int
 
 
 def _filter_clause(
-    entry_id: Optional[int] = None,
-    set_id: Optional[int] = None,
-    session_id: Optional[int] = None,
-) -> tuple[str, dict]:
-    filter_clauses = []
-    query_data = {}
+    entry_id: int | None = None,
+    set_id: int | None = None,
+    session_id: int | None = None,
+) -> tuple[str, QueryData]:
+    filter_clauses: list[str] = []
+    query_data: QueryData = {}
 
     if entry_id is not None:
         filter_clauses.append("id = :id")
@@ -29,10 +37,10 @@ def _filter_clause(
 
 
 def get_playlist_entries(
-    entry_id: Optional[int] = None,
-    set_id: Optional[int] = None,
-    session_id: Optional[int] = None,
-    con: Optional[Connection] = None,
+    entry_id: int | None = None,
+    set_id: int | None = None,
+    session_id: int | None = None,
+    con: Connection | None = None,
 ) -> Iterator[model.PlaylistEntry]:
     filter_clause, data = _filter_clause(entry_id=entry_id, set_id=set_id, session_id=session_id)
     query = f"""
@@ -43,5 +51,18 @@ def get_playlist_entries(
     """
     with get_connection(con) as con:
         cur = con.cursor()
-        cur.execute(query, data)
-        return map(row_to_playlist_entry, cur.fetchall())
+        _ = cur.execute(query, data)
+        return map(conversion.row_to_playlist_entry, cur.fetchall())
+
+
+def get_tune_sessions(tema_ids: list[int], con: Connection | None = None) -> Iterator[Session]:
+    query = """
+      SELECT p.tema_id, s.id, s.date, s.start_time, s.end_time, s.venue_name, s.venue_url, s.is_live
+      FROM playlists p JOIN sessions s ON p.session_id = s.id
+      WHERE p.tema_id IN :tema_ids
+    """
+    data = dict(tema_ids=tuple(tema_ids))
+    with get_connection(con) as con:
+        cur = con.cursor()
+        _ = cur.execute(query, data)
+        return map(sessions_conversion.row_to_session, cur.fetchall())