5 files changed, 8 insertions, 36 deletions
diff --git a/python/ack_checker.py b/python/ack_checker.py
index 8f7a4cd9..a140fd72 100644
--- a/python/ack_checker.py
+++ b/python/ack_checker.py
@@ -3,8 +3,8 @@ import datetime
 import re
 from csv import reader
 from io import BytesIO
-from remote import FtpClient
-from utils.db import dbconn
+from serenitas.utils.remote import FtpClient
+from serenitas.utils.db import dbconn
 
 
 def ack_check(date: datetime.date, conn):
diff --git a/python/common.py b/python/common.py
deleted file mode 100644
index 8f2748d9..00000000
--- a/python/common.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import logging
-import os
-import redis
-import sys
-
-def sanitize_float(intex_float):
-    try:
-        intex_float = intex_float.replace(",", "")
-        if " " in intex_float: #case of combo notes
-            return float(intex_float.split(" ")[0])
-        if "(" in intex_float:
-            return - float(intex_float[1:-1])
-        else:
-            return float(intex_float)
-    except (AttributeError, ValueError):
-        return intex_float
-
-def get_redis_queue():
-    q = redis.Redis(unix_socket_path='/run/redis/redis.sock')
-    try:
-        q.ping()
-    except redis.ConnectionError:
-        try:
-            q = redis.Redis(os.environ['REDIS_HOST'])
-        except KeyError:
-            logging.error("Please set redis host in REDIS_HOST")
-            sys.exit(1)
-    return q
diff --git a/python/dtcc_sdr.py b/python/dtcc_sdr.py
index b9476d56..da85b166 100644
--- a/python/dtcc_sdr.py
+++ b/python/dtcc_sdr.py
@@ -3,9 +3,9 @@ import io
 import pandas as pd
 import requests
 import zipfile
-from utils.db import serenitas_engine, dawn_engine
+from serenitas.utils.db import serenitas_engine, dawn_engine
 
-from env import DATA_DIR
+from serenitas.utils.env import DATA_DIR
 from typing import Dict, Any
 from utils.db import dbconn
 from pickle import dumps, loads
@@ -201,7 +201,7 @@ def get_correction(conn: connection, dissemination_id: int) -> Dict[str, Any]:
             "SELECT correction FROM dtcc_corrections WHERE dissemination_id=%s",
             (dissemination_id,),
         )
-        pick, = c.fetchone()
+        (pick,) = c.fetchone()
     conn.commit()
     return loads(pick)
 
diff --git a/python/process_queue.py b/python/process_queue.py
index e4c25101..214207a4 100644
--- a/python/process_queue.py
+++ b/python/process_queue.py
@@ -24,7 +24,7 @@ from pickle import loads
 from serenitas.analytics.bbg_helpers import init_bbg_session, retrieve_data, BBG_IP
 from serenitas.utils.db import dbconn
 from serenitas.utils.remote import FtpClient, SftpClient
-from common import get_redis_queue
+from serenitas.utils import get_redis_queue
 from functools import partial
 from pyisda.date import previous_twentieth
 from typing import Tuple, Union
diff --git a/python/task_runner.py b/python/task_runner.py
index f54807d7..6bade79f 100644
--- a/python/task_runner.py
+++ b/python/task_runner.py
@@ -1,8 +1,8 @@
 import logging
 
 from systemd.daemon import notify
-from utils.db import dbconn
-from common import get_redis_queue
+from serenitas.utils.db import dbconn
+from serenitas.utils import get_redis_queue
 from subprocess import CalledProcessError
 from tasks import Rpc