Skip to content

Commit 6f27225

Browse files
Merge remote-tracking branch 'github/main' into op_constraints
2 parents b987653 + 0be8911 commit 6f27225

File tree

5 files changed

+672
-22
lines changed

5 files changed

+672
-22
lines changed

bigframes/dataframe.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,11 @@ def empty(self) -> bool:
306306
def values(self) -> numpy.ndarray:
307307
return self.to_numpy()
308308

309+
@property
310+
def bqclient(self) -> bigframes.Session:
311+
"""BigQuery REST API Client the DataFrame uses for operations."""
312+
return self._session.bqclient
313+
309314
@property
310315
def _session(self) -> bigframes.Session:
311316
return self._get_block().expr.session

bigframes/ml/compose.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import bigframes_vendored.sklearn.compose._column_transformer
2525

26-
from bigframes import constants
2726
from bigframes.core import log_adapter
2827
from bigframes.ml import base, core, globals, preprocessing, utils
2928
import bigframes.pandas as bpd
@@ -77,7 +76,6 @@ def transformers_(
7776
]
7877
] = []
7978

80-
column_set: set[str] = set()
8179
for entry in self.transformers:
8280
name, transformer, column_or_columns = entry
8381
columns = (
@@ -87,10 +85,6 @@ def transformers_(
8785
)
8886

8987
for column in columns:
90-
if column in column_set:
91-
raise NotImplementedError(
92-
f"Chained transformers on the same column isn't supported. {constants.FEEDBACK_LINK}"
93-
)
9488
result.append((name, transformer, column))
9589

9690
return result

notebooks/dataframes/dataframe.ipynb

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
{
22
"cells": [
3+
{
4+
"cell_type": "code",
5+
"execution_count": 1,
6+
"id": "eeec3428",
7+
"metadata": {},
8+
"outputs": [],
9+
"source": [
10+
"# Copyright 2023 Google LLC\n",
11+
"#\n",
12+
"# Licensed under the Apache License, Version 2.0 (the \"License\");\n",
13+
"# you may not use this file except in compliance with the License.\n",
14+
"# You may obtain a copy of the License at\n",
15+
"#\n",
16+
"# https://www.apache.org/licenses/LICENSE-2.0\n",
17+
"#\n",
18+
"# Unless required by applicable law or agreed to in writing, software\n",
19+
"# distributed under the License is distributed on an \"AS IS\" BASIS,\n",
20+
"# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n",
21+
"# See the License for the specific language governing permissions and\n",
22+
"# limitations under the License."
23+
]
24+
},
325
{
426
"attachments": {},
527
"cell_type": "markdown",

0 commit comments

Comments
 (0)