fix: support scalar strings in fill_none (#2793)

* fix: identify strings as scalars * test: add test for `fill_none` with bare strings * Update src/awkward/operations/ak_fill_none.py
scikit-hep · Nov 3, 2023 · c01efd8 · c01efd8
1 parent 4ed2397
commit c01efd8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/awkward/operations/ak_fill_none.py b/src/awkward/operations/ak_fill_none.py
@@ -81,19 +81,24 @@ def _impl(array, value, axis, highlevel, behavior):
         allow_unknown=False,
         use_from_iter=True,
         primitive_policy="pass-through",
+        string_policy="pass-through",
     )
 
     if isinstance(valuelayout, ak.record.Record):
         valuelayout = valuelayout.array[valuelayout.at : valuelayout.at + 1]
     elif isinstance(valuelayout, ak.contents.Content):
         valuelayout = valuelayout[np.newaxis, ...]
     else:
+        # Now that we know `valuelayout` isn't a low-level type, we must have scalars
+        # Thus, we can safely promote these scalars to a layout without
+        # adding a new axis
         valuelayout = ak.operations.to_layout(
             value,
             allow_record=True,
             allow_unknown=False,
             use_from_iter=True,
             primitive_policy="promote",
+            string_policy="promote",
         )
     valuelayout = valuelayout.to_backend(backend)
 

diff --git a/tests/test_2763_to_layout_granularity.py b/tests/test_2763_to_layout_granularity.py
@@ -71,3 +71,28 @@ def test_with_field():
             ["x"],
         )
     )
+
+
+def test_fill_none():
+    array = ak.Array([None, 1, 2, None])
+    result = ak.fill_none(array, "hello world!")
+    assert result.layout.is_equal_to(
+        ak.contents.UnionArray(
+            ak.index.Index8([1, 0, 0, 1]),
+            ak.index.Index64([0, 0, 1, 0]),
+            [
+                ak.contents.NumpyArray(np.array([1, 2], dtype=np.int64)),
+                ak.contents.ListOffsetArray(
+                    ak.index.Index64([0, 12]),
+                    ak.contents.NumpyArray(
+                        np.array(
+                            [104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 33],
+                            dtype=np.uint8,
+                        ),
+                        parameters={"__array__": "char"},
+                    ),
+                    parameters={"__array__": "string"},
+                ),
+            ],
+        )
+    )