Merge pull request #4016 from airqo-platform/staging

Baalmart · web-flow · commit 16e708ac0a83 · 2024-12-06T12:22:25.000+03:00
move to production
diff --git a/k8s/auth-service/values-prod.yaml b/k8s/auth-service/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-auth-api
-  tag: prod-f3a0213d-1733408157
+  tag: prod-a3cb024a-1733435812
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/auth-service/values-stage.yaml b/k8s/auth-service/values-stage.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-auth-api
-  tag: stage-73463ae7-1733386665
+  tag: stage-95dea6dd-1733435752
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/exceedance/values-prod-airqo.yaml b/k8s/exceedance/values-prod-airqo.yaml
@@ -4,6 +4,6 @@ app:
   configmap: env-exceedance-production
 image:
   repository: eu.gcr.io/airqo-250220/airqo-exceedance-job
-  tag: prod-f3a0213d-1733408157
+  tag: prod-a3cb024a-1733435812
 nameOverride: ''
 fullnameOverride: ''
diff --git a/k8s/exceedance/values-prod-kcca.yaml b/k8s/exceedance/values-prod-kcca.yaml
@@ -4,6 +4,6 @@ app:
   configmap: env-exceedance-production
 image:
   repository: eu.gcr.io/airqo-250220/kcca-exceedance-job
-  tag: prod-f3a0213d-1733408157
+  tag: prod-a3cb024a-1733435812
 nameOverride: ''
 fullnameOverride: ''
diff --git a/k8s/predict/values-prod.yaml b/k8s/predict/values-prod.yaml
@@ -7,7 +7,7 @@ images:
     predictJob: eu.gcr.io/airqo-250220/airqo-predict-job
     trainJob: eu.gcr.io/airqo-250220/airqo-train-job
     predictPlaces: eu.gcr.io/airqo-250220/airqo-predict-places-air-quality
-  tag: prod-f3a0213d-1733408157
+  tag: prod-a3cb024a-1733435812
 api:
   name: airqo-prediction-api
   label: prediction-api
diff --git a/k8s/spatial/values-prod.yaml b/k8s/spatial/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-spatial-api
-  tag: prod-f3a0213d-1733408157
+  tag: prod-a3cb024a-1733435812
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/workflows/values-prod.yaml b/k8s/workflows/values-prod.yaml
@@ -10,7 +10,7 @@ images:
     initContainer: eu.gcr.io/airqo-250220/airqo-workflows-xcom
     redisContainer: eu.gcr.io/airqo-250220/airqo-redis
     containers: eu.gcr.io/airqo-250220/airqo-workflows
-  tag: prod-f3a0213d-1733408157
+  tag: prod-a3cb024a-1733435812
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/src/workflows/airqo_etl_utils/data_validator.py b/src/workflows/airqo_etl_utils/data_validator.py
@@ -159,12 +159,12 @@ def remove_outliers(data: pd.DataFrame) -> pd.DataFrame:
                         column_name=mapped_name, row_value=x
                     )
                 )
-        else:
-            data[col] = data[col].apply(
-                lambda x: DataValidationUtils.get_valid_value(
-                    column_name=mapped_name, row_value=x
+            else:
+                data[col] = data[col].apply(
+                    lambda x: DataValidationUtils.get_valid_value(
+                        column_name=mapped_name, row_value=x
+                    )
                 )
-            )
         return data
 
     @staticmethod
diff --git a/src/workflows/airqo_etl_utils/data_warehouse_utils.py b/src/workflows/airqo_etl_utils/data_warehouse_utils.py
@@ -45,7 +45,7 @@ def extract_hourly_bam_data(
             },
             inplace=True,
         )
-        data.loc[:, "device_category"] = str(DeviceCategory.BAM)
+        data["device_category"] = str(DeviceCategory.BAM)
         return DataWarehouseUtils.filter_valid_columns(data)
 
     @staticmethod

Original file line number	Diff line number	Diff line change
`@@ -159,12 +159,12 @@ def remove_outliers(data: pd.DataFrame) -> pd.DataFrame:`
`159`	`159`	`column_name=mapped_name, row_value=x`
`160`	`160`	`)`
`161`	`161`	`)`
`162`		`- else:`
`163`		`- data[col] = data[col].apply(`
`164`		`- lambda x: DataValidationUtils.get_valid_value(`
`165`		`- column_name=mapped_name, row_value=x`
	`162`	`+ else:`
	`163`	`+ data[col] = data[col].apply(`
	`164`	`+ lambda x: DataValidationUtils.get_valid_value(`
	`165`	`+ column_name=mapped_name, row_value=x`
	`166`	`+ )`
`166`	`167`	`)`
`167`		`- )`
`168`	`168`	`return data`
`169`	`169`
`170`	`170`	`@staticmethod`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ def extract_hourly_bam_data(`
`45`	`45`	`},`
`46`	`46`	`inplace=True,`
`47`	`47`	`)`
`48`		`- data.loc[:, "device_category"] = str(DeviceCategory.BAM)`
	`48`	`+ data["device_category"] = str(DeviceCategory.BAM)`
`49`	`49`	`return DataWarehouseUtils.filter_valid_columns(data)`
`50`	`50`
`51`	`51`	`@staticmethod`