Remove redundant download functions

Author: rumackaaron

changehc/delphi_changehc/download_ftp_files.py

@@ -42,61 +42,7 @@ def get_files_from_dir(sftp, filedate, out_path):
 
 
 def download_covid(filedate, out_path, ftp_conn):
-    """Download files necessary to create chng-covid signal from ftp server.
-
-    Args:
-        filedate: YYYYmmdd string for which the files are named
-        out_path: Path to local directory into which to download the files
-        ftp_conn: Dict containing login credentials to ftp server
-    """
-    # open client
-    try:
-        client = paramiko.SSHClient()
-        client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-
-        client.connect(ftp_conn["host"], username=ftp_conn["user"],
-                       password=ftp_conn["pass"],
-                       port=ftp_conn["port"],
-                       allow_agent=False, look_for_keys=False)
-        sftp = client.open_sftp()
-
-        sftp.chdir('/countproducts')
-        get_files_from_dir(sftp, filedate, out_path)
-
-    finally:
-        if client:
-            client.close()
-
-
-def download_cli(filedate, out_path, ftp_conn):
-    """Download files necessary to create chng-cli signal from ftp server.
-
-    Args:
-        filedate: YYYYmmdd string for which the files are named
-        out_path: Path to local directory into which to download the files
-        ftp_conn: Dict containing login credentials to ftp server
-    """
-    # open client
-    try:
-        client = paramiko.SSHClient()
-        client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-
-        client.connect(ftp_conn["host"], username=ftp_conn["user"],
-                       password=ftp_conn["pass"],
-                       port=ftp_conn["port"],
-                       allow_agent=False, look_for_keys=False)
-        sftp = client.open_sftp()
-
-        sftp.chdir('/countproducts')
-        get_files_from_dir(sftp, filedate, out_path)
-
-    finally:
-        if client:
-            client.close()
-
-
-def download_flu(filedate, out_path, ftp_conn):
-    """Download files necessary to create chng-flu signal from ftp server.
+    """Download files necessary to create chng- signals from ftp server.
 
     Args:
         filedate: YYYYmmdd string for which the files are named

changehc/delphi_changehc/run.py

@@ -14,7 +14,7 @@
 from delphi_utils import get_structured_logger
 
 # first party
-from .download_ftp_files import download_covid, download_cli, download_flu
+from .download_ftp_files import download_covid
 from .load_data import load_combined_data, load_cli_data, load_flu_data
 from .update_sensor import CHCSensorUpdater
 
@@ -26,12 +26,13 @@ def retrieve_files(params, filedate, logger):
 
         ## download recent files from FTP server
         logger.info("downloading recent files through SFTP")
-        if "covid" in params["indicator"]["types"]:
-            download_covid(filedate, params["indicator"]["input_cache_dir"], params["indicator"]["ftp_conn"])
-        if "cli" in params["indicator"]["types"]:
-            download_cli(filedate, params["indicator"]["input_cache_dir"], params["indicator"]["ftp_conn"])
-        if "flu" in params["indicator"]["types"]:
-            download_flu(filedate, params["indicator"]["input_cache_dir"], params["indicator"]["ftp_conn"])
+        #if "covid" in params["indicator"]["types"]:
+        #    download_covid(filedate, params["indicator"]["input_cache_dir"], params["indicator"]["ftp_conn"])
+        #if "cli" in params["indicator"]["types"]:
+        #    download_cli(filedate, params["indicator"]["input_cache_dir"], params["indicator"]["ftp_conn"])
+        #if "flu" in params["indicator"]["types"]:
+        #    download_flu(filedate, params["indicator"]["input_cache_dir"], params["indicator"]["ftp_conn"])
+        download_covid(filedate, params["indicator"]["input_cache_dir"], params["indicator"]["ftp_conn"])
 
         denom_file = "%s/%s_Counts_Products_Denom.dat.gz" % (params["indicator"]["input_cache_dir"],filedate)
         covid_file = "%s/%s_Counts_Products_Covid.dat.gz" % (params["indicator"]["input_cache_dir"],filedate)