monopyly 1.5.0__tar.gz → 1.5.2__tar.gz

{monopyly-1.5.0 → 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.0 → monopyly-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: monopyly
-Version: 1.5.0
+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.0
-Requires-Dist: flask-wtf==1.2.1
-Requires-Dist: flask==3.0.3
-Requires-Dist: fuisce==1.0.2
-Requires-Dist: gunicorn==22.0.0
-Requires-Dist: markdown==3.6
-Requires-Dist: nltk==3.8.1
+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.9
+Requires-Dist: nltk==3.9.1
 Requires-Dist: python-dateutil==2.9.0
-Requires-Dist: rich==13.7.1
-Requires-Dist: sqlalchemy==2.0.29
+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.0 → monopyly-1.5.2}/monopyly/CHANGELOG.md

@@ -199,4 +199,27 @@
 - Create a tool for reconciling credit card transactions with information collected from external resources (e.g., CSVs downloaded from a user's online credit card account)
 
 
+### 1.5.1
+
+- Bump dependencies (including patching security vulnerability in NLTK)
+- Style credit transaction submissions as receipts
+- Style flash messages according to content
+- 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.0 → 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.0 → 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.2/monopyly/_version.py

@@ -0,0 +1,16 @@
+# file generated by setuptools_scm
+# don't change, don't track in version control
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple, Union
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '1.5.2'
+__version_tuple__ = version_tuple = (1, 5, 2)

{monopyly-1.5.0 → monopyly-1.5.2}/monopyly/auth/actions.py

@@ -1,5 +1,10 @@
 """Module describing logical authorization actions (to be used in routes)."""
 
+from flask import current_app
+from sqlalchemy import select
+
+from ..database.models import User
+
 
 def get_username_and_password(form):
     """
@@ -11,3 +16,10 @@ def get_username_and_password(form):
     username = form["username"].lower()
     password = form["password"]
     return username, password
+
+
+def identify_user(username):
+    """Identify the user in the database based on the username."""
+    user_query = select(User).where(User.username == username)
+    user = current_app.db.session.scalar(user_query)
+    return user

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

@@ -2,21 +2,22 @@
 Routes for site authentication.
 """
 
+from dry_foundation.database import db_transaction
 from flask import (
     current_app,
     flash,
+    g,
     redirect,
     render_template,
     request,
     session,
     url_for,
 )
-from fuisce.database import db_transaction
 from sqlalchemy import select
 from werkzeug.security import check_password_hash, generate_password_hash
 
 from ..database.models import User
-from .actions import get_username_and_password
+from .actions import get_username_and_password, identify_user
 from .blueprint import bp
 
 
@@ -33,24 +34,17 @@ def register():
             error = "Username is required."
         elif not password:
             error = "Password is required."
+        elif user := identify_user(username):
+            error = f"User {username} is already registered."
         else:
-            # Get user information from the database
-            user_query = select(User).where(User.username == username)
-            user = current_app.db.session.scalar(user_query)
-            if user:
-                error = f"User {username} is already registered."
-            else:
-                error = None
-        # Add the username and hashed password to the database
-        if not error:
+            # Create a new user
             new_user = User(
                 username=username,
                 password=generate_password_hash(password),
             )
             current_app.db.session.add(new_user)
             return redirect(url_for("auth.login"))
-        else:
-            flash(error)
+        flash(error)
     # Display the registration page
     return render_template("auth/register.html")
 
@@ -60,23 +54,17 @@ def login():
     if request.method == "POST":
         # Get username and passwords from the form
         username, password = get_username_and_password(request.form)
-        # Get user information from the database
-        user_query = select(User).where(User.username == username)
-        user = current_app.db.session.scalar(user_query)
         # Check for errors in the accessed information
-        if user is None:
+        if (user := identify_user(username)) is None:
             error = "That user is not yet registered."
         elif not check_password_hash(user.password, password):
             error = "Incorrect username and password combination."
         else:
-            error = None
-        # Set the user ID securely for a new session
-        if not error:
+            # Set the user ID securely for a new session
             session.clear()
             session["user_id"] = user.id
             return redirect(url_for("core.index"))
-        else:
-            flash(error)
+        flash(error)
     # Display the login page
     return render_template("auth/login.html")
 
@@ -86,3 +74,24 @@ def logout():
     # End the session and clear the user ID
     session.clear()
     return redirect(url_for("core.index"))
+
+
+@bp.route("/change_password", methods=("GET", "POST"))
+@db_transaction
+def change_password():
+    if request.method == "POST":
+        current_password = request.form["current-password"]
+        new_password = request.form["new-password"]
+        if check_password_hash(g.user.password, current_password):
+            # Merge the user item (dissociated from the current session) for updating
+            g.user = current_app.db.session.merge(g.user)
+            g.user.password = generate_password_hash(new_password)
+            flash("Password updated successfully.", category="success")
+            return redirect(url_for("core.load_profile"))
+        else:
+            flash(
+                "The provided value for the current password does not match the "
+                "value of the current password set on this account.",
+                category="error",
+            )
+    return render_template("auth/change_password.html")

{monopyly-1.5.0 → monopyly-1.5.2}/monopyly/auth/tools.py

@@ -14,8 +14,7 @@ from .blueprint import bp
 @bp.before_app_request
 def load_logged_in_user():
     # Match the user's information with the session
-    user_id = session.get("user_id")
-    if user_id is None:
+    if (user_id := session.get("user_id")) is None:
         g.user = None
     else:
         query = select(User).where(User.id == user_id)

{monopyly-1.5.0 → 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.0 → 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.0 → 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.0 → 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.0 → monopyly-1.5.2}/monopyly/common/forms/utils.py

@@ -145,7 +145,6 @@ def execute_on_form_validation(func):
         else:
             # Show an error to the user and print the errors for the admin
             flash(form_err_msg)
-            print(form.errors)
-            raise ValidationError("The form did not validate properly.")
+            raise ValidationError(f"The form did not validate properly: {form.errors}")
 
     return wrapper

{monopyly-1.5.0 → 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.0 → 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.0 → monopyly-1.5.2}/monopyly/core/routes.py

@@ -5,7 +5,6 @@ Routes for core functionality.
 from pathlib import Path
 
 from flask import g, render_template, render_template_string, session
-from werkzeug.exceptions import abort
 
 from ..auth.tools import login_required
 from ..banking.accounts import BankAccountHandler
@@ -85,8 +84,3 @@ def load_profile():
     banks = BankHandler.get_banks()
     # Return banks as a list to allow multiple reuse
     return render_template("core/profile.html", banks=list(banks))
-
-
-@bp.route("/change_password")
-def change_password():
-    abort(418)

{monopyly-1.5.0 → 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.0 → 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.0 → monopyly-1.5.2}/monopyly/credit/forms.py

@@ -301,7 +301,7 @@ class CreditTransactionForm(TransactionForm):
 
     def _extract_merchant_suggestion(self, data):
         # Use the merchant transaction data as a suggestion source
-        if merchant := self._extract_suggestion(data, "merchant"):
+        if merchant := data.get("merchant"):
             merchant_tokens = ActivityMatchmaker.tokenize(merchant)
             # Suggest a known merchant with the closest distance to the activity merchant
             score_records = []