Skip to content

Feature/session mix in #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WattsUp merged 11 commits into from
Jan 25, 2026
Merged

Feature/session mix in #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c626951
Added session and query mix-ins
WattsUp Jan 19, 2026
db3e2f8
Migrated models to use session mix-in
WattsUp Jan 19, 2026
ab7bf3a
Migrated web
WattsUp Jan 20, 2026
e9673bf
Migrated controllers to use session mix-in
WattsUp Jan 21, 2026
9c490a6
Migrated portfolio to use session mix-in
WattsUp Jan 21, 2026
4ae204a
Migrated migrations to use session mix-in
WattsUp Jan 22, 2026
fd44c98
Migrated health checks to use session mix-in
WattsUp Jan 23, 2026
d284fea
Migrated commands to use session mix-in
WattsUp Jan 23, 2026
154ec0a
Updated tests
WattsUp Jan 24, 2026
b09272d
Added checks to use new mix in features
WattsUp Jan 25, 2026
77206dc
Fixed linter issues
WattsUp Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
- id: ruff-check
args: [--fix, --exit-non-zero-on-fix]
- repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.402
rev: v1.1.408
hooks:
- id: pyright
- repo: https://github.com/pycqa/isort
Expand Down
94 changes: 42 additions & 52 deletions nummus/commands/export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@
import argparse
import io

from sqlalchemy import orm

from nummus.models.currency import Currency
from nummus.models.transaction import TransactionSplit


class Export(Command):
"""Export transactions."""
Expand Down Expand Up @@ -85,43 +80,29 @@ def setup_args(cls, parser: argparse.ArgumentParser) -> None:

@override
def run(self) -> int:
# Defer for faster time to main
from nummus.models.transaction import TransactionSplit

with self._p.begin_session() as s:
query = (
s.query(TransactionSplit)
.where(
TransactionSplit.asset_id.is_(None),
)
.with_entities(TransactionSplit.amount)
)
if self._start is not None:
query = query.where(
TransactionSplit.date_ord >= self._start.toordinal(),
)
if self._end is not None:
query = query.where(
TransactionSplit.date_ord <= self._end.toordinal(),
)

with self._csv_path.open("w", encoding="utf-8") as file:
n = write_csv(file, query, no_bars=self._no_bars)

with (
self._p.begin_session(),
self._csv_path.open("w", encoding="utf-8") as file,
):
n = write_csv(file, self._start, self._end, no_bars=self._no_bars)
print(f"{Fore.GREEN}{n} transactions exported to {self._csv_path}")
return 0


def write_csv(
file: io.TextIOBase,
transactions_query: orm.Query[TransactionSplit],
start: datetime.date | None,
end: datetime.date | None,
*,
no_bars: bool,
) -> int:
"""Write transactions to CSV file.

Args:
file: Destination file to write to
transactions_query: ORM query to obtain TransactionSplits
start: Start date to filter transactions
end: End date to filter transactions
no_bars: True will disable progress bars

Returns:
Expand All @@ -131,34 +112,43 @@ def write_csv(
# Defer for faster time to main
import tqdm

from nummus import sql
from nummus.models.account import Account
from nummus.models.base import YIELD_PER
from nummus.models.currency import CURRENCY_FORMATS
from nummus.models.transaction import TransactionCategory, TransactionSplit
from nummus.models.utils import query_count

s = transactions_query.session

query = s.query(Account).with_entities(
query = Account.query(
Account.id_,
Account.name,
Account.currency,
)
accounts: dict[int, tuple[str, Currency]] = {
r[0]: (r[1], r[2]) for r in query.yield_per(YIELD_PER)
}

categories = TransactionCategory.map_name_emoji(s)

query = transactions_query.with_entities(
TransactionSplit.date_ord,
TransactionSplit.account_id,
TransactionSplit.payee,
TransactionSplit.memo,
TransactionSplit.category_id,
TransactionSplit.amount,
).order_by(TransactionSplit.date_ord)
n = query_count(query)
accounts = sql.to_dict_tuple(query)

categories = TransactionCategory.map_name_emoji()

query = (
TransactionSplit.query(
TransactionSplit.date_ord,
TransactionSplit.account_id,
TransactionSplit.payee,
TransactionSplit.memo,
TransactionSplit.category_id,
TransactionSplit.amount,
)
.order_by(TransactionSplit.date_ord)
.where(
TransactionSplit.asset_id.is_(None),
)
)
if start is not None:
query = query.where(
TransactionSplit.date_ord >= start.toordinal(),
)
if end is not None:
query = query.where(
TransactionSplit.date_ord <= end.toordinal(),
)
n = sql.count(query)

header = [
"Date",
Expand All @@ -177,7 +167,7 @@ def write_csv(
t_cat_id,
amount,
) in tqdm.tqdm(
query.yield_per(YIELD_PER),
sql.yield_(query),
total=n,
desc="Exporting",
disable=no_bars,
Expand All @@ -189,8 +179,8 @@ def write_csv(
[
datetime.date.fromordinal(date).isoformat(),
acct_name,
payee,
memo,
payee or "",
memo or "",
categories[t_cat_id],
cf(amount),
],
Expand Down
16 changes: 9 additions & 7 deletions nummus/commands/health.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,15 @@ def run(self) -> int:

p = self._p

with p.begin_session() as s:
with p.begin_session():
if self._clear_ignores:
s.query(HealthCheckIssue).delete()
HealthCheckIssue.query().delete()
elif self._ignores:
# Set ignore for all specified issues
print(self._ignores)
print(HealthCheckIssue.uri_to_id(self._ignores[0]))
ids = {HealthCheckIssue.uri_to_id(uri) for uri in self._ignores}
s.query(HealthCheckIssue).where(HealthCheckIssue.id_.in_(ids)).update(
HealthCheckIssue.query().where(HealthCheckIssue.id_.in_(ids)).update(
{HealthCheckIssue.ignore: True},
)

Expand All @@ -141,8 +143,8 @@ def run(self) -> int:

# Update LAST_HEALTH_CHECK_TS
utc_now = datetime.datetime.now(datetime.UTC)
with p.begin_session() as s:
Config.set_(s, ConfigKey.LAST_HEALTH_CHECK_TS, utc_now.isoformat())
with p.begin_session():
Config.set_(ConfigKey.LAST_HEALTH_CHECK_TS, utc_now.isoformat())
if any_severe_issues:
return -2
if any_issues:
Expand All @@ -164,8 +166,8 @@ def _test_check(self, check_type: type[HealthCheck]) -> str | None:
no_ignores=self._no_ignores,
no_description_typos=self._no_description_typos,
)
with self._p.begin_session() as s:
c.test(s)
with self._p.begin_session():
c.test()
n_issues = len(c.issues)
if n_issues == 0:
print(f"{Fore.GREEN}Check '{c.name()}' has no issues")
Expand Down
8 changes: 4 additions & 4 deletions nummus/commands/migrate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ def run(self) -> int:
# Back up Portfolio
_, tar_ver = p.backup()

with p.begin_session() as s:
v_db = Config.db_version(s)
with p.begin_session():
v_db = Config.db_version()

any_migrated = False
try:
Expand All @@ -78,13 +78,13 @@ def run(self) -> int:
m.migrate(p) # no comments
print(f"{Fore.GREEN}Portfolio model schemas updated")

with p.begin_session() as s:
with p.begin_session():
v = max(
Version(__version__),
*[m.min_version() for m in MIGRATORS],
)

Config.set_(s, ConfigKey.VERSION, str(v))
Config.set_(ConfigKey.VERSION, str(v))
except Exception: # pragma: no cover
# No immediate exception thrown, can't easily test
portfolio.Portfolio.restore(p, tar_ver=tar_ver)
Expand Down
31 changes: 11 additions & 20 deletions nummus/commands/summarize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,41 +108,33 @@ def _get_summary(
# Defer for faster time to main
from sqlalchemy import func

from nummus import utils
from nummus import sql, utils
from nummus.models.account import Account
from nummus.models.asset import Asset, AssetCategory, AssetValuation
from nummus.models.config import Config
from nummus.models.currency import CURRENCY_FORMATS
from nummus.models.transaction import TransactionSplit
from nummus.models.utils import query_count

today = datetime.datetime.now().astimezone().date()
today_ord = today.toordinal()

with self._p.begin_session() as s:
accts = {acct.id_: acct for acct in s.query(Account).all()}
assets = {
a.id_: a
for a in (
s.query(Asset).where(Asset.category != AssetCategory.INDEX).all()
)
}
with self._p.begin_session():
accts = {acct.id_: acct for acct in Account.all()}
query = Asset.query().where(Asset.category != AssetCategory.INDEX)
assets = {a.id_: a for a in sql.yield_(query)}

# Get the inception date
start_date_ord: int = (
s.query(
func.min(TransactionSplit.date_ord),
).scalar()
or datetime.date(1970, 1, 1).toordinal()
query = TransactionSplit.query(
func.min(TransactionSplit.date_ord),
)
start_date_ord = sql.scalar(query) or datetime.date(1970, 1, 1).toordinal()

n_accounts = len(accts)
n_transactions = query_count(s.query(TransactionSplit))
n_transactions = TransactionSplit.count()
n_assets = len(assets)
n_valuations = query_count(s.query(AssetValuation))
n_valuations = AssetValuation.count()

value_accts, profit_accts, value_assets = Account.get_value_all(
s,
start_date_ord,
today_ord,
)
Expand Down Expand Up @@ -180,7 +172,6 @@ def _get_summary(
)

profit_assets = Account.get_profit_by_asset_all(
s,
start_date_ord,
today_ord,
)
Expand Down Expand Up @@ -224,7 +215,7 @@ def _get_summary(
"total_asset_value": total_asset_value,
"assets": summary_assets,
"db_size": self._p.path.stat().st_size,
"cf": CURRENCY_FORMATS[Config.base_currency(s)],
"cf": CURRENCY_FORMATS[Config.base_currency()],
}

@classmethod
Expand Down
Loading