cleanups

Author: TrevorBergeron

packages/bigframes/bigframes/session/bq_caching_executor.py

@@ -80,7 +80,7 @@ def __init__(
         metrics: Optional[bigframes.session.metrics.ExecutionMetrics] = None,
         enable_polars_execution: bool = False,
         publisher: bigframes.core.events.Publisher,
-        labels: Mapping[str, str] = {},
+        labels: tuple[tuple[str, str], ...] = (),
         compiler_name: Literal["ibis", "sqlglot"] = "ibis",
         cache: Optional[execution_cache.ExecutionCache] = None,
     ):
@@ -166,7 +166,7 @@ def execute(
             result = self._export_gbq(
                 array_value,
                 execution_spec.destination_spec,
-                extra_labels=dict(execution_spec.labels),
+                extra_labels=execution_spec.labels,
             )
             self._publisher.publish(
                 bigframes.core.events.ExecutionFinished(
@@ -183,7 +183,7 @@ def execute(
             if isinstance(execution_spec.destination_spec, ex_spec.CacheSpec)
             else None,
             must_create_table=not execution_spec.promise_under_10gb,
-            extra_labels=dict(execution_spec.labels),
+            extra_labels=execution_spec.labels,
         )
         # post steps: export
         if isinstance(execution_spec.destination_spec, ex_spec.GcsOutputSpec):
@@ -246,7 +246,7 @@ def _export_gbq(
         self,
         array_value: bigframes.core.ArrayValue,
         spec: ex_spec.TableOutputSpec,
-        extra_labels: Mapping[str, str] = {},
+        extra_labels: tuple[tuple[str, str], ...] = (),
     ) -> executor.ExecuteResult:
         """
         Export the ArrayValue to an existing BigQuery table.
@@ -365,7 +365,7 @@ def _run_execute_query(
         job_config: Optional[bq_job.QueryJobConfig] = None,
         query_with_job: bool = True,
         session=None,
-        extra_labels: Mapping[str, str] = {},
+        extra_labels: tuple[tuple[str, str], ...] = (),
     ) -> Tuple[bq_table.RowIterator, Optional[bigquery.QueryJob]]:
         """
         Starts BigQuery query job and waits for results.

packages/bigframes/bigframes/session/proxy_executor.py

@@ -52,7 +52,7 @@ def __init__(
         metrics: Optional[bigframes.session.metrics.ExecutionMetrics] = None,
         enable_polars_execution: bool = False,
         publisher: bigframes.core.events.Publisher,
-        labels: Mapping[str, str] = {},
+        labels: tuple[tuple[str, str], ...] = (),
     ):
         self._enable_polars_execution = enable_polars_execution
         shared_cache = execution_cache.ExecutionCache()
@@ -119,10 +119,10 @@ def execute(
                         {_COMPILER_LABEL_KEY: f"sqlglot-{correlation_id}"}
                     ),
                 )
-            except google.cloud.exceptions.BadRequest as e:
+            except Exception as e:
                 msg = bfe.format_message(
-                    f"Compiler ID {correlation_id}: BadRequest on sqlglot. "
-                    f"Falling back to ibis. Details: {e.message}"
+                    f"Compiler ID {correlation_id}: Exception on sqlglot. "
+                    f"Falling back to ibis. Details: {e}"
                 )
                 warnings.warn(msg, category=UserWarning)
                 return self._ibis_executor.execute(

packages/bigframes/tests/unit/session/test_proxy_executor.py

@@ -175,7 +175,7 @@ def test_cached_stable_routes_to_sqlglot_fallback_to_ibis(mock_executor, monkeyp
     with mock.patch("uuid.uuid1") as mock_uuid:
         mock_uuid.return_value.hex = "1234567890123456"
         with pytest.warns(
-            UserWarning, match="Compiler ID 123456789012: BadRequest on sqlglot"
+            UserWarning, match="Compiler ID 123456789012: Exception on sqlglot"
         ):
             mock_executor.cached(array_value, config=config)