datasette-events-forward 0.1a0__py3-none-any.whl → 0.1a2__py3-none-any.whl

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.dist-info → datasette_events_forward-0.1a2.dist-info}/METADATA

@@ -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'
+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.1a2.dist-info/RECORD

@@ -0,0 +1,7 @@
+datasette_events_forward/__init__.py,sha256=abRlM75YQwG8cjOMdR0TaR3GTtt_hZTfobVeKRp2T58,6233
+datasette_events_forward-0.1a2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+datasette_events_forward-0.1a2.dist-info/METADATA,sha256=J0acEBm0ZeKmfBPBXkmYg-3aGKRR7Vmprtq4-gI4wRM,4215
+datasette_events_forward-0.1a2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datasette_events_forward-0.1a2.dist-info/entry_points.txt,sha256=gA9e336VTQukKzZ31P5fcujufJVRjNCqbOrQco5xQ-Q,54
+datasette_events_forward-0.1a2.dist-info/top_level.txt,sha256=hcEFDCsbPWOqo39qf1PpGpWEqFsGk6wrZOTbR24TYqM,25
+datasette_events_forward-0.1a2.dist-info/RECORD,,

{datasette_events_forward-0.1a0.dist-info → datasette_events_forward-0.1a2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

datasette_events_forward-0.1a0.dist-info/RECORD

@@ -1,7 +0,0 @@
-datasette_events_forward/__init__.py,sha256=UrZq2LbwZAGeJ3Ft93rs5HJK3ATgcgWc5Y346c8NZvc,6061
-datasette_events_forward-0.1a0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-datasette_events_forward-0.1a0.dist-info/METADATA,sha256=R6sNYUnPSSLPswLMjfk5GIwIfONZbVAeX8XEnz53TlY,4165
-datasette_events_forward-0.1a0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-datasette_events_forward-0.1a0.dist-info/entry_points.txt,sha256=gA9e336VTQukKzZ31P5fcujufJVRjNCqbOrQco5xQ-Q,54
-datasette_events_forward-0.1a0.dist-info/top_level.txt,sha256=hcEFDCsbPWOqo39qf1PpGpWEqFsGk6wrZOTbR24TYqM,25
-datasette_events_forward-0.1a0.dist-info/RECORD,,