diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/collateral_calc.py | 6 | ||||
| -rw-r--r-- | python/parse_gs_exchange.py | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/python/collateral_calc.py b/python/collateral_calc.py index 601c6a88..9a566fa6 100644 --- a/python/collateral_calc.py +++ b/python/collateral_calc.py @@ -10,6 +10,7 @@ from time import sleep from pandas.tseries.offsets import BDay from paramiko import Transport, SFTPClient from download_emails import GmailMessage +from sqlalchemy.exc import IntegrityError DAILY_DIR = Path(os.environ["DAILY_DIR"]) logging.basicConfig(filename=os.path.join(os.getenv("LOG_DIR"), @@ -177,7 +178,10 @@ def sg_collateral(d): df_margin = df_margin.rename(columns={'SG IMR': 'amount', 'Currency': 'currency'}) df_margin['date'] = d - df_margin.to_sql("fcm_im", dbengine("dawndb"), if_exists='append', index=False) + try: + df_margin.to_sql("fcm_im", dbengine("dawndb"), if_exists='append', index=False) + except IntegrityError: + pass return df diff --git a/python/parse_gs_exchange.py b/python/parse_gs_exchange.py index f0e49702..5aac63ae 100644 --- a/python/parse_gs_exchange.py +++ b/python/parse_gs_exchange.py @@ -4,6 +4,7 @@ from pytz import timezone from parse_emails import write_todb import datetime import logging +import os import pandas as pd import re @@ -73,7 +74,7 @@ def parse_email(email, fwd_index): 'index': indextype, 'series': series, 'ref': refspread if indextype == "IG" else ref, - 'msg_id': get_msg_id(email)} + 'msg_id': int(get_msg_id(email), 16)} if indextype == "IG": d['fwdspread'] = float(fwspread) else: |