support for parsing scheme valuation (#2)

Author: codereverser

casparser/cli.py

@@ -1,3 +1,4 @@
+from decimal import Decimal
 import json
 import re
 import sys
@@ -40,37 +41,53 @@ def print_summary(data):
             fmt_value = fmt_value[:37] + "..."
         click.echo(f"{key:>40s}: {fmt_value}")
     click.echo("")
-    table = texttable.Texttable(max_width=100)
-    table.set_cols_align(["l", "r", "r", "r", "r", "c"])
-    table.set_cols_valign(["m", "m", "m", "m", "m", "m"])
-    table.add_row(
-        ["Scheme", "Open", "Close\nReported", "Close\nCalculated", "Transactions", "Status"]
-    )
+    table = texttable.Texttable(max_width=120)
+    header = [
+        "Scheme",
+        "Open",
+        "Close\nReported",
+        "Close\nCalculated",
+        f"Value\n({data['statement_period']['to']})",
+        "Transactions",
+        "Status",
+    ]
+    table.add_row(header)
+    table.set_cols_align(["l"] + ["r"] * (len(header) - 2) + ["c"])
+    table.set_cols_valign(["m"] * len(header))
     current_amc = None
+    value = Decimal(0)
     for folio in data["folios"]:
         if current_amc != folio.get("amc", ""):
             current_amc = folio["amc"]
-            table.add_row([current_amc] + [""] * 5)
+            table.add_row([current_amc] + [""] * 6)
         for scheme in folio["schemes"]:
             calc_close = scheme["open"] + sum([x["units"] for x in scheme["transactions"]])
+            valuation = scheme["valuation"]
             if calc_close != scheme["close"]:
                 err += 1
                 status = "❗️"
             else:
                 status = "️✅"
             scheme_name = f"{scheme['scheme']}\nFolio: {folio['folio']}"
+            value += valuation["value"]
             table.add_row(
                 [
                     scheme_name,
                     scheme["open"],
                     scheme["close"],
                     calc_close,
+                    f"₹{valuation['value']:,.2f}",
                     len(scheme["transactions"]),
                     status,
                 ]
             )
             count += 1
     click.echo(table.draw())
+    click.echo(
+        "Portfolio Valuation : "
+        + click.style(f"₹{value:,.2f}", fg="green", bold=True)
+        + f" [As of {data['statement_period']['to']}]"
+    )
     click.secho("Summary", bold=True)
     click.echo("Total   : " + click.style(f"{count:4d}", fg="white", bold=True) + " schemes")
     click.echo("Matched : " + click.style(f"{count - err:4d}", fg="green", bold=True) + " schemes")

casparser/process.py

@@ -5,7 +5,7 @@
 
 from .exceptions import HeaderParseError, CASParseError
 from .regex import FOLIO_RE, HEADER_RE, SCHEME_RE
-from .regex import CLOSE_UNITS_RE, OPEN_UNITS_RE, TRANSACTION_RE
+from .regex import CLOSE_UNITS_RE, OPEN_UNITS_RE, VALUATION_RE, TRANSACTION_RE
 
 
 def parse_header(text):
@@ -64,6 +64,7 @@ def process_cas_text(text):
                     "rta": m.group(4).strip(),
                     "open": Decimal(0.0),
                     "close": Decimal(0.0),
+                    "valuation": {"date": None, "value": 0},
                     "transactions": [],
                 }
         if not curr_scheme_data:
@@ -73,6 +74,11 @@ def process_cas_text(text):
             continue
         if m := re.search(CLOSE_UNITS_RE, line):
             curr_scheme_data["close"] = Decimal(m.group(1).replace(",", "_"))
+        if m := re.search(VALUATION_RE, line, re.I):
+            curr_scheme_data["valuation"].update(
+                date=date_parser.parse(m.group(1)).date(),
+                value=Decimal(m.group(2).replace(",", "_")),
+            )
             continue
         if m := re.search(TRANSACTION_RE, line, re.DOTALL):
             date = date_parser.parse(m.group(1)).date()

casparser/regex.py

@@ -8,6 +8,7 @@
 SCHEME_RE = r"([\s\w]+)-\s*\d*\s*(.+?)\s*\(Advisor\s*:\s*(.+?)\)\s+Registrar\s*:\s*(.*)\s*$"
 OPEN_UNITS_RE = r"Opening\s+Unit\s+Balance.+?([\d,.]+)"
 CLOSE_UNITS_RE = r"Closing\s+Unit\s+Balance.+?([\d,.]+)"
+VALUATION_RE = r"Valuation\s+on\s+(\d{2}-[A-Za-z]{3}-\d{4})\s*:\s*INR\s*([\d,.]+)"
 
 TRANSACTION_RE = (
     r"(\d{2}-[A-Za-z]{3}-\d{4})\t\t([^\t]+?)\t\t([(\d,.]+)\)*\t\t"

casparser/types.py

@@ -27,6 +27,11 @@ class TransactionType(TypedDict):
     balance: Union[Decimal, float]
 
 
+class SchemeValuation(TypedDict):
+    date: Union[date, str]
+    value: Union[Decimal, float]
+
+
 class SchemeType(TypedDict, total=False):
     """Mutual Fund Scheme data structure."""
 
@@ -37,6 +42,7 @@ class SchemeType(TypedDict, total=False):
     rta: str
     open: Union[Decimal, float]
     close: Union[Decimal, float]
+    valuation: str
     transactions: List[TransactionType]
 
 

tests/base.py

@@ -20,7 +20,7 @@ def setup_class(cls):
         cls.kfintech_password = os.getenv("KFINTECH_CAS_PASSWORD")
 
     def read_pdf(self, filename, password, output="dict"):
-        use_pdfminer = (self.mode == "pdfminer")
+        use_pdfminer = self.mode == "pdfminer"
         return read_cas_pdf(filename, password, output=output, force_pdfminer=use_pdfminer)
 
     def test_read_dict(self):