Changeset - 20d242c7c753
Parent rev.
Child rev.
[Not reviewed]
0 2 0
Ben Sturmfels (bsturmfels) - 3 years ago 2022-03-02 07:26:10
ben@sturm.com.au
reconcile: Fix a mutation bug causing not all matches to be passed through.
2 files changed with 54 insertions and 20 deletions:
conservancy_beancount/reconcile/statement_reconciler.py
36
20
tests/test_reconcile.py
18
0 comments (0 inline, 0 general)
conservancy_beancount/reconcile/statement_reconciler.py
➞
Show inline comments
...
 
@@ -105,5 +105,5 @@ import os
 
import re
 
import sys
 
from typing import Callable, Dict, List, Tuple, TextIO
 
from typing import Callable, Dict, List, Optional, Sequence, Tuple, TextIO
 

			




	
	
	
		
 
from beancount import loader


			




	...
	
		
 
@@ -111,4 +111,7 @@ from beancount.query.query import run_query


			




	
	
	
		
 
from colorama import Fore, Style  # type: ignore


			




	
	
	
		
 

			




	
	
	
		
 
from .. import cliutil


			




	
	
	
		
 
from .. import config as configmod


			




	
	
	
		
 

			




	
	
	
		
 
if not sys.warnoptions:


			




	
	
	
		
 
    import warnings


			




	...
	
		
 
@@ -118,10 +121,10 @@ if not sys.warnoptions:


			




	
	
	
		
 
from thefuzz import fuzz  # type: ignore


			




	
	
	
		
 

			




	
	
	
		
 
logger = logging.getLogger()


			




	
	
	
		
 
logger.setLevel(logging.INFO)


			




	
	
	
		
 

			




	
	
	
		
 
# Console logging.


			




	
	
	
		
 
logger.addHandler(logging.StreamHandler())


			




	
	
	
		
 
PROGNAME = 'reconcile-statement'


			




	
	
	
		
 
logger = logging.getLogger(__name__)


			




	
	
	
		
 

			




	
	
	
		
 
# Get some interesting feedback on call to RT with this:


			




	
	
	
		
 
# logger.setLevel(logging.DEBUG)


			




	
	
	
		
 
# logger.addHandler(logging.StreamHandler())


			




	
	
	
		
 

			




	
	
	
		
 
JUNK_WORDS = [


			




	...
	
		
 
@@ -458,6 +461,14 @@ def parse_repo_relative_path(path: str) -> str:


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def parse_args(argv: List[str]) -> argparse.Namespace:


			




	
	
	
		
 
    parser = argparse.ArgumentParser(description='Reconciliation helper')


			




	
	
	
		
 
def parse_decimal_with_separator(number_text: str) -> decimal.Decimal:


			




	
	
	
		
 
    """decimal.Decimal can't parse numbers with thousands separator."""


			




	
	
	
		
 
    number_text = number_text.replace(',', '')


			




	
	
	
		
 
    return decimal.Decimal(number_text)


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def parse_arguments(argv: List[str]) -> argparse.Namespace:


			




	
	
	
		
 
    parser = argparse.ArgumentParser(prog=PROGNAME, description='Reconciliation helper')


			




	
	
	
		
 
    cliutil.add_version_argument(parser)


			




	
	
	
		
 
    cliutil.add_loglevel_argument(parser)


			




	
	
	
		
 
    parser.add_argument('--beancount-file', required=True, type=parse_path)


			




	
	
	
		
 
    parser.add_argument('--csv-statement', required=True, type=parse_repo_relative_path)


			




	...
	
		
 
@@ -467,7 +478,8 @@ def parse_args(argv: List[str]) -> argparse.Namespace:


			




	
	
	
		
 
    # parser.add_argument('--report-group-regex')


			




	
	
	
		
 
    parser.add_argument('--show-reconciled-matches', action='store_true')


			




	
	
	
		
 
    parser.add_argument('--statement-balance', type=decimal.Decimal, required=True, help="A.K.A \"cleared balance\" taken from the end of the period on the PDF statement. Required because CSV statements don't include final or running totals")


			




	
	
	
		
 
    parser.add_argument('--statement-balance', type=parse_decimal_with_separator, required=True, help="A.K.A \"cleared balance\" taken from the end of the period on the PDF statement. Required because CSV statements don't include final or running totals")


			




	
	
	
		
 
    parser.add_argument('--non-interactive', action='store_true', help="Don't prompt to write to the books")


			




	
	
	
		
 
    return parser.parse_args(args=argv[1:])


			




	
	
	
		
 
    args = parser.parse_args(args=argv)


			




	
	
	
		
 
    return args


			




	
	
	
		
 

			




	
	
	
		
 

			




	...
	
		
 
@@ -513,7 +525,4 @@ def subset_match(statement_trans: List[dict], books_trans: List[dict]) -> Tuple[


			




	
	
	
		
 
            if best_match_index is not None:


			




	
	
	
		
 
                del statement_trans[best_match_index]


			




	
	
	
		
 
            for item in group_items:


			




	
	
	
		
 
                # TODO: Why?


			




	
	
	
		
 
                books_trans.remove(item)


			




	
	
	
		
 
        else:


			




	
	
	
		
 
            remaining_books_trans.append(r2)


			




	...
	
		
 
@@ -532,5 +541,15 @@ def process_unmatched(statement_trans: List[dict], books_trans: List[dict]) -> L


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def main(args: argparse.Namespace) -> None:


			




	
	
	
		
 
def main(arglist: Optional[Sequence[str]] = None,


			




	
	
	
		
 
         stdout: TextIO = sys.stdout,


			




	
	
	
		
 
         stderr: TextIO = sys.stderr,


			




	
	
	
		
 
         config: Optional[configmod.Config] = None,


			




	
	
	
		
 
         ) -> int:


			




	
	
	
		
 
    args = parse_arguments(arglist)


			




	
	
	
		
 
    cliutil.set_loglevel(logger, args.loglevel)


			




	
	
	
		
 
    if config is None:


			




	
	
	
		
 
        config = configmod.Config()


			




	
	
	
		
 
        config.load_file()


			




	
	
	
		
 

			




	
	
	
		
 
    # TODO: Should put in a sanity check to make sure the statement you're feeding


			




	
	
	
		
 
    # in matches the account you've provided.


			




	...
	
		
 
@@ -608,9 +627,6 @@ def main(args: argparse.Namespace) -> None:


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
if __name__ == '__main__':


			




	
	
	
		
 
    args = parse_args(sys.argv)


			




	
	
	
		
 
    main(args)


			




	
	
	
		
 
entry_point = cliutil.make_entry_point(__name__, PROGNAME)


			




	
	
	
		
 

			




	
	
	
		
 
def entry_point():


			




	
	
	
		
 
    args = parse_args(sys.argv)


			




	
	
	
		
 
    main(args)


			




	
	
	
		
 
if __name__ == '__main__':


			




	
	
	
		
 
    exit(entry_point())


			




        

    


    
    

    

        

                

                    tests/test_reconcile.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -309,2 +309,20 @@ def test_subset_sum_match():


			




	
	
	
		
 
        [],  # No remaining books trans.


			




	
	
	
		
 
    )


			




	
	
	
		
 

			




	
	
	
		
 
def test_subset_passes_through_all_non_matches():


			




	
	
	
		
 
    """This was used to locate a bug where some of the non-matches had


			




	
	
	
		
 
    gone missing due to mutation of books_trans."""


			




	
	
	
		
 
    statement_trans = [


			




	
	
	
		
 
        S1,  # No match


			




	
	
	
		
 
        S4,  # Match


			




	
	
	
		
 
    ]


			




	
	
	
		
 
    books_trans = [


			




	
	
	
		
 
        B2,  # No match


			




	
	
	
		
 
        B4A, B4B, B4C, # Match


			




	
	
	
		
 
        B3_next_day, B3_next_week,  # No match


			




	
	
	
		
 
    ]


			




	
	
	
		
 
    assert subset_match(statement_trans, books_trans) == (


			




	
	
	
		
 
        [([S4], [B4A, B4B, B4C], [])],  # Matched


			




	
	
	
		
 
        [S1],  # No match: preserved intact


			




	
	
	
		
 
        [B2, B3_next_day, B3_next_week]  # No match: preserved intact


			




	
	
	
		
 
    )


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








    
        Server instance: kapok.sfconservancy.org-11478
    
    
        This site is powered by
            Kallithea 0.6.3,
        which is
        © 2010–2020 by various authors & licensed under GPLv3.
            – Support
        – Privacy Policy