notebook fix

Author: yellowbean

absbox/local/cf.py

@@ -164,7 +164,7 @@ def readInspect(r:dict) -> pd.DataFrame:
     else:
         u = pd.DataFrame()
 
-    w = r['waterfallInspect'].to_records() if ('waterfallInspect' in r and r['waterfallInspect']) else []
+    w = r['waterfallInspect'].to_records() if ('waterfallInspect' in r and (not r['waterfallInspect'].empty)) else []
     wdf = tz.pipe(tz.groupby(lambda x:tz.nth(2,x), w)
             ,lambda m: tz.valmap(lambda xs: [ (_[1],_[4]) for _ in xs],m)
             ,lambda m: tz.valmap(lambda xs: pd.DataFrame(xs, columns =['Date', 'val']).set_index('Date'),m)

absbox/local/component.py

@@ -1715,7 +1715,7 @@ def mkFieldRule(z):
         case ("ById",ids,assumps)| ("ByID",ids,assumps):
             return mkTag(("ObligorById",[[vStr(i) for i in ids],mkPDF(*assumps)]))
         case ("ByTag", tags, rule, assumps):
-            return mkTag(("ObligorByTag",[lmap(mkRule,tags), mkRule(rule),mkPDF(*assumps)]))
+            return mkTag(("ObligorByTag",[tags, mkRule(rule),mkPDF(*assumps)]))
         case ("ByField", fieldRules, assumps):
             return mkTag(("ObligorByField",[lmap(mkFieldRule,fieldRules),mkPDF(*assumps)]))
         case ("ByDefault",assumps) | ("_",assumps):

docs/source/nbsample/AccountSetup.ipynb

@@ -776,7 +776,7 @@
     }
    ],
    "source": [
-    "readAccsCf(r['agg_accounts']).loc[\"2021-08-20\":\"2021-10-20\"]"
+    "readAccsCf(r['accounts']).loc[\"2021-08-20\":\"2021-10-20\"]"
    ]
   },
   {
@@ -1430,7 +1430,7 @@
     }
    ],
    "source": [
-    "readAccsCf(r2['agg_accounts']).loc[:\"2022-10-20\"]"
+    "readAccsCf(r2['accounts']).loc[:\"2022-10-20\"]"
    ]
   },
   {

docs/source/nbsample/MultiRunAssumption.ipynb

@@ -287,7 +287,7 @@
     }
    ],
    "source": [
-    "r[\"A\"][\"pool\"]['flow'].tail()"
+    "r[\"A\"][\"pool\"]['flow']['PoolConsol'].tail()"
    ]
   },
   {
@@ -486,7 +486,7 @@
     }
    ],
    "source": [
-    "r[\"B\"][\"pool\"]['flow'].tail()"
+    "r[\"B\"][\"pool\"]['flow']['PoolConsol'].tail()"
    ]
   },
   {

docs/source/nbsample/run_deal.ipynb

@@ -117,7 +117,7 @@
    },
    "outputs": [],
    "source": [
-    "r['00']['pool']['flow'].head()"
+    "r['00']['pool']['flow']['PoolConsol'].head()"
    ]
   },
   {
@@ -129,7 +129,7 @@
    },
    "outputs": [],
    "source": [
-    "r['stressed']['pool']['flow'].head()"
+    "r['stressed']['pool']['flow']['PoolConsol'].head()"
    ]
   },
   {

docs/source/nbsample/single_mortgage.ipynb

@@ -42,7 +42,7 @@
    "source": [
     "from absbox import API,EnginePath\n",
     "\n",
-    "localAPI = API(EnginePath.LOCAL,lang='english',check=False)"
+    "localAPI = API(EnginePath.DEV,lang='english',check=False)"
    ]
   },
   {

docs/source/nbsample/viewMultiResult.ipynb

@@ -390,7 +390,7 @@
     }
    ],
    "source": [
-    "readFlowsByScenarios(rs2, lens['pool']['flow']['Prepayment']).head()"
+    "readFlowsByScenarios(rs2, lens['pool']['flow']['PoolConsol']['Prepayment']).head()"
    ]
   },
   {
@@ -510,7 +510,7 @@
    ],
    "source": [
     "readMultiFlowsByScenarios(rs2\n",
-    "                          , (lens['pool']['flow'],[\"Balance\",'Prepayment'])).head()"
+    "                          , (lens['pool']['flow']['PoolConsol'],[\"Balance\",'Prepayment'])).head()"
    ]
   },
   {
@@ -879,7 +879,7 @@
     }
    ],
    "source": [
-    "readFieldsByScenarios(rs2, lens['pool']['flow'], 'Prepayment', flip=True)"
+    "readFieldsByScenarios(rs2, lens['pool']['flow']['PoolConsol'], 'Prepayment', flip=True)"
    ]
   },
   {
@@ -1032,7 +1032,7 @@
     }
    ],
    "source": [
-    "readFieldsByScenarios(rs2, lens['pool']['flow'], '2021-10-01')"
+    "readFieldsByScenarios(rs2, lens['pool']['flow']['PoolConsol'], '2021-10-01')"
    ]
   }
  ],

docs/source/nbsample/viewMultipleCfs.ipynb

@@ -1233,7 +1233,7 @@
     }
    ],
    "source": [
-    "readAccsCf(r['agg_accounts'])"
+    "readAccsCf(r['accounts'])"
    ]
   },
   {