Skip to content

Commit cb947fa

Browse files
committed
[safe run] if non from pool cf
1 parent cbf3fe7 commit cb947fa

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

absbox/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def __post_init__(self) -> None:
175175
else:
176176
self.url = isValidUrl(self.url).rstrip("/")
177177

178-
console.print(f" Connecting engine server -> {self.url}")
178+
console.print(f"Connecting engine server -> {self.url}")
179179

180180
if self.lang not in ["chinese", "english"]:
181181
raise AbsboxError(f"❌Invalid language:{self.lang}, only support 'chinese' or 'english' ")

absbox/local/cmp.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,8 @@ def cmpMap(x:dict, y:dict) -> dict:
7171
comp_result['triggers'][locName] = cmpMap(r1['triggers'][locName], r2['triggers'][locName])
7272

7373
return comp_result
74+
75+
def compTwoEngine(xEngine, yEngine, d, pAssump, rAssump):
76+
rx = xEngine.run(d, read=True, poolAssump=pAssump, runAssump=rAssump)
77+
ry = xEngine.run(d, read=True, poolAssump=pAssump, runAssump=rAssump)
78+
return compResult(rx, ry)

absbox/local/generic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def read(resp):
146146
elif deal_content['pool']['tag']=='MultiPool':
147147
poolMap = deal_content['pool']['contents']
148148
output['pool']['flow'] = tz.valmap(lambda v: readPoolCf(v['futureCf'][0]['contents']) if (not v['futureCf'] is None) else pd.DataFrame(), poolMap)
149-
output['pool']['breakdown'] = tz.valmap(lambda v: list(tz.map(readPoolCf, v['futureCf'][1] & lens.Each()['contents'].collect() )) if (not v['futureCf'][1] is None) else [], poolMap)
149+
output['pool']['breakdown'] = tz.valmap(lambda v: list(tz.map(readPoolCf, v['futureCf'][1] & lens.Each()['contents'].collect() )) if (v['futureCf'] and (not v['futureCf'][1] is None)) else [], poolMap)
150150
elif deal_content['pool']['tag']=='ResecDeal':
151151
poolMap = deal_content['pool']['contents']
152152
output['pool']['flow'] = {tz.get([1,2,4],k.split(":")): readPoolCf(v['futureCf']['contents']) for (k,v) in poolMap.items() }

0 commit comments

Comments
 (0)