Move signal name constants to their own file, referenced from both run.py and process.py

Author: krivard

safegraph/delphi_safegraph/constants.py

@@ -0,0 +1,18 @@
+
+
+HOME_DWELL = 'median_home_dwell_time'
+COMPLETELY_HOME = 'completely_home_prop'
+FULL_TIME_WORK = 'full_time_work_prop'
+PART_TIME_WORK = 'part_time_work_prop'
+
+SIGNALS = [
+    HOME_DWELL,
+    COMPLETELY_HOME,
+    FULL_TIME_WORK,
+    PART_TIME_WORK
+]
+
+GEO_RESOLUTIONS = [
+    'county',
+    'state',
+]

safegraph/delphi_safegraph/process.py

@@ -2,12 +2,12 @@
 import numpy as np
 import pandas as pd
 
+from .constants import HOME_DWELL, COMPLETELY_HOME, FULL_TIME_WORK, PART_TIME_WORK
 from .geo import FIPS_TO_STATE
 
 # Magic number for modular arithmetic; CBG -> FIPS
 MOD = 10000000
 
-
 def add_prefix(signal_names, wip_signal, prefix: str):
     """Adds prefix to signal if there is a WIP signal
     Parameters
@@ -90,10 +90,6 @@ def construct_signals(cbg_df, signal_names):
         Dataframe with columns: timestamp, county_fips, and
         {each signal described above}.
     """
-    prefix = 'wip_'
-    COMPLETELY_HOME = 'completely_home_prop'
-    FULL_TIME_WORK = 'full_time_work_prop'
-    PART_TIME_WORK = 'part_time_work_prop'
 
     # Preparation
     cbg_df['timestamp'] = cbg_df['date_range_start'].apply(
@@ -103,13 +99,13 @@ def construct_signals(cbg_df, signal_names):
 
     # Transformation: create signal not available in raw data
     for signal in signal_names:
-        if signal in (FULL_TIME_WORK, prefix + FULL_TIME_WORK):
+        if signal.endswith(FULL_TIME_WORK):
             cbg_df[signal] = (cbg_df['full_time_work_behavior_devices']
                               / cbg_df['device_count'])
-        elif signal in (COMPLETELY_HOME, prefix + COMPLETELY_HOME):
+        elif signal.endswith(COMPLETELY_HOME):
             cbg_df[signal] = (cbg_df['completely_home_device_count']
                               / cbg_df['device_count'])
-        elif signal in (PART_TIME_WORK, prefix + PART_TIME_WORK):
+        elif signal.endswith(PART_TIME_WORK):
             cbg_df[signal] = (cbg_df['part_time_work_behavior_devices']
                               / cbg_df['device_count'])
 

safegraph/delphi_safegraph/run.py

@@ -9,21 +9,9 @@
 
 from delphi_utils import read_params
 
+from .constants import SIGNALS, GEO_RESOLUTIONS
 from .process import process, add_prefix
 
-SIGNALS = [
-    'median_home_dwell_time',
-    'completely_home_prop',
-    'full_time_work_prop',
-    'part_time_work_prop'
-]
-
-GEO_RESOLUTIONS = [
-    'county',
-    'state',
-]
-
-
 def run_module():
 
     params = read_params()