Fix HTML report & asset breakdown

Author: yellowbean

absbox/client.py

@@ -96,8 +96,6 @@ class EnginePath(str, enum.Enum):
     DEV = "https://absbox.org/api/dev"
     NY_DEV = "https://spv.run/api/dev"
     NY_PROD = "https://spv.run/api/latest"
-    LDN_DEV = "https://ldn.spv.run/api/dev"
-    LDN_PROD = "https://ldn.spv.run/api/latest"
     USE_ENV = "USE_ENV"
     """ USE_ENV (str): Use environment variable (`ABSBOX_SERVER`) for engine path """
 

absbox/local/cf.py

@@ -29,9 +29,12 @@ def readToCf(xs, header=None, idx=None, sort_index=False) -> pd.DataFrame:
 def buildDaySeq(_df):
     """  https://stackoverflow.com/questions/23435270/add-a-sequential-counter-column-on-groups-to-a-pandas-dataframe """
     df = _df.reset_index()
-    dfGrp = df['date'].ne(df['date'].shift()).cumsum()
-    df['daySeq'] = df['date'].groupby(dfGrp).cumcount()
-    return df.set_index(["date", "daySeq"])
+    date_col = 'date' if 'date' in df.columns else ('Date' if 'Date' in df.columns else None)
+    if date_col is None:
+        raise KeyError("Neither 'date' nor 'Date' column found in DataFrame.")
+    dfGrp = df[date_col].ne(df[date_col].shift()).cumsum()
+    df['daySeq'] = df[date_col].groupby(dfGrp).cumcount()
+    return df.set_index([date_col, "daySeq"])
 
 
 def buildDaySeq2(_df):
@@ -133,6 +136,10 @@ def readFeesCf(fMap, popColumns=["due","剩余支付"]) -> pd.DataFrame:
 def readLedgers(lMap, **k) -> pd.DataFrame:
     return buildJointCf(lMap, **k)
 
+def readPoolsCfBreakdown(cfs) -> pd.DataFrame:
+    m = dict(zip(range(len(cfs)), cfs))
+    return buildJointCf(m)
+
 
 def readPoolsCf(pMap) -> pd.DataFrame:
     ''' read a map of pools in dataframes to a single dataframe, with key as 1st level index'''
@@ -150,6 +157,7 @@ def readPoolsCf(pMap) -> pd.DataFrame:
     return df
 
 
+
 def readTriggers(tMap) -> pd.DataFrame:
     ''' read a map of triggers in dataframes to a single dataframe, with key as 1st level index'''
     if tMap == {} or tMap is None:

absbox/report.py

@@ -4,7 +4,7 @@
 import json, enum, os, pathlib, re
 from htpy import body, h1, head, html, li, title, ul, div, span, h3, h2, a, h4,h5, h6
 from markupsafe import Markup
-from .local.cf import readInspect
+from .local.cf import readInspect,readPoolsCfBreakdown
 from .local.cf import readBondsCf,readFeesCf,readAccsCf,readPoolsCf,readLedgers,readTriggers
 
 class OutputType(int, enum.Enum):
@@ -82,17 +82,18 @@ def toHtml(r:dict, p:str, style=OutputType.Plain, debug=False):
 
     # section 1
     poolDf = ("Pool", r['pool']['flow'])
+    poolOsDf = ("Pool-OS", r['pool_outstanding']['flow'])
     accDf = ("Accounts", r['accounts'])
     feeDf = ("Fee", r['fees'])
-    section1 = buildSection([poolDf, feeDf, accDf])
+    section1 = buildSection([poolDf, poolOsDf, feeDf, accDf])
 
     # section 2
     section2 = buildSectionFlat([("Status",r['result']['status'])
-                               ,("Pricing",r["pricing"])
-                               ,("Bond Summary",r['result']['bonds'])
-                               ,("Log",r['result']['logs'])
-                               ,("Waterfall",r['result']['waterfall'])
-                               ,("Inspect",readInspect(r['result']))])
+                                ,("Pricing",r["pricing"])
+                                ,("Bond Summary",r['result']['bonds'])
+                                ,("Log",r['result']['logs'])
+                                ,("Waterfall",r['result']['waterfall'])
+                                ,("Inspect",readInspect(r['result']))])
     # section 3
     #section3 = [div[h2(id=f"anchor-{_t}")[_t], mapToList(x)]
     #            for (_t, x) in [("Finanical Reports", r['result'].get('report', {}))]]
@@ -102,18 +103,28 @@ def toHtml(r:dict, p:str, style=OutputType.Plain, debug=False):
     # section 4
     ledgerDf = ("Ledger", r.get("ledgers",{}))
     section4 = buildSectionFlat([("MultiFee",readFeesCf(feeDf[1]))
-                               ,("MultiBond",readBondsCf(bondDf[1],popColumns=[]))
-                               ,("MultiAccounts",readAccsCf(accDf[1]))
-                               ,("MultiPools", readPoolsCf(poolDf[1]))
-                               ,("MultiLedger", readLedgers(ledgerDf[1]))
-                               ,("MultiTrigger", readTriggers(r.get("triggers",{})))
-                               ])
-
+                                ,("MultiBond",readBondsCf(bondDf[1],popColumns=[]))
+                                ,("MultiAccounts",readAccsCf(accDf[1]))
+                                ,("MultiPools", readPoolsCf(poolDf[1]))
+                                ,("MultiOsPools", readPoolsCf(poolOsDf[1]))
+                                ,("MultiLedger", readLedgers(ledgerDf[1]))
+                                ,("MultiTrigger", readTriggers(r.get("triggers",{})))
+                                ])
+
+    # section 5 : breakdown cashflow 
+    if r['pool']['breakdown']:
+        section5 = buildSectionFlat([(f"PoolBreakdown_{k}", readPoolsCfBreakdown(vs)) 
+                                        for k,vs in r['pool']['breakdown'].items()]
+                                    )
+    else:
+        section5 = [] 
+    # section5 
 
-    dealName = r['_deal']['contents']['name']
+    dealName = r['_deal'] & lens.Values()['name'].get() 
+    
     c = html[
         head[title[dealName]],
-        body[section0, section1, section2, section3 ,section4],
+        body[section0, section1, section2, section3 ,section4, section5],
     ]
 
     if debug:

pyproject.toml

@@ -88,46 +88,20 @@ filename = "CHANGELOG.rst"
 
 start_string = ".. towncrier release notes start\n"
 underlines = ["-", "~", "\""]
-title_format = "`{version} <https://github.com/yellowbean/AbsBox/tree/{version}>`_ - {project_date}"
+title_format = "{version} - {project_date}"
 issue_format = "`{issue} <https://github.com/yellowbean/AbsBox/issues/{issue}>`_"
 
 [[tool.towncrier.type]]
-directory = "security"
-name = "Security"
+directory = "feature"
+name = "Features"
 showcontent = true
 
 [[tool.towncrier.type]]
-directory = "removed"
-name = "Removed"
-showcontent = true
-
-[[tool.towncrier.type]]
-directory = "deprecated"
-name = "Deprecated"
-showcontent = true
-
-[[tool.towncrier.type]]
-directory = "added"
-name = "Added"
-showcontent = true
-
-[[tool.towncrier.type]]
-directory = "changed"
-name = "Changed"
-showcontent = true
-
-[[tool.towncrier.type]]
-directory = "fixed"
-name = "Fixed"
-showcontent = true
-
-[[tool.towncrier.type]]
-directory = "performance"
-name = "Performance"
+directory = "enhance"
+name = "Enhance"
 showcontent = true
 
-
 [[tool.towncrier.type]]
-directory = "enhance"
-name = "Enhance"
+directory = "bug"
+name = "Bug"
 showcontent = true