Change mapping

data_bridges_knots/client.py

@@ -116,11 +116,7 @@ def get_household_survey(self, survey_id, access_type, page_size=600):
 
         df = pd.DataFrame(responses)
 
-        df = df.apply(lambda x: pd.to_numeric(x, errors='ignore', downcast='integer').fillna(9999).astype(int if x.dtype == 'int' or x.dtype == 'float' else x.dtype))
 
-        # df = df.apply(lambda x: pd.to_numeric(x, errors='ignore', downcast='integer').fillna(9999).astype(int if x.dtype == 'float' else x.dtype))
-
-        df = df.replace({9999: None})
         return df
 
     def get_prices(self, country_iso3, survey_date, page_size=1000):

data_bridges_knots/helpers.py

@@ -32,6 +32,8 @@ def get_column_labels(df):
 
 # Map values if int
 def map_value_labels(survey_data, questionnaire):
+
+    survey_data = survey_data.convert_dtypes()
     choiceList = pd.json_normalize(questionnaire['choiceList'])
     choiceList = choiceList.rename(columns={"name": "choice_name"})
     choiceList = choiceList.join(questionnaire["name"]).dropna()
@@ -55,9 +57,10 @@ def map_value_labels(survey_data, questionnaire):
 
     return survey_data_value_labels
 
-def as_numeric(df, cols = []):
-    for col in cols:
-        df[col].apply(lambda x: x.astype(int))
+def as_numeric(df, col_list):
+    for col in col_list:
+        df[col] = pd.to_numeric(df[col], errors='ignore').fillna(9999).astype('int64')
+
     return df