monopyly 1.6.1__py3-none-any.whl → 1.6.2__py3-none-any.whl

monopyly/CHANGELOG.md

@@ -244,4 +244,12 @@
 - 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/_version.py

@@ -1,16 +1,34 @@
-# file generated by setuptools_scm
+# 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, Union
+    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)
 
-__version__ = version = '1.6.1'
-__version_tuple__ = version_tuple = (1, 6, 1)
+__commit_id__ = commit_id = None

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/static/js/bind-tag-actions.js

@@ -13,111 +13,199 @@ import { executeAjaxRequest } from './modules/ajax.js';
 
 
 (function() {
-
-  const endpointAddTag = ADD_TAG_ENDPOINT;
-  const endpointRemoveTag = REMOVE_TAG_ENDPOINT;
-  // Set animation parameters
-  const slideTime = 300;
   // Identify the buttons
-  const $buttonsAddTag = $('#transaction-tags .new-tag.button');
-  const $buttonsDelete = $('#transaction-tags .action.button.delete');
-
-  bindTagCreator($buttonsAddTag, $buttonsDelete);
-
-  function bindTagCreator($buttonsAddTag, $buttonsDelete) {
-    // Bind add tag buttons
-    $buttonsAddTag.on('click', function() {
-      const $container = $(this).closest('.tag-container');
-      const $tags = $container.children('ul.tags');
-      const $input = $tags.children('input.new-tag');
-      // Reveal the input
-      showInput($input);
-      // Perform actions when focus is lost
-      $input.on('blur', function() {
-        if ($input.val()) {
-          addNewTag($input, $container);
-        } else {
-          hideEmptyInput($input);
-        }
-        clearInput($input);
-      });
-      $input.on('keydown', function() {
-        if (event.which == 27) {
-          clearInput($input);
-          hideEmptyInput($input);
-        }
-      });
+  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();
     });
-    // Bind remove tag buttons
-    $buttonsDelete.on('click', function() {
-      if (confirmDelete()) {
-        const $container = $(this).closest('.tag-container');
-        const $tag = $container.find('.tag').first();
-        // Remove the tag from the database
-        removeTag($tag);
-        // Remove the tag from the display
-        const $tagContainer = $tag.closest('.tag-area');
-        $tagContainer.slideUp(300, function() {
-          $(this).remove()
-        });
+    this.$input.on('keydown', function() {
+      if (event.key == 'Escape') {
+        self.#clearInput();
+        this.blur();
+      } else if (event.key == 'Enter') {
+        this.blur();
       }
     });
   }
 
-  function addNewTag($input, $container) {
-    // Add the input value to the database as a tag
-    const parentTag = $container.children('.tag-area').find('.tag').text()
+  /**
+   * 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': $input.val(),
-      'parent': parentTag
+      'tag_name': this.$input.val(),
+      'parent': this.$tag.text()
     };
-    // Execute the AJAX request and display update
-    function addTag(response) {
-      // Add the AJAX request response to the DOM before the input
-      $input.before(response);
-      hideFilledInput($input);
-      // Bind the buttons for the newly added tag
-      const $buttonAddTag = $input.prev().find('.new-tag.button');
-      const $buttonRemoveTag = $input.prev().find('.action.button.delete');
-      bindTagCreator($buttonAddTag, $buttonRemoveTag);
-    }
-    executeAjaxRequest(endpointAddTag, rawData, addTag);
+    // Execute the AJAX request and place the new tag
+    executeAjaxRequest(this.#endpoint, rawData, this.#placeNewTag.bind(this));
   }
 
-  function showInput($input) {
-    $input.slideDown(slideTime, function() {
-      $input.addClass('visible');
-      $input.focus();
-    });
+  /**
+   * 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')
+    );
   }
 
-  function hideFilledInput($input) {
-    // Hide the input immediately
-    $input.hide();
-    $input.removeClass('visible');
+  /**
+   * Hide the input immediately.
+   */
+  #hideFilledInput() {
+    this.$input.hide();
+    this.$input.removeClass('visible');
+    this.#clearInput();
   }
 
-  function hideEmptyInput($input) {
-    // Hide the input gracefully
-    $input.removeClass('visible');
-    $input.slideUp(slideTime);
+  /**
+   * Hide the (empty) input gracefully.
+   */
+  #hideEmptyInput() {
+    this.$input.removeClass('visible');
+    this.$input.slideUp(this.slideTime);
+    console.log('hiding empty input', this.$input);
   }
 
-  function clearInput($input) {
-    // Clear the input
-    $input.val('');
+  /**
+   * Clear the input.
+   */
+  #clearInput() {
+    this.$input.val('');
   }
 
-  function confirmDelete() {
-    return confirm('Are you sure you want to delete this tag?');
+}
+
+
+/**
+ * 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();
+    }
   }
 
-  function removeTag($tag) {
-    // Get the name of the tag
-    const tagName = $tag.html();
-    const rawData = {'tag_name': tagName};
-    // Execute the AJAX request
-    executeAjaxRequest(endpointRemoveTag, rawData);
+  /**
+   * 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/static/js/highlight-discrepant-transactions.js

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

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/templates/common/tags_page.html

@@ -33,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') }}" />

{monopyly-1.6.1.dist-info → monopyly-1.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monopyly
-Version: 1.6.1
+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.6.0
+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.10
+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.2.0
-Requires-Dist: sqlalchemy==2.0.45
+Requires-Dist: rich==14.3.2
+Requires-Dist: sqlalchemy==2.0.46
 Description-Content-Type: text/markdown
 
 <div id="header">

{monopyly-1.6.1.dist-info → monopyly-1.6.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-monopyly/CHANGELOG.md,sha256=Vnw4KMwtRmyZB90oD4eWHnhZgo3vG69hGpI280a5wjo,9702
+monopyly/CHANGELOG.md,sha256=ageIgsoNIn4S7g64zhNHpp7LVkxX3XtXL1uQvcRnup8,10107
 monopyly/README.md,sha256=TBuObVJnYFYIiSvYUrcAsCtXCUz7D9ZpIHmhDzdPD9k,9045
 monopyly/__init__.py,sha256=fC8Z7V4uGJMPfA4MeC94EPA8Tq5qgUE33vLngYg2ut8,2046
-monopyly/_version.py,sha256=edFVVa8HpVPfLqL2y6CKtViSqJREfmXxInA-HCy-134,411
+monopyly/_version.py,sha256=pmw-c24rp71yAW3-J78udTUvsycSgeO_KbRTgXpqRGA,704
 monopyly/auth/actions.py,sha256=uwXg0LVz3QVJxKkiI-YCJMT8OSjUK7R-aEy-XTM0Ghs,702
 monopyly/auth/blueprint.py,sha256=xA2vC10uu0ekFYPj0q0z2er1-v0G7juVI35RKNN0GQw,266
 monopyly/auth/routes.py,sha256=V9c0omnvLKOp-B5EL14waUF-4QrkoriFVKMjPaRph2w,3345
@@ -39,7 +39,7 @@ monopyly/credit/transactions/__init__.py,sha256=LnixNzeUV3jzZqxB2xdxBBRu94F1oZh9
 monopyly/credit/transactions/_transactions.py,sha256=4K1_QUYUMAikaYicXsm5GsojUL5UjA6x8Jjemf2rbwY,9621
 monopyly/credit/transactions/activity/__init__.py,sha256=hT1VaqPQQz0qxpgJyy46kSHbiBE5crg4pxW2Xvg_2KE,248
 monopyly/credit/transactions/activity/data.py,sha256=6ND7fz5L1aH2g_2drGz2Xf7maUaJ6RyItLdBeWXBIlA,5849
-monopyly/credit/transactions/activity/parser.py,sha256=bwJF-Z3kDJnUTQT5iAf88SNsITMnf3dwpA3hE_fKC9M,11581
+monopyly/credit/transactions/activity/parser.py,sha256=7NWmEyTOxeKIinBKZLhtbUKHnykUhhh_rPxxigSw3XQ,11589
 monopyly/credit/transactions/activity/reconciliation.py,sha256=1CIeaVBhJ-2wufyk7OBo40X6Ql627_I-rZ8axOFeFpM,19449
 monopyly/database/__init__.py,sha256=GMbtb8FQM_gdvClzVLue7g1dkQIOfc0YnA_vRK-9edI,1582
 monopyly/database/models.py,sha256=9QCZZNXfe0JWtX33Jtk94m0cEBd-Lxk1SUWeawWgbDw,14667
@@ -110,7 +110,7 @@ monopyly/static/img/icons/x-thick.png,sha256=Fs9bVUFDVUCjWZQbicFGYZMcsUwerxf6KlX
 monopyly/static/js/add-subtransaction.js,sha256=BoLvpahd__YHOwodqJXg10OCY7CJJX0k7yJpYAVW9iw,1465
 monopyly/static/js/add-transfer.js,sha256=3ve8v-7g-LIVi9Mij68CGCLnIesjhR0vtmsnkVbtNzE,1496
 monopyly/static/js/autocomplete-transaction.js,sha256=pZQ7v04WEHcJ7riPparhdF70W3ZDSz9Z0j0N_OVgZ9k,2753
-monopyly/static/js/bind-tag-actions.js,sha256=ev0WMvkatJFlvvTyMuGAcstYJ2cziOKXZzXLmhDdqr0,3776
+monopyly/static/js/bind-tag-actions.js,sha256=WK0jNuxUG2sVp4VOi4JPANfT1SyS2PsPc99LtX2BfFI,5075
 monopyly/static/js/create-balance-chart.js,sha256=LX4mbEPf1b6QayEkAj1L1b-zPE4Pxr84V4rQ_Es2OqA,2452
 monopyly/static/js/create-category-chart.js,sha256=SfWQrs4c0QT4whr7KvrvWVdyYfeGu-ENscpoPjEYcqc,519
 monopyly/static/js/define-filter.js,sha256=nz64sha6G9QXOyVEqxd_xYK0F_fXxzXxIHiQfpvUo7A,1133
@@ -122,7 +122,7 @@ monopyly/static/js/expand-bank.js,sha256=vb1DTCOidQgQzX0FC-7Zwk-Poc-e38mpORgWG_L
 monopyly/static/js/expand-transaction.js,sha256=wfql6MjA6LP1bSob4MUUREkHLhAFbcbH0pQAdbouObE,984
 monopyly/static/js/flip-card.js,sha256=4a65JFO7kf4qzZ-8wvWiiO_BwZpiWO2cHHzZugXRoAQ,720
 monopyly/static/js/hide-homepage-block.js,sha256=Yw3m5sc5dO6pDh2VUzJu1re4NXZcuSLSMs6Acou_rHo,495
-monopyly/static/js/highlight-discrepant-transactions.js,sha256=jnbs6HSh4Byq46xJuDNseGHOnf_KuVH-wYRr_dsj_Y8,4188
+monopyly/static/js/highlight-discrepant-transactions.js,sha256=lQg7S6BqjWiMlMvqaiEDt6zlSvObQaA4G5SGh2CshYw,4189
 monopyly/static/js/infer-card.js,sha256=WIDXWhfF4gXdlRCo2OA0IpSsszxDTkV7ZSb6Qo7pheA,1790
 monopyly/static/js/infer-statement.js,sha256=ufcYJ2z6halVXpiZHviI_4JN48jOBAM4NbSDtWH9BoU,1896
 monopyly/static/js/load-more-transactions.js,sha256=PhhYVW3mDQo_hYz5vhbLK-BtB1k6NluGAxPFY44rqf0,671
@@ -171,8 +171,8 @@ monopyly/templates/banking/transactions_table/table.html,sha256=1zxNJOOXmc6RkMkB
 monopyly/templates/banking/transactions_table/transaction_field_titles.html,sha256=WvjcRAByg1xSHqfNEkcJYB1eFnNfm4-qfHZben_YApI,600
 monopyly/templates/banking/transactions_table/transactions.html,sha256=UuBCMXwDqKlHdxUy07O_hVQjJ8V5nhM4O5trfF4zJYg,394
 monopyly/templates/common/form_page.html,sha256=Sx2Y6dhNsjkDQBaepTBPBvVeIe7N730llhgbcAQOrCk,107
-monopyly/templates/common/tag_tree.html,sha256=sCmyVNGJBaBtfuvl9PepYhfV9HPYn5aL79reGhpl6H4,644
-monopyly/templates/common/tags_page.html,sha256=hBG1777lXotxAljoWGDZ15gVa1o_I9vyZN9Po5QePx8,803
+monopyly/templates/common/tag_tree.html,sha256=STdQI84sehxWIKjkr6bt6kIYzM3KhKd6f3658j_GyKM,778
+monopyly/templates/common/tags_page.html,sha256=-L8LyKpzGJE-nOOQrAa_PlOfM8ig0QPg7ei7XWijHa4,862
 monopyly/templates/common/transaction_form/subform.html,sha256=BjwJA0-ZOeBhrLdZAkddl5F5ElMN2MSykD2hZu8PNEA,370
 monopyly/templates/common/transaction_form/subtransaction_subform.html,sha256=WBCGnkKNGC0x7KSJeKA1g8Xbm5sO9N3jY5Nt2WiWpUk,827
 monopyly/templates/common/transaction_form/transaction_form_page.html,sha256=gZ7uWIgaVo67m4F9cgXnrjwQ3_nEk_F2E1jT_C1yy8s,294
@@ -227,9 +227,9 @@ monopyly/templates/credit/transactions_table/expanded_row_content.html,sha256=Ui
 monopyly/templates/credit/transactions_table/table.html,sha256=S2xjvUyWnsKDIux2kt_sV2DRzKov-TfPuACBYrh9HDw,224
 monopyly/templates/credit/transactions_table/transaction_field_titles.html,sha256=km-3YEDJaygwcKV-rwYnrE7xF8u4Z7jCBsk0Ia-LO-M,758
 monopyly/templates/credit/transactions_table/transactions.html,sha256=83zHx5Oa1KH1bMrKk2mlBmMiYKwa1t5lBq_JSAgslgc,390
-monopyly-1.6.1.dist-info/METADATA,sha256=9Pb68wIyAxWEnIN37V6c4dH08nmTyv03QtL-fNGM4Y8,10969
-monopyly-1.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-monopyly-1.6.1.dist-info/entry_points.txt,sha256=VMqyRA0VRpTc0-5Z-VB-wX1AuyezoKKPhcf4bIUKz9g,110
-monopyly-1.6.1.dist-info/licenses/COPYING,sha256=5X8cMguM-HmKfS_4Om-eBqM6A1hfbgZf6pfx2G24QFI,35150
-monopyly-1.6.1.dist-info/licenses/LICENSE,sha256=94rIicMccmTPhqXiRLV9JsU8P2ocMuEUUtUpp6LPKiE,253
-monopyly-1.6.1.dist-info/RECORD,,
+monopyly-1.6.2.dist-info/METADATA,sha256=6_yb0zSwwJlc832fqs8fjfUykRdC0w2rDCfp8UO1qXE,10971
+monopyly-1.6.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+monopyly-1.6.2.dist-info/entry_points.txt,sha256=VMqyRA0VRpTc0-5Z-VB-wX1AuyezoKKPhcf4bIUKz9g,110
+monopyly-1.6.2.dist-info/licenses/COPYING,sha256=5X8cMguM-HmKfS_4Om-eBqM6A1hfbgZf6pfx2G24QFI,35150
+monopyly-1.6.2.dist-info/licenses/LICENSE,sha256=94rIicMccmTPhqXiRLV9JsU8P2ocMuEUUtUpp6LPKiE,253
+monopyly-1.6.2.dist-info/RECORD,,

{monopyly-1.6.1.dist-info → monopyly-1.6.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any