aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--python/download_markit_quotes.py2
-rw-r--r--python/globeop.py26
-rw-r--r--python/process_queue.py2
-rw-r--r--python/task_server/globeop.py26
4 files changed, 29 insertions, 27 deletions
diff --git a/python/download_markit_quotes.py b/python/download_markit_quotes.py
index 6ee2b761..40252c2b 100644
--- a/python/download_markit_quotes.py
+++ b/python/download_markit_quotes.py
@@ -8,7 +8,7 @@ from selenium.webdriver.support.ui import WebDriverWait
from selenium.common.exceptions import TimeoutException
import time, os, shutil
-from config import markit_login, markit_password
+from task_server.config import markit_login, markit_password
from task_server.insert_tranche_quotes import insert_quotes
import logging
import sys
diff --git a/python/globeop.py b/python/globeop.py
new file mode 100644
index 00000000..80515b83
--- /dev/null
+++ b/python/globeop.py
@@ -0,0 +1,26 @@
+import logging
+import argparse
+import pandas as pd
+from task_server.globeop import download_data, upload_data
+
+logging.basicConfig(filename='/home/share/CorpCDOs/logs/globeop.log',
+ level=logging.INFO,
+ format='%(asctime)s %(message)s')
+
+parser = argparse.ArgumentParser()
+group = parser.add_mutually_exclusive_group(required=True)
+## options are technically not exclusive, but we will be running them
+## at different times of the day
+group.add_argument("-d", "--download", action="store_true",
+ help="download reports from GlobeOp")
+group.add_argument("-u", "--upload", action="store_true",
+ help="upload marks to GlobeOp")
+parser.add_argument("date", nargs='?', type=lambda s: pd.datetime.strptime(s, "%Y-%m-%d"),
+ default=pd.datetime.today())
+args = parser.parse_args()
+
+if args.download:
+ download_data(args.date)
+elif args.upload:
+ engine = create_engine('postgresql://dawn_user@debian/dawndb')
+ upload_data(args.date)
diff --git a/python/process_queue.py b/python/process_queue.py
index 4c99f946..491c03c7 100644
--- a/python/process_queue.py
+++ b/python/process_queue.py
@@ -10,7 +10,7 @@ else:
from pickle import loads
from ftplib import FTP
-import config
+import task_server.config as config
import os
from sqlalchemy import create_engine
from bbg_helpers import init_bbg_session, retrieve_data, BBG_IP
diff --git a/python/task_server/globeop.py b/python/task_server/globeop.py
index afd6a194..47cede1d 100644
--- a/python/task_server/globeop.py
+++ b/python/task_server/globeop.py
@@ -2,10 +2,9 @@ import os
import os.path
from ftplib import FTP
import gnupg
-import task_server.config
+from . import config
import re
import logging
-import argparse
import shutil
import pandas as pd
from sqlalchemy import create_engine
@@ -118,26 +117,3 @@ def upload_data(workdate):
with open(fullpath, "rb") as fh:
ftp.storbinary('STOR ' + filename, fh)
logging.info("upload done")
-
-if __name__=="__main__":
- logging.basicConfig(filename='/home/share/CorpCDOs/logs/globeop.log',
- level=logging.INFO,
- format='%(asctime)s %(message)s')
-
- parser = argparse.ArgumentParser()
- group = parser.add_mutually_exclusive_group(required=True)
- ## options are technically not exclusive, but we will be running them
- ## at different times of the day
- group.add_argument("-d", "--download", action="store_true",
- help="download reports from GlobeOp")
- group.add_argument("-u", "--upload", action="store_true",
- help="upload marks to GlobeOp")
- parser.add_argument("date", nargs='?', type=lambda s: pd.datetime.strptime(s, "%Y-%m-%d"),
- default=pd.datetime.today())
- args = parser.parse_args()
-
- if args.download:
- download_data(args.date)
- elif args.upload:
- engine = create_engine('postgresql://dawn_user@debian/dawndb')
- upload_data(args.date)