Skip to content

Commit 12335b3

Browse files
shuoweilshuoweil
committed
fix failed testcase
1 parent 0cf9348 commit 12335b3

File tree

3 files changed

+76
-71
lines changed

3 files changed

+76
-71
lines changed

‎bigframes/core/indexes/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ def __repr__(self) -> __builtins__.str:
378378
max_results = opts.max_rows
379379
# anywdiget mode uses the same display logic as the "deferred" mode
380380
# for faster execution
381-
if opts.repr_mode in ("deferred", "anywidget"):
381+
if opts.repr_mode == "deferred":
382382
_, dry_run_query_job = self._block._compute_dry_run()
383383
return formatter.repr_query_job(dry_run_query_job)
384384

‎notebooks/dataframes/anywidget_mode.ipynb‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
},
7070
{
7171
"cell_type": "code",
72-
"execution_count": null,
72+
"execution_count": 4,
7373
"id": "f289d250",
7474
"metadata": {},
7575
"outputs": [
@@ -104,16 +104,16 @@
104104
"output_type": "stream",
105105
"text": [
106106
"state gender year name number\n",
107-
" AL F 1910 Cora 61\n",
108-
" AL F 1910 Anna 74\n",
109-
" AR F 1910 Willie 132\n",
110-
" CO F 1910 Anna 42\n",
111-
" FL F 1910 Louise 70\n",
112-
" GA F 1910 Catherine 57\n",
113-
" IL F 1910 Jessie 43\n",
114-
" IN F 1910 Anna 100\n",
115-
" IN F 1910 Pauline 77\n",
116-
" IN F 1910 Beulah 39\n",
107+
" AL F 1910 Hazel 51\n",
108+
" AL F 1910 Lucy 76\n",
109+
" AR F 1910 Nellie 39\n",
110+
" AR F 1910 Lena 40\n",
111+
" CO F 1910 Thelma 36\n",
112+
" CO F 1910 Ruth 68\n",
113+
" CT F 1910 Elizabeth 86\n",
114+
" DC F 1910 Mary 80\n",
115+
" FL F 1910 Annie 101\n",
116+
" FL F 1910 Alma 39\n",
117117
"...\n",
118118
"\n",
119119
"[5552452 rows x 5 columns]\n"
@@ -181,7 +181,7 @@
181181
{
182182
"data": {
183183
"application/vnd.jupyter.widget-view+json": {
184-
"model_id": "5384f97c565f4de9814893c5d39a27e9",
184+
"model_id": "e22f918712dc41a3bfc8a7b8d4a951ba",
185185
"version_major": 2,
186186
"version_minor": 1
187187
},
@@ -217,79 +217,79 @@
217217
" <td>AL</td>\n",
218218
" <td>F</td>\n",
219219
" <td>1910</td>\n",
220-
" <td>Cora</td>\n",
221-
" <td>61</td>\n",
220+
" <td>Hazel</td>\n",
221+
" <td>51</td>\n",
222222
" </tr>\n",
223223
" <tr>\n",
224224
" <th>1</th>\n",
225225
" <td>AL</td>\n",
226226
" <td>F</td>\n",
227227
" <td>1910</td>\n",
228-
" <td>Anna</td>\n",
229-
" <td>74</td>\n",
228+
" <td>Lucy</td>\n",
229+
" <td>76</td>\n",
230230
" </tr>\n",
231231
" <tr>\n",
232232
" <th>2</th>\n",
233233
" <td>AR</td>\n",
234234
" <td>F</td>\n",
235235
" <td>1910</td>\n",
236-
" <td>Willie</td>\n",
237-
" <td>132</td>\n",
236+
" <td>Nellie</td>\n",
237+
" <td>39</td>\n",
238238
" </tr>\n",
239239
" <tr>\n",
240240
" <th>3</th>\n",
241-
" <td>CO</td>\n",
241+
" <td>AR</td>\n",
242242
" <td>F</td>\n",
243243
" <td>1910</td>\n",
244-
" <td>Anna</td>\n",
245-
" <td>42</td>\n",
244+
" <td>Lena</td>\n",
245+
" <td>40</td>\n",
246246
" </tr>\n",
247247
" <tr>\n",
248248
" <th>4</th>\n",
249-
" <td>FL</td>\n",
249+
" <td>CO</td>\n",
250250
" <td>F</td>\n",
251251
" <td>1910</td>\n",
252-
" <td>Louise</td>\n",
253-
" <td>70</td>\n",
252+
" <td>Thelma</td>\n",
253+
" <td>36</td>\n",
254254
" </tr>\n",
255255
" <tr>\n",
256256
" <th>5</th>\n",
257-
" <td>GA</td>\n",
257+
" <td>CO</td>\n",
258258
" <td>F</td>\n",
259259
" <td>1910</td>\n",
260-
" <td>Catherine</td>\n",
261-
" <td>57</td>\n",
260+
" <td>Ruth</td>\n",
261+
" <td>68</td>\n",
262262
" </tr>\n",
263263
" <tr>\n",
264264
" <th>6</th>\n",
265-
" <td>IL</td>\n",
265+
" <td>CT</td>\n",
266266
" <td>F</td>\n",
267267
" <td>1910</td>\n",
268-
" <td>Jessie</td>\n",
269-
" <td>43</td>\n",
268+
" <td>Elizabeth</td>\n",
269+
" <td>86</td>\n",
270270
" </tr>\n",
271271
" <tr>\n",
272272
" <th>7</th>\n",
273-
" <td>IN</td>\n",
273+
" <td>DC</td>\n",
274274
" <td>F</td>\n",
275275
" <td>1910</td>\n",
276-
" <td>Anna</td>\n",
277-
" <td>100</td>\n",
276+
" <td>Mary</td>\n",
277+
" <td>80</td>\n",
278278
" </tr>\n",
279279
" <tr>\n",
280280
" <th>8</th>\n",
281-
" <td>IN</td>\n",
281+
" <td>FL</td>\n",
282282
" <td>F</td>\n",
283283
" <td>1910</td>\n",
284-
" <td>Pauline</td>\n",
285-
" <td>77</td>\n",
284+
" <td>Annie</td>\n",
285+
" <td>101</td>\n",
286286
" </tr>\n",
287287
" <tr>\n",
288288
" <th>9</th>\n",
289-
" <td>IN</td>\n",
289+
" <td>FL</td>\n",
290290
" <td>F</td>\n",
291291
" <td>1910</td>\n",
292-
" <td>Beulah</td>\n",
292+
" <td>Alma</td>\n",
293293
" <td>39</td>\n",
294294
" </tr>\n",
295295
" </tbody>\n",
@@ -346,7 +346,7 @@
346346
{
347347
"data": {
348348
"application/vnd.jupyter.widget-view+json": {
349-
"model_id": "bb32dbe7265e43dca0e8c341be36be84",
349+
"model_id": "66d200cd4e3f476fafaad8d80f88cafd",
350350
"version_major": 2,
351351
"version_minor": 1
352352
},
@@ -446,7 +446,7 @@
446446
{
447447
"data": {
448448
"application/vnd.jupyter.widget-view+json": {
449-
"model_id": "f4dbd2b24e9a43e2a8003638e427ee1f",
449+
"model_id": "c18c1794f30f45c98e2892d6b1b26b1b",
450450
"version_major": 2,
451451
"version_minor": 1
452452
},
@@ -486,7 +486,7 @@
486486
"data": {
487487
"text/html": [
488488
"✅ Completed. \n",
489-
" Query processed 85.9 kB in 30 seconds of slot time.\n",
489+
" Query processed 85.9 kB in 28 seconds of slot time.\n",
490490
" "
491491
],
492492
"text/plain": [
@@ -555,7 +555,7 @@
555555
{
556556
"data": {
557557
"application/vnd.jupyter.widget-view+json": {
558-
"model_id": "fe0abfd9a9bd4ee8aac06a95631d7f7b",
558+
"model_id": "54007f0106044ce49520b92a4662192f",
559559
"version_major": 2,
560560
"version_minor": 1
561561
},
@@ -621,16 +621,16 @@
621621
" <td>EU</td>\n",
622622
" <td>DE</td>\n",
623623
" <td>03.10.2018</td>\n",
624-
" <td>H01L 21/20</td>\n",
624+
" <td>H05B 6/12</td>\n",
625625
" <td>&lt;NA&gt;</td>\n",
626-
" <td>18166536.5</td>\n",
627-
" <td>16.02.2016</td>\n",
626+
" <td>18165514.3</td>\n",
627+
" <td>03.04.2018</td>\n",
628+
" <td>30.03.2017</td>\n",
628629
" <td>&lt;NA&gt;</td>\n",
629-
" <td>Scheider, Sascha et al</td>\n",
630-
" <td>EV Group E. Thallner GmbH</td>\n",
631-
" <td>Kurz, Florian</td>\n",
632-
" <td>VORRICHTUNG ZUM BONDEN VON SUBSTRATEN</td>\n",
633-
" <td>EP 3 382 744 A1</td>\n",
630+
" <td>BSH Hausgeräte GmbH</td>\n",
631+
" <td>Acero Acero, Jesus</td>\n",
632+
" <td>VORRICHTUNG ZUR INDUKTIVEN ENERGIE√úBERTRAGUNG</td>\n",
633+
" <td>EP 3 383 141 A2</td>\n",
634634
" </tr>\n",
635635
" <tr>\n",
636636
" <th>2</th>\n",
@@ -657,16 +657,16 @@
657657
" <td>EU</td>\n",
658658
" <td>DE</td>\n",
659659
" <td>03.10.2018</td>\n",
660-
" <td>A01K 31/00</td>\n",
660+
" <td>H01L 21/20</td>\n",
661661
" <td>&lt;NA&gt;</td>\n",
662-
" <td>18171005.4</td>\n",
663-
" <td>05.02.2015</td>\n",
664-
" <td>05.02.2014</td>\n",
665-
" <td>Stork Bamberger Patentanwälte</td>\n",
666-
" <td>Linco Food Systems A/S</td>\n",
667-
" <td>Thrane, Uffe</td>\n",
668-
" <td>MASTHÄHNCHENCONTAINER ALS BESTANDTEIL EINER E...</td>\n",
669-
" <td>EP 3 381 276 A1</td>\n",
662+
" <td>18166536.5</td>\n",
663+
" <td>16.02.2016</td>\n",
664+
" <td>&lt;NA&gt;</td>\n",
665+
" <td>Scheider, Sascha et al</td>\n",
666+
" <td>EV Group E. Thallner GmbH</td>\n",
667+
" <td>Kurz, Florian</td>\n",
668+
" <td>VORRICHTUNG ZUM BONDEN VON SUBSTRATEN</td>\n",
669+
" <td>EP 3 382 744 A1</td>\n",
670670
" </tr>\n",
671671
" <tr>\n",
672672
" <th>4</th>\n",
@@ -675,16 +675,16 @@
675675
" <td>EU</td>\n",
676676
" <td>DE</td>\n",
677677
" <td>03.10.2018</td>\n",
678-
" <td>H05B 6/12</td>\n",
679-
" <td>&lt;NA&gt;</td>\n",
680-
" <td>18165514.3</td>\n",
681-
" <td>03.04.2018</td>\n",
682-
" <td>30.03.2017</td>\n",
678+
" <td>A01K 31/00</td>\n",
683679
" <td>&lt;NA&gt;</td>\n",
684-
" <td>BSH Hausgeräte GmbH</td>\n",
685-
" <td>Acero Acero, Jesus</td>\n",
686-
" <td>VORRICHTUNG ZUR INDUKTIVEN ENERGIE√úBERTRAGUNG</td>\n",
687-
" <td>EP 3 383 141 A2</td>\n",
680+
" <td>18171005.4</td>\n",
681+
" <td>05.02.2015</td>\n",
682+
" <td>05.02.2014</td>\n",
683+
" <td>Stork Bamberger Patentanwälte</td>\n",
684+
" <td>Linco Food Systems A/S</td>\n",
685+
" <td>Thrane, Uffe</td>\n",
686+
" <td>MASTHÄHNCHENCONTAINER ALS BESTANDTEIL EINER E...</td>\n",
687+
" <td>EP 3 381 276 A1</td>\n",
688688
" </tr>\n",
689689
" </tbody>\n",
690690
"</table>\n",

‎tests/system/small/test_progress_bar.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,17 @@ def test_repr_anywidget_dataframe(penguins_df_default_index: bf.dataframe.DataFr
153153
pytest.importorskip("anywidget")
154154
with bf.option_context("display.repr_mode", "anywidget"):
155155
actual_repr = repr(penguins_df_default_index)
156-
assert EXPECTED_DRY_RUN_MESSAGE in actual_repr
156+
assert "species" in actual_repr
157+
assert "island" in actual_repr
158+
assert "[344 rows x 7 columns]" in actual_repr
157159

158160

159161
def test_repr_anywidget_index(penguins_df_default_index: bf.dataframe.DataFrame):
160162
pytest.importorskip("anywidget")
161163
with bf.option_context("display.repr_mode", "anywidget"):
162164
index = penguins_df_default_index.index
163165
actual_repr = repr(index)
164-
assert EXPECTED_DRY_RUN_MESSAGE in actual_repr
166+
# In non-interactive environments, should still get a useful summary.
167+
assert "Index" in actual_repr
168+
assert "0, 1, 2, 3, 4" in actual_repr
169+
assert "dtype='Int64'" in actual_repr

0 commit comments

Comments
 (0)