image function still have bug

Author: shuoweil

bigframes/blob/_functions.py

@@ -26,6 +26,7 @@
     float: "FLOAT64",
     str: "STRING",
     bytes: "BYTES",
+    bool: "BOOL",
 }
 
 
@@ -118,7 +119,7 @@ def udf(self):
         return self._session.read_gbq_function(udf_name)
 
 
-def exif_func(src_obj_ref_rt: str, verbose: bool) -> str:
+def exif_func(src_obj_ref_rt: str) -> str:
     import io
     import json
 
@@ -149,10 +150,7 @@ def exif_func(src_obj_ref_rt: str, verbose: bool) -> str:
     except Exception as e:
         result_dict["status"] = str(e)
 
-    if verbose:
-        return json.dumps(result_dict)
-    else:
-        return result_dict["content"]
+    return json.dumps(result_dict)
 
 
 exif_func_def = FunctionDef(exif_func, ["pillow", "requests"])
@@ -165,7 +163,6 @@ def image_blur_func(
     ksize_x: int,
     ksize_y: int,
     ext: str,
-    verbose: bool,
 ) -> str:
     import json
 
@@ -214,17 +211,14 @@ def image_blur_func(
     except Exception as e:
         result_dict["status"] = str(e)
 
-    if verbose:
-        return json.dumps(result_dict)
-    else:
-        return result_dict["content"]
+    return json.dumps(result_dict)
 
 
 image_blur_def = FunctionDef(image_blur_func, ["opencv-python", "numpy", "requests"])
 
 
 def image_blur_to_bytes_func(
-    src_obj_ref_rt: str, ksize_x: int, ksize_y: int, ext: str, verbose: bool
+    src_obj_ref_rt: str, ksize_x: int, ksize_y: int, ext: str
 ) -> str:
     import base64
     import json
@@ -257,11 +251,8 @@ def image_blur_to_bytes_func(
     except Exception as e:
         status = str(e)
 
-    if verbose:
-        encoded_content = base64.b64encode(content).decode("utf-8")
-        return json.dumps({"status": status, "content": encoded_content})
-    else:
-        return base64.b64encode(content).decode("utf-8")
+    encoded_content = base64.b64encode(content).decode("utf-8")
+    return json.dumps({"status": status, "content": encoded_content})
 
 
 image_blur_to_bytes_def = FunctionDef(
@@ -277,7 +268,6 @@ def image_resize_func(
     fx: float,
     fy: float,
     ext: str,
-    verbose: bool,
 ) -> str:
     import json
 
@@ -326,10 +316,7 @@ def image_resize_func(
     except Exception as e:
         result_dict["status"] = str(e)
 
-    if verbose:
-        return json.dumps(result_dict)
-    else:
-        return result_dict["content"]
+    return json.dumps(result_dict)
 
 
 image_resize_def = FunctionDef(
@@ -344,7 +331,6 @@ def image_resize_to_bytes_func(
     fx: float,
     fy: float,
     ext: str,
-    verbose: bool,
 ) -> str:
     import base64
     import json
@@ -377,11 +363,8 @@ def image_resize_to_bytes_func(
     except Exception as e:
         status = str(e)
 
-    if verbose:
-        encoded_content = base64.b64encode(content).decode("utf-8")
-        return json.dumps({"status": status, "content": encoded_content})
-    else:
-        return base64.b64encode(content).decode("utf-8")
+    encoded_content = base64.b64encode(content).decode("utf-8")
+    return json.dumps({"status": status, "content": encoded_content})
 
 
 image_resize_to_bytes_def = FunctionDef(
@@ -396,7 +379,6 @@ def image_normalize_func(
     beta: float,
     norm_type: str,
     ext: str,
-    verbose: bool,
 ) -> str:
     import json
 
@@ -454,10 +436,7 @@ def image_normalize_func(
     except Exception as e:
         result_dict["status"] = str(e)
 
-    if verbose:
-        return json.dumps(result_dict)
-    else:
-        return result_dict["content"]
+    return json.dumps(result_dict)
 
 
 image_normalize_def = FunctionDef(
@@ -471,7 +450,6 @@ def image_normalize_to_bytes_func(
     beta: float,
     norm_type: str,
     ext: str,
-    verbose: bool,
 ) -> str:
     import base64
     import json
@@ -515,10 +493,7 @@ def image_normalize_to_bytes_func(
     except Exception as e:
         result_dict["status"] = str(e)
 
-    if verbose:
-        return json.dumps(result_dict)
-    else:
-        return result_dict["content"]
+    return json.dumps(result_dict)
 
 
 image_normalize_to_bytes_def = FunctionDef(

bigframes/operations/blob.py

@@ -332,6 +332,7 @@ def exif(
 
         connection = self._resolve_connection(connection)
         df = self.get_runtime_json_str(mode="R").to_frame()
+        df["verbose"] = verbose
 
         exif_udf = blob_func.TransformFunction(
             blob_func.exif_func_def,

tests/system/large/blob/test_function.py

@@ -51,13 +51,7 @@ def images_output_uris(images_output_folder: str) -> list[str]:
     ]
 
 
-@pytest.mark.parametrize(
-    "verbose",
-    [
-        (True),
-        (False),
-    ],
-)
+@pytest.mark.parametrize("verbose", [True, False])
 def test_blob_exif(
     bq_connection: str,
     session: bigframes.Session,
@@ -489,13 +483,7 @@ def test_blob_image_normalize_to_bq(
         assert actual.dtype == dtypes.BYTES_DTYPE
 
 
-@pytest.mark.parametrize(
-    "verbose",
-    [
-        (True),
-        (False),
-    ],
-)
+@pytest.mark.parametrize("verbose", [True, False])
 def test_blob_pdf_extract(
     pdf_mm_df: bpd.DataFrame,
     verbose: bool,
@@ -538,13 +526,7 @@ def test_blob_pdf_extract(
         ), f"Item (verbose={verbose}): Expected keyword '{keyword}' not found in extracted text. "
 
 
-@pytest.mark.parametrize(
-    "verbose",
-    [
-        (True),
-        (False),
-    ],
-)
+@pytest.mark.parametrize("verbose", [True, False])
 def test_blob_pdf_chunk(pdf_mm_df: bpd.DataFrame, verbose: bool, bq_connection: str):
     actual = (
         pdf_mm_df["pdf"]