sqlite-export-for-ynab 2.5.0__tar.gz → 2.6.0__tar.gz

{sqlite_export_for_ynab-2.5.0/sqlite_export_for_ynab.egg-info → sqlite_export_for_ynab-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlite_export_for_ynab
-Version: 2.5.0
+Version: 2.6.0
 Summary: SQLite Export for YNAB - Export YNAB Data to SQLite
 Home-page: https://github.com/mxr/sqlite-export-for-ynab
 Author: Max R
@@ -17,7 +17,8 @@ License-File: LICENSE
 Requires-Dist: aiohttp>=3
 Requires-Dist: aiopathlib
 Requires-Dist: aiosqlite
-Requires-Dist: rich
+Requires-Dist: fasteners
+Requires-Dist: rich>=14
 Dynamic: license-file
 
 # sqlite-export-for-ynab

{sqlite_export_for_ynab-2.5.0 → sqlite_export_for_ynab-2.6.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = sqlite_export_for_ynab
-version = 2.5.0
+version = 2.6.0
 description = SQLite Export for YNAB - Export YNAB Data to SQLite
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -22,7 +22,8 @@ install_requires =
 	aiohttp>=3
 	aiopathlib
 	aiosqlite
-	rich
+	fasteners
+	rich>=14
 python_requires = >=3.12
 
 [options.entry_points]

{sqlite_export_for_ynab-2.5.0 → sqlite_export_for_ynab-2.6.0}/sqlite_export_for_ynab/_main.py

@@ -23,6 +23,7 @@ from urllib.parse import urlunparse
 
 import aiohttp
 import aiosqlite
+import fasteners
 from aiopathlib import AsyncPath
 from rich.progress import BarColumn
 from rich.progress import MofNCompleteColumn
@@ -66,6 +67,7 @@ _ENV_TOKEN = "YNAB_PERSONAL_ACCESS_TOKEN"
 _PACKAGE = "sqlite-export-for-ynab"
 
 _BATCH_SIZE = 100
+_SYNC_LOCK_TIMEOUT = 30.0
 
 _PROGRESS_COLUMNS = (
     TextColumn("[progress.description]{task.description}"),
@@ -143,14 +145,39 @@ class _Context:
     session: aiohttp.ClientSession
     progress: Progress
     con: aiosqlite.Connection
+    lock: fasteners.InterProcessLock
 
 
 @asynccontextmanager
-async def _context(db: Path, *, quiet: bool) -> AsyncIterator[_Context]:
+async def _context(
+    db: Path, *, quiet: bool, timeout: float = _SYNC_LOCK_TIMEOUT
+) -> AsyncIterator[_Context]:
     progress = Progress(*_PROGRESS_COLUMNS, disable=quiet)
+    lock_path = db.parent / f"{db.name}.lock"
+    lock = fasteners.InterProcessLock(lock_path)
     async with aiohttp.ClientSession() as session, aiosqlite.connect(db) as con:
         con.row_factory = aiosqlite.Row
-        yield _Context(session, progress, con)
+        loop = asyncio.get_running_loop()
+        deadline = loop.time() + timeout
+        _print("Acquiring lock...", quiet=quiet)
+        while True:
+            acquired = await asyncio.to_thread(lock.acquire, False)
+            if acquired:
+                _print("Done", quiet=quiet)
+                break
+            if loop.time() >= deadline:
+                raise TimeoutError(
+                    f"Timed out waiting {timeout} seconds for sync lock at {lock.path}"
+                )
+            await asyncio.sleep(0.1)
+
+        try:
+            yield _Context(session, progress, con, lock)
+        finally:
+            try:
+                await asyncio.to_thread(lock.release)
+            finally:
+                await AsyncPath(lock_path).unlink(missing_ok=True)
 
 
 @contextmanager
@@ -169,7 +196,7 @@ async def sync(
 ) -> None:
     await AsyncPath(db).parent.mkdir(parents=True, exist_ok=True)
 
-    async with _context(db, quiet=quiet) as context:
+    async with _context(db, quiet=quiet, timeout=_SYNC_LOCK_TIMEOUT) as context:
         plans = (await YnabClient(token, context.session)("plans"))["plans"]
 
         plan_ids = [plan["id"] for plan in plans]

{sqlite_export_for_ynab-2.5.0 → sqlite_export_for_ynab-2.6.0/sqlite_export_for_ynab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlite_export_for_ynab
-Version: 2.5.0
+Version: 2.6.0
 Summary: SQLite Export for YNAB - Export YNAB Data to SQLite
 Home-page: https://github.com/mxr/sqlite-export-for-ynab
 Author: Max R
@@ -17,7 +17,8 @@ License-File: LICENSE
 Requires-Dist: aiohttp>=3
 Requires-Dist: aiopathlib
 Requires-Dist: aiosqlite
-Requires-Dist: rich
+Requires-Dist: fasteners
+Requires-Dist: rich>=14
 Dynamic: license-file
 
 # sqlite-export-for-ynab

{sqlite_export_for_ynab-2.5.0 → sqlite_export_for_ynab-2.6.0}/sqlite_export_for_ynab.egg-info/requires.txt

@@ -1,4 +1,5 @@
 aiohttp>=3
 aiopathlib
 aiosqlite
-rich
+fasteners
+rich>=14

{sqlite_export_for_ynab-2.5.0 → sqlite_export_for_ynab-2.6.0}/tests/_main_test.py

@@ -3,11 +3,13 @@ from __future__ import annotations
 import asyncio
 import json
 from configparser import ConfigParser
+from contextlib import asynccontextmanager
 from pathlib import Path
 from unittest.mock import patch
 
 import aiohttp
 import aiosqlite
+import fasteners
 import pytest
 import pytest_asyncio
 from aiohttp.http_exceptions import HttpProcessingError
@@ -16,6 +18,7 @@ from rich.progress import Progress
 from sqlite_export_for_ynab import default_db_path
 from sqlite_export_for_ynab._main import _ALL_RELATIONS
 from sqlite_export_for_ynab._main import _Context
+from sqlite_export_for_ynab._main import _context
 from sqlite_export_for_ynab._main import _ENV_TOKEN
 from sqlite_export_for_ynab._main import _PACKAGE
 from sqlite_export_for_ynab._main import _PROGRESS_COLUMNS
@@ -89,7 +92,7 @@ async def fetchall(con, query):
 
 
 @pytest_asyncio.fixture
-async def context():
+async def context(tmp_path):
     with Progress(*_PROGRESS_COLUMNS, disable=True) as progress:
         async with (
             aiohttp.ClientSession(loop=asyncio.get_event_loop()) as session,
@@ -97,7 +100,10 @@ async def context():
         ):
             con.row_factory = aiosqlite.Row
             await con.executescript(await contents("create-relations.sql"))
-            yield _Context(session, progress, con)
+            lock = fasteners.InterProcessLock(
+                tmp_path / "sqlite-export-for-ynab-test.lock"
+            )
+            yield _Context(session, progress, con, lock)
 
 
 @pytest.mark.parametrize(
@@ -695,6 +701,92 @@ def test_resolve_token_env(monkeypatch):
     assert resolve_token() == TOKEN
 
 
+@patch(
+    "sqlite_export_for_ynab._main.fasteners.InterProcessLock.acquire",
+    autospec=True,
+)
+@patch("sqlite_export_for_ynab._main.asyncio.get_running_loop")
+@patch("sqlite_export_for_ynab._main.aiohttp.ClientSession")
+@pytest.mark.asyncio
+async def test_sync_lock_times_out(
+    mock_client_session, mock_get_running_loop, mock_acquire, tmp_path
+):
+    class FakeLoop:
+        def __init__(self):
+            self._times = iter((0.0, 0.2))
+
+        def time(self):
+            return next(self._times)
+
+    mock_get_running_loop.return_value = FakeLoop()
+
+    @asynccontextmanager
+    async def fake_client_session():
+        yield object()
+
+    mock_client_session.return_value = fake_client_session()
+    mock_acquire.return_value = False
+
+    with pytest.raises(TimeoutError):
+        await _context(tmp_path / "db.sqlite", quiet=True, timeout=0.1).__aenter__()
+
+    assert mock_acquire.call_count == 1
+    assert mock_acquire.call_args.args[1] is False
+
+
+@patch(
+    "sqlite_export_for_ynab._main.fasteners.InterProcessLock.acquire",
+    autospec=True,
+)
+@patch("sqlite_export_for_ynab._main.fasteners.InterProcessLock.release", autospec=True)
+@patch("sqlite_export_for_ynab._main.asyncio.sleep")
+@patch("sqlite_export_for_ynab._main.asyncio.get_running_loop")
+@patch("sqlite_export_for_ynab._main.aiohttp.ClientSession")
+@pytest.mark.asyncio
+async def test_context_retries_after_sleep(
+    mock_client_session,
+    mock_get_running_loop,
+    mock_sleep,
+    mock_release,
+    mock_acquire,
+    tmp_path,
+):
+    class FakeLoop:
+        def __init__(self):
+            self._times = iter((0.0, 0.0, 0.2))
+
+        def time(self):
+            return next(self._times)
+
+    mock_get_running_loop.return_value = FakeLoop()
+
+    @asynccontextmanager
+    async def fake_client_session():
+        yield object()
+
+    mock_client_session.return_value = fake_client_session()
+    mock_acquire.side_effect = [False, True]
+
+    async with _context(tmp_path / "db.sqlite", quiet=True, timeout=0.1):
+        pass
+
+    assert mock_acquire.call_count == 2
+    assert mock_acquire.call_args_list[0].args[1] is False
+    assert mock_sleep.call_count == 1
+    assert mock_release.call_count == 1
+
+
+@pytest.mark.asyncio
+async def test_context_removes_lock_file(tmp_path):
+    db = tmp_path / "db.sqlite"
+    lock_path = tmp_path / "db.sqlite.lock"
+
+    async with _context(db, quiet=True):
+        assert lock_path.exists()
+
+    assert not lock_path.exists()
+
+
 @pytest.mark.asyncio
 @pytest.mark.usefixtures(mock_aioresponses.__name__)
 async def test_sync_no_data(tmp_path, mock_aioresponses):