datasette-extract for datasette>=1.0a20

Refs simonw/datasette#2577

Author: simonw

.github/workflows/publish.yml

@@ -30,6 +30,9 @@ jobs:
  deploy:
  runs-on: ubuntu-latest
  needs: [test]
+ environment: release
+ permissions:
+ id-token: write
  steps:
  - uses: actions/checkout@v5
  - name: Set up Python
@@ -40,12 +43,10 @@ jobs:
  cache-dependency-path: pyproject.toml
  - name: Install dependencies
  run: |
- pip install setuptools wheel twine build
- - name: Publish
- env:
- TWINE_USERNAME: __token__
- TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+ pip install setuptools wheel build
+ - name: Build
  run: |
  python -m build
- twine upload dist/*
+ - name: Publish
+ uses: pypa/gh-action-pypi-publish@release/v1
 

datasette_extract/__init__.py

@@ -1,6 +1,8 @@
 import asyncio
 import llm
-from datasette import hookimpl, Response, NotFound, Permission, Forbidden
+from datasette import hookimpl, Response, NotFound, Forbidden
+from datasette.permissions import Action
+from datasette.resources import DatabaseResource, TableResource
 from datasette_secrets import Secret, get_secret
 from datetime import datetime, timezone
 from sqlite_utils import Database
@@ -12,15 +14,11 @@
 
 
 @hookimpl
-def register_permissions(datasette):
+def register_actions(datasette):
  return [
- Permission(
+ Action(
  name="datasette-extract",
- abbr=None,
  description="Use the extract tool to populate tables",
- takes_database=False,
- takes_resource=False,
- default=False,
  )
  ]
 
@@ -36,34 +34,32 @@ def register_secrets():
  ]
 
 
-@hookimpl
-def permission_allowed(action, actor):
- if action == "datasette-extract" and actor and actor.get("id") == "root":
- return True
-
-
 def get_config(datasette):
  return datasette.plugin_config("datasette-extract") or {}
 
 
 async def can_extract(datasette, actor, database_name, to_table=None):
  if actor is None:
  return False
- reply_from_that = await datasette.permission_allowed(actor, "datasette-extract")
+ reply_from_that = await datasette.allowed(actor=actor, action="datasette-extract")
  if not reply_from_that:
  return False
  if not to_table:
  # Need create-table for database
- can_create_table = await datasette.permission_allowed(
- actor, "create-table", resource=database_name
+ can_create_table = await datasette.allowed(
+ actor=actor,
+ action="create-table",
+ resource=DatabaseResource(database_name),
  )
  if not can_create_table:
  return False
  return True
  else:
  # Need insert-row for that table
- return await datasette.permission_allowed(
- actor, "insert-row", resource=(database_name, to_table)
+ return await datasette.allowed(
+ actor=actor,
+ action="insert-row",
+ resource=TableResource(database_name, to_table),
  )
 
 

pyproject.toml

@@ -4,14 +4,13 @@ version = "0.1a11"
 description = "Import unstructured data (text and images) into structured tables"
 readme = "README.md"
 authors = [{name = "Simon Willison"}]
-license = {text = "Apache-2.0"}
+license = "Apache-2.0"
 classifiers=[
- "Framework :: Datasette",
- "License :: OSI Approved :: Apache Software License"
+ "Framework :: Datasette"
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
- "datasette==1.0a19",
+ "datasette>=1.0a21",
  "datasette-secrets>=0.1a2",
  "llm>=0.24",
  "llm-openai-plugin",

tests/test_web.py

@@ -10,6 +10,7 @@
 @pytest.mark.asyncio
 async def test_extract_flow():
  ds = Datasette()
+ ds.root_enabled = True
  ds.add_memory_database("data")
  cookies = {"ds_actor": ds.client.actor_cookie({"id": "root"})}
  response = await ds.client.get("/data/-/extract", cookies=cookies)
@@ -86,14 +87,17 @@ async def test_permissions(actor, path, should_allow):
  ds = Datasette(
  config={
  "permissions": {
- "insert-row": {"id": ["allowed_all", "no_create"]},
- "create-table": {"id": ["allowed_all", "no_extract", "no_insert"]},
+ "insert-row": {"id": ["allowed_all", "no_create", "root"]},
+ "create-table": {
+ "id": ["allowed_all", "no_extract", "no_insert", "root"]
+ },
  "datasette-extract": {
  "id": ["allowed_all", "no_insert", "no_create", "root"]
  },
  }
  }
  )
+ ds.root_enabled = True
  db = ds.add_memory_database("test")
  await db.execute_write("create table if not exists foo (id integer primary key)")
  cookies = {"ds_actor": ds.client.actor_cookie({"id": actor})}
@@ -129,6 +133,7 @@ async def test_action_menus_require_api_key(monkeypatch, path, has_env_variable)
  }
  }
  )
+ ds.root_enabled = True
  db = ds.add_memory_database("test2")
  await db.execute_write("create table if not exists foo (id integer primary key)")
  cookies = {"ds_actor": ds.client.actor_cookie({"id": "root"})}
@@ -144,6 +149,7 @@ async def test_action_menus_require_api_key(monkeypatch, path, has_env_variable)
 @pytest.mark.asyncio
 async def test_create_table_copying_columns():
  ds = Datasette()
+ ds.root_enabled = True
  data = ds.add_memory_database("data")
  await data.execute_write(
  "create table foo (name text, age integer, weight float, bio text)"