monopyly 1.5.0__tar.gz → 1.5.1__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: monopyly
-Version: 1.5.0
+Version: 1.5.1
 Summary: A homemade personal finance manager.
 Project-URL: Download, https://pypi.org/project/monopyly
 Project-URL: Homepage, http://monopyly.com
@@ -23,16 +23,16 @@ 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: 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: gunicorn==22.0.0
-Requires-Dist: markdown==3.6
-Requires-Dist: nltk==3.8.1
+Requires-Dist: gunicorn==23.0.0
+Requires-Dist: markdown==3.7
+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==13.8.1
+Requires-Dist: sqlalchemy==2.0.35
 Description-Content-Type: text/markdown
 
 <div id="header">

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

@@ -199,4 +199,15 @@
 - 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
+- Increase the flexibility of the credit activity parser
+
+
 <a name="bottom" id="bottom"></a>

monopyly-1.5.1/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.1'
+__version_tuple__ = version_tuple = (1, 5, 1)

{monopyly-1.5.0 → monopyly-1.5.1}/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.1}/monopyly/auth/routes.py

@@ -5,6 +5,7 @@ Routes for site authentication.
 from flask import (
     current_app,
     flash,
+    g,
     redirect,
     render_template,
     request,
@@ -16,7 +17,7 @@ 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.1}/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.1}/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.1}/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.1}/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 = []

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

@@ -201,6 +201,8 @@ def load_statement_details(statement_id):
     categories = categorize(transactions)
     # Get bank accounts for potential payments
     bank_accounts = BankAccountHandler.get_accounts()
+    # Save a pointer to this statement to allow easy returns
+    session["statement_focus"] = statement_id
     return render_template(
         "credit/statement_page.html",
         statement=statement,
@@ -210,6 +212,18 @@ def load_statement_details(statement_id):
     )
 
 
+@bp.before_app_request
+def clear_statement_focus():
+    exempt_endpoints = (
+        "credit.expand_transaction",
+        "credit.delete_transaction",
+        "static",
+        None,
+    )
+    if request.endpoint not in exempt_endpoints:
+        session.pop("statement_focus", None)
+
+
 @bp.route("/_update_statement_due_date/<int:statement_id>", methods=("POST",))
 @login_required
 @db_transaction
@@ -307,7 +321,7 @@ def clear_reconciliation_info():
         "credit.update_transaction",
         "credit.infer_statement",
         "credit.suggest_transaction_autocomplete",
-        "credit.delete_transacton",
+        "credit.delete_transaction",
         "static",
         None,
     )
@@ -483,6 +497,10 @@ 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)
+        )
     return redirect(url_for("credit.load_transactions"))
 
 

{monopyly-1.5.0 → monopyly-1.5.1}/monopyly/credit/transactions/activity/parser.py

@@ -4,12 +4,14 @@ import csv
 from abc import ABC, abstractmethod
 from pathlib import Path
 
-from flask import current_app
+from flask import abort, current_app
 from werkzeug.utils import secure_filename
 
 from ....common.utils import parse_date
 from .data import ActivityLoadingError, TransactionActivities, TransactionActivityLoader
 
+SUPPORTED_BANKS = ("Bank of America", "Chase", "Discover")
+
 
 def parse_transaction_activity_file(transaction_file):
     """
@@ -91,7 +93,7 @@ class _TransactionDateColumnIdentifier(_ColumnIdentifier):
         elif "date" in standardized_title.split():
             if "trans." in standardized_title:
                 return True
-            elif standardized_title == "date":
+            elif standardized_title == "date" or standardized_title == "posted date":
                 return None
         return False
 
@@ -104,8 +106,8 @@ class _TransactionTotalColumnIdentifier(_ColumnIdentifier):
 
 class _TransactionDescriptionColumnIdentifier(_ColumnIdentifier):
     def check(self, standardized_title):
-        """Check if the title indicates this column contains a description."""
-        return standardized_title in ("description", "desc.")
+        """Check if the title indicates this column contains a description (payee)."""
+        return standardized_title in ("description", "desc.", "payee")
 
 
 class _TransactionCategoryColumnIdentifier(_ColumnIdentifier):
@@ -184,9 +186,15 @@ class _TransactionActivityParser:
         }
         for column_type in self.column_types:
             if raw_column_indices[column_type] is None:
-                raise RuntimeError(
-                    f"The '{column_type}' column could not be identified in the data."
+                current_app.logger.debug(
+                    f"The '{column_type}' column could not be identified in the data. "
+                )
+                msg = (
+                    "The data was unable to be parsed, most likely because it did not "
+                    "match a recognized format. Supported data formats include those "
+                    f"from the following banks: {', '.join(SUPPORTED_BANKS)}."
                 )
+                abort(400, msg)
         return raw_column_indices
 
     def _determine_expenditure_sign(self, raw_data):

{monopyly-1.5.0 → monopyly-1.5.1}/monopyly/static/css/style.css

@@ -11,6 +11,10 @@
   --masthead-height: 50px;
   --masthead-color: #2b2b2b;
   --border-gray: #dddddd;
+  --button-background-base: #fbfbfb;
+  --button-background: linear-gradient(#fbfbfb, #efefef);
+  --button-block-background-base: #eeeeee;
+  --button-block-background: linear-gradient(#eeeeee, #e6e6e6);
 }
 
 html {
@@ -386,6 +390,35 @@ aside.sidebar {
 }
 
 
+/*
+ * Provide styles for flashed messages
+ */
+.flash.success,
+.flash.warning,
+.flash.error {
+  margin: 20px 0;
+  padding: 10px 20px;
+  border-radius: 10px;
+  box-shadow: 1px 1px 4px #ddd;
+  font-size: 0.9em;
+}
+
+.flash.success {
+  border: 1px solid #6fda6f;
+  background: linear-gradient(45deg, #e6efe1, #f5fef1);
+}
+
+.flash.warning {
+  border: 1px solid #dac96f;
+  background: linear-gradient(45deg, #efede1, #fefbf1);
+}
+
+.flash.error {
+  border: 1px solid #da6f6f;
+  background: linear-gradient(45deg, #f3e8e8, #fef1f1);
+}
+
+
 /*
  * Provide styles for error pages
  */
@@ -459,8 +492,8 @@ aside.sidebar {
   border: 1px solid var(--border-gray);
   border-radius: 10px;
   box-shadow: 1px 1px 3px #bbbbbb;
-  background-color: #eeeeee;
-  background-image: linear-gradient(#eeeeee, #e6e6e6);
+  background-color: var(--button-block-background-base);
+  background-image: var(--button-block-background);
   color: inherit;
 }
 
@@ -546,15 +579,16 @@ aside.sidebar {
   left: 0;
   height: 100%;
   width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
   background-color: rgba(0, 0, 0, 0.75);
   z-index: 50;  /* in front of content, but behind the header */
 }
 
 .modal {
-  position: relative;
-  top: 0%;
-  left: 50%;
-  transform: translate(-50%, 15%);
+  min-width: 200px;
 }
 
 .modal-box {
@@ -638,8 +672,8 @@ form input.button {
   align-items: center;
   margin-top: 20px;
   padding: 10px;
-  background-color: #fbfbfb;
-  background-image: linear-gradient(#fbfbfb, #efefef);
+  background-color: var(--button-background-base);
+  background-image: var(--button-background);
   color: #333333;
   font-weight:bold;
   text-align: center;
@@ -2564,6 +2598,21 @@ form .autocomplete-box .item.active {
 }
 
 
+/*
+ * Customization for the 'Registration' page
+ */
+.no-registration-notice {
+  width: 60%;
+  margin: 25px auto;
+  padding: 10px;
+  border: 1px solid var(--moneytree-leaves);
+  border-radius: 10px;
+  box-shadow: 0 0 10px var(--moneytree-leaves);
+  background-color: #f5f5f5;
+  text-align: center;
+}
+
+
 /*
  * Customization for the 'Profile' page
  */
@@ -3532,7 +3581,6 @@ form#pay #make-payment[type="submit"] #prompt {
 #statement-reconciliation.modal {
   width: 50%;
   min-width: 300px;
-  transform: translate(-50%, 100%);
 }
 
 #statement-reconciliation.modal .modal-box {
@@ -3604,13 +3652,145 @@ form#credit-transaction .merchant-field {
 /*
  * Customization for the transaction submission page
  */
-#receipt {
-  width: 31%;
+#submission {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 50%;
   margin: auto;
 }
+@media screen and (max-width: 600px) {
+  /* Mobile layout */
+  #submission {
+    width: 90%;
+  }
+}
+
+#submission-title {
+  text-align: center;
+}
+
+#receipt {
+  width: 60%;
+  min-width: 250px;
+  max-width: 300px;
+  margin: 40px auto;
+  padding: 10px 20px 30px;
+  box-shadow: 2px 2px 6px #bbbbbb;
+  background-color: #fafafa;
+  font-family: monospace;
+}
+@media screen and (max-width: 600px) {
+  /* Mobile layout */
+  #receipt {
+    margin: 10px auto 30px;
+  }
+}
 
 #receipt-title {
+  margin-bottom: 20px;
   text-align: center;
+  color: var(--silver-dollar);
+  font-size: 10pt;
+  font-weight: 400;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  letter-spacing: 2px;
+  text-transform: uppercase;
+}
+
+#receipt .receipt-item {
+  display: flex;
+  margin: 15px 0;
+}
+
+#receipt .receipt-item .receipt-key {
+  font-weight: bold;
+}
+
+#receipt #receipt-header {
+  margin-bottom: 40px;
+}
+
+#receipt #receipt-header #receipt-merchant {
+  font-size: 14pt;
+  justify-content: center;
+}
+
+#receipt #receipt-header #receipt-date {
+  font-size: 10pt;
+  font-weight: normal;
+  justify-content: center;
+}
+
+#receipt .receipt-subtransaction {
+  display: flex;
+  gap: 10px 20px;
+  margin: 10px 0;
+}
+
+#receipt .receipt-subtransaction .note,
+#receipt #receipt-total .total {
+  flex: 4;
+}
+
+#receipt .receipt-subtransaction .amount,
+#receipt #receipt-total .amount {
+  flex: 1;
+  text-align: right;
+}
+
+#receipt #receipt-card {
+  margin-top: 40px;
+}
+
+#receipt #receipt-card .receipt-item {
+  flex-direction: column;
+}
+
+#receipt #receipt-card .receipt-item .receipt-key {
+  margin-bottom: 5px;
+}
+
+#receipt #receipt-card .receipt-item .receipt-value {
+  margin-left: 0;
+}
+
+#submission-actions {
+  display: flex;
+  flex-direction: column;
+  gap: 3px;
+  align-items: center;
+  width: 100%;
+  max-width: 400px;
+}
+@media screen and (max-width: 600px) {
+  /* Mobile layout */
+  #submission-actions {
+    gap: 5px;
+  }
+}
+
+#submission-actions .submission.button {
+  width: 100%;
+  padding: 3px 10px;
+  border: 1px solid var(--border-gray);
+  border-radius: 5px;
+  background-color: var(--button-background-base);
+  background-image: var(--button-background);;
+  font-size: 12pt;
+  text-decoration: none;
+  box-sizing: border-box;
+}
+@media screen and (max-width: 600px) {
+  /* Mobile layout */
+  #submission-actions .submission.button {
+    padding: 10px;
+    font-size: 10pt;
+  }
+}
+
+#submission-actions .submission.button:hover {
+  filter: brightness(0.98);
 }
 
 

monopyly-1.5.1/monopyly/templates/auth/change_password.html

@@ -0,0 +1,21 @@
+{% extends 'layout.html' %}
+
+{% block header %}
+  <h1>{% block title %}Change Password{% endblock %}</h1>
+{% endblock %}
+
+{% block content %}
+
+  <form id="change-password" method="post">
+    <p class="instructions">
+      Use this form to change the password for user: <b>{{ g.user.username }}</b>
+    </p>
+
+    <label for="password">Current Password</label>
+    <input type="password" name="current-password" id="current-password" required>
+    <label for="new-password">New Password</label>
+    <input type="password" name="new-password" id="new-password" required>
+    <input class="button" type="submit" value="Update" />
+  </form>
+
+{% endblock %}

{monopyly-1.5.0 → monopyly-1.5.1}/monopyly/templates/auth/login.html

@@ -5,11 +5,13 @@
 {% endblock %}
 
 {% block content %}
-  <form method="post">
+
+  <form id="log-in" method="post">
     <label for="username">Username</label>
     <input name="username" id="username" required>
     <label for="password">Password</label>
     <input type="password" name="password" id="password" required>
     <input class="button" type="submit" value="Log In" />
   </form>
+
 {% endblock %}

monopyly-1.5.1/monopyly/templates/auth/register.html

@@ -0,0 +1,25 @@
+{% extends 'layout.html' %}
+
+{% block header %}
+  <h1>{% block title %}Register{% endblock %}</h1>
+{% endblock %}
+
+{% block content %}
+
+  {% if not config['REGISTRATION'] %}
+    <div class="no-registration-notice">
+      <b>Notice:</b> The app is not currently accepting new registrations.
+    </div>
+  {% endif %}
+
+  {% with input_status = 'required' if config['REGISTRATION'] else 'disabled' %}
+    <form id="register" method="post">
+      <label for="username">Username</label>
+      <input name="username" id="username" {{ input_status }}>
+      <label for="password">Password</label>
+      <input type="password" name="password" id="password" {{ input_status }}>
+      <input class="button" type="submit" value="Register" />
+    </form>
+  {% endwith %}
+
+{% endblock %}

{monopyly-1.5.0 → monopyly-1.5.1}/monopyly/templates/core/profile.html

@@ -25,8 +25,8 @@
         <div class=user-settings">
 
           <div class="password">
-            <a style="color: gray;" href="{{ url_for('core.change_password') }}">
-              Change password (coming soon)
+            <a style="color: gray;" href="{{ url_for('auth.change_password') }}">
+              Change password
             </a>
           </div>