diff options
| -rw-r--r-- | python/mtm_upload.py | 12 | ||||
| -rw-r--r-- | python/process_queue.py | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/python/mtm_upload.py b/python/mtm_upload.py index d56a60d2..f97bd908 100644 --- a/python/mtm_upload.py +++ b/python/mtm_upload.py @@ -13,19 +13,21 @@ deal_registry = { } -def mtm_process_upload(tradeids, asset_type): +def mtm_process_upload(tradeids, product_type): objs = [ - deal_registry["asset_type"].from_tradeid(tradeid).to_markit() + deal_registry[product_type].from_tradeid(tradeid).to_markit() for tradeid in tradeids ] buf = StringIO() csvwriter = csv.writer(buf) - csvwriter.writerow(MTM_HEADERS[asset_type]) + csvwriter.writerow(MTM_HEADERS[product_type]) csvwriter.writerows( - [obj.get(h, None) for h in MTM_HEADERS[asset_type]] for obj in objs + [obj.get(h, None) for h in MTM_HEADERS[product_type]] for obj in objs ) buf = buf.getvalue().encode() - fname = f"MTM.{datetime.datetime.now():%Y%m%d.%H%M%S}.{asset_type.capitalize()}.csv" + fname = ( + f"MTM.{datetime.datetime.now():%Y%m%d.%H%M%S}.{product_type.capitalize()}.csv" + ) sftp = SftpClient.from_creds("mtm") sftp.put(buf, fname) dest = DAILY_DIR / str(datetime.date.today()) / fname diff --git a/python/process_queue.py b/python/process_queue.py index 9c3143fb..ef930426 100644 --- a/python/process_queue.py +++ b/python/process_queue.py @@ -75,10 +75,10 @@ def process_indicative( process_fun = globals().get( f"{trade_type}_trade_process", lambda conn, session, trade: trade ) + mtm_uploads = [] for trade in get_trades(p, trade_type): process_fun(conn, session, trade) fund = trade["fund"] - mtm_uploads = [] if trade.get("upload", True) and ( fund in ("SERCGMAST", "BOWDST") or trade_type in ("cds", "swaption") ): @@ -88,7 +88,9 @@ def process_indicative( or (trade_type == "swaption" and trade.get("swap_type", "CD_INDEX_OPTION")) ) and trade.get("upload", True): mtm_uploads.append(trade["id"]) - mtm_process_upload(mtm_uploads, trade_type) + if mtm_uploads: + print(mtm_uploads) + mtm_process_upload(mtm_uploads, trade_type) p.delete(trade_type) |