use JSON literals for options parameter

Author: tswast

bigframes/core/compile/ibis_compiler/operations/geo_ops.py

@@ -42,7 +42,7 @@ def st_regionstats(
         include = None
 
     if op.options:
-        options = ibis.literal(op.options, type=ibis_dtypes.string())
+        options = ibis.literal(op.options, type=ibis_dtypes.json())
     else:
         options = None
 
@@ -52,4 +52,4 @@ def st_regionstats(
         band=band,
         include=include,
         options=options,
-    )
+    ).to_expr()

bigframes/core/compile/sqlglot/expressions/geo_ops.py

@@ -95,5 +95,7 @@ def _(
     if op.include:
         args.append(sge.Kwarg(this="include", expression=sge.convert(op.include)))
     if op.options:
-        args.append(sge.Kwarg(this="options", expression=sge.convert(op.options)))
+        args.append(
+            sge.Kwarg(this="options", expression=sge.JSON(this=sge.convert(op.options)))
+        )
     return sge.func("ST_REGIONSTATS", *args)

tests/unit/core/compile/sqlglot/snapshots/test_compile_geo/test_st_regionstats/out.sql

@@ -10,7 +10,7 @@ WITH `bfcte_0` AS (
       'ee://some/raster/uri',
       band => 'band1',
       include => 'some equation',
-      options => '{"scale": 100}'
+      options => JSON '{"scale": 100}'
     ) AS `bfcol_2`
   FROM `bfcte_0`
 ), `bfcte_2` AS (

third_party/bigframes_vendored/ibis/backends/sql/compilers/base.py

@@ -811,7 +811,7 @@ def visit_DefaultLiteral(self, op, *, value, dtype):
         elif dtype.is_uuid():
             return self.cast(str(value), dtype)
         elif dtype.is_json():
-            return sge.ParseJSON(this=sge.convert(str(value)))
+            return sge.JSON(this=sge.convert(str(value)))
         elif dtype.is_geospatial():
             wkt = value if isinstance(value, str) else value.wkt
             return self.f.st_geogfromtext(wkt)

third_party/bigframes_vendored/ibis/expr/operations/geospatial.py

@@ -350,7 +350,7 @@ class GeoRegionStats(GeoSpatialUnOp):
     raster_id: Value[dt.String]
     band: Value[dt.String]
     include: Value[dt.String]
-    options: Value[dt.String]
+    options: Value[dt.JSON]
 
     dtype = dt.Struct(
         fields={