prevent exception when no bond cashflow

yellowbean · Jun 8, 2024 · 7fba807 · 7fba807
1 parent dc723b2
commit 7fba807
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/absbox/client.py b/absbox/client.py
@@ -2,6 +2,7 @@
 from importlib.metadata import version
 from json.decoder import JSONDecodeError
 from dataclasses import dataclass
+from datetime import datetime
 
 import requests
 from requests.exceptions import ConnectionError, ReadTimeout
@@ -281,7 +282,6 @@ def build_pool_req(self, pool, poolAssump, rateAssumps, isMultiScenario=False) -
         r = None
         _rateAssump = map(mkRateAssumption, rateAssumps) if rateAssumps else None
         assetDate = getValWithKs(pool, ['cutoffDate', '封包日'])
-        #assetDate = pool['cutoffDate']
 
         def buildPoolType(p) -> dict:
             """ build type for `PoolTypeWrap` """
@@ -319,7 +319,7 @@ def run(self, deal,
         :type showWarning: bool, optional
         :param debug: return request text instead of sending out such request, defaults to False
         :type debug: bool, optional
-        :return: result of run, a dict or dataframe
+        :return: result of run, a dict of dataframe if `read` is True.
         :rtype: dict
 
         """        
@@ -345,9 +345,9 @@ def run(self, deal,
         if result is None or 'error' in result:
             raise AbsboxError(f"❌{MsgColor.Error.value}Failed to get response from run")
 
-        rawWarnMsg = [f"{MsgColor.Warning.value}{_['contents']}" for _ in filter_by_tags(result[RunResp.LogResp.value], enumVals(ValidationMsg))]
+        rawWarnMsg = map( lambda x:f"{MsgColor.Warning.value}{x['contents']}", filter_by_tags(result[RunResp.LogResp.value], enumVals(ValidationMsg)))
         if rawWarnMsg and showWarning:
-            console.print("Warning Message from server:\n"+"\n".join(rawWarnMsg))
+            console.print("Warning Message from server:\n"+"\n".join(list(rawWarnMsg)))
 
         if read:
             return deal.read(result)

diff --git a/absbox/local/generic.py b/absbox/local/generic.py
@@ -77,7 +77,7 @@ def readBondStmt(respBond):
                 case {'tag':'BondGroup','contents':bndMap }:
                     return {k: pd.DataFrame(list(tz.pluck("contents",[] if v['bndStmt'] is None else v['bndStmt'])), columns=english_bondflow_fields).set_index("date") for k,v in bndMap.items() }
                 case {'tag':'Bond', **singleBndMap }:
-                    bStmt = singleBndMap.get('bndStmt',[])
+                    bStmt = mapNone(singleBndMap.get('bndStmt',[]),[])
                     return pd.DataFrame(list(tz.pluck("contents", bStmt)), columns=english_bondflow_fields).set_index("date")
                 case _:
                     raise RuntimeError("Failed to read bond flow from resp",respBond)