diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/globeop_reports.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/python/globeop_reports.py b/python/globeop_reports.py index 461cb236..4df1d385 100644 --- a/python/globeop_reports.py +++ b/python/globeop_reports.py @@ -104,11 +104,11 @@ def get_net_navs(): df_val[df_val.fund == "SERCGMAST"].groupby("periodenddate")["endbooknav"].sum() ) nav = nav.resample("M").last() - df = pd.read_csv( - "/home/serenitas/edwin/Python/subscription_fee_data.csv", - parse_dates=["date"], - index_col=["date"], + sql_string = "SELECT * FROM subscription_and_fee where fund ='SERCGMAST'" + df = pd.read_sql_query( + sql_string, dawn_engine, parse_dates=["date"], index_col=["date"] ) + df["net_flow"] = (df.subscription - df.redemption).fillna(0) df.index = df.index.to_period("M").to_timestamp("M") df = df.join(nav) df["begbooknav"] = (df.endbooknav + df.net_flow).shift(1) @@ -206,7 +206,7 @@ def rmbs_pos(date, model_date=None, dm=False): params_list = (model_date,) if date > datetime.date(2017, 9, 30): r = dawn_engine.execute("SELECT latest_sim FROM latest_sim(%s)", model_date) - model_id, = next(r) + (model_id,) = next(r) sql_string += " AND model_id_sub = %s" params_list += (model_id,) model = pd.read_sql_query( |