Skip to content

Commit 6055998

Browse files
committed
refactor: Address review comments
1 parent 44e1b62 commit 6055998

File tree

2 files changed

+33
-25
lines changed

2 files changed

+33
-25
lines changed

packages/bigframes/bigframes/session/__init__.py

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -115,29 +115,27 @@ def _constructor(self):
115115
return _ExecutionHistory
116116

117117
def _repr_html_(self) -> str | None:
118-
try:
119-
import bigframes.formatting_helpers as formatter
118+
import bigframes.formatting_helpers as formatter
119+
120+
if self.empty:
121+
return "<div>No executions found.</div>"
122+
123+
cols = ["job_id", "status", "total_bytes_processed", "job_url"]
120124

121-
if self.empty:
122-
return "<div>No executions found.</div>"
125+
def format_url(url):
126+
return f'<a target="_blank" href="{url}">Open Job</a>' if url else ""
123127

124-
cols = ["job_id", "status", "total_bytes_processed", "job_url"]
128+
try:
125129
df_display = self[cols].copy()
126130
df_display["total_bytes_processed"] = df_display[
127131
"total_bytes_processed"
128132
].apply(formatter.get_formatted_bytes)
129-
130-
def format_url(url):
131-
return f'<a target="_blank" href="{url}">Open Job</a>' if url else ""
132-
133133
df_display["job_url"] = df_display["job_url"].apply(format_url)
134134

135135
# Rename job_id to query_id to match user expectations
136136
df_display = df_display.rename(columns={"job_id": "query_id"})
137137

138-
compact_html = df_display.to_html(escape=False, index=False)
139-
140-
return compact_html
138+
return df_display.to_html(escape=False, index=False)
141139
except Exception:
142140
return super()._repr_html_() # type: ignore
143141

@@ -470,7 +468,8 @@ def read_gbq( # type: ignore[overload-overlap]
470468
col_order: Iterable[str] = ...,
471469
dry_run: Literal[False] = ...,
472470
allow_large_results: Optional[bool] = ...,
473-
) -> dataframe.DataFrame: ...
471+
) -> dataframe.DataFrame:
472+
...
474473

475474
@overload
476475
def read_gbq(
@@ -486,7 +485,8 @@ def read_gbq(
486485
col_order: Iterable[str] = ...,
487486
dry_run: Literal[True] = ...,
488487
allow_large_results: Optional[bool] = ...,
489-
) -> pandas.Series: ...
488+
) -> pandas.Series:
489+
...
490490

491491
def read_gbq(
492492
self,
@@ -558,7 +558,8 @@ def _read_gbq_colab(
558558
*,
559559
pyformat_args: Optional[Dict[str, Any]] = None,
560560
dry_run: Literal[False] = ...,
561-
) -> dataframe.DataFrame: ...
561+
) -> dataframe.DataFrame:
562+
...
562563

563564
@overload
564565
def _read_gbq_colab(
@@ -567,7 +568,8 @@ def _read_gbq_colab(
567568
*,
568569
pyformat_args: Optional[Dict[str, Any]] = None,
569570
dry_run: Literal[True] = ...,
570-
) -> pandas.Series: ...
571+
) -> pandas.Series:
572+
...
571573

572574
@log_adapter.log_name_override("read_gbq_colab")
573575
def _read_gbq_colab(
@@ -628,7 +630,8 @@ def read_gbq_query( # type: ignore[overload-overlap]
628630
filters: third_party_pandas_gbq.FiltersType = ...,
629631
dry_run: Literal[False] = ...,
630632
allow_large_results: Optional[bool] = ...,
631-
) -> dataframe.DataFrame: ...
633+
) -> dataframe.DataFrame:
634+
...
632635

633636
@overload
634637
def read_gbq_query(
@@ -644,7 +647,8 @@ def read_gbq_query(
644647
filters: third_party_pandas_gbq.FiltersType = ...,
645648
dry_run: Literal[True] = ...,
646649
allow_large_results: Optional[bool] = ...,
647-
) -> pandas.Series: ...
650+
) -> pandas.Series:
651+
...
648652

649653
def read_gbq_query(
650654
self,
@@ -791,7 +795,8 @@ def read_gbq_table( # type: ignore[overload-overlap]
791795
use_cache: bool = ...,
792796
col_order: Iterable[str] = ...,
793797
dry_run: Literal[False] = ...,
794-
) -> dataframe.DataFrame: ...
798+
) -> dataframe.DataFrame:
799+
...
795800

796801
@overload
797802
def read_gbq_table(
@@ -805,7 +810,8 @@ def read_gbq_table(
805810
use_cache: bool = ...,
806811
col_order: Iterable[str] = ...,
807812
dry_run: Literal[True] = ...,
808-
) -> pandas.Series: ...
813+
) -> pandas.Series:
814+
...
809815

810816
def read_gbq_table(
811817
self,
@@ -956,23 +962,26 @@ def read_pandas(
956962
pandas_dataframe: pandas.Index,
957963
*,
958964
write_engine: constants.WriteEngineType = "default",
959-
) -> bigframes.core.indexes.Index: ...
965+
) -> bigframes.core.indexes.Index:
966+
...
960967

961968
@typing.overload
962969
def read_pandas(
963970
self,
964971
pandas_dataframe: pandas.Series,
965972
*,
966973
write_engine: constants.WriteEngineType = "default",
967-
) -> bigframes.series.Series: ...
974+
) -> bigframes.series.Series:
975+
...
968976

969977
@typing.overload
970978
def read_pandas(
971979
self,
972980
pandas_dataframe: pandas.DataFrame,
973981
*,
974982
write_engine: constants.WriteEngineType = "default",
975-
) -> dataframe.DataFrame: ...
983+
) -> dataframe.DataFrame:
984+
...
976985

977986
def read_pandas(
978987
self,

packages/bigframes/bigframes/session/metrics.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ def count_job_stats(
195195
self.execution_secs += exec_seconds or 0
196196

197197
metadata = JobMetadata.from_job(query_job, exec_seconds=exec_seconds)
198-
metadata.total_bytes_processed = bytes_processed
199-
metadata.total_slot_ms = slot_millis
200198
self.jobs.append(metadata)
201199

202200
else:
@@ -249,6 +247,7 @@ def on_event(self, event: Any):
249247
if event.result and isinstance(event.result, LocalExecuteResult):
250248
self.execution_count += 1
251249
bytes_processed = event.result.total_bytes_processed or 0
250+
self.bytes_processed += bytes_processed
252251

253252
metadata = JobMetadata(
254253
job_type="polars",

0 commit comments

Comments
 (0)