add val2

yellowbean · Dec 30, 2023 · c8b0f94 · c8b0f94
1 parent 19358a3
commit c8b0f94
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/absbox/__init__.py b/absbox/__init__.py
@@ -12,6 +12,7 @@
 from absbox.deal import mkDeal, mkDealsBy, setDealsBy, prodDealsBy, setAssumpsBy, prodAssumpsBy
 from absbox.local.analytics import run_yield_table, flow_by_scenario
 from absbox.validation import *
+from absbox.local.chart import viz
 from importlib.metadata import version
 
 __version__ = version("absbox")
diff --git a/absbox/client.py b/absbox/client.py
@@ -14,7 +14,8 @@
 
 from absbox.local.util import mkTag, guess_pool_locale, mapValsBy, guess_pool_flow_header \
                               , _read_cf, _read_asset_pricing, mergeStrWithDict \
-                              , earlyReturnNone, searchByFst, filter_by_tags
+                              , earlyReturnNone, searchByFst, filter_by_tags \
+                              , enumVals
 from absbox.local.component import mkPool, mkAssumpType, mkNonPerfAssumps, mkLiqMethod \
                                    , mkAssetUnion, mkRateAssumption
 from absbox.local.base import ValidationMsg
@@ -71,7 +72,7 @@ class API:
     url: str
     lang: str = "chinese"
     check: bool = True
-    server_info = {}
+    server_info: dict = {}
     version = VERSION_NUM.split(".")
     hdrs = {'Content-type': 'application/json', 'Accept': '*/*'
             , 'Accept-Encoding': 'gzip'}
@@ -164,10 +165,10 @@ def run(self, deal,
 
         rawWarnMsg = []
         if multi_run_flag:
-            rawWarnMsgByScen = {k: [f"{MsgColor.Warning.value}{_['contents']}" for _ in filter_by_tags(v[RunResp.LogResp.value],[ValidationMsg.Warning.value, ValidationMsg.Error.value])] for k, v in result.items()}
+            rawWarnMsgByScen = {k: [f"{MsgColor.Warning.value}{_['contents']}" for _ in filter_by_tags(v[RunResp.LogResp.value], enumVals(ValidationMsg))] for k, v in result.items()}
             rawWarnMsg = [b for a in rawWarnMsgByScen.values() for b in a]
         else:
-            rawWarnMsg = [f"{MsgColor.Warning.value}{_['contents']}" for _ in filter_by_tags(result[RunResp.LogResp.value], [ValidationMsg.Warning.value, ValidationMsg.Error.value])]
+            rawWarnMsg = [f"{MsgColor.Warning.value}{_['contents']}" for _ in filter_by_tags(result[RunResp.LogResp.value], enumVals(ValidationMsg)])]
 
         if rawWarnMsg and showWarning:
             console.print("Warning Message from server:\n"+"\n".join(rawWarnMsg))

diff --git a/absbox/local/generic.py b/absbox/local/generic.py
@@ -5,6 +5,7 @@
 from absbox.local.util import mkTag,mapListValBy,mapValsBy,renameKs2\
                               ,guess_pool_flow_header,positionFlow,mapNone\
                               ,isMixedDeal
+from absbox.local.util import earlyReturnNone                              
 from absbox.local.component import *
 from absbox.local.base import * 
 import pandas as pd
@@ -73,9 +74,7 @@ def read_assump(self, assump):
         return None
 
     def read_pricing(self, pricing):
-        if pricing:
-            return mkPricingAssump(pricing)
-        return None
+        return earlyReturnNone(mkPricingAssump, pricing)
 
     @staticmethod
     def read(resp):

diff --git a/absbox/local/util.py b/absbox/local/util.py
@@ -310,10 +310,8 @@ def _read_cf(x, lang):
     return result
 
 
-def _read_asset_pricing(xs, lang):
-    header = assetPricingHeader[lang]
-    data = [x['contents'] for x in xs]
-    return pd.DataFrame(data, columns=header)
+def _read_asset_pricing(xs, lang) -> pd.DataFrame:
+    return pd.DataFrame([x['contents'] for x in xs], columns=assetPricingHeader[lang])
 
 
 def mergeStrWithDict(s: str, m: dict) -> str:
@@ -402,7 +400,7 @@ def strFromLens(x) -> str:
         return str(x)
 
 
-def enumVals(e):
+def enumVals(e) -> list:
     ''' return a list of enum values '''
     return [_.value for _ in [*e]]