diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/task_server/__main__.py | 4 | ||||
| -rw-r--r-- | python/task_server/globeop.py | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/python/task_server/__main__.py b/python/task_server/__main__.py index 38ebaf48..5293cde3 100644 --- a/python/task_server/__main__.py +++ b/python/task_server/__main__.py @@ -32,4 +32,6 @@ engine = create_engine("postgresql://dawn_user@debian/dawndb") if args.download: download_data(engine, args.date) elif args.upload: - upload_data(engine, args.date) + time = datetime.datetime.now().time() + date = datetime.datetime.combine(args.date, time) + upload_data(engine, date) diff --git a/python/task_server/globeop.py b/python/task_server/globeop.py index 83afd05d..d0ffac78 100644 --- a/python/task_server/globeop.py +++ b/python/task_server/globeop.py @@ -171,16 +171,17 @@ def insert_todb(engine, workdate: datetime.date): df.to_sql(table, engine, if_exists="append", index=False) -def upload_bond_marks(engine, workdate: datetime.date): +def upload_bond_marks(engine, workdate: datetime.datetime): + d = workdate.date() df = pd.read_sql_query( "SELECT identifier, price from list_marks(%s) " "RIGHT JOIN list_positions(%s, NULL, False) " "USING (identifier)", engine, - params=(workdate, workdate), + params=(d, d), ) df.rename(columns={"identifier": "IDENTIFIER", "price": "Price"}, inplace=True) - fullpath = DAILY_DIR / str(workdate) / f"securitiesNpv{workdate:%Y%m%d_%H%M%S}.csv" + fullpath = DAILY_DIR / str(d) / f"securitiesNpv{workdate:%Y%m%d_%H%M%S}.csv" df.to_csv(fullpath, index=False) ftp = get_ftp("incoming") with fullpath.open("rb") as fh: @@ -188,15 +189,16 @@ def upload_bond_marks(engine, workdate: datetime.date): logger.info("upload bond marks done") -def upload_cds_marks(engine, workdate: datetime.date): +def upload_cds_marks(engine, workdate: datetime.datetime): + d = workdate.date() df = pd.read_sql_query( """SELECT cds.dealid AS "DealID", 'CREDIT_SWAP' AS "Instrument Type", (a.clean_nav+a.accrued) AS "NPV" from list_abscds_marks(%s) a JOIN cds USING (security_id)""", engine, - params=(workdate,), + params=(d,), ) - fullpath = DAILY_DIR / str(workdate) / f"otcNpv{workdate:%Y%m%d}.csv" + fullpath = DAILY_DIR / str(d) / f"otcNpv{workdate:%Y%m%d}.csv" df.to_csv(fullpath, index=False) ftp = get_ftp("incoming") with fullpath.open("rb") as fh: |