sqlite-export-for-ynab 2.7.2__tar.gz → 2.9.0__tar.gz

{sqlite_export_for_ynab-2.7.2/sqlite_export_for_ynab.egg-info → sqlite_export_for_ynab-2.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlite_export_for_ynab
-Version: 2.7.2
+Version: 2.9.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,7 @@ License-File: LICENSE
 Requires-Dist: aiohttp>=3
 Requires-Dist: aiopathlib
 Requires-Dist: aiosqlite
-Requires-Dist: asyncio-for-ynab
+Requires-Dist: asyncio-for-ynab~=1.84.0
 Requires-Dist: fasteners
 Requires-Dist: rich>=10
 Requires-Dist: tenacity
@@ -272,7 +272,7 @@ WITH interest_by_account AS (
     SELECT
         plan_id
         , account_name
-        , SUM(-amount_currency) AS total
+        , SUM(amount_currency) AS total
     FROM flat_transactions
     WHERE
         TRUE
@@ -536,7 +536,7 @@ WITH params AS (
         TRUE
         AND NOT c.deleted
         AND c.category_group_name != 'Credit Card Payments'
-        AND c.category_group_name != 'Internal Master Category'
+        AND NOT c.internal
         AND (
             v.include_category_groups = ''
             OR EXISTS (

{sqlite_export_for_ynab-2.7.2 → sqlite_export_for_ynab-2.9.0}/README.md

@@ -242,7 +242,7 @@ WITH interest_by_account AS (
     SELECT
         plan_id
         , account_name
-        , SUM(-amount_currency) AS total
+        , SUM(amount_currency) AS total
     FROM flat_transactions
     WHERE
         TRUE
@@ -506,7 +506,7 @@ WITH params AS (
         TRUE
         AND NOT c.deleted
         AND c.category_group_name != 'Credit Card Payments'
-        AND c.category_group_name != 'Internal Master Category'
+        AND NOT c.internal
         AND (
             v.include_category_groups = ''
             OR EXISTS (

{sqlite_export_for_ynab-2.7.2 → sqlite_export_for_ynab-2.9.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = sqlite_export_for_ynab
-version = 2.7.2
+version = 2.9.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,7 @@ install_requires =
 	aiohttp>=3
 	aiopathlib
 	aiosqlite
-	asyncio-for-ynab
+	asyncio-for-ynab~=1.84.0
 	fasteners
 	rich>=10
 	tenacity

{sqlite_export_for_ynab-2.7.2 → sqlite_export_for_ynab-2.9.0}/sqlite_export_for_ynab/_main.py

@@ -46,6 +46,8 @@ from sqlite_export_for_ynab import ddl
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator
+    from collections.abc import Awaitable
+    from collections.abc import Callable
     from collections.abc import Iterator
     from collections.abc import Sequence
 
@@ -603,7 +605,13 @@ async def insert_entries(
     if not entries:
         return
 
-    entry_keys = tuple(entries[0])
+    async with context.con.cursor() as cur:
+        await cur.execute(f"PRAGMA table_info({table})")
+        table_columns = {row["name"] async for row in cur}
+
+    # Ignore any keys the YNAB API returns that aren't columns in the DDL so
+    # newly-added API fields don't break the insert.
+    entry_keys = tuple(k for k in entries[0] if k in table_columns)
     sql = f"INSERT OR REPLACE INTO {table} ({', '.join(entry_keys + ('plan_id',))}) VALUES ({', '.join('?' * (len(entry_keys) + 1))})"
 
     async with context.con.cursor() as cur:
@@ -634,100 +642,45 @@ async def _get_all_ynab(
 async def _get_plan_data(
     context: _Context, plan_id: str, lkos: dict[str, int], task_id: TaskID
 ) -> tuple[str, _YnabPlanData]:
-    (
-        accounts,
-        categories,
-        payees,
-        transactions_serverknowledge,
-        scheduled_transactions,
-    ) = await asyncio.gather(
-        _get_accounts(context, plan_id, lkos, task_id),
-        _get_categories(context, plan_id, lkos, task_id),
-        _get_payees(context, plan_id, lkos, task_id),
-        _get_transactions(context, plan_id, lkos, task_id),
-        _get_scheduled_transactions(context, plan_id, lkos, task_id),
+    accounts, categories, payees, transactions, scheduled = await asyncio.gather(
+        *(
+            _get_ynab(context, endpoint, plan_id, lkos, task_id)
+            for endpoint in (
+                AccountsApi(context.api_client).get_accounts,
+                CategoriesApi(context.api_client).get_categories,
+                PayeesApi(context.api_client).get_payees,
+                TransactionsApi(context.api_client).get_transactions,
+                ScheduledTransactionsApi(context.api_client).get_scheduled_transactions,
+            )
+        )
     )
-    transactions, server_knowledge = transactions_serverknowledge
     return (
         plan_id,
         _YnabPlanData(
-            accounts=accounts,
-            category_groups=categories,
-            payees=payees,
-            transactions=transactions,
-            server_knowledge=server_knowledge,
-            scheduled_transactions=scheduled_transactions,
+            accounts=accounts.data.accounts,
+            category_groups=categories.data.category_groups,
+            payees=payees.data.payees,
+            transactions=transactions.data.transactions,
+            server_knowledge=transactions.data.server_knowledge,
+            scheduled_transactions=scheduled.data.scheduled_transactions,
         ),
     )
 
 
 @retry(stop=stop_after_attempt(3))
-async def _get_accounts(
-    context: _Context, plan_id: str, lkos: dict[str, int], task_id: TaskID
-) -> list[Account]:
-    resp = await AccountsApi(context.api_client).get_accounts(
-        plan_id=plan_id, last_knowledge_of_server=lkos.get(plan_id)
-    )
-    context.progress.update(task_id, advance=1)
-    return resp.data.accounts
-
-
-@retry(stop=stop_after_attempt(3))
-async def _get_categories(
-    context: _Context, plan_id: str, lkos: dict[str, int], task_id: TaskID
-) -> list[CategoryGroupWithCategories]:
-    resp = await CategoriesApi(context.api_client).get_categories(
-        plan_id=plan_id, last_knowledge_of_server=lkos.get(plan_id)
-    )
-    context.progress.update(task_id, advance=1)
-    return resp.data.category_groups
-
-
-@retry(stop=stop_after_attempt(3))
-async def _get_payees(
-    context: _Context, plan_id: str, lkos: dict[str, int], task_id: TaskID
-) -> list[Payee]:
-    resp = await PayeesApi(context.api_client).get_payees(
-        plan_id=plan_id, last_knowledge_of_server=lkos.get(plan_id)
-    )
-    context.progress.update(task_id, advance=1)
-    return resp.data.payees
-
-
-@retry(stop=stop_after_attempt(3))
-async def _get_transactions(
-    context: _Context, plan_id: str, lkos: dict[str, int], task_id: TaskID
-) -> tuple[list[TransactionDetail], int]:
-    resp = await TransactionsApi(context.api_client).get_transactions(
-        plan_id=plan_id, last_knowledge_of_server=lkos.get(plan_id)
-    )
-    context.progress.update(task_id, advance=1)
-    return resp.data.transactions, resp.data.server_knowledge
-
-
-@retry(stop=stop_after_attempt(3))
-async def _get_scheduled_transactions(
-    context: _Context, plan_id: str, lkos: dict[str, int], task_id: TaskID
-) -> list[ScheduledTransactionDetail]:
-    resp = await ScheduledTransactionsApi(
-        context.api_client
-    ).get_scheduled_transactions(
-        plan_id=plan_id, last_knowledge_of_server=lkos.get(plan_id)
-    )
-    context.progress.update(task_id, advance=1)
-    return resp.data.scheduled_transactions
-
-
-# @retry(stop=stop_after_attempt(3))
-# async def _get_ynab[T](
-#     context: _Context,
-#     getter: Callable[..., Awaitable[T]],
-#     task_id: TaskID,
-# ) -> T:
-#     try:
-#         return await getter()
-#     finally:
-#         context.progress.update(task_id, advance=1)
+async def _get_ynab[T](
+    context: _Context,
+    endpoint: Callable[..., Awaitable[T]],
+    plan_id: str,
+    lkos: dict[str, int],
+    task_id: TaskID,
+) -> T:
+    try:
+        return await endpoint(
+            plan_id=plan_id, last_knowledge_of_server=lkos.get(plan_id)
+        )
+    finally:
+        context.progress.update(task_id, advance=1)
 
 
 def main(

{sqlite_export_for_ynab-2.7.2 → sqlite_export_for_ynab-2.9.0}/sqlite_export_for_ynab/ddl/create-relations.sql

@@ -56,6 +56,7 @@ CREATE TABLE IF NOT EXISTS category_groups (
     , plan_id TEXT
     , name TEXT
     , hidden BOOLEAN
+    , internal BOOLEAN
     , deleted BOOLEAN
     , FOREIGN KEY (plan_id) REFERENCES plans (id)
 )
@@ -68,6 +69,7 @@ CREATE TABLE IF NOT EXISTS categories (
     , category_group_name TEXT
     , name TEXT
     , hidden BOOLEAN
+    , internal BOOLEAN
     , original_category_group_id TEXT
     , note TEXT
     , budgeted INT

{sqlite_export_for_ynab-2.7.2 → sqlite_export_for_ynab-2.9.0/sqlite_export_for_ynab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlite_export_for_ynab
-Version: 2.7.2
+Version: 2.9.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,7 @@ License-File: LICENSE
 Requires-Dist: aiohttp>=3
 Requires-Dist: aiopathlib
 Requires-Dist: aiosqlite
-Requires-Dist: asyncio-for-ynab
+Requires-Dist: asyncio-for-ynab~=1.84.0
 Requires-Dist: fasteners
 Requires-Dist: rich>=10
 Requires-Dist: tenacity
@@ -272,7 +272,7 @@ WITH interest_by_account AS (
     SELECT
         plan_id
         , account_name
-        , SUM(-amount_currency) AS total
+        , SUM(amount_currency) AS total
     FROM flat_transactions
     WHERE
         TRUE
@@ -536,7 +536,7 @@ WITH params AS (
         TRUE
         AND NOT c.deleted
         AND c.category_group_name != 'Credit Card Payments'
-        AND c.category_group_name != 'Internal Master Category'
+        AND NOT c.internal
         AND (
             v.include_category_groups = ''
             OR EXISTS (

{sqlite_export_for_ynab-2.7.2 → sqlite_export_for_ynab-2.9.0}/sqlite_export_for_ynab.egg-info/requires.txt

@@ -1,7 +1,7 @@
 aiohttp>=3
 aiopathlib
 aiosqlite
-asyncio-for-ynab
+asyncio-for-ynab~=1.84.0
 fasteners
 rich>=10
 tenacity

{sqlite_export_for_ynab-2.7.2 → sqlite_export_for_ynab-2.9.0}/testing/fixtures.py

@@ -156,6 +156,7 @@ CATEGORY_GROUPS: list[CategoryGroupWithCategories] = [
         id=UUID(CATEGORY_GROUP_ID_1),
         name=CATEGORY_GROUP_NAME_1,
         hidden=False,
+        internal=False,
         deleted=False,
         categories=[
             Category(
@@ -164,6 +165,7 @@ CATEGORY_GROUPS: list[CategoryGroupWithCategories] = [
                 category_group_name=CATEGORY_GROUP_NAME_1,
                 name=CATEGORY_NAME_1,
                 hidden=False,
+                internal=False,
                 original_category_group_id=None,
                 note=None,
                 budgeted=14500,
@@ -206,6 +208,7 @@ CATEGORY_GROUPS: list[CategoryGroupWithCategories] = [
                 category_group_name=CATEGORY_GROUP_NAME_1,
                 name=CATEGORY_NAME_2,
                 hidden=False,
+                internal=False,
                 original_category_group_id=None,
                 note=None,
                 budgeted=10250,
@@ -248,6 +251,7 @@ CATEGORY_GROUPS: list[CategoryGroupWithCategories] = [
         id=UUID(CATEGORY_GROUP_ID_2),
         name=CATEGORY_GROUP_NAME_2,
         hidden=False,
+        internal=False,
         deleted=False,
         categories=[
             Category(
@@ -256,6 +260,7 @@ CATEGORY_GROUPS: list[CategoryGroupWithCategories] = [
                 category_group_name=CATEGORY_GROUP_NAME_2,
                 name=CATEGORY_NAME_3,
                 hidden=False,
+                internal=False,
                 original_category_group_id=None,
                 note=None,
                 budgeted=15000,
@@ -298,6 +303,7 @@ CATEGORY_GROUPS: list[CategoryGroupWithCategories] = [
                 category_group_name=CATEGORY_GROUP_NAME_2,
                 name=CATEGORY_NAME_4,
                 hidden=False,
+                internal=False,
                 original_category_group_id=None,
                 note=None,
                 budgeted=20000,

{sqlite_export_for_ynab-2.7.2 → sqlite_export_for_ynab-2.9.0}/tests/_main_test.py

@@ -29,6 +29,7 @@ from sqlite_export_for_ynab._main import get_last_knowledge_of_server
 from sqlite_export_for_ynab._main import get_relations
 from sqlite_export_for_ynab._main import insert_accounts
 from sqlite_export_for_ynab._main import insert_category_groups
+from sqlite_export_for_ynab._main import insert_entries
 from sqlite_export_for_ynab._main import insert_payees
 from sqlite_export_for_ynab._main import insert_plans
 from sqlite_export_for_ynab._main import insert_scheduled_transactions
@@ -255,6 +256,7 @@ async def test_insert_category_groups(context):
                 "name": CATEGORY_GROUP_NAME_1,
                 "plan_id": PLAN_ID_1,
                 "hidden": False,
+                "internal": False,
                 "deleted": False,
             },
             {
@@ -262,6 +264,7 @@ async def test_insert_category_groups(context):
                 "name": CATEGORY_GROUP_NAME_2,
                 "plan_id": PLAN_ID_1,
                 "hidden": False,
+                "internal": False,
                 "deleted": False,
             },
         ],
@@ -277,6 +280,7 @@ async def test_insert_category_groups(context):
                 "plan_id": PLAN_ID_1,
                 "name": CATEGORY_NAME_1,
                 "hidden": False,
+                "internal": False,
                 "original_category_group_id": None,
                 "note": None,
                 "budgeted": 14500,
@@ -319,6 +323,7 @@ async def test_insert_category_groups(context):
                 "plan_id": PLAN_ID_1,
                 "name": CATEGORY_NAME_2,
                 "hidden": False,
+                "internal": False,
                 "original_category_group_id": None,
                 "note": None,
                 "budgeted": 10250,
@@ -361,6 +366,7 @@ async def test_insert_category_groups(context):
                 "plan_id": PLAN_ID_1,
                 "name": CATEGORY_NAME_3,
                 "hidden": False,
+                "internal": False,
                 "original_category_group_id": None,
                 "note": None,
                 "budgeted": 15000,
@@ -403,6 +409,7 @@ async def test_insert_category_groups(context):
                 "plan_id": PLAN_ID_1,
                 "name": CATEGORY_NAME_4,
                 "hidden": False,
+                "internal": False,
                 "original_category_group_id": None,
                 "note": None,
                 "budgeted": 20000,
@@ -458,6 +465,7 @@ async def test_insert_category_group_without_categories(context):
                 "name": CATEGORY_GROUP_NAME_1,
                 "plan_id": PLAN_ID_1,
                 "hidden": False,
+                "internal": False,
                 "deleted": False,
             },
         ],
@@ -492,6 +500,31 @@ async def test_insert_payees(context):
     )
 
 
+@pytest.mark.asyncio
+async def test_insert_entries_ignores_unknown_keys(context):
+    task_id = context.progress.add_task("Payees", total=1)
+    entry = {
+        "id": PAYEE_ID_1,
+        "name": "Payee",
+        "transfer_account_id": None,
+        "deleted": False,
+        "brand_new_api_field": "surprise",
+    }
+    await insert_entries(context, "payees", PLAN_ID_1, [entry], task_id)
+    assert_rows(
+        await fetchall(context.con, "SELECT * FROM payees"),
+        [
+            {
+                "id": PAYEE_ID_1,
+                "plan_id": PLAN_ID_1,
+                "name": "Payee",
+                "transfer_account_id": None,
+                "deleted": False,
+            }
+        ],
+    )
+
+
 @pytest.mark.asyncio
 async def test_insert_transactions(context):
     await insert_transactions(context, PLAN_ID_1, [])