Merge pull request #4052 from NicholasTurner23/update-fix/Clean_up

Update fix/clean up
airqo-platform · Dec 12, 2024 · 76f24f1 · 76f24f1
2 parents e2ebab3 + 23a1218
commit 76f24f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/workflows/airqo_etl_utils/airqo_api.py b/src/workflows/airqo_etl_utils/airqo_api.py
@@ -138,7 +138,7 @@ def get_devices(
         Retrieve devices given a network and device category.
 
         Args:
-            - network (str): An Enum that represents site ownership.
+            - network (str): A string that represents device manufaturer.
             - device_category (DeviceCategory, optional): An Enum that represents device category. Defaults to `DeviceCategory.None` if not supplied.
 
         Returns:

diff --git a/src/workflows/airqo_etl_utils/meta_data_utils.py b/src/workflows/airqo_etl_utils/meta_data_utils.py
@@ -9,7 +9,7 @@
 
 class MetaDataUtils:
     @staticmethod
-    def extract_devices_from_api(tenant: Tenant = Tenant.ALL) -> pd.DataFrame:
+    def extract_devices_from_api(network: str = "all") -> pd.DataFrame:
         devices = AirQoApi().get_devices()
         dataframe = pd.json_normalize(devices)
         dataframe = dataframe[
@@ -20,13 +20,12 @@ def extract_devices_from_api(tenant: Tenant = Tenant.ALL) -> pd.DataFrame:
                 "site_id",
                 "device_id",
                 "device_number",
-                "name",
                 "description",
                 "device_manufacturer",
                 "device_category",
             ]
         ]
-
+        dataframe["name"] = dataframe["device_id"]
         dataframe = DataValidationUtils.remove_outliers(dataframe)
 
         return dataframe