monopyly 1.5.1__tar.gz → 1.5.2__tar.gz

{monopyly-1.5.1 → monopyly-1.5.2}/.gitignore

@@ -1,4 +1,5 @@
 *.swp
+*vimrc*.vim
 .ipynb_checkpoints
 
 # Byte-compiled / optimized / DLL files
@@ -85,3 +86,6 @@ monopyly/static/favicon/*.ai
 
 # Flask instance files/data
 instance/
+
+# PyPI Token
+.TOKEN

{monopyly-1.5.1 → monopyly-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monopyly
-Version: 1.5.1
+Version: 1.5.2
 Summary: A homemade personal finance manager.
 Project-URL: Download, https://pypi.org/project/monopyly
 Project-URL: Homepage, http://monopyly.com
@@ -23,16 +23,15 @@ Classifier: Topic :: Office/Business :: Financial
 Classifier: Topic :: Office/Business :: Financial :: Accounting
 Classifier: Topic :: Office/Business :: Financial :: Spreadsheet
 Requires-Python: <3.11,>=3.10
-Requires-Dist: authanor==1.1.1
-Requires-Dist: flask-wtf==1.2.1
-Requires-Dist: flask==3.0.3
-Requires-Dist: fuisce==1.0.2
+Requires-Dist: dry-foundation==1.3.0
+Requires-Dist: flask-wtf==1.2.2
+Requires-Dist: flask==3.1.2
 Requires-Dist: gunicorn==23.0.0
-Requires-Dist: markdown==3.7
+Requires-Dist: markdown==3.9
 Requires-Dist: nltk==3.9.1
 Requires-Dist: python-dateutil==2.9.0
-Requires-Dist: rich==13.8.1
-Requires-Dist: sqlalchemy==2.0.35
+Requires-Dist: rich==14.1.0
+Requires-Dist: sqlalchemy==2.0.43
 Description-Content-Type: text/markdown
 
 <div id="header">
@@ -64,10 +63,10 @@ The package requires a recent version of Python (3.10+).
 
 ## Getting started
 
-Once the package is properly installed, run the app in local mode from the command line (the default options should be sensible, but you may customize the host and port if necessary):
+Once the package is properly installed, launch the app in local mode from the command line (the default options should be sensible, but you may customize the host and port if necessary):
 
 ```
-$ monopyly local --browser [--host HOST] [--port PORT]
+$ monopyly launch local --browser [--host HOST] [--port PORT]
 ```
 
 Local mode indicates that the app is just going to be run using a locally hosted server, accessible to just your machine.

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/CHANGELOG.md

@@ -207,7 +207,19 @@
 - Return to statement details page after deleting a transaction (rather than returning to the general transactions page)
 - Allow users to change their password
 - Warn users before form submission if the configuration currently disallows registration
+- Fix issues with the application launcher not launching the browser; couple application launch process more tightly with click
+- Use type annotations for SQLAlchemy ORM declarative mappings
 - Increase the flexibility of the credit activity parser
 
 
+### 1.5.2
+
+- Use smoothing on charts for up to 100 transactions
+- Improve tokenization normalization for credit reconciliation
+- Remove statement requiring activity files be located in the `Downloads` directory
+- Do not clear the reconciliation info when adding subtransaction fields via POST request
+- Incorporate support for enhanced database handler selection subsets
+- Bump dependencies (including support for recent SQLAlchemy versions)
+
+
 <a name="bottom" id="bottom"></a>

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/README.md

@@ -27,10 +27,10 @@ The package requires a recent version of Python (3.10+).
 
 ## Getting started
 
-Once the package is properly installed, run the app in local mode from the command line (the default options should be sensible, but you may customize the host and port if necessary):
+Once the package is properly installed, launch the app in local mode from the command line (the default options should be sensible, but you may customize the host and port if necessary):
 
 ```
-$ monopyly local --browser [--host HOST] [--port PORT]
+$ monopyly launch local --browser [--host HOST] [--port PORT]
 ```
 
 Local mode indicates that the app is just going to be run using a locally hosted server, accessible to just your machine.

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/__init__.py

@@ -2,39 +2,29 @@
 Run the Monopyly app.
 """
 
-from flask import Flask
+from dry_foundation import DryFlask, Factory, interact
 
-from monopyly.config import DevelopmentConfig, ProductionConfig
-from monopyly.core.errors import render_error_template
-from monopyly.database import SQLAlchemy, register_db_cli_commands
+from .core.errors import render_error_template
+from .database import SQLAlchemy
 
 
-def create_app(test_config=None, debug=None):
-    # Create and configure the app
-    app = Flask(__name__, instance_relative_config=True)
-
-    # Prepare the app configuration
-    if test_config:
-        config = test_config
-    else:
-        # Load the development/production config when not testing
-        if app.debug or debug:
-            config = DevelopmentConfig.configure_for_instance(app.instance_path)
-        else:
-            config = ProductionConfig.configure_for_instance(app.instance_path)
-    app.config.from_object(config)
-
-    # Initialize the app, including CLI commands and blueprints
-    init_app(app)
-    return app
-
+@Factory(db_interface=SQLAlchemy)
+def create_app(config=None):
+    """
+    Create the Flask application.
 
-@SQLAlchemy.interface_selector
-def init_app(app):
-    """Initialize the app."""
+    Create the Flask app, including configurations as specified. This
+    will configure the app using the configuration objects made
+    available by the Monopyly application and initialize the app
+    by registering app blueprints, routes, and commands.
+    """
+    # Create and configure the app
+    app = DryFlask(__name__, app_name="Monopyly")
+    app.configure(config)
+    # Register blueprints and error handlers specific to this app
     register_blueprints(app)
     register_errorhandlers(app)
-    register_db_cli_commands(app)
+    return app
 
 
 def register_blueprints(app):
@@ -76,3 +66,8 @@ def register_errorhandlers(app):
     ]
     for code in handled_error_codes:
         app.register_error_handler(code, render_error_template)
+
+
+def main():
+    """The entry point to the Monopyly application."""
+    interact(__name__)

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.5.1'
-__version_tuple__ = version_tuple = (1, 5, 1)
+__version__ = version = '1.5.2'
+__version_tuple__ = version_tuple = (1, 5, 2)

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/auth/routes.py

@@ -2,6 +2,7 @@
 Routes for site authentication.
 """
 
+from dry_foundation.database import db_transaction
 from flask import (
     current_app,
     flash,
@@ -12,7 +13,6 @@ from flask import (
     session,
     url_for,
 )
-from fuisce.database import db_transaction
 from sqlalchemy import select
 from werkzeug.security import check_password_hash, generate_password_hash
 

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/banking/accounts.py

@@ -3,7 +3,7 @@ Tools for interacting with bank accounts in the database.
 """
 
 import sqlalchemy.sql.functions as sql_func
-from authanor.database.handler import DatabaseViewHandler
+from dry_foundation.database.handler import DatabaseViewHandler
 from werkzeug.exceptions import abort
 
 from ..common.forms.utils import execute_on_form_validation
@@ -229,10 +229,10 @@ class BankAccountHandler(
         return account
 
     @classmethod
-    def _filter_entries(cls, query, criteria):
+    def _filter_entries(cls, query, criteria, offset, limit):
         # Add a join to enable filtering by bank account type
         query = query.join(BankAccountTypeView)
-        return super()._filter_entries(query, criteria)
+        return super()._filter_entries(query, criteria, offset, limit)
 
     @classmethod
     def delete_entry(cls, entry_id):

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/banking/banks.py

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

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/banking/routes.py

@@ -2,8 +2,8 @@
 Routes for banking financials.
 """
 
+from dry_foundation.database import db_transaction
 from flask import jsonify, redirect, render_template, request, url_for
-from fuisce.database import db_transaction
 
 from ..auth.tools import login_required
 from ..common.forms.utils import extend_field_list_for_ajax

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/banking/transactions.py

@@ -2,7 +2,7 @@
 Tools for interacting with the bank transactions in the database.
 """
 
-from authanor.database.handler import DatabaseViewHandler
+from dry_foundation.database.handler import DatabaseViewHandler
 
 from ..common.forms.utils import execute_on_form_validation
 from ..common.transactions import TransactionHandler, TransactionTagHandler
@@ -36,7 +36,9 @@ class BankTransactionHandler(
 
     @classmethod
     @DatabaseViewHandler.view_query
-    def get_transactions(cls, account_ids=None, active=None, sort_order="DESC"):
+    def get_transactions(
+        cls, account_ids=None, active=None, sort_order="DESC", offset=None, limit=None
+    ):
         """
         Get bank transactions from the database.
 
@@ -61,6 +63,13 @@ class BankTransactionHandler(
             An indicator of whether the transactions should be ordered
             in ascending (oldest at top) or descending (newest at top)
             order. The default is descending order.
+        offset : int, optional
+            The number of transactions by which to offset the results
+            returned by this query. The default is `None`, in which case
+            no offset will be added.
+        limit : int, optional
+            A limit on the number of transactions retrieved from the
+            database.
 
         Returns
         -------
@@ -71,7 +80,7 @@ class BankTransactionHandler(
         criteria.add_match_filter(cls.model, "account_id", account_ids)
         criteria.add_match_filter(BankAccountView, "active", active)
         transactions = super()._get_transactions(
-            criteria=criteria, sort_order=sort_order
+            criteria=criteria, sort_order=sort_order, offset=None, limit=None
         )
         return transactions
 
@@ -150,7 +159,7 @@ class BankTagHandler(TransactionTagHandler, model=TransactionTagHandler.model):
         return tags
 
     @classmethod
-    def _filter_entries(cls, query, criteria):
+    def _filter_entries(cls, query, criteria, offset, limit):
         # Add a join to enable filtering by transaction ID or subtransaction ID
         join_transaction = BankTransactionView in criteria.discriminators
         join_subtransaction = (
@@ -160,7 +169,7 @@ class BankTagHandler(TransactionTagHandler, model=TransactionTagHandler.model):
             query = query.join(bank_tag_link_table).join(BankSubtransaction)
             if join_transaction:
                 query = query.join(BankTransactionView)
-        return super()._filter_entries(query, criteria)
+        return super()._filter_entries(query, criteria, offset, limit)
 
 
 @execute_on_form_validation

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/common/transactions.py

@@ -4,7 +4,7 @@ Tools for building a common transaction interface.
 
 from abc import abstractmethod
 
-from authanor.database.handler import DatabaseHandler, DatabaseViewHandler
+from dry_foundation.database.handler import DatabaseHandler, DatabaseViewHandler
 from flask import current_app
 
 from ..database.models import (
@@ -31,17 +31,27 @@ class TransactionHandler(DatabaseViewHandler):
     """
 
     @classmethod
-    def _customize_entries_query(cls, query, criteria, column_orders):
+    def _customize_entries_query(
+        cls, query, criteria, column_orders, offset=None, limit=None
+    ):
         # Group transactions and order by transaction date
         query = query.group_by(cls.model.id)
-        return super()._customize_entries_query(query, criteria, column_orders)
+        return super()._customize_entries_query(
+            query, criteria, column_orders, offset=offset, limit=limit
+        )
 
     @classmethod
-    def _get_transactions(cls, criteria=None, sort_order="DESC"):
+    def _get_transactions(
+        cls, criteria=None, sort_order="DESC", offset=None, limit=None
+    ):
         # Specify transaction order
         column_orders = {cls.model.transaction_date: sort_order}
         entries = cls.get_entries(
-            entry_ids=None, criteria=criteria, column_orders=column_orders
+            entry_ids=None,
+            criteria=criteria,
+            column_orders=column_orders,
+            offset=offset,
+            limit=limit,
         )
         return entries
 
@@ -232,10 +242,10 @@ class TransactionTagHandler(DatabaseHandler, model=TransactionTag):
         return tags
 
     @classmethod
-    def _filter_entries(cls, query, criteria):
+    def _filter_entries(cls, query, criteria, offset, limit):
         # Only get distinct tag entries
         query = query.distinct()
-        return super()._filter_entries(query, criteria)
+        return super()._filter_entries(query, criteria, offset, limit)
 
     @classmethod
     def get_subtags(cls, tag):

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/core/actions.py

@@ -1,15 +1,8 @@
 """Module describing logical core actions (to be used in routes)."""
 
-from datetime import datetime
-
 import markdown
 
 
-def get_timestamp():
-    """Get a timestamp for backup filenames."""
-    return datetime.now().strftime("%Y%m%d_%H%M%S")
-
-
 class MarkdownConverter:
 
     replacements = {

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/credit/accounts.py

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

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/credit/cards.py

@@ -2,7 +2,7 @@
 Tools for interacting with credit cards in the database.
 """
 
-from authanor.database.handler import DatabaseHandler
+from dry_foundation.database.handler import DatabaseHandler
 
 from ..common.forms.utils import execute_on_form_validation
 from ..database.models import Bank, CreditAccount, CreditCard
@@ -99,8 +99,12 @@ class CreditCardHandler(DatabaseHandler, model=CreditCard):
         return card
 
     @classmethod
-    def _customize_entries_query(cls, query, filters, sort_order):
-        query = super()._customize_entries_query(query, filters, sort_order)
+    def _customize_entries_query(
+        cls, query, filters, sort_order, offset=None, limit=None
+    ):
+        query = super()._customize_entries_query(
+            query, filters, sort_order, offset=offset, limit=limit
+        )
         # Order cards by active status (active cards first)
         query = query.order_by(cls.model.active.desc())
         return query

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/credit/routes.py

@@ -4,6 +4,7 @@ Routes for credit card financials.
 
 from itertools import islice
 
+from dry_foundation.database import db_transaction
 from flask import (
     flash,
     g,
@@ -14,7 +15,6 @@ from flask import (
     session,
     url_for,
 )
-from fuisce.database import db_transaction
 from sqlalchemy.exc import MultipleResultsFound
 from werkzeug.exceptions import abort
 from wtforms.validators import ValidationError
@@ -321,6 +321,7 @@ def clear_reconciliation_info():
         "credit.update_transaction",
         "credit.infer_statement",
         "credit.suggest_transaction_autocomplete",
+        "credit.add_subtransaction_fields",
         "credit.delete_transaction",
         "static",
         None,
@@ -344,15 +345,33 @@ def load_transactions(card_id):
     # Get all of the user's transactions for the selected cards
     sort_order = "DESC"
     transactions = CreditTransactionHandler.get_transactions(
-        card_ids=selected_card_ids,
-        sort_order=sort_order,
+        card_ids=selected_card_ids, sort_order=sort_order, limit=100
     )
     return render_template(
         "credit/transactions_page.html",
         filter_cards=cards,
         selected_card_ids=selected_card_ids,
         sort_order=sort_order,
-        transactions=islice(transactions, 100),
+        transactions=transactions,
+    )
+
+
+@bp.route("/_update_transactions_display", methods=("POST",))
+@login_required
+def update_transactions_display():
+    # Separate the arguments of the POST method
+    post_args = request.get_json()
+    card_ids = map(int, post_args["card_ids"])
+    sort_order = "ASC" if post_args["sort_order"] == "asc" else "DESC"
+    # Filter selected transactions from the database
+    transactions = CreditTransactionHandler.get_transactions(
+        card_ids=card_ids, sort_order=sort_order, limit=100
+    )
+    return render_template(
+        "credit/transactions_table/transactions.html",
+        sort_order=sort_order,
+        transactions=transactions,
+        full_view=True,
     )
 
 
@@ -385,26 +404,6 @@ def show_linked_transaction():
     )
 
 
-@bp.route("/_update_transactions_display", methods=("POST",))
-@login_required
-def update_transactions_display():
-    # Separate the arguments of the POST method
-    post_args = request.get_json()
-    card_ids = map(int, post_args["card_ids"])
-    sort_order = "ASC" if post_args["sort_order"] == "asc" else "DESC"
-    # Filter selected transactions from the database
-    transactions = CreditTransactionHandler.get_transactions(
-        card_ids=card_ids,
-        sort_order=sort_order,
-    )
-    return render_template(
-        "credit/transactions_table/transactions.html",
-        sort_order=sort_order,
-        transactions=islice(transactions, 100),
-        full_view=True,
-    )
-
-
 @bp.route(
     "/add_transaction",
     defaults={"card_id": None, "statement_id": None},
@@ -497,10 +496,14 @@ def add_subtransaction_fields():
 @db_transaction
 def delete_transaction(transaction_id):
     CreditTransactionHandler.delete_entry(transaction_id)
-    if statement_id := session.pop("statement_focus", None):
-        return redirect(
-            url_for("credit.load_statement_details", statement_id=statement_id)
-        )
+    if (statement_id := session.pop("statement_focus", None)) is not None:
+        statement = CreditStatementHandler.get_entry(statement_id)
+        # Delete the statement if it has no more transactions
+        if statement.balance is not None:
+            return redirect(
+                url_for("credit.load_statement_details", statement_id=statement.id)
+            )
+        CreditStatementHandler.delete_entry(statement.id)
     return redirect(url_for("credit.load_transactions"))
 
 

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/credit/statements.py

@@ -2,8 +2,8 @@
 Tools for interacting with the credit statements in the database.
 """
 
-from authanor.database.handler import DatabaseViewHandler
 from dateutil.relativedelta import relativedelta
+from dry_foundation.database.handler import DatabaseViewHandler
 
 from ..common.utils import get_next_occurrence_of_day
 from ..database.models import (

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/credit/transactions/_transactions.py

@@ -2,7 +2,7 @@
 Tools for interacting with the credit transactions in the database.
 """
 
-from authanor.database.handler import DatabaseHandler, DatabaseViewHandler
+from dry_foundation.database.handler import DatabaseHandler, DatabaseViewHandler
 
 from ...common.forms.utils import execute_on_form_validation
 from ...common.transactions import TransactionHandler, TransactionTagHandler
@@ -38,7 +38,13 @@ class CreditTransactionHandler(
     @classmethod
     @DatabaseViewHandler.view_query
     def get_transactions(
-        cls, statement_ids=None, card_ids=None, active=None, sort_order="DESC"
+        cls,
+        statement_ids=None,
+        card_ids=None,
+        active=None,
+        sort_order="DESC",
+        offset=None,
+        limit=None,
     ):
         """
         Get credit card transactions from the database.
@@ -66,6 +72,13 @@ class CreditTransactionHandler(
             An indicator of whether the transactions should be ordered
             in ascending (oldest at top) or descending (newest at top)
             order.
+        offset : int, optional
+            The number of transactions by which to offset the results
+            returned by this query. The default is `None`, in which case
+            no offset will be added.
+        limit : int, optional
+            A limit on the number of transactions retrieved from the
+            database.
 
         Returns
         -------
@@ -77,7 +90,7 @@ class CreditTransactionHandler(
         criteria.add_match_filter(CreditCard, "id", card_ids)
         criteria.add_match_filter(CreditCard, "active", active)
         transactions = super()._get_transactions(
-            criteria=criteria, sort_order=sort_order
+            criteria=criteria, sort_order=sort_order, offset=offset, limit=limit
         )
         return transactions
 
@@ -196,7 +209,7 @@ class CreditTagHandler(TransactionTagHandler, model=TransactionTagHandler.model)
         return tags
 
     @classmethod
-    def _filter_entries(cls, query, criteria):
+    def _filter_entries(cls, query, criteria, offset, limit):
         # Add a join to enable filtering by transaction ID or subtransaction ID
         join_transaction = CreditTransactionView in criteria.discriminators
         join_subtransaction = (
@@ -206,7 +219,7 @@ class CreditTagHandler(TransactionTagHandler, model=TransactionTagHandler.model)
             query = query.join(credit_tag_link_table).join(CreditSubtransaction)
             if join_transaction:
                 query = query.join(CreditTransactionView)
-        return super()._filter_entries(query, criteria)
+        return super()._filter_entries(query, criteria, offset, limit)
 
 
 @execute_on_form_validation

{monopyly-1.5.1 → monopyly-1.5.2}/monopyly/credit/transactions/activity/reconciliation.py

@@ -222,7 +222,26 @@ class _Matchmaker(ABC):
         field : str
             The string of text to be tokenized.
         """
-        return set(wordpunct_tokenize(field.replace("'", "").casefold()))
+        replacements = [
+            # Remove disruptive punctuation
+            ("1-800", "1800"),
+            ("-", " "),
+            (".", " "),
+            (",", " "),
+            ("(", " "),
+            (")", " "),
+            ("'", ""),
+            # Standardize characters
+            ("&", "and"),
+            ("é", "e"),
+        ]
+        for original, replacement in replacements:
+            field = field.replace(original, replacement)
+        tokens = set(wordpunct_tokenize(field.replace("'", "").casefold()))
+        removals = ["and", "the", "of"]
+        for word in removals:
+            tokens.discard(word)
+        return tokens
 
     def _compute_transaction_activity_similarity_score(
         self, merchant_tokens, notes_tokens, activity_tokens

monopyly-1.5.2/monopyly/database/__init__.py

@@ -0,0 +1,46 @@
+"""
+Expose commonly used database functionality to the rest of the package.
+"""
+
+from pathlib import Path
+
+from dry_foundation.database import SQLAlchemy as _SQLAlchemy
+from flask import current_app
+
+
+class SQLAlchemy(_SQLAlchemy):
+    """Store an interface to SQLAlchemy database objects."""
+
+    def initialize(self, app):
+        """
+        Initialize the database.
+
+        Initialize the database by executing the SQL schema to clear
+        existing data and create new tables.
+
+        Parameters
+        ----------
+        app : flask.Flask
+            The app object, which may pass initialization parameters via
+            its configuration.
+        """
+        with app.app_context():
+            # Establish a raw connection in order to execute the complete files
+            raw_conn = self.engine.raw_connection()
+            # Load the tables, table views, and preloaded data
+            sql_dir = Path(__file__).parent
+            sql_filepaths = [
+                sql_dir / path for path in ("schema.sql", "views.sql", "preloads.sql")
+            ]
+            auxiliary_preload_path = app.config.get("PRELOAD_DATA_PATH")
+            if auxiliary_preload_path:
+                sql_filepaths.append(auxiliary_preload_path)
+            for sql_filepath in sql_filepaths:
+                with current_app.open_resource(sql_filepath) as sql_file:
+                    raw_conn.executescript(sql_file.read().decode("utf8"))
+            raw_conn.close()
+        # Top level initialization does not overwrite tables, so it goes at the end
+        super().initialize(app)
+
+
+SQLAlchemy.create_default_interface(echo_engine=False)