dinary 1.2.0__tar.gz → 1.2.2__tar.gz

{dinary-1.2.0 → dinary-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dinary
-Version: 1.2.0
+Version: 1.2.2
 Summary: Server for [Dinary - your dinar diary](https://github.com/andgineer/dinary). Track expenses, scan receipts, analyze spending with AI
 Project-URL: Homepage, https://andgineer.github.io/dinary/
 Project-URL: Documentation, https://andgineer.github.io/dinary/

dinary-1.2.2/src/dinary/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.2.2"

{dinary-1.2.0 → dinary-1.2.2}/tasks/__init__.py

@@ -20,6 +20,7 @@ from .devtools.constants import ALLOWED_VERSION_TYPES
 from .devtools.dev import build_static, dev, pre, reqs, test, uv, ver_task_factory, version
 from .healthcheck import healthcheck
 from .imports.import_tasks import (
+    export_income_original,
     import_budget,
     import_budget_all,
     import_catalog,
@@ -47,6 +48,7 @@ __all__ = [
     "dev",
     "docs_task_factory",
     "healthcheck",
+    "export_income_original",
     "import_budget",
     "import_budget_all",
     "import_catalog",

{dinary-1.2.0 → dinary-1.2.2}/tasks/imports/import_tasks.py

@@ -2,10 +2,12 @@
 
 import json as _json
 import sys
+from pathlib import Path
 from datetime import datetime as _dt
 
 from invoke import task
 
+from tasks.imports import income_original_export
 from tasks.imports import report_2d_3d as _report_2d_3d_module
 from tasks.reports import verify_budget, verify_income
 from tasks.ssh_utils import remote_snapshot_cmd, ssh_capture_bytes, ssh_json, ssh_run
@@ -248,6 +250,19 @@ def verify_income_equivalence_all(c, json=False):  # noqa: A002
     sys.exit(verify_income.exit_code_for_batch(results))
 
 
+@task(name="export-income-original")
+def export_income_original(c, output=""):
+    """Export income from all sheets in original currency (RUB/RSD) to a JSON file.
+
+    Reads every registered income source from .deploy/import_sources.json and
+    writes a flat list of {year, month, amount, currency} entries to JSON.
+    Default output path: data/income_original.json. Override with --output.
+    """
+    dest = Path(output) if output else income_original_export.DEFAULT_OUTPUT
+    count = income_original_export.export_to_file(dest)
+    print(f"Wrote {count} entries to {dest}")
+
+
 def _render_2d3d_locally(raw: bytes, *, as_csv: bool) -> None:
     """Render a JSON envelope produced by ``tasks.imports.report_2d_3d --json``.
 

dinary-1.2.2/tasks/imports/income_original_export.py

@@ -0,0 +1,180 @@
+"""Extract monthly income from Google Sheets in original currency (no EUR conversion).
+
+Reads every registered income source from ``.deploy/import_sources.json``
+and aggregates amounts per (year, month) in the currency the sheet is
+denominated in — RUB for years up to mid-2022, RSD from mid-2022 onward
+(exact boundary is the ``transition_month`` in each year's ``IncomeLayout``).
+
+The result is written as a JSON file with a flat list of entries:
+
+.. code-block:: json
+
+    {
+      "generated_at": "2026-05-31",
+      "entries": [
+        {"year": 2019, "month": 1, "amount": "85000.00", "currency": "RUB"},
+        ...
+      ]
+    }
+
+``inv export-income-original`` is the operator entry point. The module
+can also be run with ``uv run python -m tasks.imports.income_original_export``.
+"""
+
+import argparse
+import json
+import logging
+import sys
+from collections import defaultdict
+from datetime import date
+from decimal import Decimal
+from pathlib import Path
+
+from dinary.adapters.sheets_client import get_sheet
+from dinary.config import IMPORT_SOURCES_DOC_HINT, read_import_sources
+from tasks.imports.expense_import import MONTHS_IN_YEAR
+from tasks.imports.income_import import (
+    INCOME_LAYOUTS,
+    IncomeLayout,
+    _cell,
+    _parse_amount,
+    _parse_date,
+)
+
+logger = logging.getLogger(__name__)
+
+DEFAULT_OUTPUT = Path("data/income_original.json")
+
+
+def aggregate_original_currency(
+    year: int,
+    spreadsheet_id: str,
+    worksheet_name: str,
+    layout: IncomeLayout,
+) -> dict[tuple[int, str], Decimal]:
+    """Read one Income/Balance worksheet; return ``{(month, currency): total}``.
+
+    Does NOT convert to accounting currency. Each month carries exactly
+    one currency (the layout's ``currency`` before ``transition_month``,
+    ``transition_currency`` from that month onward).
+    """
+    ss = get_sheet(spreadsheet_id)
+    ws = ss.worksheet(worksheet_name)
+    all_values = ws.get_all_values()
+
+    monthly: dict[tuple[int, str], Decimal] = defaultdict(Decimal)
+
+    for row_idx in range(layout.header_rows, len(all_values)):
+        row = all_values[row_idx]
+        parsed = _parse_date(_cell(row, layout.col_date))
+        if parsed is None:
+            continue
+        row_year, month = parsed
+        if row_year != year:
+            continue
+        if not 1 <= month <= MONTHS_IN_YEAR:
+            continue
+
+        amount = _parse_amount(_cell(row, layout.col_amount))
+        if amount is None:
+            continue
+
+        currency = layout.currency
+        if (
+            layout.transition_month is not None
+            and layout.transition_currency is not None
+            and month >= layout.transition_month
+        ):
+            currency = layout.transition_currency
+
+        monthly[(month, currency)] += amount
+
+    return dict(monthly)
+
+
+def extract_all_years() -> list[dict]:
+    """Return a flat list of ``{year, month, amount, currency}`` dicts.
+
+    Iterates every import source that has an income worksheet. Years with
+    no registered source or no income worksheet are silently skipped.
+    Amounts are ``str`` (canonical decimal notation) to avoid float rounding.
+    """
+    sources = read_import_sources()
+    entries: list[dict] = []
+
+    for source in sorted(sources, key=lambda s: s.year):
+        if not source.income_worksheet_name:
+            continue
+        if not source.income_layout_key or source.income_layout_key not in INCOME_LAYOUTS:
+            logger.warning(
+                "Year %d: unknown income_layout_key %r — skipping. %s",
+                source.year,
+                source.income_layout_key,
+                IMPORT_SOURCES_DOC_HINT,
+            )
+            continue
+
+        layout = INCOME_LAYOUTS[source.income_layout_key]
+        logger.info(
+            "Extracting year %d from worksheet %r",
+            source.year,
+            source.income_worksheet_name,
+        )
+
+        try:
+            monthly = aggregate_original_currency(
+                source.year,
+                source.spreadsheet_id,
+                source.income_worksheet_name,
+                layout,
+            )
+        except Exception:
+            logger.exception("Failed to read year %d — skipping", source.year)
+            continue
+
+        for (month, currency), total in sorted(monthly.items()):
+            entries.append(
+                {
+                    "year": source.year,
+                    "month": month,
+                    "amount": format(total, "f"),
+                    "currency": currency,
+                },
+            )
+
+    return entries
+
+
+def export_to_file(output: Path) -> int:
+    """Extract all income in original currency and write to ``output``.
+
+    Returns the number of entries written. Raises on I/O errors.
+    """
+    entries = extract_all_years()
+    payload = {
+        "generated_at": str(date.today()),
+        "entries": entries,
+    }
+    output.parent.mkdir(parents=True, exist_ok=True)
+    output.write_text(json.dumps(payload, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
+    return len(entries)
+
+
+def main(argv: list[str] | None = None) -> int:
+    parser = argparse.ArgumentParser(
+        description="Extract income from all sheets in original currency to JSON.",
+    )
+    parser.add_argument(
+        "--output",
+        default=str(DEFAULT_OUTPUT),
+        help=f"destination JSON file (default: {DEFAULT_OUTPUT})",
+    )
+    args = parser.parse_args(argv)
+    output = Path(args.output)
+    count = export_to_file(output)
+    print(f"Wrote {count} entries to {output}")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

{dinary-1.2.0 → dinary-1.2.2}/webapp/src/components/IncomeForm.vue

@@ -20,14 +20,17 @@ function today() {
   return new Date().toISOString().slice(0, 10);
 }
 
-function currentMonth() {
+function defaultIncomeMonth() {
   const now = new Date();
-  return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}`;
+  // Salary for the previous month is paid on the 5th (or earlier if weekend),
+  // so on days 1–5 the income being entered is for the previous month.
+  const d = now.getDate() <= 5 ? new Date(now.getFullYear(), now.getMonth() - 1, 1) : now;
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}`;
 }
 
 const amount = ref("");
 const selectedCurrency = ref("");
-const monthValue = ref(currentMonth());
+const monthValue = ref(defaultIncomeMonth());
 const dateValue = ref(today());
 const comment = ref("");
 const currencyPickerOpen = ref(false);
@@ -66,7 +69,7 @@ async function save() {
     currency.setLastUsed(code);
     amount.value = "";
     comment.value = "";
-    monthValue.value = currentMonth();
+    monthValue.value = defaultIncomeMonth();
     dateValue.value = today();
     emit("saved");
   } catch {

dinary-1.2.0/src/dinary/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.2.0"