diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/baml.py | 9 | ||||
| -rw-r--r-- | python/bowdst.py | 10 |
2 files changed, 12 insertions, 7 deletions
diff --git a/python/baml.py b/python/baml.py index 07f3f11c..fab7b768 100644 --- a/python/baml.py +++ b/python/baml.py @@ -6,6 +6,7 @@ from serenitas.utils.env import DAILY_DIR from urllib.parse import urlsplit, parse_qs, urlunsplit from serenitas.utils.db import dawn_engine import datetime +from serenitas.analytics.dates import prev_business_day logger = logging.getLogger(__name__) @@ -48,11 +49,14 @@ def load_cash_report(workdate: datetime.date): "Local Currency", "Account Name", "Portfolio ID", + "Information As Of", ], ) df = ( df[df["Asset Class"] == "CASH AND EQUIVALENTS"] - .groupby(["Local Currency", "Account Name", "Portfolio ID"]) + .groupby( + ["Local Currency", "Account Name", "Portfolio ID", "Information As Of"] + ) .sum() ) df = df.reset_index().rename( @@ -61,11 +65,12 @@ def load_cash_report(workdate: datetime.date): "Local Currency": "currency_code", "Account Name": "account_name", "Local Market Value": "balance", + "Information As Of": "date", }, axis=1, ) + df["date"] = pd.to_datetime(df["date"]) df["fund"] = "SERCGMAST" - df["date"] = workdate df.to_sql("cash_balances", dawn_engine, if_exists="append", index=False) diff --git a/python/bowdst.py b/python/bowdst.py index cf5054bf..a8e99f6e 100644 --- a/python/bowdst.py +++ b/python/bowdst.py @@ -219,7 +219,7 @@ def cmp_positions(cob: datetime.date, df_blotter: pd.DataFrame) -> pd.DataFrame: return check -def load_cash_report(workdate: datetime.date): +def load_cash_report(workdate: datetime.date, cob): p = ( DAILY_DIR / str(workdate) @@ -231,7 +231,7 @@ def load_cash_report(workdate: datetime.date): df["Transaction Type"].isna() | df["Transaction Type"].isin(["BUY", "SELL"]) ] df = df.groupby(["Account Name", "Account Number", "Local Currency Code"]).sum() - df["date"] = workdate + df["date"] = cob df["fund"] = "BOWDST" df = df[["Opening Balance Local", "date", "fund"]] df.reset_index(inplace=True) @@ -323,6 +323,6 @@ if __name__ == "__main__": em = ExchangeMessage() download_messages(em) cob = (args.workdate - bus_day).date() - df_bonds, df_cds, df_tranches = get_positions(cob) - send_email(em, cob, df_bonds, df_cds, df_tranches) - load_cash_report(args.workdate) + # df_bonds, df_cds, df_tranches = get_positions(cob) + # send_email(em, cob, df_bonds, df_cds, df_tranches) + load_cash_report(args.workdate, cob) |