Revert "fix testcase"

This reverts commit 9a5bcd2.

Author: shuoweil

bigframes/blob/_functions.py

@@ -215,8 +215,6 @@ def image_blur_func(
             timeout=30,
         )
 
-        result_dict["content"] = dst_obj_ref_rt_json["objectref"]["uri"]
-
     except Exception as e:
         result_dict["status"] = str(e)
 
@@ -235,7 +233,8 @@ def image_blur_to_bytes_func(
     import base64
     import json
 
-    result_dict = {"status": "", "content": ""}
+    status = ""
+    content = b""
 
     try:
         import cv2 as cv  # type: ignore
@@ -259,12 +258,11 @@ def image_blur_to_bytes_func(
         img_blurred = cv.blur(img, ksize=(ksize_x, ksize_y))
         content = cv.imencode(ext, img_blurred)[1].tobytes()
 
-        encoded_content = base64.b64encode(content).decode("utf-8")
-        result_dict["content"] = encoded_content
-
     except Exception as e:
-        result_dict["status"] = str(e)
+        status = str(e)
 
+    encoded_content = base64.b64encode(content).decode("utf-8")
+    result_dict = {"status": status, "content": encoded_content}
     if verbose:
         return json.dumps(result_dict)
     else:
@@ -330,8 +328,6 @@ def image_resize_func(
             timeout=30,
         )
 
-        result_dict["content"] = dst_obj_ref_rt_json["objectref"]["uri"]
-
     except Exception as e:
         result_dict["status"] = str(e)
 
@@ -358,7 +354,8 @@ def image_resize_to_bytes_func(
     import base64
     import json
 
-    result_dict = {"status": "", "content": ""}
+    status = ""
+    content = b""
 
     try:
         import cv2 as cv  # type: ignore
@@ -382,12 +379,11 @@ def image_resize_to_bytes_func(
         img_resized = cv.resize(img, dsize=(dsize_x, dsize_y), fx=fx, fy=fy)
         content = cv.imencode(".jpeg", img_resized)[1].tobytes()
 
-        encoded_content = base64.b64encode(content).decode("utf-8")
-        result_dict["content"] = encoded_content
-
     except Exception as e:
-        result_dict["status"] = str(e)
+        status = str(e)
 
+    encoded_content = base64.b64encode(content).decode("utf-8")
+    result_dict = {"status": status, "content": encoded_content}
     if verbose:
         return json.dumps(result_dict)
     else:
@@ -461,8 +457,6 @@ def image_normalize_func(
             timeout=30,
         )
 
-        result_dict["content"] = dst_obj_ref_rt_json["objectref"]["uri"]
-
     except Exception as e:
         result_dict["status"] = str(e)
 

bigframes/dataframe.py

@@ -96,7 +96,7 @@
     import bigframes.session
 
     SingleItemValue = Union[bigframes.series.Series, int, float, str, Callable]
-    MultiItemValue = Union["DataFrame", Sequence[Union[int, float, str, Callable]]]
+    MultiItemValue = Union["DataFrame", Sequence[int | float | str | Callable]]
 
 LevelType = typing.Hashable
 LevelsType = typing.Union[LevelType, typing.Sequence[LevelType]]

bigframes/operations/blob.py

@@ -15,7 +15,6 @@
 from __future__ import annotations
 
 import os
-import typing
 from typing import cast, Literal, Optional, Union
 import warnings
 
@@ -372,10 +371,7 @@ def image_blur(
         container_cpu: Union[float, int] = 0.33,
         container_memory: str = "512Mi",
         verbose: bool = False,
-    ) -> typing.Union[
-        bigframes.series.Series,
-        typing.Tuple[bigframes.series.Series, bigframes.series.Series],
-    ]:
+    ) -> bigframes.series.Series:
         """Blurs images.
 
         Args:
@@ -478,8 +474,11 @@ def image_blur(
             )
             content_series = res._apply_unary_op(ops.JSONValue(json_path="$.content"))
             dst_blobs = content_series.str.to_blob(connection=connection)
-
-            return dst_blobs, blurred_status_series
+            results_df = bpd.DataFrame(
+                {"status": blurred_status_series, "content": dst_blobs}
+            )
+            results_struct = bbq.struct(results_df).rename("blurred_results")
+            return results_struct
         else:
             return res.str.to_blob(connection=connection)
 
@@ -632,10 +631,7 @@ def image_normalize(
         container_cpu: Union[float, int] = 0.33,
         container_memory: str = "512Mi",
         verbose: bool = False,
-    ) -> typing.Union[
-        bigframes.series.Series,
-        typing.Tuple[bigframes.series.Series, bigframes.series.Series],
-    ]:
+    ) -> bigframes.series.Series:
         """Normalize images.
 
         Args:
@@ -744,8 +740,14 @@ def image_normalize(
             )
             content_series = res._apply_unary_op(ops.JSONValue(json_path="$.content"))
             dst_blobs = content_series.str.to_blob(connection=connection)
-
-            return dst_blobs, normalized_status_series
+            results_df = bpd.DataFrame(
+                {
+                    "status": normalized_status_series,
+                    "content": dst_blobs,
+                }
+            )
+            results_struct = bbq.struct(results_df).rename("normalized_results")
+            return results_struct
         else:
             return res.str.to_blob(connection=connection)
 

tests/system/large/blob/test_function.py

@@ -121,7 +121,6 @@ def test_blob_image_blur_to_series(
         content_series = actual_exploded["content"]
         # Content should be blob objects for GCS destination
         assert hasattr(content_series, "blob")
-        assert not content_series.blob.size().isna().any()
 
     else:
         expected_df = pd.DataFrame(
@@ -133,13 +132,14 @@ def test_blob_image_blur_to_series(
             }
         )
         pd.testing.assert_frame_equal(
-            actual.blob.to_frame().to_pandas(),
+            actual.struct.explode().to_pandas(),
             expected_df,
             check_dtype=False,
             check_index_type=False,
         )
-        # verify the files exist
-        assert not actual.blob.size().isna().any()
+
+    # verify the files exist
+    assert not actual.blob.size().isna().any()
 
 
 @pytest.mark.parametrize("verbose", [True, False])
@@ -169,7 +169,6 @@ def test_blob_image_blur_to_folder(
         content_series = actual_exploded["content"]
         # Content should be blob objects for GCS destination
         assert hasattr(content_series, "blob")
-        assert not content_series.blob.size().isna().any()
 
     else:
         expected_df = pd.DataFrame(
@@ -181,13 +180,14 @@ def test_blob_image_blur_to_folder(
             }
         )
         pd.testing.assert_frame_equal(
-            actual.blob.to_frame().to_pandas(),
+            actual.struct.explode().to_pandas(),
             expected_df,
             check_dtype=False,
             check_index_type=False,
         )
-        # verify the files exist
-        assert not actual.blob.size().isna().any()
+
+    # verify the files exist
+    assert not actual.blob.size().isna().any()
 
 
 @pytest.mark.parametrize("verbose", [True, False])
@@ -249,7 +249,6 @@ def test_blob_image_resize_to_series(
         content_series = actual_exploded["content"]
         # Content should be blob objects for GCS destination
         assert hasattr(content_series, "blob")
-        assert not content_series.blob.size().isna().any()
 
     else:
         expected_df = pd.DataFrame(
@@ -261,13 +260,14 @@ def test_blob_image_resize_to_series(
             }
         )
         pd.testing.assert_frame_equal(
-            actual.blob.to_frame().to_pandas(),
+            actual.struct.explode().to_pandas(),
             expected_df,
             check_dtype=False,
             check_index_type=False,
         )
-        # verify the files exist
-        assert not actual.blob.size().isna().any()
+
+    # verify the files exist
+    assert not actual.blob.size().isna().any()
 
 
 @pytest.mark.parametrize("verbose", [True, False])
@@ -298,7 +298,6 @@ def test_blob_image_resize_to_folder(
         content_series = actual_exploded["content"]
         # Content should be blob objects for GCS destination
         assert hasattr(content_series, "blob")
-        assert not content_series.blob.size().isna().any()
 
     else:
         expected_df = pd.DataFrame(
@@ -310,13 +309,14 @@ def test_blob_image_resize_to_folder(
             }
         )
         pd.testing.assert_frame_equal(
-            actual.blob.to_frame().to_pandas(),
+            actual.struct.explode().to_pandas(),
             expected_df,
             check_dtype=False,
             check_index_type=False,
         )
-        # verify the files exist
-        assert not actual.blob.size().isna().any()
+
+    # verify the files exist
+    assert not actual.blob.size().isna().any()
 
 
 @pytest.mark.parametrize("verbose", [True, False])
@@ -369,6 +369,7 @@ def test_blob_image_normalize_to_series(
     )
 
     if verbose:
+
         assert hasattr(actual, "struct")
         actual_exploded = actual.struct.explode()
         assert "status" in actual_exploded.columns
@@ -380,7 +381,6 @@ def test_blob_image_normalize_to_series(
         content_series = actual_exploded["content"]
         # Content should be blob objects for GCS destination
         assert hasattr(content_series, "blob")
-        assert not content_series.blob.size().isna().any()
 
     else:
         expected_df = pd.DataFrame(
@@ -392,7 +392,7 @@ def test_blob_image_normalize_to_series(
             }
         )
         pd.testing.assert_frame_equal(
-            actual.blob.to_frame().to_pandas(),
+            actual.struct.explode().to_pandas(),
             expected_df,
             check_dtype=False,
             check_index_type=False,
@@ -432,7 +432,6 @@ def test_blob_image_normalize_to_folder(
         content_series = actual_exploded["content"]
         # Content should be blob objects for GCS destination
         assert hasattr(content_series, "blob")
-        assert not content_series.blob.size().isna().any()
 
     else:
         expected_df = pd.DataFrame(
@@ -444,14 +443,14 @@ def test_blob_image_normalize_to_folder(
             }
         )
         pd.testing.assert_frame_equal(
-            actual.blob.to_frame().to_pandas(),
+            actual.struct.explode().to_pandas(),
             expected_df,
             check_dtype=False,
             check_index_type=False,
         )
 
-        # verify the files exist
-        assert not actual.blob.size().isna().any()
+    # verify the files exist
+    assert not actual.blob.size().isna().any()
 
 
 @pytest.mark.parametrize("verbose", [True, False])