monopyly 1.6.0__tar.gz → 1.6.2__tar.gz

{monopyly-1.6.0 → monopyly-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monopyly
-Version: 1.6.0
+Version: 1.6.2
 Summary: A homemade personal finance manager.
 Project-URL: Download, https://pypi.org/project/monopyly
 Project-URL: Homepage, http://monopyly.com
@@ -23,15 +23,15 @@ Classifier: Topic :: Office/Business :: Financial
 Classifier: Topic :: Office/Business :: Financial :: Accounting
 Classifier: Topic :: Office/Business :: Financial :: Spreadsheet
 Requires-Python: >=3.10
-Requires-Dist: dry-foundation==1.4.1
+Requires-Dist: dry-foundation==1.6.2
 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: gunicorn==25.0.1
+Requires-Dist: markdown==3.10.1
 Requires-Dist: nltk==3.9.2
 Requires-Dist: python-dateutil==2.9.0
-Requires-Dist: rich==14.1.0
-Requires-Dist: sqlalchemy==2.0.43
+Requires-Dist: rich==14.3.2
+Requires-Dist: sqlalchemy==2.0.46
 Description-Content-Type: text/markdown
 
 <div id="header">

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/CHANGELOG.md

@@ -237,4 +237,19 @@
 - Update JavaScript libraries (jQuery, Chartist)
 
 
+### 1.6.1
+
+- Allow pie chart labels to overflow the SVG container
+- Define JavaScript elements in header (deferring execution when logical)
+- Bump dependencies
+
+
+### 1.6.2
+
+- Fix bug in the transaction tag tree template preventing new subtags in the same subtag subtree
+- Refactor JavaScript used to manage the transaction tag tree
+- Add specificity to the reconciliation tool when parsing payment columns (when otherwise unidentified, payment transactions are determined by the presence of the isolated word "payment" in the description field)
+- Bump dependencies
+
+
 <a name="bottom" id="bottom"></a>

monopyly-1.6.2/monopyly/_version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '1.6.2'
+__version_tuple__ = version_tuple = (1, 6, 2)
+
+__commit_id__ = commit_id = None

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/banking/forms.py

@@ -115,6 +115,10 @@ class BankAccountForm(EntryForm):
             }
             return account_type_data
 
+        def gather_entry_data(self, entry):
+            """Gather data for the form from the given database entry."""
+            raise NotImplementedError
+
     # Fields to identify the bank/account type information for the account
     bank_info = FormField(BankSubform)
     account_type_info = FormField(AccountTypeSubform)

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/common/forms/_forms.py

@@ -2,10 +2,10 @@
 General form constructions.
 """
 
-from abc import ABC, abstractmethod
+from abc import abstractmethod
 from datetime import date
 
-from flask_wtf import FlaskForm
+from dry_foundation.forms import AbstractFlaskForm, FlaskSubform
 from wtforms.fields import StringField, SubmitField
 from wtforms.validators import DataRequired
 
@@ -15,12 +15,7 @@ from .fields import CurrencyField, DateField
 form_err_msg = "There was an improper value in your form. Please try again."
 
 
-class AbstractEntryFormMixinMeta(type(FlaskForm), ABC):
-    # Defined to allow the forms to also to be abstract base classes
-    pass
-
-
-class EntryForm(FlaskForm, metaclass=AbstractEntryFormMixinMeta):
+class EntryForm(AbstractFlaskForm):
     """
     A form designed to accept database entry information.
 
@@ -85,11 +80,8 @@ class EntryForm(FlaskForm, metaclass=AbstractEntryFormMixinMeta):
         )
 
 
-class EntrySubform(EntryForm):
-    """Subform disabling CSRF (CSRF is REQUIRED in encapsulating form)."""
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(meta={"csrf": False}, *args, **kwargs)
+class EntrySubform(FlaskSubform, EntryForm):
+    """A subform implementing ``EntryForm`` behavior."""
 
 
 class AcquisitionSubform(EntrySubform):
@@ -149,7 +141,6 @@ class TransactionForm(EntryForm):
             }
             return data
 
-        @abstractmethod
         def gather_entry_data(self, entry):
             if self.subtransaction_model is None:
                 raise RuntimeError(

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/common/forms/fields.py

@@ -24,15 +24,6 @@ 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.6.0 → monopyly-1.6.2}/monopyly/common/forms/utils.py

@@ -113,9 +113,9 @@ def extend_field_list_for_ajax(form_class, field_list_name, field_list_count):
 
     Parameters
     ----------
-    form_class : flask_wtf.FlaskForm
-        The class (not class instance) containing the field list to be
-        extended.
+    form_class : type
+        The form class (not class instance) containing the field list to
+        be extended.
     field_list_name : str
         The name of the field list to be extended.
     field_list_count : int

monopyly-1.6.2/monopyly/core/context_processors.py

@@ -0,0 +1,23 @@
+"""
+Filters defined for the application.
+"""
+
+from dry_foundation.utils import define_basic_template_global_variables
+
+from .actions import determine_summary_balance_svg_viewbox_width
+from .blueprint import bp
+
+
+@bp.app_context_processor
+def inject_global_template_variables():
+    """Inject template variables globally into the template context."""
+    return define_basic_template_global_variables("monopyly._version")
+
+
+@bp.app_context_processor
+def inject_utility_functions():
+    """Inject utility functions globally into the template context."""
+    utility_functions = {
+        "calculate_summary_balance_width": determine_summary_balance_svg_viewbox_width,
+    }
+    return utility_functions

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/credit/cards.py

@@ -137,7 +137,7 @@ def save_card(form, card_id=None):
 
     Parameters
     ----------
-    form : flask_wtf.FlaskForm
+    form : CreditCardForm
         The form beign used to provide the data being saved.
     card_id : int
         The ID of hte card to be saved. If provided, the named card will

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/credit/forms.py

@@ -5,6 +5,7 @@ Generate credit card forms for the user to complete.
 from flask import abort
 from wtforms.fields import (
     BooleanField,
+    DateField,
     FieldList,
     FormField,
     IntegerField,
@@ -18,7 +19,6 @@ from ..common.forms import AcquisitionSubform, EntryForm, EntrySubform, Transact
 from ..common.forms.fields import (
     CustomChoiceSelectField,
     LastFourDigitsField,
-    OptionalDateField,
     StringField,
 )
 from ..common.forms.utils import Autocompleter
@@ -152,6 +152,10 @@ class CardStatementTransferForm(EntryForm):
     transfer = RadioField("transfer", choices=[("yes", "Yes"), ("no", "No")])
     submit = SubmitField("Continue")
 
+    def gather_entry_data(self, entry):
+        """Gather data for the form from the given database entry."""
+        raise NotImplementedError
+
 
 class CreditTransactionForm(TransactionForm):
     """Form to input/edit credit card transactions."""
@@ -193,7 +197,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 = OptionalDateField("Statement Date")
+        issue_date = DateField("Statement Date", [Optional()])
 
         def get_statement(self, transaction_date):
             """Get the credit card statement described by the form data."""

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/credit/transactions/activity/parser.py

@@ -213,7 +213,7 @@ class _TransactionActivityParser:
         def _infer_payment_row(row):
             # Infer whether the row constitutes a payment transaction
             contextual_info = [row[i].lower() for i in contextual_column_indices]
-            return any("payment" in element for element in contextual_info)
+            return any("payment" in element.split() for element in contextual_info)
 
         payment_rows = list(filter(_infer_payment_row, raw_data))
         return self._extrapolate_payments_positive(payment_rows, raw_data)

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/static/css/style.css

@@ -3481,6 +3481,10 @@ form#pay #make-payment[type="submit"] #prompt {
   min-height: 400px;
 }
 
+#category-chart.ct-chart svg {
+  overflow: visible;
+}
+
 #category-chart text.ct-label {
   transition: fill 0.1s ease;
 }

monopyly-1.6.2/monopyly/static/js/bind-tag-actions.js

@@ -0,0 +1,211 @@
+/*
+ * Add a transaction tag on the 'Transaction Tags' page.
+ *
+ * Adds a transaction tag under the tag or category corresponding to the
+ * plus icon that is clicked. Clicking the plus icon adds a tag shaped
+ * input box that accepts a new tag name. Once the input loses focus,
+ * an AJAX request is executed, the database is updated and the tree of
+ * transactions is partially refreshed to allow further additions. If no
+ * tag name was provided, no request occurs.
+ */
+
+import { executeAjaxRequest } from './modules/ajax.js';
+
+
+(function() {
+  // Identify the buttons
+  const $createTagButtons = $('#transaction-tags .new-tag.button');
+  const $deleteTagButtons = $('#transaction-tags .action.button.delete');
+  bindTagButtonBehavior($createTagButtons, $deleteTagButtons);
+
+})();
+
+
+/**
+ * Create the tag manager.
+ *
+ * @param {JQuery} $createTagButtons - Buttons for adding subtags to one or
+ *     more tags.
+ * @param {JQuery} $deleteTagButtons - Buttons for removing tags.
+ */
+function bindTagButtonBehavior($createTagButtons, $deleteTagButtons) {
+  console.log('bind create buttons', $createTagButtons);
+  console.log('bind delete buttons', $deleteTagButtons);
+  $createTagButtons.on('click', function() {
+    const $button = $(this);
+    const behavior = new TagCreation($button);
+    behavior.perform();
+  });
+  $deleteTagButtons.on('click', function() {
+    const $button = $(this);
+    const behavior = new TagDeletion($button);
+    behavior.perform();
+  });
+}
+
+
+/**
+ * A class for managing transaction tags and the behavior of their buttons.
+ */
+class TagButtonBehavior {
+
+  /**
+   * Create the tag manager.
+   *
+   * @param {JQuery} $button - A button belonging to a tag.
+   */
+  constructor($button) {
+    this.$container = $button.closest('.tag-container');
+    this.$tag = this.$container.children('.tag-area').find('.tag');
+    this.$tags = this.$container.children('ul.tags');
+    this.$input = this.$tags.children('input.new-tag');
+    // Set animation parameters
+    this.slideTime = 300;
+  }
+
+}
+
+/**
+ * A class for managing transaction tags creation behavior.
+ */
+class TagCreation extends TagButtonBehavior {
+
+  #endpoint = ADD_TAG_ENDPOINT;
+
+  /**
+   * Create the tag creator.
+   *
+   * @param {JQuery} $button - A button belonging to a tag.
+   */
+  constructor($button) {
+    super($button);
+    self = this;
+    this.$input.on('blur', function() {
+      self.#dropInputFocus();
+    });
+    this.$input.on('keydown', function() {
+      if (event.key == 'Escape') {
+        self.#clearInput();
+        this.blur();
+      } else if (event.key == 'Enter') {
+        this.blur();
+      }
+    });
+  }
+
+  /**
+   * Perform the behavior.
+   */
+  perform() {
+    this.#showInput();
+  }
+
+  /**
+   * Show the input box to collect new tag information.
+   */
+  #showInput() {
+    console.log('showing input', this.$input);
+    self = this;
+    this.$input.slideDown(this.slideTime, function() {
+      self.$input.addClass('visible');
+      self.$input.focus();
+      console.log('focus', self.$input);
+    });
+  }
+
+  /**
+   * Perform a specific action when the input loses focus.
+   */
+  #dropInputFocus() {
+    if (this.$input.val()) {
+      this.#createTag();
+      this.#hideFilledInput();
+    } else {
+      this.#hideEmptyInput();
+    }
+  }
+
+  /**
+   * Create the new tag in the database.
+   */
+  #createTag() {
+    const rawData = {
+      'tag_name': this.$input.val(),
+      'parent': this.$tag.text()
+    };
+    // Execute the AJAX request and place the new tag
+    executeAjaxRequest(this.#endpoint, rawData, this.#placeNewTag.bind(this));
+  }
+
+  /**
+   * Add the new tag to the DOM before the input.
+   */
+  #placeNewTag(newTagHTML) {
+    const $newTag = $(newTagHTML);
+    this.$input.before($newTag);
+    // Bind behavior functionality to the newly created/placed tag buttons
+    bindTagButtonBehavior(
+      $newTag.find('.new-tag.button'), $newTag.find('.action.button.delete')
+    );
+  }
+
+  /**
+   * Hide the input immediately.
+   */
+  #hideFilledInput() {
+    this.$input.hide();
+    this.$input.removeClass('visible');
+    this.#clearInput();
+  }
+
+  /**
+   * Hide the (empty) input gracefully.
+   */
+  #hideEmptyInput() {
+    this.$input.removeClass('visible');
+    this.$input.slideUp(this.slideTime);
+    console.log('hiding empty input', this.$input);
+  }
+
+  /**
+   * Clear the input.
+   */
+  #clearInput() {
+    this.$input.val('');
+  }
+
+}
+
+
+/**
+ * A class for managing transaction tags deletion behavior.
+ */
+class TagDeletion extends TagButtonBehavior {
+
+  #endpoint = REMOVE_TAG_ENDPOINT;
+
+  /**
+   * Perform the behavior.
+   */
+  perform() {
+    if (this.#confirmDelete()) {
+      this.#removeTag();
+    }
+  }
+
+  /**
+   * Remove the tag from the database.
+   */
+  #removeTag() {
+    const rawData = {'tag_name': this.$tag.html()};
+    // Execute the AJAX request to delete the tag
+    executeAjaxRequest(this.#endpoint, rawData);
+    // Remove the tag from the display
+    this.$container.slideUp(this.slideTime, function() {this.remove()});
+  }
+
+  #confirmDelete() {
+    return confirm('Are you sure you want to delete this tag?');
+  }
+
+}

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/static/js/highlight-discrepant-transactions.js

@@ -114,6 +114,7 @@ class DiscrepancyHighlighter {
       this.removeHighlight($(activity), $matchingTransactionRow);
     }
   }
+
 }
 
 

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/templates/banking/account_form/account_form_page_new.html

@@ -1,6 +1,16 @@
 {% extends "common/form_page.html" %}
 
 
+{% block javascript %}
+
+  <script type="module" src="{{ url_for('static', filename='js/display-new-bank-inputs.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/display-new-account-type-inputs.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block title %}
   New Bank Account
 {% endblock %}
@@ -13,11 +23,3 @@
   {% endwith %}
 
 {% endblock %}
-
-
-{% block javascript %}
-  <script type="module" src="{{ url_for('static', filename='js/display-new-bank-inputs.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/display-new-account-type-inputs.js') }}">
-  </script>
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/templates/banking/accounts_page.html

@@ -1,6 +1,14 @@
 {% extends 'layout.html' %}
 
 
+{% block javascript %}
+
+  <script type="module" src="{{ url_for('static', filename='js/expand-bank-account.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block header %}
 
   <h1>
@@ -83,9 +91,3 @@
     </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-  <script type="module" src="{{ url_for('static', filename='js/expand-bank-account.js') }}">
-  </script>
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/templates/common/tag_tree.html

@@ -18,7 +18,10 @@
   </li>
 
   {% if loop.last %}
-    <input class="new-tag" type="text" />
+    {# Do not create a new input for a tag when its subtree is updated #}
+    {% if new_tree or loop.depth0 != 0 %}
+      <input class="new-tag" type="text" />
+    {% endif %}
   {% endif %}
 {% else %}
   <input class="new-tag" type="text" />

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/templates/common/tags_page.html

@@ -1,6 +1,18 @@
 {% extends 'layout.html' %}
 
 
+{% block javascript %}
+
+  <script>
+    const ADD_TAG_ENDPOINT = "{{ url_for('banking.add_tag') }}";
+    const REMOVE_TAG_ENDPOINT = "{{ url_for('banking.delete_tag') }}";
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/bind-tag-actions.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block header %}
 
   <h1>
@@ -21,7 +33,9 @@
     <div id="tags-container" class="tag-container">
 
       <ul class="tags">
-        {% include 'common/tag_tree.html' %}
+        {% with new_tree = True %}
+          {% include 'common/tag_tree.html' %}
+        {% endwith %}
       </ul>
 
       <img class="root new-tag button" src="{{ url_for('static', filename='img/icons/plus-thick.png') }}" />
@@ -31,15 +45,3 @@
   </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-
-  <script>
-    const ADD_TAG_ENDPOINT = "{{ url_for('banking.add_tag') }}";
-    const REMOVE_TAG_ENDPOINT = "{{ url_for('banking.delete_tag') }}";
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/bind-tag-actions.js') }}">
-  </script>
-
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/templates/core/index.html

@@ -1,5 +1,17 @@
 {% extends "layout.html" %}
 
+
+{% block javascript %}
+
+  <script>
+    const HIDE_HOMEPAGE_BLOCK_ENDPOINT = "{{ url_for('core.hide_homepage_block') }}";
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/hide-homepage-block.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block content %}
 
   {% if session["show_homepage_block"] %}
@@ -170,11 +182,3 @@
   {% endif %}
 
 {% endblock %}
-
-{% block javascript %}
-  <script>
-    const HIDE_HOMEPAGE_BLOCK_ENDPOINT = "{{ url_for('core.hide_homepage_block') }}";
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/hide-homepage-block.js') }}">
-  </script>
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.2}/monopyly/templates/core/profile.html

@@ -1,13 +1,28 @@
 {% extends "layout.html" %}
 
-{% block title %}
-  Profile
+
+{% block javascript %}
+
+  <script>
+    const UPDATE_BANK_NAME_ENDPOINTS = {
+      {% for bank in banks %}
+        {{ bank.id }}: "{{ url_for('banking.update_bank_name', bank_id=bank.id) }}",
+      {% endfor %}
+    };
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/expand-bank.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/update-bank-name.js') }}">
+  </script>
+
 {% endblock %}
 
+
 {% block header %}
-  <h1>Profile</h1>
+  <h1>{% block title %}Profile{% endblock %}</h1>
 {% endblock %}
 
+
 {% block content %}
 
   <div id="profile">
@@ -76,19 +91,3 @@
   </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-  <script>
-
-    const UPDATE_BANK_NAME_ENDPOINTS = {
-      {% for bank in banks %}
-        {{ bank.id }}: "{{ url_for('banking.update_bank_name', bank_id=bank.id) }}",
-      {% endfor %}
-    };
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/expand-bank.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-bank-name.js') }}">
-  </script>
-{% endblock %}