Merge pull request #3759 from airqo-platform/staging

move to production
airqo-platform · Oct 25, 2024 · 8d57231 · 8d57231
2 parents 3b54479 + 5034b8b
commit 8d57231
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 13 deletions.
diff --git a/k8s/analytics/values-prod.yaml b/k8s/analytics/values-prod.yaml
@@ -8,7 +8,7 @@ images:
     celeryWorker: eu.gcr.io/airqo-250220/airqo-analytics-celery-worker
     reportJob: eu.gcr.io/airqo-250220/airqo-analytics-report-job
     devicesSummaryJob: eu.gcr.io/airqo-250220/airqo-analytics-devices-summary-job
-  tag: prod-5e76c979-1729804905
+  tag: prod-3b544791-1729807166
 api:
   name: airqo-analytics-api
   label: analytics-api

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-5e76c979-1729804905
+  tag: prod-3b544791-1729807166
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/device-registry/values-prod.yaml b/k8s/device-registry/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-device-registry-api
-  tag: prod-5e76c979-1729804905
+  tag: prod-3b544791-1729807166
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/device-registry/values-stage.yaml b/k8s/device-registry/values-stage.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-device-registry-api
-  tag: stage-4f8b662e-1729719666
+  tag: stage-792d9b38-1729807076
 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-5e76c979-1729804905
+  tag: prod-3b544791-1729807166
 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-5e76c979-1729804905
+  tag: prod-3b544791-1729807166
 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-5e76c979-1729804905
+  tag: prod-3b544791-1729807166
 api:
   name: airqo-prediction-api
   label: prediction-api

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-5e76c979-1729804905
+  tag: prod-3b544791-1729807166
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/src/workflows/airqo_etl_utils/data_validator.py b/src/workflows/airqo_etl_utils/data_validator.py
@@ -290,9 +290,6 @@ def transform_devices(devices: List[Dict[str, Any]], task_instance) -> pd.DataFr
             pd.DataFrame: Transformed DataFrame if the devices data has changed since
                         the last execution; otherwise, an empty DataFrame.
         """
-        from .airqo_utils import (
-            AirQoDataUtils,
-        ) 
         import hashlib
 
         devices.rename(

diff --git a/src/workflows/dags/airqo_kafka_workflows.py b/src/workflows/dags/airqo_kafka_workflows.py
@@ -20,14 +20,16 @@ def airqo_devices_data():
 
     @task()
     def extract_devices(**kwargs) -> pd.DataFrame:
-        return AirQoApi.get_devices()
+        airqo_api = AirQoApi()
+        return airqo_api.get_devices()
 
     @task()
     def send_device_data_to_broker(devices: pd.DataFrame, **kwargs) -> None:
         from airqo_etl_utils.message_broker_utils import MessageBrokerUtils
         from airqo_etl_utils.data_validator import DataValidationUtils
 
-        devices = DataValidationUtils.transform_devices(
+        data_validation = DataValidationUtils()
+        devices = data_validation.transform_devices(
             devices=devices, taskinstance=kwargs["ti"]
         )
         if not devices.empty: