From 0d1c097396b8e39f4c5d20ea16282c295d2e4e0b Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Tue, 23 Jun 2026 12:16:42 -0700
Subject: [PATCH] Document database views and queries as dataclasses

---
 datasette/views/database.py | 22 +++++++++++++++-------
 docs/template_context.rst   |  8 ++++----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/datasette/views/database.py b/datasette/views/database.py
index fd985b77..e02de657 100644
--- a/datasette/views/database.py
+++ b/datasette/views/database.py
@@ -11,7 +11,7 @@ import textwrap
 from datasette.extras import extra_names_from_request
 from datasette.database import QueryInterrupted
 from datasette.resources import DatabaseResource, QueryResource
-from datasette.stored_queries import stored_query_to_dict
+from datasette.stored_queries import StoredQuery, stored_query_to_dict
 from datasette.write_sql import QueryWriteRejected
 from datasette.utils import (
     add_cors_headers,
@@ -60,6 +60,14 @@ class DatabaseTable:
     private: bool
 
 
+@dataclass
+class DatabaseViewInfo:
+    "Summary of a SQLite view shown on the database page."
+
+    name: str
+    private: bool
+
+
 class DatabaseView(View):
     async def get(self, request, datasette):
         format_ = request.url_vars.get("format") or "html"
@@ -109,7 +117,7 @@ class DatabaseView(View):
         # Filter to just views
         view_names_set = set(await db.view_names())
         sql_views = [
-            {"name": name, "private": allowed_dict[name].private}
+            DatabaseViewInfo(name=name, private=allowed_dict[name].private)
             for name in allowed_dict
             if name in view_names_set
         ]
@@ -186,7 +194,7 @@ class DatabaseView(View):
             "size": db.size,
             "tables": [asdict(table) for table in tables],
             "hidden_count": len([table for table in tables if table.hidden]),
-            "views": sql_views,
+            "views": [asdict(view) for view in sql_views],
             "queries": [stored_query_to_dict(query) for query in stored_queries],
             "queries_more": queries_more,
             "queries_count": queries_count,
@@ -287,14 +295,14 @@ class DatabaseContext(Context):
         }
     )
     hidden_count: int = field(metadata={"help": "Count of hidden tables"})
-    views: list = field(
+    views: list[DatabaseViewInfo] = field(
         metadata={
-            "help": "List of SQLite view dictionaries. Each item has ``name`` and ``private`` keys."
+            "help": "List of ``DatabaseViewInfo`` objects describing SQLite views in the database. Each item has ``name`` and ``private`` attributes."
         }
     )
-    queries: list = field(
+    queries: list[StoredQuery] = field(
         metadata={
-            "help": "List of stored query objects. Each has attributes including ``name``, ``sql``, ``title``, ``description``, ``description_html``, ``hide_sql``, ``fragment``, ``parameters``, ``is_write`` and ``private``."
+            "help": "List of ``StoredQuery`` objects. Each has attributes including ``name``, ``sql``, ``title``, ``description``, ``description_html``, ``hide_sql``, ``fragment``, ``parameters``, ``is_write`` and ``private``."
         }
     )
     queries_more: bool = field(
diff --git a/docs/template_context.rst b/docs/template_context.rst
index 311de8bb..52ccca49 100644
--- a/docs/template_context.rst
+++ b/docs/template_context.rst
@@ -124,8 +124,8 @@ The page listing the tables, views and queries in a database, e.g. /fixtures. Re
 ``private`` - ``bool``
     Boolean indicating if this is a private database
 
-``queries`` - ``list``
-    List of stored query objects. Each has attributes including ``name``, ``sql``, ``title``, ``description``, ``description_html``, ``hide_sql``, ``fragment``, ``parameters``, ``is_write`` and ``private``.
+``queries`` - ``list[StoredQuery]``
+    List of ``StoredQuery`` objects. Each has attributes including ``name``, ``sql``, ``title``, ``description``, ``description_html``, ``hide_sql``, ``fragment``, ``parameters``, ``is_write`` and ``private``.
 
 ``queries_count`` - ``int``
     Count of visible stored queries
@@ -151,8 +151,8 @@ The page listing the tables, views and queries in a database, e.g. /fixtures. Re
 ``top_database`` - ``callable``
     Async callable that renders the ``top_database`` plugin slot for this database and returns HTML.
 
-``views`` - ``list``
-    List of SQLite view dictionaries. Each item has ``name`` and ``private`` keys.
+``views`` - ``list[DatabaseViewInfo]``
+    List of ``DatabaseViewInfo`` objects describing SQLite views in the database. Each item has ``name`` and ``private`` attributes.
 
 Query page
 ----------