monopyly 1.5.1__py3-none-any.whl → 1.6.0__py3-none-any.whl

monopyly/credit/transactions/activity/reconciliation.py

@@ -113,9 +113,11 @@ class _Matchmaker(ABC):
 
         def includes_activity(self, activity):
             for value in self.values():
-                if activity == value:
-                    return True
-                elif isinstance(value, TransactionActivityGroup) and activity in value:
+                same_activity = activity == value
+                same_group = (
+                    isinstance(value, TransactionActivityGroup) and activity in value
+                )
+                if same_activity or same_group:
                     return True
             return False
 
@@ -222,7 +224,26 @@ class _Matchmaker(ABC):
         field : str
             The string of text to be tokenized.
         """
-        return set(wordpunct_tokenize(field.replace("'", "").casefold()))
+        replacements = [
+            # Remove disruptive punctuation
+            ("1-800", "1800"),
+            ("-", " "),
+            (".", " "),
+            (",", " "),
+            ("(", " "),
+            (")", " "),
+            ("'", ""),
+            # Standardize characters
+            ("&", "and"),
+            ("é", "e"),
+        ]
+        for original, replacement in replacements:
+            field = field.replace(original, replacement)
+        tokens = set(wordpunct_tokenize(field.replace("'", "").casefold()))
+        removals = ["and", "the", "of"]
+        for word in removals:
+            tokens.discard(word)
+        return tokens
 
     def _compute_transaction_activity_similarity_score(
         self, merchant_tokens, notes_tokens, activity_tokens

monopyly/database/__init__.py

@@ -2,17 +2,10 @@
 Expose commonly used database functionality to the rest of the package.
 """
 
-import sqlite3
 from pathlib import Path
 
-import click
+from dry_foundation.database import SQLAlchemy as _SQLAlchemy
 from flask import current_app
-from flask.cli import with_appcontext
-from fuisce.database import SQLAlchemy as _SQLAlchemy
-
-from ..core.actions import get_timestamp
-
-BASE_DB_NAME = f"monopyly.sqlite"
 
 
 class SQLAlchemy(_SQLAlchemy):
@@ -48,54 +41,3 @@ class SQLAlchemy(_SQLAlchemy):
             raw_conn.close()
         # Top level initialization does not overwrite tables, so it goes at the end
         super().initialize(app)
-
-
-SQLAlchemy.create_default_interface(echo_engine=False)
-
-
-@click.command("init-db")
-@with_appcontext
-def init_db_command():
-    """Initialize the database from the command line (if it does not exist)."""
-    db_path = current_app.config["DATABASE"]
-    if not db_path.is_file():
-        current_app.db.initialize(current_app)
-        click.echo(f"Initialized the database ('{db_path}')")
-        preload_path = current_app.config.get("PRELOAD_DATA_PATH")
-        if preload_path:
-            click.echo(f"Prepopulated the database using '{preload_path}'")
-    else:
-        click.echo(f"Database exists, using '{db_path}'")
-
-
-@click.command("back-up-db")
-@with_appcontext
-def back_up_db_command():
-    """Back up the database from the command line."""
-    timestamp = get_timestamp()
-    # Connect to the database
-    db = sqlite3.connect(current_app.config["DATABASE"])
-    # Create and connect to the backup database
-    backup_db_dir_path = Path(current_app.instance_path) / "db_backups"
-    backup_db_dir_path.mkdir(exist_ok=True, parents=True)
-    backup_db_path = backup_db_dir_path / f"backup_{timestamp}.sqlite"
-    backup_db = sqlite3.connect(backup_db_path)
-    # Back up the database and print status
-    back_up_db(db, backup_db)
-    click.echo(f"Backup complete ({timestamp})")
-
-
-def back_up_db(db, backup_db):
-    """Create a backup of the database."""
-    # Backup the database
-    with backup_db:
-        db.backup(backup_db)
-    # Close the connections
-    backup_db.close()
-    db.close()
-
-
-def register_db_cli_commands(app):
-    """Register database CLI commands with the app."""
-    app.cli.add_command(init_db_command)
-    app.cli.add_command(back_up_db_command)