diff options
Diffstat (limited to 'python/task_server')
| -rw-r--r-- | python/task_server/__main__.py | 5 | ||||
| -rw-r--r-- | python/task_server/globeop.py | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/python/task_server/__main__.py b/python/task_server/__main__.py index 71113b78..38ebaf48 100644 --- a/python/task_server/__main__.py +++ b/python/task_server/__main__.py @@ -27,8 +27,9 @@ parser.add_argument( ) args = parser.parse_args() +engine = create_engine("postgresql://dawn_user@debian/dawndb") + if args.download: - download_data(args.date) + download_data(engine, args.date) elif args.upload: - engine = create_engine("postgresql://dawn_user@debian/dawndb") upload_data(engine, args.date) diff --git a/python/task_server/globeop.py b/python/task_server/globeop.py index 52ac249a..5a73de54 100644 --- a/python/task_server/globeop.py +++ b/python/task_server/globeop.py @@ -8,7 +8,6 @@ from . import config import re import logging import sys -from sqlalchemy import create_engine sys.path.append("..") import load_globeop_report @@ -80,7 +79,7 @@ def convert_to_csv(f): f.unlink() -def download_data(workdate: datetime.date): +def download_data(engine, workdate: datetime.date): ftp = get_ftp("outgoing") files = ftp.nlst() pnlfiles = [ @@ -141,10 +140,10 @@ def download_data(workdate: datetime.date): (reports_dir / filename).unlink() # convert xls to csv convert_to_csv(reports_dir / "CDS_Report.xls") - insert_todb(workdate) + insert_todb(engine, workdate) -def insert_todb(workdate: datetime.date): +def insert_todb(engine, workdate: datetime.date): reports_dir = DAILY_DIR / str(workdate) / "Reports" if not reports_dir.exists(): reports_dir = ( @@ -154,7 +153,6 @@ def insert_todb(workdate: datetime.date): / str(workdate) / "Reports" ) - engine = create_engine("postgresql://dawn_user@debian/dawndb") for report in ["Valuation", "Pnl", "CDS"]: fun = getattr(load_globeop_report, f"read_{report.lower()}_report") table = f"{report.lower()}_reports" |