wip

Author: bramj

openhexa/cli/api.py

@@ -316,7 +316,7 @@ def _build_pipeline_version_input(
         "description": description,
         "externalLink": external_link,
         "zipfile": base64.b64encode(zip_file.read()).decode("ascii"),
-        "parameters": [_parameter_to_graphql_input(p) for p in pipeline.parameters],
+        "parameters": [p.to_dict() for p in pipeline.parameters],
         "timeout": pipeline.timeout,
     }
 
@@ -687,20 +687,6 @@ def generate_zip_file(pipeline_directory_path: str | Path) -> io.BytesIO:
     return zip_file
 
 
-def _parameter_to_graphql_input(parameter) -> dict:
-    """Serialize a pipeline parameter into a GraphQL ``ParameterInput``.
-
-    ``Parameter.to_dict()`` uses snake_case keys for the parameter spec, but the
-    GraphQL ``ParameterInput`` type expects camelCase field names. Most keys are
-    single words and match in both conventions; ``choices_from_file`` is the
-    exception and must be renamed to ``choicesFromFile``.
-    """
-    spec = parameter.to_dict()
-    if "choices_from_file" in spec:
-        spec["choicesFromFile"] = spec.pop("choices_from_file")
-    return spec
-
-
 def upload_pipeline(
     target_pipeline_code: str,
     pipeline_directory_path: str | Path,

openhexa/sdk/pipelines/parameter/decorator.py

@@ -119,7 +119,7 @@ def to_dict(self) -> dict[str, typing.Any]:
             "directory": self.directory,
         }
         if isinstance(self.choices, ChoicesFromFile):
-            d["choices_from_file"] = self.choices.to_dict()
+            d["choicesFromFile"] = self.choices.to_dict()
         return d
 
     def _validate_single(self, value: typing.Any):

tests/test_choices.py

@@ -1,7 +1,8 @@
 """Tests for ChoicesFromFile dynamic parameter choices."""
 
 import tempfile
-from unittest import TestCase
+from pathlib import Path
+from unittest import TestCase, mock
 
 import pytest
 
@@ -168,7 +169,7 @@ def test_ast_string_shorthand_csv(self):
             p = get_pipeline(tmpdir)
             param_dict = p.to_dict()["parameters"][0]
             assert param_dict["choices"] is None
-            assert param_dict["choices_from_file"] == {"format": None, "path": "districts.csv", "column": None}
+            assert param_dict["choicesFromFile"] == {"format": None, "path": "districts.csv", "column": None}
 
     def test_ast_string_shorthand_json(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -177,7 +178,7 @@ def test_ast_string_shorthand_json(self):
                 "@parameter('district', type=str, choices='regions.json')",
             )
             p = get_pipeline(tmpdir)
-            assert p.to_dict()["parameters"][0]["choices_from_file"]["format"] is None
+            assert p.to_dict()["parameters"][0]["choicesFromFile"]["format"] is None
 
     def test_ast_string_shorthand_any_extension(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -186,7 +187,7 @@ def test_ast_string_shorthand_any_extension(self):
                 "@parameter('district', type=str, choices='list.yml')",
             )
             p = get_pipeline(tmpdir)
-            assert p.to_dict()["parameters"][0]["choices_from_file"]["format"] is None
+            assert p.to_dict()["parameters"][0]["choicesFromFile"]["format"] is None
 
     def test_ast_string_shorthand_same_output_as_explicit(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -229,7 +230,7 @@ def test_ast_static_list_unaffected(self):
             p = get_pipeline(tmpdir)
             param_dict = p.to_dict()["parameters"][0]
             assert param_dict["choices"] == ["UG", "KE"]
-            assert "choices_from_file" not in param_dict
+            assert "choicesFromFile" not in param_dict
 
     def test_ast_string_no_extension_accepted(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -238,7 +239,7 @@ def test_ast_string_no_extension_accepted(self):
                 "@parameter('district', type=str, choices='nodot')",
             )
             p = get_pipeline(tmpdir)
-            assert p.to_dict()["parameters"][0]["choices_from_file"]["format"] is None
+            assert p.to_dict()["parameters"][0]["choicesFromFile"]["format"] is None
 
     def test_ast_string_any_extension_accepted(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -247,7 +248,7 @@ def test_ast_string_any_extension_accepted(self):
                 "@parameter('district', type=str, choices='file.xlsx')",
             )
             p = get_pipeline(tmpdir)
-            assert p.to_dict()["parameters"][0]["choices_from_file"]["format"] is None
+            assert p.to_dict()["parameters"][0]["choicesFromFile"]["format"] is None
 
 
 # ---------------------------------------------------------------------------
@@ -264,13 +265,13 @@ def test_to_dict_emits_file_choices_key(self):
         p = Parameter(code="district", type=str, choices=ChoicesFromFile("districts.csv", column="code", format="csv"))
         d = p.to_dict()
         assert d["choices"] is None
-        assert d["choices_from_file"] == {"format": "csv", "path": "districts.csv", "column": "code"}
+        assert d["choicesFromFile"] == {"format": "csv", "path": "districts.csv", "column": "code"}
 
     def test_to_dict_no_file_choices_key_for_static_choices(self):
         p = Parameter(code="country", type=str, choices=["UG", "KE"])
         d = p.to_dict()
         assert d["choices"] == ["UG", "KE"]
-        assert "choices_from_file" not in d
+        assert "choicesFromFile" not in d
 
     def test_rejects_file_choices_on_bool_type(self):
         with pytest.raises(InvalidParameterError, match="don't accept choices"):
@@ -331,7 +332,7 @@ def test_file_choices_positional_path(self):
             p = get_pipeline(tmpdir)
             param_dict = p.to_dict()["parameters"][0]
             assert param_dict["choices"] is None
-            assert param_dict["choices_from_file"] == {"format": None, "path": "districts.csv", "column": None}
+            assert param_dict["choicesFromFile"] == {"format": None, "path": "districts.csv", "column": None}
 
     def test_file_choices_with_column(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -341,7 +342,7 @@ def test_file_choices_with_column(self):
             )
             p = get_pipeline(tmpdir)
             param_dict = p.to_dict()["parameters"][0]
-            assert param_dict["choices_from_file"] == {"format": None, "path": "data/districts.csv", "column": "code"}
+            assert param_dict["choicesFromFile"] == {"format": None, "path": "data/districts.csv", "column": "code"}
 
     def test_file_choices_with_column_positional(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -351,7 +352,7 @@ def test_file_choices_with_column_positional(self):
             )
             p = get_pipeline(tmpdir)
             param_dict = p.to_dict()["parameters"][0]
-            assert param_dict["choices_from_file"] == {"format": None, "path": "data/districts.csv", "column": "code"}
+            assert param_dict["choicesFromFile"] == {"format": None, "path": "data/districts.csv", "column": "code"}
 
     def test_file_choices_explicit_format(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -361,7 +362,7 @@ def test_file_choices_explicit_format(self):
             )
             p = get_pipeline(tmpdir)
             param_dict = p.to_dict()["parameters"][0]
-            assert param_dict["choices_from_file"]["format"] == "json"
+            assert param_dict["choicesFromFile"]["format"] == "json"
 
     def test_file_choices_format_none_by_default(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -371,7 +372,28 @@ def test_file_choices_format_none_by_default(self):
             )
             p = get_pipeline(tmpdir)
             param_dict = p.to_dict()["parameters"][0]
-            assert param_dict["choices_from_file"]["format"] is None
+            assert param_dict["choicesFromFile"]["format"] is None
+
+    def test_upload_pipeline_sends_camel_case_key(self):
+        # The GraphQL ParameterInput type expects camelCase field names; a
+        # snake_case choices_from_file key is rejected by the server.
+        from openhexa.cli.api import upload_pipeline
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            self._write_pipeline(
+                tmpdir,
+                "@parameter('district', type=str, choices=ChoicesFromFile('districts.csv', column='code'))",
+            )
+            with mock.patch("openhexa.cli.api.graphql") as mock_graphql:
+                mock_graphql.return_value = {
+                    "uploadPipeline": {"success": True, "errors": [], "pipelineVersion": {"id": "version-id"}}
+                }
+                upload_pipeline("test-pipeline", Path(tmpdir))
+
+            input_data = mock_graphql.call_args[0][1]["input"]
+            (param,) = input_data["parameters"]
+            assert "choices_from_file" not in param
+            assert param["choicesFromFile"] == {"format": None, "path": "districts.csv", "column": "code"}
 
     def test_unsupported_call_in_choices_raises(self):
         with tempfile.TemporaryDirectory() as tmpdir: