sqlite-export-for-ynab 2.8.0__tar.gz → 2.9.1__tar.gz

{sqlite_export_for_ynab-2.8.0/sqlite_export_for_ynab.egg-info → sqlite_export_for_ynab-2.9.1}/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: sqlite_export_for_ynab
-Version: 2.8.0
+Version: 2.9.1
 Summary: SQLite Export for YNAB - Export YNAB Data to SQLite
-Home-page: https://github.com/mxr/sqlite-export-for-ynab
-Author: Max R
-Author-email: maxr@outlook.com
-License: MIT
+Author-email: Max R <mxr@users.noreply.github.com>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/mxr/sqlite-export-for-ynab
 Keywords: ynab,sqlite,sql,budget,plan,cli
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
@@ -21,11 +20,6 @@ Requires-Dist: asyncio-for-ynab~=1.84.0
 Requires-Dist: fasteners
 Requires-Dist: rich>=10
 Requires-Dist: tenacity
-Provides-Extra: dev
-Requires-Dist: covdefaults>=2.1.0; extra == "dev"
-Requires-Dist: coverage; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-asyncio; extra == "dev"
 Dynamic: license-file
 
 # sqlite-export-for-ynab
@@ -272,7 +266,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

{sqlite_export_for_ynab-2.8.0 → sqlite_export_for_ynab-2.9.1}/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

sqlite_export_for_ynab-2.9.1/pyproject.toml

@@ -0,0 +1,133 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = ["setuptools"]
+
+[dependency-groups]
+dev = [
+  "covdefaults>=2.1.0",
+  "coverage",
+  "pytest",
+  "pytest-asyncio",
+]
+
+[project]
+authors = [{name = "Max R", email = "mxr@users.noreply.github.com"}]
+classifiers = [
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = [
+  "aiohttp>=3",
+  "aiopathlib",
+  "aiosqlite",
+  "asyncio-for-ynab~=1.84.0",
+  "fasteners",
+  "rich>=10",
+  "tenacity",
+]
+description = "SQLite Export for YNAB - Export YNAB Data to SQLite"
+keywords = ["ynab", "sqlite", "sql", "budget", "plan", "cli"]
+license = "MIT"
+license-files = ["LICENSE"]
+name = "sqlite_export_for_ynab"
+readme = "README.md"
+requires-python = ">=3.12"
+version = "2.9.1"
+
+[project.scripts]
+sqlite-export-for-ynab = "sqlite_export_for_ynab._main:main"
+
+[project.urls]
+Homepage = "https://github.com/mxr/sqlite-export-for-ynab"
+
+[tool.coverage.run]
+plugins = ["covdefaults"]
+
+[tool.mypy]
+check_untyped_defs = true
+disallow_any_generics = true
+disallow_incomplete_defs = true
+disallow_untyped_defs = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+disallow_untyped_defs = false
+module = "testing.*"
+
+[[tool.mypy.overrides]]
+disallow_untyped_defs = false
+module = "tests.*"
+
+[tool.pytest.ini_options]
+asyncio_default_fixture_loop_scope = "function"
+
+[tool.ruff]
+target-version = "py312"
+
+[tool.ruff.lint]
+extend-select = [
+  "UP",  # see pyupgrade
+  "B",  # see flake8-bugbear
+  "A",  # see flake8-builtins
+  "C4",  # see flake8-comprehension
+  "SIM",  # see flake8-simplify
+  "TC",  # see flake8-type-checking
+]
+
+[tool.setuptools.package-data]
+"*" = ["*.sql"]
+sqlite_export_for_ynab = ["py.typed"]
+
+[tool.setuptools.packages]
+find = {}
+
+[tool.sqlfluff.layout.type.comma]
+line_position = "leading"
+spacing_before = "touch"
+
+[tool.sqlfluff.layout.type.from_clause]
+keyword_line_position = "leading"
+
+[tool.sqlfluff.layout.type.when_clause]
+keyword_line_position = "leading"
+
+[tool.sqlfluff.rules.capitalisation.functions]
+extended_capitalisation_policy = 'upper'
+
+[tool.sqlfluff.rules.capitalisation.identifiers]
+extended_capitalisation_policy = 'lower'
+
+[tool.sqlfluff.rules.capitalisation.keywords]
+capitalisation_policy = 'upper'
+
+[tool.sqlfluff.rules.capitalisation.literals]
+capitalisation_policy = 'upper'
+
+[tool.sqlfluff.rules.convention.not_equal]
+preferred_not_equal_style = "c_style"
+
+[tool.sqlfluff.rules.convention.terminator]
+multiline_newline = true
+require_final_semicolon = true
+
+[tool.sqlfluff.rules.references.quoting]
+prefer_quoted_keywords = true
+
+[tool.tox]
+env_list = ["py", "pypy3", "pre-commit"]
+
+[tool.tox.env.pre-commit]
+commands = [["pre-commit", "run", "--all-files", "--show-diff-on-failure"]]
+deps = ["pre-commit-uv"]
+skip_install = true
+
+[tool.tox.env_run_base]
+commands = [
+  ["coverage", "erase"],
+  ["coverage", "run", "-m", "pytest", "{posargs:tests}"],
+  ["coverage", "report"],
+]
+dependency_groups = ["dev"]

sqlite_export_for_ynab-2.9.1/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{sqlite_export_for_ynab-2.8.0 → sqlite_export_for_ynab-2.9.1}/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
 
@@ -305,7 +307,7 @@ async def sync(
 
 
 async def contents(filename: str) -> str:
-    return await AsyncPath(resources.files(ddl) / filename).read_text()
+    return await AsyncPath(str(resources.files(ddl) / filename)).read_text()
 
 
 async def get_relations(cur: aiosqlite.Cursor) -> set[str]:
@@ -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,43 @@ 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),
+    py = _ProgressYnab(context, plan_id, lkos, task_id)
+    accounts, categories, payees, transactions, scheduled = await asyncio.gather(
+        py.get(AccountsApi(context.api_client).get_accounts),
+        py.get(CategoriesApi(context.api_client).get_categories),
+        py.get(PayeesApi(context.api_client).get_payees),
+        py.get(TransactionsApi(context.api_client).get_transactions),
+        py.get(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
-
+@dataclass(slots=True)
+class _ProgressYnab:
+    context: _Context
+    plan_id: str
+    lkos: dict[str, int]
+    task_id: TaskID
 
-@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)
+    @retry(stop=stop_after_attempt(3))
+    async def get[T](self, endpoint: Callable[..., Awaitable[T]]) -> T:
+        try:
+            return await endpoint(
+                plan_id=self.plan_id,
+                last_knowledge_of_server=self.lkos.get(self.plan_id),
+            )
+        finally:
+            self.context.progress.update(self.task_id, advance=1)
 
 
 def main(

{sqlite_export_for_ynab-2.8.0 → sqlite_export_for_ynab-2.9.1/sqlite_export_for_ynab.egg-info}/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: sqlite_export_for_ynab
-Version: 2.8.0
+Version: 2.9.1
 Summary: SQLite Export for YNAB - Export YNAB Data to SQLite
-Home-page: https://github.com/mxr/sqlite-export-for-ynab
-Author: Max R
-Author-email: maxr@outlook.com
-License: MIT
+Author-email: Max R <mxr@users.noreply.github.com>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/mxr/sqlite-export-for-ynab
 Keywords: ynab,sqlite,sql,budget,plan,cli
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
@@ -21,11 +20,6 @@ Requires-Dist: asyncio-for-ynab~=1.84.0
 Requires-Dist: fasteners
 Requires-Dist: rich>=10
 Requires-Dist: tenacity
-Provides-Extra: dev
-Requires-Dist: covdefaults>=2.1.0; extra == "dev"
-Requires-Dist: coverage; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-asyncio; extra == "dev"
 Dynamic: license-file
 
 # sqlite-export-for-ynab
@@ -272,7 +266,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

{sqlite_export_for_ynab-2.8.0 → sqlite_export_for_ynab-2.9.1}/sqlite_export_for_ynab.egg-info/SOURCES.txt

@@ -1,8 +1,6 @@
 LICENSE
 README.md
 pyproject.toml
-setup.cfg
-setup.py
 sqlite_export_for_ynab/__init__.py
 sqlite_export_for_ynab/__main__.py
 sqlite_export_for_ynab/_main.py

{sqlite_export_for_ynab-2.8.0 → sqlite_export_for_ynab-2.9.1}/sqlite_export_for_ynab.egg-info/requires.txt

@@ -5,9 +5,3 @@ asyncio-for-ynab~=1.84.0
 fasteners
 rich>=10
 tenacity
-
-[dev]
-covdefaults>=2.1.0
-coverage
-pytest
-pytest-asyncio

{sqlite_export_for_ynab-2.8.0 → sqlite_export_for_ynab-2.9.1}/sqlite_export_for_ynab.egg-info/top_level.txt

@@ -1,3 +1,4 @@
+dist
 sqlite_export_for_ynab
 testing
 tests

{sqlite_export_for_ynab-2.8.0 → sqlite_export_for_ynab-2.9.1}/tests/_main_test.py

@@ -1,9 +1,7 @@
 from __future__ import annotations
 
-from configparser import ConfigParser
+import tomllib
 from pathlib import Path
-from typing import Any
-from typing import cast
 from unittest.mock import AsyncMock
 from unittest.mock import Mock
 from unittest.mock import patch
@@ -29,6 +27,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
@@ -453,7 +452,7 @@ async def test_insert_category_group_without_categories(context):
     await insert_category_groups(
         context,
         PLAN_ID_1,
-        cast("Any", [CATEGORY_GROUPS[0].model_copy(update={"categories": []})]),
+        [CATEGORY_GROUPS[0].model_copy(update={"categories": []})],
     )
 
     assert_rows(
@@ -499,6 +498,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, [])
@@ -834,7 +858,7 @@ async def test_insert_scheduled_transactions(context):
 )
 @pytest.mark.asyncio
 async def test_get_plan_summaries_retries():
-    assert await _get_plan_summaries(object()) == PLANS
+    assert await _get_plan_summaries(Mock(spec=asyncio_for_ynab.ApiClient)) == PLANS
 
 
 @patch("sqlite_export_for_ynab._main.sync")
@@ -851,9 +875,9 @@ async def test_async_main_parses_full_refresh_and_quiet(sync, tmp_path, monkeypa
 
 
 def test_main_version(capsys):
-    cp = ConfigParser()
-    cp.read(Path(__file__).parent.parent / "setup.cfg")
-    expected_version = cp["metadata"]["version"]
+    with open(Path(__file__).parent.parent / "pyproject.toml", "rb") as f:
+        data = tomllib.load(f)
+    expected_version = data["project"]["version"]
 
     with pytest.raises(SystemExit) as excinfo:
         main(("--version",))

sqlite_export_for_ynab-2.8.0/pyproject.toml

@@ -1,63 +0,0 @@
-[tool.mypy]
-check_untyped_defs = true
-disallow_any_generics = true
-disallow_incomplete_defs = true
-disallow_untyped_defs = true
-warn_redundant_casts = true
-warn_unused_ignores = true
-
-[[tool.mypy.overrides]]
-disallow_untyped_defs = false
-module = "testing.*"
-
-[[tool.mypy.overrides]]
-disallow_untyped_defs = false
-module = "tests.*"
-
-[tool.pytest.ini_options]
-asyncio_default_fixture_loop_scope = "function"
-
-[tool.ruff]
-target-version = "py312"
-
-[tool.ruff.lint]
-extend-select = [
-  "UP",  # see pyupgrade
-  "B",  # see flake8-bugbear
-  "A",  # see flake8-builtins
-  "C4",  # see flake8-comprehension
-  "SIM",  # see flake8-simplify
-  "TC",  # see flake8-type-checking
-]
-
-[tool.sqlfluff.layout.type.comma]
-line_position = "leading"
-spacing_before = "touch"
-
-[tool.sqlfluff.layout.type.from_clause]
-keyword_line_position = "leading"
-
-[tool.sqlfluff.layout.type.when_clause]
-keyword_line_position = "leading"
-
-[tool.sqlfluff.rules.capitalisation.functions]
-extended_capitalisation_policy = 'upper'
-
-[tool.sqlfluff.rules.capitalisation.identifiers]
-extended_capitalisation_policy = 'lower'
-
-[tool.sqlfluff.rules.capitalisation.keywords]
-capitalisation_policy = 'upper'
-
-[tool.sqlfluff.rules.capitalisation.literals]
-capitalisation_policy = 'upper'
-
-[tool.sqlfluff.rules.convention.not_equal]
-preferred_not_equal_style = "c_style"
-
-[tool.sqlfluff.rules.convention.terminator]
-multiline_newline = true
-require_final_semicolon = true
-
-[tool.sqlfluff.rules.references.quoting]
-prefer_quoted_keywords = true

sqlite_export_for_ynab-2.8.0/setup.cfg

@@ -1,71 +0,0 @@
-[metadata]
-name = sqlite_export_for_ynab
-version = 2.8.0
-description = SQLite Export for YNAB - Export YNAB Data to SQLite
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://github.com/mxr/sqlite-export-for-ynab
-author = Max R
-author_email = maxr@outlook.com
-license = MIT
-license_files = LICENSE
-classifiers = 
-	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3 :: Only
-	Programming Language :: Python :: Implementation :: CPython
-	Programming Language :: Python :: Implementation :: PyPy
-keywords = ynab, sqlite, sql, budget, plan, cli
-
-[options]
-packages = find:
-install_requires = 
-	aiohttp>=3
-	aiopathlib
-	aiosqlite
-	asyncio-for-ynab~=1.84.0
-	fasteners
-	rich>=10
-	tenacity
-python_requires = >=3.12
-
-[options.entry_points]
-console_scripts = 
-	sqlite-export-for-ynab = sqlite_export_for_ynab._main:main
-
-[options.extras_require]
-dev = 
-	covdefaults>=2.1.0
-	coverage
-	pytest
-	pytest-asyncio
-
-[options.package_data]
-* = *.sql
-sqlite_export_for_ynab = 
-	py.typed
-
-[bdist_wheel]
-universal = True
-
-[coverage:run]
-plugins = covdefaults
-
-[tox:tox]
-envlist = py,pypy3,pre-commit
-
-[testenv]
-extras = dev
-commands = 
-	coverage erase
-	coverage run -m pytest {posargs:tests}
-	coverage report
-
-[testenv:pre-commit]
-skip_install = true
-deps = pre-commit-uv
-commands = pre-commit run --all-files --show-diff-on-failure
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

sqlite_export_for_ynab-2.8.0/setup.py

@@ -1,5 +0,0 @@
-from __future__ import annotations
-
-from setuptools import setup
-
-setup()