remote/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2026-10-22 09:17:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

path and full_path arguments for output renderers, closes #1179

Browse source 
Output renderer render() and can_render() callbacks can now accept
path and full_path arguments - the path to the HTML version of the
page without the .extension, with and without the query string.

Also fixed path_with_format() so it replaces the extension the current
request used instead of falling back to ?_format=, which Datasette no
longer reads. This broke links generated by renderers such as
datasette-export-notebook, and the URLs returned by ?_extra=renderers
on .json pages.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TzcVp1Cq5yCRW81GiN88JX
This commit is contained in:
Claude 2026-10-05 21:44:50 +00:00
commit cf6357cf93
No known key found for this signature in database
10 changed files with 180 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

63
tests/test_plugins.py
View file

@ -624,11 +624,50 @@ async def test_hook_register_output_renderer_all_parameters(ds_client):
"database": "fixtures",
"table": "facetable",
"request": '<asgi.Request method="GET" url="http://localhost/fixtures/facetable.testall">',
"path": "/fixtures/facetable",
"full_path": "/fixtures/facetable",
"view_name": "table",
"1+1": 2,
}
@pytest.mark.asyncio
@pytest.mark.parametrize(
"path,expected_path,expected_full_path",
(
(
"/fixtures/facetable.testall?_sort_desc=pk&_size=2",
"/fixtures/facetable",
"/fixtures/facetable?_sort_desc=pk&_size=2",
),
(
"/fixtures/simple_primary_key/1.testall",
"/fixtures/simple_primary_key/1",
"/fixtures/simple_primary_key/1",
),
(
"/fixtures/-/query.testall?sql=select+1",
"/fixtures/-/query",
"/fixtures/-/query?sql=select+1",
),
(
"/fixtures/pragma_cache_size.testall",
"/fixtures/pragma_cache_size",
"/fixtures/pragma_cache_size",
),
),
)
async def test_hook_register_output_renderer_path_and_full_path(
ds_client, path, expected_path, expected_full_path
):
# https://github.com/simonw/datasette/issues/1179
response = await ds_client.get(path)
assert response.status_code == 200
data = json.loads(response.text)
assert data["path"] == expected_path
assert data["full_path"] == expected_full_path
@pytest.mark.asyncio
async def test_hook_register_output_renderer_custom_status_code(ds_client):
response = await ds_client.get(
@ -701,10 +740,34 @@ async def test_hook_register_output_renderer_can_render(ds_client):
"query_name": None,
"database": "fixtures",
"table": "facetable",
"path": "/fixtures/facetable",
"full_path": "/fixtures/facetable?_no_can_render=1",
"view_name": "table",
}.items() <= ds_client.ds._can_render_saw.items()
@pytest.mark.asyncio
async def test_hook_register_output_renderer_renderers_extra_links(ds_client):
# https://github.com/simonw/datasette/issues/1179
# Links from a .json page previously came out as
# /fixtures/facetable.json?_format=testall - which returned JSON
response = await ds_client.get("/fixtures/facetable.json?_extra=renderers")
assert response.status_code == 200
renderers = response.json()["renderers"]
assert renderers["json"] == "/fixtures/facetable.json?_extra=renderers&_labels=on"
assert (
renderers["testall"]
== "/fixtures/facetable.testall?_extra=renderers&_labels=on"
)
saw = ds_client.ds._can_render_saw
assert saw["path"] == "/fixtures/facetable"
assert saw["full_path"] == "/fixtures/facetable?_extra=renderers"
# Following the link should run the renderer
response = await ds_client.get(renderers["testall"])
assert response.status_code == 200
assert response.headers["content-type"] == "text/plain"
@pytest.mark.asyncio
async def test_hook_register_output_renderer_can_render_canned_query(ds_client):
# https://github.com/simonw/datasette/issues/2711