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

{datasette-events-forward-0.1a1 → 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.1a1
+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.1a1 → datasette_events_forward-0.1a2}/datasette_events_forward/__init__.py

@@ -24,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
 
 
@@ -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

{datasette-events-forward-0.1a1 → 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.1a1
+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.1a1 → 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.1a1 → datasette_events_forward-0.1a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datasette-events-forward"
-version = "0.1a1"
+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.1a1 → 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
@@ -14,8 +15,12 @@ def non_mocked_hosts():
 @pytest.mark.parametrize("configured", (True, False))
 async def test_events_forward(tmpdir, configured, httpx_mock):
     if configured:
-        httpx_mock.add_response(
-            url="https://example.com/data/-/create", json={"ok": True}
+        # 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")
@@ -23,12 +28,16 @@ async def test_events_forward(tmpdir, configured, httpx_mock):
     db["foo"].insert({"id": 1}, pk="id")
     datasette = Datasette(
         [db_path],
-        plugin_config={
-            "datasette-events-forward": {
-                "api_url": "https://example.com/data/-/create" if configured else "",
-                "api_token": "xxx",
-                "rate_limit": 5,
-                "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,
+                }
             }
         },
     )