add reader for aeson

Author: yellowbean

absbox/client.py

@@ -17,7 +17,8 @@
 from absbox.local.util import mkTag,mapValsBy \
                               , _read_cf, _read_asset_pricing, mergeStrWithDict \
                               , earlyReturnNone, searchByFst, filter_by_tags \
-                              , enumVals, lmap, inferPoolTypeFromAst, getValWithKs, mapNone
+                              , enumVals, lmap, inferPoolTypeFromAst, getValWithKs, mapNone\
+                              , readAeson
 from absbox.local.component import mkPool, mkAssumpType, mkNonPerfAssumps, mkLiqMethod \
                                    , mkAssetUnion, mkRateAssumption, mkDatePattern, mkPoolType
 
@@ -718,10 +719,11 @@ def runFirstLoss(self, deal, bName, poolAssump=None, runAssump=[], read=True, sh
         if result is None or 'error' in result or 'Left' in result:
             leftVal = result.get("Left","")
             raise AbsboxError(f"❌{MsgColor.Error.value}Failed to get response from run: {leftVal}")
-        # 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(list(rawWarnMsg)))
-        return result['Right']
+
+        if read:
+            return readAeson(result['Right'])
+        else:
+            result['Right']
 
     def runAsset(self, date, _assets, poolAssump=None, rateAssump=None
                  , pricing=None, read=True, debug=False) -> tuple:

absbox/local/util.py

@@ -450,3 +450,25 @@ def patchDicts(dict1:dict,dict2:dict)-> dict:
     if key only exists in either one, use the only one value
     """
     return tz.merge_with(lambda xs: xs[1] if len(xs)==2 else xs[0] ,dict1 ,dict2)
+
+
+def readAeson(x:dict):
+    match x:
+        case {"tag": tag,"contents": contents} if isinstance(contents,list):
+            return {tag:readAeson(contents)}
+        case {"tag": tag,"contents": contents} if isinstance(contents,dict):
+            return {tag:readAeson(contents)}            
+        case {"tag": tag,"contents": contents} if isinstance(contents,str):
+            return {tag: contents}   
+        case {"tag": tag} if isinstance(tag,str):
+            return tag   
+        case x if isinstance(x,list):
+            return [readAeson(_x) for _x in x]
+        case {'numerator': n,'denominator': de}:
+            return (n/de)
+        case n if isinstance(n,float) or isinstance(n,int):
+            return n
+        case None:
+            return None
+        case _:
+            raise RuntimeError("failed to match",x)