monopyly 1.4.4__tar.gz → 1.4.6__tar.gz

{monopyly-1.4.4 → monopyly-1.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: monopyly
-Version: 1.4.4
+Version: 1.4.6
 Summary: A homemade personal finance manager.
 Project-URL: Download, https://pypi.org/project/monopyly
 Project-URL: Homepage, http://monopyly.com
@@ -25,13 +25,13 @@ Classifier: Topic :: Office/Business :: Financial :: Spreadsheet
 Requires-Python: <3.11,>=3.10
 Requires-Dist: authanor==1.1.0
 Requires-Dist: flask-wtf==1.2.1
-Requires-Dist: flask==3.0.0
+Requires-Dist: flask==3.0.3
 Requires-Dist: fuisce==1.0.2
-Requires-Dist: gunicorn==21.2.0
-Requires-Dist: markdown==3.5.1
-Requires-Dist: python-dateutil==2.8.2
-Requires-Dist: rich==13.7.0
-Requires-Dist: sqlalchemy==2.0.23
+Requires-Dist: gunicorn==22.0.0
+Requires-Dist: markdown==3.6
+Requires-Dist: python-dateutil==2.9.0
+Requires-Dist: rich==13.7.1
+Requires-Dist: sqlalchemy==2.0.29
 Description-Content-Type: text/markdown
 
 <div id="header">

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/__init__.py

@@ -1,6 +1,7 @@
 """
 Run a development server for the Monopyly app.
 """
+
 from flask import Flask
 
 from monopyly.config import DevelopmentConfig, ProductionConfig
@@ -38,7 +39,7 @@ def register_blueprints(app):
     """
     Register blueprints with the app.
 
-    Note
+    Notes
     -----
     Blueprints are imported in this function to avoid loading modules
     that require database models before those models have been set up

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '1.4.4'
-__version_tuple__ = version_tuple = (1, 4, 4)
+__version__ = version = '1.4.6'
+__version_tuple__ = version_tuple = (1, 4, 6)

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/auth/blueprint.py

@@ -1,6 +1,7 @@
 """
 Flask blueprint for site authentication.
 """
+
 from flask import Blueprint
 
 # Define the blueprint

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/auth/routes.py

@@ -1,6 +1,7 @@
 """
 Routes for site authentication.
 """
+
 from flask import (
     current_app,
     flash,

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/auth/tools.py

@@ -1,6 +1,7 @@
 """
 Tools for dealing with the authorization blueprint.
 """
+
 import functools
 
 from flask import current_app, g, redirect, session, url_for

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/banking/accounts.py

@@ -1,6 +1,7 @@
 """
 Tools for interacting with bank accounts in the database.
 """
+
 import sqlalchemy.sql.functions as sql_func
 from authanor.database.handler import DatabaseViewHandler
 from werkzeug.exceptions import abort
@@ -57,7 +58,7 @@ class BankAccountTypeHandler(
         query = query.join(BankAccount).join(Bank).distinct()
         # Get only types for the specified bank
         query = query.where(Bank.id == bank_id)
-        account_types = cls._db.session.execute(query).scalars()
+        account_types = cls._db.session.scalars(query)
         return account_types
 
     @classmethod

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/banking/actions.py

@@ -1,4 +1,5 @@
 """Module describing logical banking actions (to be used in routes)."""
+
 from ..common.utils import convert_date_to_midnight_timestamp
 from .accounts import BankAccountHandler, BankAccountTypeHandler
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/banking/banks.py

@@ -1,6 +1,7 @@
 """
 Tools for interacting with banks in the database.
 """
+
 from authanor.database.handler import DatabaseHandler
 
 from ..database.models import Bank

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/banking/blueprint.py

@@ -1,6 +1,7 @@
 """
 Flask blueprint for bank financials.
 """
+
 from flask import Blueprint
 
 # Define the blueprint

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/banking/filters.py

@@ -1,6 +1,7 @@
 """
 Filters defined for the banking blueprint.
 """
+
 from .blueprint import bp
 
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/banking/forms.py

@@ -1,6 +1,7 @@
 """
 Generate banking forms for the user to complete.
 """
+
 from wtforms.fields import BooleanField, FieldList, FormField, StringField, SubmitField
 from wtforms.validators import DataRequired, Optional
 
@@ -162,7 +163,7 @@ class BankTransactionForm(TransactionForm):
         last_four_digits = LastFourDigitsField(
             "Last Four Digits", validators=[DataRequired()]
         )
-        type_name = StringField("AccountType", validators=[DataRequired()])
+        type_name = StringField("Account Type", validators=[DataRequired()])
 
         def get_account(self):
             """Get the bank account described by the form data."""

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/banking/routes.py

@@ -1,6 +1,7 @@
 """
 Routes for banking financials.
 """
+
 from flask import jsonify, redirect, render_template, request, url_for
 from fuisce.database import db_transaction
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/banking/transactions.py

@@ -1,6 +1,7 @@
 """
 Tools for interacting with the bank transactions in the database.
 """
+
 from authanor.database.handler import DatabaseViewHandler
 
 from ..common.forms.utils import execute_on_form_validation

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/cli/apps.py

@@ -1,4 +1,5 @@
 """Application objects for running the app via the CLI."""
+
 import multiprocessing
 import subprocess
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/common/forms/_forms.py

@@ -1,6 +1,7 @@
 """
 General form constructions.
 """
+
 from abc import ABC, abstractmethod
 
 from flask_wtf import FlaskForm
@@ -33,16 +34,6 @@ class EntryForm(FlaskForm, metaclass=AbstractEntryFormMixinMeta):
         """
         Generate a duplicate prepopulated form.
 
-        Note
-        ----
-        WTForms requires that a form be instantiated in order to be
-        able to properly introspect fields. Because of this, this method
-        will only return a duplicate form matching the type of the
-        form instance used to call it. Using the form's process method
-        will not properly handle enumeration of field lists, so it
-        can not be used as a replacement for populating an existing
-        form.
-
         Parameters
         ----------
         entry : database.models.Model
@@ -54,6 +45,16 @@ class EntryForm(FlaskForm, metaclass=AbstractEntryFormMixinMeta):
         form : EntryForm
             A duplicate form, prepopulated with the collected database
             information.
+
+        Notes
+        -----
+        WTForms requires that a form be instantiated in order to be
+        able to properly introspect fields. Because of this, this method
+        will only return a duplicate form matching the type of the
+        form instance used to call it. Using the form's process method
+        will not properly handle enumeration of field lists, so it
+        can not be used as a replacement for populating an existing
+        form.
         """
         data = self.gather_entry_data(entry)
         return self.__class__(data=data)

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/common/forms/fields.py

@@ -1,6 +1,7 @@
 """
 General form constructions.
 """
+
 from abc import ABC, abstractmethod
 
 from flask_wtf import FlaskForm
@@ -25,6 +26,15 @@ class DateField(wtforms_fields.DateField):
         super().__init__(*args, filters=filters, **kwargs)
 
 
+class OptionalDateField(DateField):
+    """A date field where the field value is optional."""
+
+    def process_formdata(self, valuelist):
+        """Process data from the form, ignoring an ommitted value."""
+        if valuelist != [""]:
+            super().process_formdata(valuelist)
+
+
 class CurrencyField(wtforms_fields.DecimalField):
     """A decimal field with currency-specific customizations."""
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/common/forms/utils.py

@@ -1,6 +1,7 @@
 """
 General utility objects for handling forms.
 """
+
 from functools import wraps
 
 from flask import current_app, flash
@@ -73,7 +74,7 @@ class Autocompleter:
         """Get autocomplete suggestions for a field."""
         # Get information from the database to use for autocompletion
         query = model.select_for_user(getattr(model, field))
-        values = current_app.db.session.execute(query).scalars()
+        values = current_app.db.session.scalars(query)
         suggestions = sort_by_frequency([value for value in values])
         return suggestions
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/common/forms/validators.py

@@ -1,6 +1,7 @@
 """
 Commonly shared form validators.
 """
+
 from wtforms.validators import ValidationError
 
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/common/transactions.py

@@ -1,6 +1,7 @@
 """
 Tools for building a common transaction interface.
 """
+
 from abc import abstractmethod
 
 from authanor.database.handler import DatabaseHandler, DatabaseViewHandler
@@ -248,7 +249,7 @@ class TransactionTagHandler(DatabaseHandler, model=TransactionTag):
         # Filter the query to get only subtags of the given tag
         parent_id = tag.id if tag else None
         query = query.where(cls.model.parent_id == parent_id)
-        subtags = cls._db.session.execute(query).scalars()
+        subtags = cls._db.session.scalars(query)
         return subtags
 
     @classmethod

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/common/utils.py

@@ -1,6 +1,7 @@
 """
 General utility objects.
 """
+
 import datetime
 from collections import Counter
 from datetime import timezone

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/config/default_settings.py

@@ -1,4 +1,5 @@
 """Default configuration settings."""
+
 import json
 from pathlib import Path
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/config/settings.py

@@ -1,4 +1,5 @@
 """A module containing objects with various configuration settings."""
+
 import warnings
 from pathlib import Path
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/core/actions.py

@@ -1,4 +1,5 @@
 """Module describing logical core actions (to be used in routes)."""
+
 from datetime import datetime
 
 import markdown

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/core/blueprint.py

@@ -1,6 +1,7 @@
 """
 Flask blueprint for core functionality.
 """
+
 from flask import Blueprint
 
 # Define the blueprint

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/core/context_processors.py

@@ -1,6 +1,7 @@
 """
 Filters defined for the application.
 """
+
 from datetime import date
 from importlib import import_module
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/core/filters.py

@@ -1,6 +1,7 @@
 """
 Filters defined for the application.
 """
+
 from .blueprint import bp
 
 
@@ -29,8 +30,8 @@ def make_ordinal(integer):
         -  21 => 21st
         -  101 => 101st
 
-    Note
-    ----
+    Notes
+    -----
     This function is an adaptation of the one proposed by Stack Overflow user
     Florian Brucker (https://stackoverflow.com/a/50992575/8754471).
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/core/internal_transactions.py

@@ -1,6 +1,7 @@
 """
 Tools for interacting with internal transactions in the database.
 """
+
 from flask import current_app
 from sqlalchemy import insert
 

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/core/routes.py

@@ -1,6 +1,7 @@
 """
 Routes for core functionality.
 """
+
 from pathlib import Path
 
 from flask import g, render_template, render_template_string, session

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/credit/accounts.py

@@ -1,6 +1,7 @@
 """
 Tools for interacting with credit accounts in the database.
 """
+
 from authanor.database.handler import DatabaseHandler
 
 from ..database.models import CreditAccount

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/credit/actions.py

@@ -1,4 +1,5 @@
 """Module describing logical credit actions (to be used in routes)."""
+
 from ..banking.transactions import record_new_transfer
 from ..common.forms.utils import execute_on_form_validation
 from .cards import CreditCardHandler
@@ -12,7 +13,7 @@ def get_card_statement_grouping(cards):
 
     Parameters
     ----------
-    cards : list of sqlite3.Row
+    cards : list of database.models.CreditCard
         The database card entries for which to get statements.
 
     Returns
@@ -30,6 +31,33 @@ def get_card_statement_grouping(cards):
     return card_statements
 
 
+def get_statement_and_transactions(statement_id, transaction_sort_order="DESC"):
+    """
+    Given a statement ID, get the corresponding statement and transactions.
+
+    Parameters
+    ----------
+    statement_id : int
+        The ID of the statement to acquire.
+    transaction_sort_order : str
+        The order to sort transactions returned for the statement. The
+        default is 'DESC' for transactions sorted in descending order.
+
+    Returns
+    -------
+    statement : database.models.CreditStatementView
+        The statement with the given ID.
+    transactions : list of database.models.CreditTransactionView
+        All transactions on the statement with the given ID.
+    """
+    statement = CreditStatementHandler.get_entry(statement_id)
+    transactions = CreditTransactionHandler.get_transactions(
+        statement_ids=(statement_id,),
+        sort_order=transaction_sort_order,
+    )
+    return statement, transactions.all()
+
+
 def get_potential_preceding_card(card):
     """
     Get the card that this new card may be intended to replace (if any).
@@ -41,7 +69,7 @@ def get_potential_preceding_card(card):
 
     Parameters
     ----------
-    card : sqlite3.Row
+    card : database.models.CreditCard
         The new card being added to the database.
 
     Returns

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/credit/blueprint.py

@@ -1,6 +1,7 @@
 """
 Flask blueprint for credit card financials.
 """
+
 from flask import Blueprint
 
 # Define the blueprint

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/credit/cards.py

@@ -1,6 +1,7 @@
 """
 Tools for interacting with credit cards in the database.
 """
+
 from authanor.database.handler import DatabaseHandler
 
 from ..common.forms.utils import execute_on_form_validation

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/credit/forms.py

@@ -1,6 +1,7 @@
 """
 Generate credit card forms for the user to complete.
 """
+
 from werkzeug.exceptions import abort
 from wtforms.fields import (
     BooleanField,
@@ -18,8 +19,8 @@ from ..banking.forms import BankSelectField, BankSubform
 from ..common.forms import AcquisitionSubform, EntryForm, EntrySubform, TransactionForm
 from ..common.forms.fields import (
     CustomChoiceSelectField,
-    DateField,
     LastFourDigitsField,
+    OptionalDateField,
     StringField,
 )
 from ..common.forms.utils import Autocompleter
@@ -69,13 +70,20 @@ class CreditCardForm(EntryForm):
         statement_issue_day = IntegerField("Statement Issue Day", [Optional()])
         statement_due_day = IntegerField("Statement Due Day", [Optional()])
 
-        def validate(self, *args, **kwargs):
-            """Validate the subform."""
-            # Unset subform `CustomChoiceSelectField` values will be invalid
+        def validate(self, extra_validators=None):
+            """
+            Validate the subform.
+
+            Notes
+            -----
+            Unset values on the ``CustomChoiceSelectField`` will take a
+            default value that will be considered to be invalid. They
+            must be replaced (after processing) with the inferred value.
+            """
             if self.bank_info.bank_id.data == -1:
                 account = self.get_account()
                 self.bank_info.bank_id.data = account.bank.id
-            return super().validate(*args, **kwargs)
+            return super().validate(extra_validators=extra_validators)
 
         def get_account(self):
             return self._produce_entry_from_field("account_id")
@@ -185,7 +193,7 @@ class CreditTransactionForm(TransactionForm):
         # Fields to identify the card/bank information for the statement
         card_info = FormField(CardSubform)
         # Fields pertaining to the statement
-        issue_date = DateField("Statement Date")
+        issue_date = OptionalDateField("Statement Date")
 
         def get_statement(self, transaction_date):
             """Get the credit card statement described by the form data."""

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/credit/routes.py

@@ -1,6 +1,7 @@
 """
 Routes for credit card financials.
 """
+
 from itertools import islice
 
 from flask import flash, g, jsonify, redirect, render_template, request, url_for
@@ -21,6 +22,7 @@ from .accounts import CreditAccountHandler
 from .actions import (
     get_card_statement_grouping,
     get_potential_preceding_card,
+    get_statement_and_transactions,
     make_payment,
     transfer_credit_card_statement,
 )
@@ -176,11 +178,7 @@ def update_statements_display():
 @bp.route("/statement/<int:statement_id>")
 @login_required
 def load_statement_details(statement_id):
-    statement = CreditStatementHandler.get_entry(statement_id)
-    transactions = CreditTransactionHandler.get_transactions(
-        statement_ids=(statement_id,),
-        sort_order="DESC",
-    )
+    statement, transactions = get_statement_and_transactions(statement_id)
     # Get bank accounts for potential payments
     bank_accounts = BankAccountHandler.get_accounts()
     return render_template(

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/credit/statements.py

@@ -1,7 +1,9 @@
 """
 Tools for interacting with the credit statements in the database.
 """
+
 from authanor.database.handler import DatabaseViewHandler
+from dateutil.relativedelta import relativedelta
 
 from ..common.utils import get_next_occurrence_of_day
 from ..database.models import (
@@ -135,7 +137,7 @@ class CreditStatementHandler(
 
         Returns
         -------
-        statement : database.models.CreditStatementView
+        statement : database.models.CreditStatement
             The inferred statement entry for the transaction.
         """
         issue_day = card.account.statement_issue_day
@@ -145,6 +147,25 @@ class CreditStatementHandler(
             statement = cls.add_statement(card, issue_date)
         return statement
 
+    @classmethod
+    @DatabaseViewHandler.view_query
+    def get_prior_statement(cls, statement):
+        """
+        Given a statement, get the immediately preceding statement.
+
+        Parameters
+        ----------
+        statement : database.models.CreditStatement
+            The statement for which to find the preceding statement.
+
+        Returns
+        -------
+        statement : database.models.CreditStatementView
+            The statement immediately preceding the given statement.
+        """
+        issue_date = statement.issue_date + relativedelta(months=-1)
+        return cls.find_statement(statement.card.id, issue_date=issue_date)
+
     @classmethod
     def add_statement(cls, card, issue_date, due_date=None):
         """Add a statement to the database."""

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/credit/transactions/__init__.py

@@ -1,4 +1,5 @@
 """
 Tools for interacting with the credit transactions in the database.
 """
+
 from ._transactions import CreditTagHandler, CreditTransactionHandler, save_transaction

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/credit/transactions/_transactions.py

@@ -1,6 +1,7 @@
 """
 Tools for interacting with the credit transactions in the database.
 """
+
 from authanor.database.handler import DatabaseHandler, DatabaseViewHandler
 
 from ...common.forms.utils import execute_on_form_validation

{monopyly-1.4.4 → monopyly-1.4.6}/monopyly/database/__init__.py

@@ -1,6 +1,7 @@
 """
 Expose commonly used database functionality to the rest of the package.
 """
+
 import sqlite3
 from pathlib import Path
 
@@ -49,7 +50,7 @@ class SQLAlchemy(_SQLAlchemy):
         super().initialize(app)
 
 
-SQLAlchemy.create_default_interface()
+SQLAlchemy.create_default_interface(echo_engine=False)
 
 
 @click.command("init-db")