fix: dhis org_units and iaso org_units overlap

Author: nazarfil

examples/pipelines/logistic_stats/pipeline.py

@@ -113,9 +113,9 @@ def model(dhis2_data: dict[str, typing.Any], gadm_data, worldpop_data):
     population_df = pd.Series(data=[stat["sum"] for stat in stats], index=administrative_areas.index)
     population_df = pd.DataFrame({"District": administrative_areas["NAME_2"], "Population": population_df})
     corrected_population_df = population_df.copy()
-    corrected_population_df.loc[
-        corrected_population_df["District"].str.startswith("Western"), "District"
-    ] = "Western Area"
+    corrected_population_df.loc[corrected_population_df["District"].str.startswith("Western"), "District"] = (
+        "Western Area"
+    )
 
     corrected_population_df = corrected_population_df.groupby("District").sum()
 

openhexa/sdk/pipelines/parameter.py

@@ -363,7 +363,7 @@ class IASOWidget(StrEnum):
     """Enum for IASO widgets."""
 
     FORMS = "IASO_FORMS"
-    ORG_UNITS = "IASO_ORG_UNITS"
+    IASO_ORG_UNITS = "IASO_ORG_UNITS"
     PROJECTS = "IASO_PROJECTS"
 
 

tests/test_ast.py

@@ -496,6 +496,8 @@ def test_pipeline_with_connection_parameter_for_iaso(self):
                             "from openhexa.sdk.pipelines.widgets import IASOWidget",
                             "",
                             "@parameter('iaso_con', name='IASO Connection', type=IASOConnection, required=True)",
+                            "@parameter('org_units', name='OrgUnits', type=str, widget=IASOWidget.IASO_ORG_UNITS, connection='iaso_con', required=True)",
+                            "@parameter('projects', name='Projects', type=str, widget=IASOWidget.PROJECTS, connection='iaso_con', required=True)",
                             "@parameter('forms', name='Forms', type=str, widget=IASOWidget.FORMS, connection='iaso_con', required=True)",
                             "@pipeline('Test pipeline')",
                             "def test_pipeline():",
@@ -525,6 +527,30 @@ def test_pipeline_with_connection_parameter_for_iaso(self):
                             "help": None,
                             "required": True,
                         },
+                        {
+                            "code": "org_units",
+                            "type": "str",
+                            "name": "OrgUnits",
+                            "widget": IASOWidget.IASO_ORG_UNITS.value,
+                            "connection": "iaso_con",
+                            "default": None,
+                            "multiple": False,
+                            "choices": None,
+                            "help": None,
+                            "required": True,
+                        },
+                        {
+                            "code": "projects",
+                            "type": "str",
+                            "name": "Projects",
+                            "widget": IASOWidget.PROJECTS.value,
+                            "connection": "iaso_con",
+                            "default": None,
+                            "multiple": False,
+                            "choices": None,
+                            "help": None,
+                            "required": True,
+                        },
                         {
                             "code": "forms",
                             "type": "str",