NPO-Accounting/conservancy_beancount Changeset - 5706273bbe72

Changeset - 5706273bbe72

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Brett Smith - 4 years ago 2020-06-12 17:24:25
brettcsmith@brettcsmith.org

accrual: Clean up types and imports.

Mostly I wanted to write the documentation about groups, and then
I kept pulling the thread.

1 file changed with 14 insertions and 6 deletions:

conservancy_beancount/reports/accrual.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/accrual.py

➞

Show inline comments

@@ ... / @@ -67,13 +67,12 @@ type you want with the ``--report-type`` option:: @@
 import argparse
 import collections
 import datetime
 import enum
 import logging
 import re
 import sys
 import urllib.parse as urlparse
 from pathlib import Path
 from typing import (
@@ ... / @@ -116,15 +115,13 @@ from .. import config as configmod @@
 from .. import data
 from .. import filters
 from .. import rtutil
 PROGNAME = 'accrual-report'
 CompoundAmount = TypeVar('CompoundAmount', data.Amount, core.Balance)
 PostGroups = Mapping[Optional[MetaValue], 'AccrualPostings']
 RTObject = Mapping[str, str]
 PostGroups = Mapping[Optional[str], 'AccrualPostings']
 T = TypeVar('T')
 logger = logging.getLogger('conservancy_beancount.reports.accrual')
 class Sentinel:
     pass
@@ ... / @@ -210,21 +207,24 @@ class AccrualPostings(core.RelatedPostings): @@
         return filters.iter_unique(
             post.meta['entity']
             for post in self
             if pred(post) and 'entity' in post.meta
+        )
-    def make_consistent(self) -> Iterator[Tuple[MetaValue, 'AccrualPostings']]:
+    def make_consistent(self) -> Iterator[Tuple[str, 'AccrualPostings']]:
         account_ok = isinstance(self.account, str)
         entity_ok = isinstance(self.entity, str)
         # `'/' in self.invoice` is just our heuristic to ensure that the
         # invoice metadata is "unique enough," and not just a placeholder
         # value like "FIXME". It can be refined if needed.
         invoice_ok = isinstance(self.invoice, str) and '/' in self.invoice
         if account_ok and entity_ok and invoice_ok:
             yield (self.invoice, self)
             # mypy loses track of the fact that self.invoice must be a str in
             # this case (gated on the invoice_ok boolean) and complains it
             # doesn't match the type of the return value.
             yield (self.invoice, self)  # type:ignore[misc]
             return
         groups = collections.defaultdict(list)
         for post in self:
             post_invoice = self.invoice if invoice_ok else (
                 post.meta.get('invoice') or 'BlankInvoice'
+            )
@@ ... / @@ -693,12 +693,20 @@ def main(arglist: Optional[Sequence[str]]=None, @@
     postings = list(filter_search(
         data.Posting.from_entries(entries), args.search_terms,
     ))
     if not postings:
         logger.warning("no matching entries found to report")
         returncode |= ReturnFlag.NOTHING_TO_REPORT
     # groups is a mapping of metadata value strings to AccrualPostings.
     # The keys are basically arbitrary, the report classes don't rely on them,
     # but they do help symbolize what's being grouped.
     # For the outgoing approval report, groups maps rt-id link strings to
     # associated accruals.
     # For all other reports, groups starts by grouping postings together by
     # invoice link string, then uses AccrualReport.make_consistent() to split
     # out groups that need it.
     groups: PostGroups
     if args.report_type is None or args.report_type is ReportType.OUTGOING:
         groups = dict(AccrualPostings.group_by_first_meta_link(postings, 'rt-id'))
         if (args.report_type is None
             and len(groups) == 1
             and all(group.accrual_type is AccrualAccount.PAYABLE

0 comments (0 inline, 0 general)