Merge remote-tracking branch 'origin/tswast-st-regionstats' into tswast-st-regionstats

Author: tswast

bigframes/core/nodes.py

@@ -1627,7 +1627,7 @@ class ResultNode(UnaryNode):
     # TODO: CTE definitions
 
     def _validate(self):
-        for ref, name in self.output_cols:
+        for ref, _ in self.output_cols:
             assert ref.id in self.child.ids
 
     @property

bigframes/core/rewrite/identifiers.py

@@ -57,8 +57,10 @@ def remap_variables(
     new_root = root.transform_children(lambda node: remapped_children[node])
 
     # Step 3: Transform the current node using the mappings from its children.
+    # "reversed" is required for InNode so that in case of a duplicate column ID,
+    # the left child's mapping is the one that's kept.
     downstream_mappings: dict[identifiers.ColumnId, identifiers.ColumnId] = {
-        k: v for mapping in new_child_mappings for k, v in mapping.items()
+        k: v for mapping in reversed(new_child_mappings) for k, v in mapping.items()
     }
     if isinstance(new_root, nodes.InNode):
         new_root = typing.cast(nodes.InNode, new_root)

bigframes/functions/function_typing.py

@@ -60,8 +60,22 @@ class UnsupportedTypeError(ValueError):
     def __init__(self, type_, supported_types):
         self.type = type_
         self.supported_types = supported_types
+
+        types_to_format = supported_types
+        if isinstance(supported_types, dict):
+            types_to_format = supported_types.keys()
+
+        supported_types_str = ", ".join(
+            sorted(
+                [
+                    getattr(supported, "__name__", supported)
+                    for supported in types_to_format
+                ]
+            )
+        )
+
         super().__init__(
-            f"'{type_}' must be one of the supported types ({supported_types}) "
+            f"'{getattr(type_, '__name__', type_)}' must be one of the supported types ({supported_types_str}) "
             "or a list of one of those types."
         )
 

tests/system/small/engines/test_join.py

@@ -55,7 +55,7 @@ def test_engines_join_on_coerced_key(
     assert_equivalence_execution(result.node, REFERENCE_ENGINE, engine)
 
 
-@pytest.mark.parametrize("engine", ["polars", "bq"], indirect=True)
+@pytest.mark.parametrize("engine", ["polars", "bq", "bq-sqlglot"], indirect=True)
 @pytest.mark.parametrize("join_type", ["left", "inner", "right", "outer"])
 def test_engines_join_multi_key(
     scalars_array_value: array_value.ArrayValue,
@@ -90,7 +90,7 @@ def test_engines_cross_join(
     assert_equivalence_execution(result.node, REFERENCE_ENGINE, engine)
 
 
-@pytest.mark.parametrize("engine", ["polars", "bq"], indirect=True)
+@pytest.mark.parametrize("engine", ["polars", "bq", "bq-sqlglot"], indirect=True)
 @pytest.mark.parametrize(
     ("left_key", "right_key"),
     [

tests/system/small/engines/test_slicing.py

@@ -24,7 +24,7 @@
 REFERENCE_ENGINE = polars_executor.PolarsExecutor()
 
 
-@pytest.mark.parametrize("engine", ["polars", "bq"], indirect=True)
+@pytest.mark.parametrize("engine", ["polars", "bq", "bq-sqlglot"], indirect=True)
 @pytest.mark.parametrize(
     ("start", "stop", "step"),
     [

tests/system/small/functions/test_remote_function.py

@@ -1646,7 +1646,7 @@ def func_tuple(x):
 
     with pytest.raises(
         ValueError,
-        match=r"'typing\.Sequence\[int\]' must be one of the supported types",
+        match=r"must be one of the supported types",
     ):
         bff.remote_function(
             input_types=int,

tests/unit/functions/test_function_typing.py

@@ -0,0 +1,50 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import datetime
+import decimal
+
+import pytest
+
+from bigframes.functions import function_typing
+
+
+def test_unsupported_type_error_init_with_dict():
+    err = function_typing.UnsupportedTypeError(
+        decimal.Decimal, {int: "INT64", float: "FLOAT64"}
+    )
+
+    message = str(err)
+
+    assert "Decimal" in message
+    assert "float, int" in message
+
+
+def test_unsupported_type_error_init_with_set():
+    err = function_typing.UnsupportedTypeError(decimal.Decimal, {int, float})
+
+    message = str(err)
+
+    assert "Decimal" in message
+    assert "float, int" in message
+
+
+def test_sdk_type_from_python_type_raises_unsupported_type_error():
+    with pytest.raises(function_typing.UnsupportedTypeError) as excinfo:
+        function_typing.sdk_type_from_python_type(datetime.datetime)
+
+    message = str(excinfo.value)
+
+    assert "datetime" in message
+    assert "bool, bytes, float, int, str" in message