Fixing module build errors

Author: amartyabasu

validator/delphi_validator/datafetcher.py

@@ -4,15 +4,11 @@
 import covidcast
 import pandas as pd
 from datetime import date, datetime, timedelta
-from errors import *
+from .errors import *
 import re
 from typing import List
 import json
 
-def read_params(params_filepath):
-    with open(params_filepath) as f:
-        config = json.load(f)
-    return config      
 
 def get_filenames_with_geo_signal(path, date_slist: List[str]):
 
@@ -121,12 +117,6 @@ def fetch_daily_data(data_source, survey_date, geo_type, signal):
 
 
 def new_stuff():
-    survey_sdate = "2020-06-13"
-    survey_edate = "2020-06-20"
-    dtobj_sdate = datetime.strptime(survey_sdate, '%Y-%m-%d')
-    dtobj_edate = datetime.strptime(survey_edate, '%Y-%m-%d')
-    print(dtobj_sdate.date())
-    print(dtobj_edate.date())
 
     number_of_dates = dtobj_edate - dtobj_sdate + timedelta(days=1)
     print(number_of_dates)

validator/delphi_validator/driver.py

@@ -5,7 +5,7 @@
 from pathlib import Path
 from itertools import product
 from datetime import date, datetime, timedelta
-from datafetcher import *
+from .datafetcher import *
 import math
 
 DATA_SOURCE = "fb-survey"

validator/delphi_validator/fbsurveyvalidation.py

@@ -2,13 +2,25 @@
 """Functions to call when running the function.
 
 This module should contain a function called `run_module`, that is executed
-when the module is run with `python -m MODULE_NAME`.
+when the module is run with `python -m delphi_validator`.
 """
 import numpy as np
 import pandas as pd
 from delphi_utils import read_params
+from .fbsurveyvalidation import fbsurvey_validation
+from .datafetcher import *
 
 
 def run_module():
 
     params = read_params()
+
+
+    dtobj_sdate = datetime.strptime(params['start_date'], '%Y-%m-%d')
+    dtobj_edate = datetime.strptime(params['end_date'], '%Y-%m-%d')
+    max_check_lookbehind = int(params["ref_window_size"])
+
+    # Collecting all filenames
+    daily_filnames = read_filenames(params["data_folder"])
+
+    fbsurvey_validation(daily_filnames, dtobj_sdate, dtobj_edate)

validator/delphi_validator/run.py

@@ -4,5 +4,5 @@
   "start_date": "2020-06-13",
   "end_date": "2020-06-19",
   "ref_window_size": 7,
-  "data_folder": "/data/"
+  "data_folder": "C:/Covidcast/covidcast-indicators/validator/data"
 }

validator/params.json.template

@@ -7,7 +7,8 @@
     "pytest",
     "pytest-cov",
     "pylint",
-    "delphi-utils"
+    "delphi-utils",
+    "covidcast"
 ]
 
 setup(