Skip to content

Commit 3ce1f44

Browse files
chelsea-linchelsea-lin
authored
Merge branch 'main' into main_chelsealin_windows0
2 parents ae6a0ed + b19ea98 commit 3ce1f44

File tree

9 files changed

+32
-42
lines changed

9 files changed

+32
-42
lines changed

‎bigframes/display/table_widget.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
.bigframes-widget table {
5151
border-collapse: collapse;
5252
text-align: left;
53-
width: 100%;
5453
}
5554

5655
.bigframes-widget th {

‎samples/snippets/sessions_and_io_test.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
def test_sessions_and_io(project_id: str, dataset_id: str, gcs_bucket: str) -> None:
1717
YOUR_PROJECT_ID = project_id
18+
YOUR_DATASET_ID = dataset_id
1819
YOUR_LOCATION = "us"
1920
YOUR_BUCKET = gcs_bucket
2021

@@ -66,7 +67,7 @@ def test_sessions_and_io(project_id: str, dataset_id: str, gcs_bucket: str) -> N
6667
# [END bigquery_dataframes_set_options_for_global_session]
6768

6869
# [START bigquery_dataframes_global_session_is_the_default_session]
69-
# The following two statements are essentiall the same
70+
# The following two statements are essentially the same
7071
df = bpd.read_gbq("bigquery-public-data.ml_datasets.penguins")
7172
df = bpd.get_global_session().read_gbq("bigquery-public-data.ml_datasets.penguins")
7273
# [END bigquery_dataframes_global_session_is_the_default_session]
@@ -168,12 +169,12 @@ def test_sessions_and_io(project_id: str, dataset_id: str, gcs_bucket: str) -> N
168169
# [END bigquery_dataframes_read_from_sql_query]
169170
assert df is not None
170171

171-
table_name = "snippets-session-and-io-test"
172+
YOUR_TABLE_NAME = "snippets-session-and-io-test"
172173

173174
# [START bigquery_dataframes_dataframe_to_bigquery_table]
174175
import bigframes.pandas as bpd
175176

176177
df = bpd.DataFrame({"my_col": [1, 2, 3]})
177178

178-
df.to_gbq(f"{project_id}.{dataset_id}.{table_name}")
179+
df.to_gbq(f"{YOUR_PROJECT_ID}.{YOUR_DATASET_ID}.{YOUR_TABLE_NAME}")
179180
# [END bigquery_dataframes_dataframe_to_bigquery_table]

‎tests/benchmark/read_gbq_colab/aggregate_output.py‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,15 @@
1515

1616
import benchmark.utils as utils
1717

18-
import bigframes.session
18+
import bigframes.pandas as bpd
1919

2020
PAGE_SIZE = utils.READ_GBQ_COLAB_PAGE_SIZE
2121

2222

23-
def aggregate_output(
24-
*, project_id, dataset_id, table_id, session: bigframes.session.Session
25-
):
23+
def aggregate_output(*, project_id, dataset_id, table_id):
2624
# TODO(tswast): Support alternative query if table_id is a local DataFrame,
2725
# e.g. "{local_inline}" or "{local_large}"
28-
df = session._read_gbq_colab(
29-
f"SELECT * FROM `{project_id}`.{dataset_id}.{table_id}"
30-
)
26+
df = bpd._read_gbq_colab(f"SELECT * FROM `{project_id}`.{dataset_id}.{table_id}")
3127

3228
# Simulate getting the first page, since we'll always do that first in the UI.
3329
df.shape

‎tests/benchmark/read_gbq_colab/dry_run.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515

1616
import benchmark.utils as utils
1717

18-
import bigframes.session
18+
import bigframes.pandas
1919

2020

21-
def dry_run(*, project_id, dataset_id, table_id, session: bigframes.session.Session):
21+
def dry_run(*, project_id, dataset_id, table_id):
2222
# TODO(tswast): Support alternative query if table_id is a local DataFrame,
2323
# e.g. "{local_inline}" or "{local_large}"
24-
session._read_gbq_colab(
24+
bigframes.pandas._read_gbq_colab(
2525
f"SELECT * FROM `{project_id}`.{dataset_id}.{table_id}",
2626
dry_run=True,
2727
)
2828

2929

3030
if __name__ == "__main__":
31-
config = utils.get_configuration(include_table_id=True)
31+
config = utils.get_configuration(include_table_id=True, start_session=False)
3232
current_path = pathlib.Path(__file__).absolute()
3333

3434
utils.get_execution_time(
@@ -38,5 +38,4 @@ def dry_run(*, project_id, dataset_id, table_id, session: bigframes.session.Sess
3838
project_id=config.project_id,
3939
dataset_id=config.dataset_id,
4040
table_id=config.table_id,
41-
session=config.session,
4241
)

‎tests/benchmark/read_gbq_colab/filter_output.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515

1616
import benchmark.utils as utils
1717

18-
import bigframes.session
18+
import bigframes.pandas as bpd
1919

2020
PAGE_SIZE = utils.READ_GBQ_COLAB_PAGE_SIZE
2121

2222

2323
def filter_output(
24-
*, project_id, dataset_id, table_id, session: bigframes.session.Session
24+
*,
25+
project_id,
26+
dataset_id,
27+
table_id,
2528
):
2629
# TODO(tswast): Support alternative query if table_id is a local DataFrame,
2730
# e.g. "{local_inline}" or "{local_large}"
28-
df = session._read_gbq_colab(
29-
f"SELECT * FROM `{project_id}`.{dataset_id}.{table_id}"
30-
)
31+
df = bpd._read_gbq_colab(f"SELECT * FROM `{project_id}`.{dataset_id}.{table_id}")
3132

3233
# Simulate getting the first page, since we'll always do that first in the UI.
3334
df.shape
@@ -54,5 +55,4 @@ def filter_output(
5455
project_id=config.project_id,
5556
dataset_id=config.dataset_id,
5657
table_id=config.table_id,
57-
session=config.session,
5858
)

‎tests/benchmark/read_gbq_colab/first_page.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515

1616
import benchmark.utils as utils
1717

18-
import bigframes.session
18+
import bigframes.pandas
1919

2020
PAGE_SIZE = utils.READ_GBQ_COLAB_PAGE_SIZE
2121

2222

23-
def first_page(*, project_id, dataset_id, table_id, session: bigframes.session.Session):
23+
def first_page(*, project_id, dataset_id, table_id):
2424
# TODO(tswast): Support alternative query if table_id is a local DataFrame,
2525
# e.g. "{local_inline}" or "{local_large}"
26-
df = session._read_gbq_colab(
26+
df = bigframes.pandas._read_gbq_colab(
2727
f"SELECT * FROM `{project_id}`.{dataset_id}.{table_id}"
2828
)
2929

@@ -33,7 +33,7 @@ def first_page(*, project_id, dataset_id, table_id, session: bigframes.session.S
3333

3434

3535
if __name__ == "__main__":
36-
config = utils.get_configuration(include_table_id=True)
36+
config = utils.get_configuration(include_table_id=True, start_session=False)
3737
current_path = pathlib.Path(__file__).absolute()
3838

3939
utils.get_execution_time(
@@ -43,5 +43,4 @@ def first_page(*, project_id, dataset_id, table_id, session: bigframes.session.S
4343
project_id=config.project_id,
4444
dataset_id=config.dataset_id,
4545
table_id=config.table_id,
46-
session=config.session,
4746
)

‎tests/benchmark/read_gbq_colab/last_page.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515

1616
import benchmark.utils as utils
1717

18-
import bigframes.session
18+
import bigframes.pandas
1919

2020
PAGE_SIZE = utils.READ_GBQ_COLAB_PAGE_SIZE
2121

2222

23-
def last_page(*, project_id, dataset_id, table_id, session: bigframes.session.Session):
23+
def last_page(*, project_id, dataset_id, table_id):
2424
# TODO(tswast): Support alternative query if table_id is a local DataFrame,
2525
# e.g. "{local_inline}" or "{local_large}"
26-
df = session._read_gbq_colab(
26+
df = bigframes.pandas._read_gbq_colab(
2727
f"SELECT * FROM `{project_id}`.{dataset_id}.{table_id}"
2828
)
2929

@@ -34,7 +34,7 @@ def last_page(*, project_id, dataset_id, table_id, session: bigframes.session.Se
3434

3535

3636
if __name__ == "__main__":
37-
config = utils.get_configuration(include_table_id=True)
37+
config = utils.get_configuration(include_table_id=True, start_session=False)
3838
current_path = pathlib.Path(__file__).absolute()
3939

4040
utils.get_execution_time(
@@ -44,5 +44,4 @@ def last_page(*, project_id, dataset_id, table_id, session: bigframes.session.Se
4444
project_id=config.project_id,
4545
dataset_id=config.dataset_id,
4646
table_id=config.table_id,
47-
session=config.session,
4847
)

‎tests/benchmark/read_gbq_colab/sort_output.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@
1515

1616
import benchmark.utils as utils
1717

18-
import bigframes.session
18+
import bigframes.pandas
1919

2020
PAGE_SIZE = utils.READ_GBQ_COLAB_PAGE_SIZE
2121

2222

23-
def sort_output(
24-
*, project_id, dataset_id, table_id, session: bigframes.session.Session
25-
):
23+
def sort_output(*, project_id, dataset_id, table_id):
2624
# TODO(tswast): Support alternative query if table_id is a local DataFrame,
2725
# e.g. "{local_inline}" or "{local_large}"
28-
df = session._read_gbq_colab(
26+
df = bigframes.pandas._read_gbq_colab(
2927
f"SELECT * FROM `{project_id}`.{dataset_id}.{table_id}"
3028
)
3129

@@ -44,7 +42,7 @@ def sort_output(
4442

4543

4644
if __name__ == "__main__":
47-
config = utils.get_configuration(include_table_id=True)
45+
config = utils.get_configuration(include_table_id=True, start_session=False)
4846
current_path = pathlib.Path(__file__).absolute()
4947

5048
utils.get_execution_time(
@@ -54,5 +52,4 @@ def sort_output(
5452
project_id=config.project_id,
5553
dataset_id=config.dataset_id,
5654
table_id=config.table_id,
57-
session=config.session,
5855
)

‎tests/benchmark/utils.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
class BenchmarkConfig:
2626
project_id: str
2727
dataset_id: str
28-
session: bigframes.Session
28+
session: bigframes.Session | None
2929
benchmark_suffix: str | None
3030
table_id: str | None = None
3131

3232

33-
def get_configuration(include_table_id=False) -> BenchmarkConfig:
33+
def get_configuration(include_table_id=False, start_session=True) -> BenchmarkConfig:
3434
parser = argparse.ArgumentParser()
3535
parser.add_argument(
3636
"--project_id",
@@ -65,7 +65,7 @@ def get_configuration(include_table_id=False) -> BenchmarkConfig:
6565
)
6666

6767
args = parser.parse_args()
68-
session = _initialize_session(_str_to_bool(args.ordered))
68+
session = _initialize_session(_str_to_bool(args.ordered)) if start_session else None
6969

7070
return BenchmarkConfig(
7171
project_id=args.project_id,

0 commit comments

Comments
 (0)