Merge pull request #4012 from airqo-platform/staging

airqo-platform · Dec 5, 2024 · f3a0213 · f3a0213
2 parents a7e2441 + d1496e5
commit f3a0213
Show file tree

Hide file tree

Showing 18 changed files with 90 additions and 246 deletions.
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-1c7e9a8e-1733346549
+  tag: prod-a7e2441e-1733386719
 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-1838aa7a-1733249623
+  tag: stage-73463ae7-1733386665
 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-1c7e9a8e-1733346549
+  tag: prod-a7e2441e-1733386719
 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-1c7e9a8e-1733346549
+  tag: prod-a7e2441e-1733386719
 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-1c7e9a8e-1733346549
+  tag: prod-a7e2441e-1733386719
 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-1c7e9a8e-1733346549
+  tag: prod-a7e2441e-1733386719
 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-1c7e9a8e-1733346549
+  tag: prod-a7e2441e-1733386719
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/workflows/values-stage.yaml b/k8s/workflows/values-stage.yaml
@@ -10,7 +10,7 @@ images:
     initContainer: eu.gcr.io/airqo-250220/airqo-stage-workflows-xcom
     redisContainer: eu.gcr.io/airqo-250220/airqo-stage-redis
     containers: eu.gcr.io/airqo-250220/airqo-stage-workflows
-  tag: stage-76ff52fe-1733336066
+  tag: stage-635379ef-1733407940
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/src/workflows/airqo_etl_utils/airnow_utils.py b/src/workflows/airqo_etl_utils/airnow_utils.py
@@ -52,7 +52,8 @@ def query_bam_data(
 
     @staticmethod
     def extract_bam_data(start_date_time: str, end_date_time: str) -> pd.DataFrame:
-        tenants = AirQoApi().get_tenants(DataSource.AIRNOW)
+        # TODO Update if being used.
+        tenants = AirQoApi().get_networks(DataSource.AIRNOW)
         bam_data = pd.DataFrame()
         dates = Utils.query_dates_array(
             start_date_time=start_date_time,
@@ -65,11 +66,12 @@ def extract_bam_data(start_date_time: str, end_date_time: str) -> pd.DataFrame:
             network_data = pd.DataFrame()
 
             for start, end in dates:
+                continue
                 query_data = AirnowDataUtils.query_bam_data(
                     api_key=network_api_key, start_date_time=start, end_date_time=end
                 )
                 network_data = pd.concat([network_data, query_data], ignore_index=True)
-
+            continue
             network_data["tenant"] = tenant["network"]
 
             bam_data = pd.concat([bam_data, network_data], ignore_index=True)

diff --git a/src/workflows/airqo_etl_utils/airqo_api.py b/src/workflows/airqo_etl_utils/airqo_api.py
@@ -798,58 +798,6 @@ def update_sites(self, updated_sites):
             params = {"tenant": str(Tenant.AIRQO), "id": site.pop("site_id")}
             self.__request("devices/sites", params, site, "put")
 
-    def get_tenants(self, data_source: str) -> List[Dict[str, Any]]:
-        """
-        Retrieve tenants given a data source.
-
-        Args:
-            data_source: The source of the tenant's data.
-
-        Returns:
-            List[Dict[str, Any]]: A list of dictionaries with tenant details.
-
-            [
-                {
-                    "_id": str,
-                    "net_status": str,
-                    "net_email": str,
-                    "net_phoneNumber": int,
-                    "net_category": str,
-                    "net_name": str,
-                    "net_description": str,
-                    "net_website": str,
-                    "net_acronym": str,
-                    "net_api_key": str,
-                    "net_data_source": str,
-                    "createdAt": str,
-                    "net_users": List[Dict[str,Any]],
-                    "net_permissions": List[Dict[str,Any]],
-                    "net_roles": List[Dict[str,Any]],
-                    "net_groups": List[Dict[str,Any]],
-                    "net_departments": List[Dict[str,Any]],
-                    "network_id": str,
-                    "network": str,
-                    "data_source": str,
-                    "api_key": str"
-                },
-            ]
-        """
-        response = self.__request("users/networks")
-
-        return [
-            {
-                **network,
-                **{
-                    "network_id": network.get("_id", None),
-                    "network": network.get("net_name", None),
-                    "data_source": network.get("net_data_source", None),
-                    "api_key": network.get("net_api_key", None),
-                },
-            }
-            for network in response.get("networks", [])
-            if network.get("net_data_source") == str(data_source)
-        ]
-
     def __request(self, endpoint, params=None, body=None, method="get", base_url=None):
         """
         Executes API request and returns the response.