monopyly 1.7.2__tar.gz → 1.7.3__tar.gz

{monopyly-1.7.2 → monopyly-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monopyly
-Version: 1.7.2
+Version: 1.7.3
 Summary: A homemade personal finance manager.
 Project-URL: Download, https://pypi.org/project/monopyly
 Project-URL: Homepage, http://monopyly.com
@@ -22,16 +22,16 @@ Classifier: Programming Language :: Python
 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==2.0.0
+Requires-Python: >=3.11
+Requires-Dist: dry-foundation==2.2.0
 Requires-Dist: flask-wtf==1.3.0
 Requires-Dist: flask==3.1.3
 Requires-Dist: gunicorn==26.2.0
-Requires-Dist: markdown==3.10.3
-Requires-Dist: nltk==3.10.3
-Requires-Dist: python-dateutil==2.9.0.post0
+Requires-Dist: markdown==3.11.2
+Requires-Dist: nltk==3.10.4
+Requires-Dist: python-dateutil==3.0.0
 Requires-Dist: rich==15.0.0
-Requires-Dist: sqlalchemy==2.0.52
+Requires-Dist: sqlalchemy==2.1.6
 Description-Content-Type: text/markdown
 
 <div id="header">

{monopyly-1.7.2 → monopyly-1.7.3}/monopyly/CHANGELOG.md

@@ -280,4 +280,11 @@
 - Prevent summation of statement balances returning `None` (continued)
 
 
+### 1.7.3
+
+- Update timezone handling via datetime `tzinfo`
+- Rely on foundations package for (universal) form capabilities
+- Bump dependencies and minimum Python version (3.11)
+
+
 <a name="bottom" id="bottom"></a>

{monopyly-1.7.2 → monopyly-1.7.3}/monopyly/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.7.2'
-__version_tuple__ = version_tuple = (1, 7, 2)
+__version__ = version = '1.7.3'
+__version_tuple__ = version_tuple = (1, 7, 3)
 
 __commit_id__ = commit_id = None

{monopyly-1.7.2 → monopyly-1.7.3}/monopyly/banking/forms.py

@@ -2,15 +2,12 @@
 Generate banking forms for the user to complete.
 """
 
+from dry_foundation.forms.fields import CustomDatabaseSelectField
 from wtforms.fields import BooleanField, FieldList, FormField, SubmitField
 from wtforms.validators import DataRequired, Optional
 
 from ..common.forms import AcquisitionSubform, EntryForm, EntrySubform, TransactionForm
-from ..common.forms.fields import (
-    CustomChoiceSelectField,
-    LastFourDigitsField,
-    StringField,
-)
+from ..common.forms.fields import LastFourDigitsField, StringField
 from ..common.forms.utils import Autocompleter
 from ..database.models import (
     Bank,
@@ -25,7 +22,7 @@ from .accounts import BankAccountRepository, BankAccountTypeRepository
 from .banks import BankRepository
 
 
-class BankSelectField(CustomChoiceSelectField):
+class BankSelectField(CustomDatabaseSelectField):
     """Bank field that uses the database to prepare field choices."""
 
     _db_repo = BankRepository
@@ -38,8 +35,11 @@ class BankSelectField(CustomChoiceSelectField):
         display_name = bank.bank_name
         return display_name
 
+    def _format_new_choice(self):
+        return f"New {self.label.text.lower()}"
+
 
-class BankAccountTypeSelectField(CustomChoiceSelectField):
+class BankAccountTypeSelectField(CustomDatabaseSelectField):
     """Account type field that uses the database to prepare field choices."""
 
     _db_repo = BankAccountTypeRepository
@@ -55,6 +55,9 @@ class BankAccountTypeSelectField(CustomChoiceSelectField):
             display_name += f" ({account_type.type_common_name})"
         return display_name
 
+    def _format_new_choice(self):
+        return f"New {self.label.text.lower()}"
+
 
 class BankSubform(AcquisitionSubform):
     """Form to input/edit bank identification."""
@@ -83,7 +86,7 @@ class BankSubform(AcquisitionSubform):
         """Gather data for the form from the given database entry."""
         if isinstance(entry, Bank):
             data = {
-                "bank_id": entry.id,
+                "bank_id": str(entry.id),
                 "bank_name": entry.bank_name,
             }
         else:
@@ -135,8 +138,8 @@ class BankAccountForm(EntryForm):
         bank = self.bank_info.get_bank()
         account_type = self.account_type_info.get_account_type()
         account_data = {
-            "bank_id": bank.id,
-            "account_type_id": account_type.id,
+            "bank_id": str(bank.id),
+            "account_type_id": str(account_type.id),
             "last_four_digits": self["last_four_digits"].data,
             "active": self["active"].data,
         }

{monopyly-1.7.2 → monopyly-1.7.3}/monopyly/common/forms/_forms.py

@@ -6,6 +6,7 @@ from abc import abstractmethod
 from datetime import date
 
 from dry_foundation.forms import AbstractFlaskForm, FlaskSubform
+from dry_foundation.forms.fields import CustomDatabaseSelectField
 from wtforms.fields import StringField, SubmitField
 from wtforms.validators import DataRequired
 
@@ -102,15 +103,14 @@ class AcquisitionSubform(EntrySubform):
     def _produce_entry_from_field(self, form_entry_id_field_name):
         """Produce an entry matching an ID field in the subform data."""
         form_entry_id_field = getattr(self, form_entry_id_field_name)
-        form_entry_id = int(form_entry_id_field.data)
         # If the entry is a new entry, create it from the form data
-        if form_entry_id == 0:
+        if form_entry_id_field.data == CustomDatabaseSelectField.NEW:
             data = self._prepare_mapping()
             entry = self._db_repo.add_entry(**data)
             # Set the form field to match the newly added value
             form_entry_id_field.data = entry.id
         else:
-            entry = self._db_repo.get_entry(form_entry_id)
+            entry = self._db_repo.get_entry(int(form_entry_id_field.data))
         return entry
 
     @abstractmethod

monopyly-1.7.3/monopyly/common/forms/fields.py

@@ -0,0 +1,47 @@
+"""
+General form constructions.
+"""
+
+from dry_foundation.forms.fields import StrippedFieldMixin
+from dry_foundation.forms.validators import NumeralsOnly
+from wtforms import fields as wtforms_fields
+from wtforms.validators import Length
+from wtforms.widgets import NumberInput
+
+from ..utils import parse_date
+
+
+class DateField(wtforms_fields.DateField):
+    """A date field with better parsing abilities than the WTForms default."""
+
+    def __init__(self, *args, filters=(), **kwargs):
+        # The date field should normally handle date conversion, but this
+        # filter remains as a backup for browsers not supporting locales
+        if parse_date not in filters:
+            filters = list(filters)
+            filters.append(parse_date)
+        super().__init__(*args, filters=filters, **kwargs)
+
+
+class CurrencyField(wtforms_fields.DecimalField):
+    """A decimal field with currency-specific customizations."""
+
+    widget = NumberInput(step=0.01)
+
+    def __init__(self, *args, filters=(), **kwargs):
+        filters = list(filters)
+        filters.append(lambda x: float(round(x, 2)) if x else None)
+        super().__init__(*args, filters=filters, places=2, **kwargs)
+
+
+class StringField(StrippedFieldMixin, wtforms_fields.StringField):
+    """A custom string field."""
+
+
+class LastFourDigitsField(StringField):
+    """A custom field for collecting the last four digits of cards/accounts."""
+
+    def __init__(self, *args, validators=(), **kwargs):
+        validators = list(validators)
+        validators.extend([Length(4, 4), NumeralsOnly()])
+        super().__init__(*args, validators=validators, **kwargs)

{monopyly-1.7.2 → monopyly-1.7.3}/monopyly/common/utils.py

@@ -4,7 +4,6 @@ General utility objects.
 
 import datetime
 from collections import Counter
-from datetime import timezone
 
 from dateutil.relativedelta import relativedelta
 
@@ -128,7 +127,7 @@ def convert_date_to_midnight_timestamp(date, milliseconds=False):
         The timestamp corresponding to the given date (at midnight UTC).
     """
     midnight = datetime.datetime.min.time()
-    utc_datetime = datetime.datetime.combine(date, midnight, tzinfo=timezone.utc)
+    utc_datetime = datetime.datetime.combine(date, midnight, tzinfo=datetime.UTC)
     timestamp = int(utc_datetime.timestamp())
     if milliseconds:
         timestamp *= 1000

{monopyly-1.7.2 → monopyly-1.7.3}/monopyly/credit/forms.py

@@ -2,6 +2,7 @@
 Generate credit card forms for the user to complete.
 """
 
+from dry_foundation.forms.fields import CustomDatabaseSelectField
 from flask import abort
 from wtforms.fields import (
     BooleanField,
@@ -16,11 +17,7 @@ from wtforms.validators import DataRequired, Optional
 
 from ..banking.forms import BankSubform
 from ..common.forms import AcquisitionSubform, EntryForm, EntrySubform, TransactionForm
-from ..common.forms.fields import (
-    CustomChoiceSelectField,
-    LastFourDigitsField,
-    StringField,
-)
+from ..common.forms.fields import LastFourDigitsField, StringField
 from ..common.forms.utils import Autocompleter
 from ..database.models import (
     Bank,
@@ -38,7 +35,7 @@ from .transactions import CreditTransactionRepository
 from .transactions.activity.reconciliation import ActivityMatchmaker
 
 
-class CreditAccountSelectField(CustomChoiceSelectField):
+class CreditAccountSelectField(CustomDatabaseSelectField):
     """Account field that uses the database to prepare field choices."""
 
     _db_repo = CreditAccountRepository
@@ -55,6 +52,9 @@ class CreditAccountSelectField(CustomChoiceSelectField):
         display_name = f"{bank_name} (cards: {', '.join(digits)})"
         return display_name
 
+    def _format_new_choice(self):
+        return f"New {self.label.text.lower()}"
+
 
 class CreditCardForm(EntryForm):
     """Form to input/edit credit cards."""
@@ -76,13 +76,13 @@ class CreditCardForm(EntryForm):
 
             Notes
             -----
-            Unset values on the ``CustomChoiceSelectField`` will take a
+            Unset values on the ``CustomDatabaseSelectField`` will take a
             default value that will be considered to be invalid. They
             must be replaced (after processing) with the inferred value.
             """
-            if self.bank_info.bank_id.data == -1:
+            if self.bank_info.bank_id.data == self.bank_info.bank_id.UNSET:
                 account = self.get_account()
-                self.bank_info.bank_id.data = account.bank.id
+                self.bank_info.bank_id.data = str(account.bank.id)
             return super().validate(extra_validators=extra_validators)
 
         def get_account(self):
@@ -93,7 +93,7 @@ class CreditCardForm(EntryForm):
             bank = self.bank_info.get_bank()
             # Mapping must match format for `credit_accounts` database table
             account_data = {
-                "bank_id": bank.id,
+                "bank_id": str(bank.id),
                 "statement_issue_day": self.statement_issue_day.data,
                 "statement_due_day": self.statement_due_day.data,
             }
@@ -103,7 +103,7 @@ class CreditCardForm(EntryForm):
             """Gather data for the form from the given database entry."""
             if isinstance(entry, CreditAccount):
                 data = {
-                    "account_id": entry.id,
+                    "account_id": str(entry.id),
                     "statement_issue_day": entry.statement_issue_day,
                     "statement_due_day": entry.statement_due_day,
                 }
@@ -126,7 +126,7 @@ class CreditCardForm(EntryForm):
         """Produce a dictionary corresponding to a database card."""
         account = self.account_info.get_account()
         card_data = {
-            "account_id": account.id,
+            "account_id": str(account.id),
             "last_four_digits": self.last_four_digits.data,
             "active": self.active.data,
         }

{monopyly-1.7.2 → monopyly-1.7.3}/pyproject.toml

@@ -9,17 +9,17 @@ authors = [
 ]
 description = 'A homemade personal finance manager.'
 license = { text = 'GNU GPLv3' }
-requires-python = '>=3.10'
+requires-python = '>=3.11'
 dependencies = [
-  'dry-foundation==2.0.0',
+  'dry-foundation==2.2.0',
   'Flask==3.1.3',
   'Flask-WTF==1.3.0',
   'gunicorn==26.2.0',
-  'Markdown==3.10.3',
-  'nltk==3.10.3',
-  'python-dateutil==2.9.0.post0',
+  'Markdown==3.11.2',
+  'nltk==3.10.4',
+  'python-dateutil==3.0.0',
   'rich==15.0.0',
-  'SQLAlchemy==2.0.52',
+  'SQLAlchemy==2.1.6',
 ]
 keywords = [
   'Finance',

monopyly-1.7.2/monopyly/common/forms/fields.py

@@ -1,101 +0,0 @@
-"""
-General form constructions.
-"""
-
-from abc import ABC, abstractmethod
-
-from wtforms import fields as wtforms_fields
-from wtforms.validators import Length
-from wtforms.widgets import NumberInput
-
-from ..utils import parse_date
-from .validators import NumeralsOnly, SelectionNotBlank
-
-
-class DateField(wtforms_fields.DateField):
-    """A date field with better parsing abilities than the WTForms default."""
-
-    def __init__(self, *args, filters=(), **kwargs):
-        # The date field should normally handle date conversion, but this
-        # filter remains as a backup for browsers not supporting locales
-        if parse_date not in filters:
-            filters = list(filters)
-            filters.append(parse_date)
-        super().__init__(*args, filters=filters, **kwargs)
-
-
-class CurrencyField(wtforms_fields.DecimalField):
-    """A decimal field with currency-specific customizations."""
-
-    widget = NumberInput(step=0.01)
-
-    def __init__(self, *args, filters=(), **kwargs):
-        filters = list(filters)
-        filters.append(lambda x: float(round(x, 2)) if x else None)
-        super().__init__(*args, filters=filters, places=2, **kwargs)
-
-
-class StringField(wtforms_fields.StringField):
-    """A custom string field."""
-
-    def __init__(self, *args, filters=(), **kwargs):
-        filters = list(filters)
-        filters.append(lambda x: x.strip() if x else None)
-        super().__init__(*args, filters=filters, **kwargs)
-
-
-class LastFourDigitsField(StringField):
-    """A custom field for collecting the last four digits of cards/accounts."""
-
-    def __init__(self, *args, validators=(), **kwargs):
-        validators = list(validators)
-        validators.extend([Length(4, 4), NumeralsOnly()])
-        super().__init__(*args, validators=validators, **kwargs)
-
-
-class CustomChoiceSelectField(wtforms_fields.SelectField, ABC):
-    """A select field that can auto-prepare choices."""
-
-    def __init__(self, label=None, validators=None, coerce=int, **kwargs):
-        if not validators:
-            validators = [SelectionNotBlank()]
-        super().__init__(label=label, validators=validators, coerce=int, **kwargs)
-        self.prepare_field_choices()
-
-    def process_data(self, value):
-        """Process incoming data, and set the field default value."""
-        value = -1 if value is None else value
-        super().process_data(value)
-
-    @property
-    @abstractmethod
-    def _db_repo(self):
-        raise NotImplementedError("Define the attribute in a subclass.")
-
-    def prepare_field_choices(self):
-        """
-        Prepare choices for a field in the form using the database.
-
-        Using a reference to a database repository, this method queries the
-        database for entries belonging to the user, and then uses those
-        entries to populate the list of choices that may be selected
-        for the field value.
-        """
-        # Collect all available user entries
-        entries = self._db_repo.get_entries()
-        # Set default choice values
-        self.choices = [(-1, "-"), (0, f"New {self.label.text.lower()}")]
-        # Set the user choices (for consistency, arbitrarily sort by entry ID)
-        for entry in sorted(entries, key=lambda entry: entry.id):
-            display_name = self._format_choice(entry)
-            self.choices.insert(-1, (entry.id, display_name))
-
-    @abstractmethod
-    def _format_choice(self, entry):
-        """
-        Format a database entry field to display as a form field choice.
-
-        Accepts an entry returned by the database repository, and extract a
-        name to be displayed as a choice in the list of choices.
-        """
-        raise NotImplementedError("Define the formatting for a choice in a subclass.")

monopyly-1.7.2/monopyly/common/forms/validators.py

@@ -1,51 +0,0 @@
-"""
-Commonly shared form validators.
-"""
-
-from wtforms.validators import ValidationError
-
-
-class NumeralsOnly:
-    """
-    Validates text contains only numerals.
-
-    Parameters
-    ----------
-    message : str
-        Error message to raise in case of a validation error.
-    """
-
-    def __init__(self, message=None):
-        if not message:
-            message = "Field can only contain numerals."
-        self.message = message
-
-    def __call__(self, form, field):
-        try:
-            int(field.data)
-        except ValueError:
-            raise ValidationError(self.message)
-
-
-class SelectionNotBlank:
-    """
-    Validates that a selection is not a blank submission.
-
-    Parameters
-    ----------
-    blank :
-        The value representing a blank selection. The default is the
-        integer `-1`.
-    message : str
-        Error message to raise in case of a validation error.
-    """
-
-    def __init__(self, blank=-1, message=None):
-        self.blank = blank
-        if not message:
-            message = "A selection must be made."
-        self.message = message
-
-    def __call__(self, form, field):
-        if field.data == self.blank:
-            raise ValidationError(self.message)