diff options
Diffstat (limited to 'python/task_server')
| -rw-r--r-- | python/task_server/globeop.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/python/task_server/globeop.py b/python/task_server/globeop.py index 4e9ff0c5..302407ec 100644 --- a/python/task_server/globeop.py +++ b/python/task_server/globeop.py @@ -72,7 +72,7 @@ def convert_to_csv(f): if f.exists(): for sheet, name in mapping: df = pd.read_excel(f, sheet_name=sheet, skiprows=[0, 1, 2, 3]) - df.to_csv(f.parent / f"{name}_Report.csv", index=False) + df.to_csv(f.parent / f"{f.name.removesuffix('.xls')}.csv", index=False) f.unlink() @@ -128,7 +128,9 @@ def download_data(engine, workdate: datetime.date, fund="SERCGMAST"): elif "Valuation" in filename: newfilename = f"Valuation_Report_{fund}.csv" else: - newfilename = f"CDS_Report.xls" + if fund == "BOWDST": + continue + newfilename = f"CDS_Report_{fund}.xls" with (reports_dir / filename).open("rb") as fh: creds = json.load((Path.home() / ".credentials" / "gpg-key.json").open()) dec = gpg.decrypt_file( @@ -140,7 +142,7 @@ def download_data(engine, workdate: datetime.date, fund="SERCGMAST"): logger.info(f"{filename}: {dec.status}") (reports_dir / filename).unlink() # convert xls to csv - convert_to_csv(reports_dir / "CDS_Report.xls") + convert_to_csv(reports_dir / f"CDS_Report_{fund}.xls") insert_todb(engine, workdate, fund) @@ -157,14 +159,12 @@ def insert_todb(engine, workdate: datetime.date, fund="SERCGMAST"): for report in ("Valuation", "Pnl", "CDS"): fun = getattr(load_globeop_report, f"read_{report.lower()}_report") table = f"{report.lower()}_reports" - report_file = reports_dir / ( - f"{report}_Report_{fund}.csv" if report != "CDS" else "CDS_Report.csv" - ) + report_file = reports_dir / (f"{report}_Report_{fund}.csv") alias_names = { "SERCGMAST": ("SERCGMAST", "SERCGLTD", "SERCGLLC", "SER_TEST"), "BOWDST": ("BOWDST",), } - if not report_file.exists() or (report == "CDS" and fund == "BOWDST"): + if not report_file.exists(): continue df = fun(report_file) if report == "Valuation": |