1 files changed, 19 insertions, 19 deletions
diff --git a/python/intex/load_indicative.py b/python/intex/load_indicative.py
index c9bc5bfd..0a2b9d5f 100644
--- a/python/intex/load_indicative.py
+++ b/python/intex/load_indicative.py
@@ -1,14 +1,11 @@
 import psycopg2
-import os
 import datetime
 import csv
 import pdb
+import pathlib
 from common import sanitize_float
-from . import dbconn
-from contextlib import closing
 import logging
 import re
-import sys
 
 logger = logging.getLogger(__name__)
 
@@ -65,9 +62,9 @@ def insert_new_cusip(conn, line):
     conn.commit()
 
 
-def upload_cusip_data(conn, filename):
+def upload_cusip_data(conn, filename: pathlib.Path):
     dealupdate = {}
-    with open(filename, "r") as fh:
+    with filename.open("r") as fh:
         dr = csv.DictReader(fh, dialect="excel-tab")
 
         for line in dr:
@@ -145,7 +142,7 @@ def upload_cusip_data(conn, filename):
         conn.commit()
 
 
-def upload_deal_data(conn, filename):
+def upload_deal_data(conn, filename: pathlib.Path):
     sqlstr = 'SELECT dealname, array_agg("Latest Update") FROM clo_universe GROUP BY dealname'
     with conn.cursor() as c:
         c.execute(sqlstr)
@@ -155,7 +152,7 @@ def upload_deal_data(conn, filename):
         c.execute(sqlstr)
         deallist2 = set([d for d, in c])
     conn.commit()
-    with open(filename, "r") as fh:
+    with filename.open("r") as fh:
         dr = csv.DictReader(fh, dialect="excel-tab")
         data = []
         for line in dr:
@@ -260,18 +257,21 @@ def upload_deal_data(conn, filename):
 
 
 if __name__ == "__main__":
-    if len(sys.argv) > 1:
-        workdate = sys.argv[1]
-    else:
-        workdate = str(datetime.date.today())
-    files = [
-        os.path.join(os.environ["DATA_DIR"], "Indicative_" + workdate, f)
-        for f in os.listdir(
-            os.path.join(os.environ["DATA_DIR"], "Indicative_" + workdate)
-        )
+    from serenitas.utils.db import dbconn
+    from serenitas.utils.env import DATA_DIR
+    from contextlib import closing
+    import argparse
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument("workdate", nargs="?", default=str(datetime.date.today()))
+    args = parser.parse_args()
+
+    cusip_files = [
+        f for f in (DATA_DIR / "Indicative_").iterdir() if "TrInfo" in f.name
+    ]
+    deal_files = [
+        f for f in (DATA_DIR / "Indicative_").iterdir() if "TrInfo" not in f.name
     ]
-    cusip_files = [f for f in files if "TrInfo" in f]
-    deal_files = [f for f in files if "TrInfo" not in f]
 
     with closing(dbconn("etdb")) as etdb:
         # first load deal data