datasette-events-forward 0.1a0__tar.gz → 0.1a2__tar.gz

{datasette-events-forward-0.1a0 → datasette_events_forward-0.1a2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: datasette-events-forward
-Version: 0.1a0
+Version: 0.1a2
 Summary: Forward Datasette events to another instance
 Author: Simon Willison
 License: Apache-2.0
@@ -13,14 +13,16 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: datasette>=1.0a10
+Requires-Dist: datasette==1.0a19
 Requires-Dist: python-ulid
 Requires-Dist: aiolimiter
+Requires-Dist: typing_extensions
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-asyncio; extra == "test"
 Requires-Dist: pytest-httpx; extra == "test"
 Requires-Dist: datasette-test; extra == "test"
+Dynamic: license-file
 
 # datasette-events-forward
 

{datasette-events-forward-0.1a0 → datasette_events_forward-0.1a2}/datasette_events_forward/__init__.py

@@ -17,7 +17,6 @@ create table if not exists datasette_events_to_forward (
     database_name text,
     table_name text,
     properties text, -- JSON other properties
-    sent_at text,
     failures integer default 0
 )
 """
@@ -25,6 +24,9 @@ create table if not exists datasette_events_to_forward (
 # Default is to allow 1 every 10s
 rate_limit = AsyncLimiter(max_rate=1, time_period=10)
 
+# Lock to prevent concurrent send_events() calls
+send_events_lock = asyncio.Lock()
+
 DEFAULT_BATCH_LIMIT = 10
 
 
@@ -43,7 +45,7 @@ async def send_events(datasette):
             await db.execute(
                 """
                 select * from datasette_events_to_forward
-                where sent_at is null and failures < 3
+                where failures < 3
                 order by id limit {}""".format(
                     batch_limit + 1
                 )
@@ -92,14 +94,14 @@ async def send_events(datasette):
             headers={"Authorization": "Bearer {}".format(api_token)},
         )
         if str(response.status_code).startswith("2"):
-            # It worked! Mark the rows as sent
+            # It worked! Mark the rows as sent by deleting them
             await db.execute_write(
                 """
-                update datasette_events_to_forward
-                set sent_at = ? where id in ({})""".format(
+                delete from datasette_events_to_forward
+                where id in ({})""".format(
                     ",".join(["?"] * len(rows))
                 ),
-                [datetime.datetime.utcnow().isoformat()] + [row["id"] for row in rows],
+                [row["id"] for row in rows],
             )
         else:
             # Schedule a retry task
@@ -119,6 +121,7 @@ async def send_events(datasette):
                 [row["id"] for row in rows],
             )
             should_run_again = True
+
     if should_run_again:
         asyncio.create_task(rate_limited_send_events(datasette))
 
@@ -128,7 +131,8 @@ async def rate_limited_send_events(datasette):
     # had been inserted before the send_events() function was called
     await asyncio.sleep(0.05)
     async with rate_limit:
-        await send_events(datasette)
+        async with send_events_lock:
+            await send_events(datasette)
 
 
 @hookimpl
@@ -149,6 +153,10 @@ def startup(datasette):
 
 @hookimpl
 def track_event(datasette, event):
+    config = datasette.plugin_config("datasette-events-forward") or {}
+    if not config.get("api_url"):
+        return
+
     async def inner():
         db = datasette.get_internal_database()
         properties = event.properties()

{datasette-events-forward-0.1a0 → datasette_events_forward-0.1a2}/datasette_events_forward.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: datasette-events-forward
-Version: 0.1a0
+Version: 0.1a2
 Summary: Forward Datasette events to another instance
 Author: Simon Willison
 License: Apache-2.0
@@ -13,14 +13,16 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: datasette>=1.0a10
+Requires-Dist: datasette==1.0a19
 Requires-Dist: python-ulid
 Requires-Dist: aiolimiter
+Requires-Dist: typing_extensions
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-asyncio; extra == "test"
 Requires-Dist: pytest-httpx; extra == "test"
 Requires-Dist: datasette-test; extra == "test"
+Dynamic: license-file
 
 # datasette-events-forward
 

{datasette-events-forward-0.1a0 → datasette_events_forward-0.1a2}/datasette_events_forward.egg-info/requires.txt

@@ -1,6 +1,7 @@
-datasette>=1.0a10
+datasette==1.0a19
 python-ulid
 aiolimiter
+typing_extensions
 
 [test]
 pytest

{datasette-events-forward-0.1a0 → datasette_events_forward-0.1a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datasette-events-forward"
-version = "0.1a0"
+version = "0.1a2"
 description = "Forward Datasette events to another instance"
 readme = "README.md"
 authors = [{name = "Simon Willison"}]
@@ -11,9 +11,10 @@ classifiers=[
 ]
 requires-python = ">=3.8"
 dependencies = [
-    "datasette>=1.0a10",
+    "datasette==1.0a19",
     "python-ulid",
-    "aiolimiter"
+    "aiolimiter",
+    "typing_extensions"
 ]
 
 [project.urls]

{datasette-events-forward-0.1a0 → datasette_events_forward-0.1a2}/tests/test_events_forward.py

@@ -1,5 +1,6 @@
 import asyncio
-from datasette_test import Datasette
+from datasette.app import Datasette
+import httpx
 import json
 from sqlite_utils import Database
 import pytest
@@ -11,20 +12,32 @@ def non_mocked_hosts():
 
 
 @pytest.mark.asyncio
-async def test_events_forward(tmpdir, httpx_mock):
-    httpx_mock.add_response(url="https://example.com/data/-/create", json={"ok": True})
+@pytest.mark.parametrize("configured", (True, False))
+async def test_events_forward(tmpdir, configured, httpx_mock):
+    if configured:
+        # Allow multiple POST requests to the same URL
+        def custom_response(request):
+            return httpx.Response(200, json={"ok": True})
+
+        httpx_mock.add_callback(
+            custom_response, url="https://example.com/data/-/create"
+        )
 
     db_path = str(tmpdir / "data.db")
     db = Database(db_path)
     db["foo"].insert({"id": 1}, pk="id")
     datasette = Datasette(
         [db_path],
-        plugin_config={
-            "datasette-events-forward": {
-                "api_url": "https://example.com/data/-/create",
-                "api_token": "xxx",
-                "rate_limit": 1,
-                "time_period": 0.2,
+        config={
+            "plugins": {
+                "datasette-events-forward": {
+                    "api_url": (
+                        "https://example.com/data/-/create" if configured else ""
+                    ),
+                    "api_token": "xxx",
+                    "max_rate": 5,
+                    "time_period": 0.2,
+                }
             }
         },
     )
@@ -40,6 +53,16 @@ async def test_events_forward(tmpdir, httpx_mock):
         headers={"Authorization": "Bearer {}".format(token)},
     )
     assert response.status_code == 201
+    if not configured:
+        # Should NOT have added row to table
+        count = (
+            await internal_db.execute(
+                "select count(*) from datasette_events_to_forward"
+            )
+        ).rows[0][0]
+        assert not count
+        return
+
     # Should have added a row to that table
     to_forward = dict(
         (await internal_db.execute("select * from datasette_events_to_forward")).rows[0]
@@ -48,14 +71,13 @@ async def test_events_forward(tmpdir, httpx_mock):
     assert to_forward["event"] == "create-table"
     assert to_forward["database_name"] == "data"
     assert to_forward["table_name"] == "hello"
-    assert to_forward["sent_at"] is None
-    # Wait 0.6s to give things time to be delivered
-    await asyncio.sleep(0.6)
-    to_forward2 = dict(
-        (await internal_db.execute("select * from datasette_events_to_forward")).rows[0]
-    )
-    assert to_forward2["event"] == "create-table"
-    assert to_forward2["sent_at"] is not None
+    # Wait 0.3s to give things time to be delivered
+    await asyncio.sleep(0.3)
+    # Table should be empty now
+    to_forward_count = (
+        await internal_db.execute("select count(*) from datasette_events_to_forward")
+    ).rows[0][0]
+    assert to_forward_count == 0
     # And the request should have been caught
     request = httpx_mock.get_request()
     assert request.url == "https://example.com/data/-/create"