|
10 | 10 | from rich.console import Console |
11 | 11 |
|
12 | 12 |
|
13 | | -from .interface import mkTag |
| 13 | +from .interface import mkTag,readAeson |
14 | 14 | from .util import mkTs, readTagStr, subMap, subMap2, renameKs, ensure100 |
15 | 15 | from .util import mapListValBy, uplift_m_list, mapValsBy, allList, getValWithKs, applyFnToKey,flat |
16 | 16 | from .util import earlyReturnNone, mkFloatTs, mkRateTs, mkRatioTs, mkTbl, mapNone, guess_pool_flow_header |
|
19 | 19 |
|
20 | 20 | from ..validation import vDict, vList, vStr, vNum, vInt, vDate, vFloat, vBool, vTuple, vListOfList |
21 | 21 |
|
| 22 | + |
22 | 23 | numVal = Or(float,int) |
23 | 24 | console = Console() |
24 | 25 |
|
@@ -2369,9 +2370,10 @@ def uplift_ds(df:pd.DataFrame) -> pd.DataFrame: |
2369 | 2370 | r['waterfallInspect'] = None |
2370 | 2371 | waterfall_inspect_vars = filter_by_tags(x, ["InspectWaterfall"]) |
2371 | 2372 | if waterfall_inspect_vars: |
2372 | | - waterfall_inspect_df = pd.DataFrame(data = [ (c['contents'][0],str(c['contents'][1]),ds,dsv) |
| 2373 | + waterfall_inspect_df = pd.DataFrame(data = [ (c['contents'][0], str(c['contents'][1]), readAeson(ds), dsv) |
2373 | 2374 | for c in waterfall_inspect_vars |
2374 | | - for (ds,dsv) in zip(c['contents'][2],c['contents'][3]) ] |
| 2375 | + for (ds,dsv) in zip(c['contents'][2],c['contents'][3]) |
| 2376 | + ] |
2375 | 2377 | ,columns = ["Date","Comment","DealStats","Value"]) |
2376 | 2378 | r['waterfallInspect'] = waterfall_inspect_df |
2377 | 2379 |
|
|
0 commit comments