Skip to content

Commit 5a3bf9a

Browse files
shuoweilshuoweil
committed
display the real index values, even if the index has no name
1 parent 0591d7a commit 5a3bf9a

File tree

3 files changed

+133
-128
lines changed

3 files changed

+133
-128
lines changed

‎bigframes/display/anywidget.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,13 +297,15 @@ def _set_table_html(self) -> None:
297297
page_data = cached_data.iloc[start:end].copy()
298298

299299
# Handle index display
300-
if self._dataframe._block.has_index and page_data.index.name is not None:
301-
# Custom named index - include it with its actual name
302-
page_data.insert(0, page_data.index.name, page_data.index)
300+
# TODO(b/332316283): Add tests for custom multiindex
301+
if self._dataframe._block.has_index:
302+
index_name = page_data.index.name
303+
page_data.insert(
304+
0, index_name if index_name is not None else "", page_data.index
305+
)
303306
else:
304307
# Default index - include as "Row" column
305308
page_data.insert(0, "Row", range(start + 1, start + len(page_data) + 1))
306-
307309
# Handle case where user navigated beyond available data with unknown row count
308310
is_unknown_count = self.row_count is None
309311
is_beyond_data = self._all_data_loaded and len(page_data) == 0 and self.page > 0

‎notebooks/dataframes/anywidget_mode.ipynb‎

Lines changed: 114 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,17 @@
106106
"name": "stdout",
107107
"output_type": "stream",
108108
"text": [
109-
"state gender year name number\n",
110-
" AL F 1910 Vera 71\n",
111-
" AR F 1910 Viola 37\n",
112-
" AR F 1910 Alice 57\n",
113-
" AR F 1910 Edna 95\n",
114-
" AR F 1910 Ollie 40\n",
115-
" CA F 1910 Beatrice 37\n",
116-
" CT F 1910 Marion 36\n",
117-
" CT F 1910 Marie 36\n",
118-
" FL F 1910 Alice 53\n",
119-
" GA F 1910 Thelma 133\n",
109+
"state gender year name number\n",
110+
" AL F 1910 Lillian 99\n",
111+
" AL F 1910 Ruby 204\n",
112+
" AL F 1910 Helen 76\n",
113+
" AL F 1910 Eunice 41\n",
114+
" AR F 1910 Dora 42\n",
115+
" CA F 1910 Edna 62\n",
116+
" CA F 1910 Helen 239\n",
117+
" CO F 1910 Alice 46\n",
118+
" FL F 1910 Willie 71\n",
119+
" FL F 1910 Thelma 65\n",
120120
"...\n",
121121
"\n",
122122
"[5552452 rows x 5 columns]\n"
@@ -196,7 +196,7 @@
196196
{
197197
"data": {
198198
"application/vnd.jupyter.widget-view+json": {
199-
"model_id": "0eed2201e13d496ab741662d96eddc14",
199+
"model_id": "775e84ca212c4867bb889266b830ae68",
200200
"version_major": 2,
201201
"version_minor": 1
202202
},
@@ -232,98 +232,98 @@
232232
" <td>AL</td>\n",
233233
" <td>F</td>\n",
234234
" <td>1910</td>\n",
235-
" <td>Sadie</td>\n",
236-
" <td>40</td>\n",
235+
" <td>Cora</td>\n",
236+
" <td>61</td>\n",
237237
" </tr>\n",
238238
" <tr>\n",
239239
" <th>1</th>\n",
240240
" <td>AL</td>\n",
241241
" <td>F</td>\n",
242242
" <td>1910</td>\n",
243-
" <td>Mary</td>\n",
244-
" <td>875</td>\n",
243+
" <td>Anna</td>\n",
244+
" <td>74</td>\n",
245245
" </tr>\n",
246246
" <tr>\n",
247247
" <th>2</th>\n",
248248
" <td>AR</td>\n",
249249
" <td>F</td>\n",
250250
" <td>1910</td>\n",
251-
" <td>Vera</td>\n",
252-
" <td>39</td>\n",
251+
" <td>Willie</td>\n",
252+
" <td>132</td>\n",
253253
" </tr>\n",
254254
" <tr>\n",
255255
" <th>3</th>\n",
256-
" <td>AR</td>\n",
256+
" <td>CO</td>\n",
257257
" <td>F</td>\n",
258258
" <td>1910</td>\n",
259-
" <td>Marie</td>\n",
260-
" <td>78</td>\n",
259+
" <td>Anna</td>\n",
260+
" <td>42</td>\n",
261261
" </tr>\n",
262262
" <tr>\n",
263263
" <th>4</th>\n",
264-
" <td>AR</td>\n",
264+
" <td>FL</td>\n",
265265
" <td>F</td>\n",
266266
" <td>1910</td>\n",
267-
" <td>Lucille</td>\n",
268-
" <td>66</td>\n",
267+
" <td>Louise</td>\n",
268+
" <td>70</td>\n",
269269
" </tr>\n",
270270
" <tr>\n",
271271
" <th>5</th>\n",
272-
" <td>CA</td>\n",
272+
" <td>GA</td>\n",
273273
" <td>F</td>\n",
274274
" <td>1910</td>\n",
275-
" <td>Virginia</td>\n",
276-
" <td>101</td>\n",
275+
" <td>Catherine</td>\n",
276+
" <td>57</td>\n",
277277
" </tr>\n",
278278
" <tr>\n",
279279
" <th>6</th>\n",
280-
" <td>DC</td>\n",
280+
" <td>IL</td>\n",
281281
" <td>F</td>\n",
282282
" <td>1910</td>\n",
283-
" <td>Margaret</td>\n",
284-
" <td>72</td>\n",
283+
" <td>Jessie</td>\n",
284+
" <td>43</td>\n",
285285
" </tr>\n",
286286
" <tr>\n",
287287
" <th>7</th>\n",
288-
" <td>GA</td>\n",
288+
" <td>IN</td>\n",
289289
" <td>F</td>\n",
290290
" <td>1910</td>\n",
291-
" <td>Mildred</td>\n",
292-
" <td>133</td>\n",
291+
" <td>Anna</td>\n",
292+
" <td>100</td>\n",
293293
" </tr>\n",
294294
" <tr>\n",
295295
" <th>8</th>\n",
296-
" <td>GA</td>\n",
296+
" <td>IN</td>\n",
297297
" <td>F</td>\n",
298298
" <td>1910</td>\n",
299-
" <td>Vera</td>\n",
300-
" <td>51</td>\n",
299+
" <td>Pauline</td>\n",
300+
" <td>77</td>\n",
301301
" </tr>\n",
302302
" <tr>\n",
303303
" <th>9</th>\n",
304-
" <td>GA</td>\n",
304+
" <td>IN</td>\n",
305305
" <td>F</td>\n",
306306
" <td>1910</td>\n",
307-
" <td>Sallie</td>\n",
308-
" <td>92</td>\n",
307+
" <td>Beulah</td>\n",
308+
" <td>39</td>\n",
309309
" </tr>\n",
310310
" </tbody>\n",
311311
"</table>\n",
312312
"<p>10 rows × 5 columns</p>\n",
313313
"</div>[5552452 rows x 5 columns in total]"
314314
],
315315
"text/plain": [
316-
"state gender year name number\n",
317-
" AL F 1910 Sadie 40\n",
318-
" AL F 1910 Mary 875\n",
319-
" AR F 1910 Vera 39\n",
320-
" AR F 1910 Marie 78\n",
321-
" AR F 1910 Lucille 66\n",
322-
" CA F 1910 Virginia 101\n",
323-
" DC F 1910 Margaret 72\n",
324-
" GA F 1910 Mildred 133\n",
325-
" GA F 1910 Vera 51\n",
326-
" GA F 1910 Sallie 92\n",
316+
"state gender year name number\n",
317+
" AL F 1910 Cora 61\n",
318+
" AL F 1910 Anna 74\n",
319+
" AR F 1910 Willie 132\n",
320+
" CO F 1910 Anna 42\n",
321+
" FL F 1910 Louise 70\n",
322+
" GA F 1910 Catherine 57\n",
323+
" IL F 1910 Jessie 43\n",
324+
" IN F 1910 Anna 100\n",
325+
" IN F 1910 Pauline 77\n",
326+
" IN F 1910 Beulah 39\n",
327327
"...\n",
328328
"\n",
329329
"[5552452 rows x 5 columns]"
@@ -409,12 +409,12 @@
409409
{
410410
"data": {
411411
"application/vnd.jupyter.widget-view+json": {
412-
"model_id": "45766d5dd61744c2a1c2448b8eddc86d",
412+
"model_id": "bf4224f8022042aea6d72507ddb5570b",
413413
"version_major": 2,
414414
"version_minor": 1
415415
},
416416
"text/plain": [
417-
"<bigframes.display.anywidget.TableWidget object at 0x7fa2cdb07750>"
417+
"<bigframes.display.anywidget.TableWidget object at 0x7fc15e437890>"
418418
]
419419
},
420420
"execution_count": 7,
@@ -523,12 +523,12 @@
523523
{
524524
"data": {
525525
"application/vnd.jupyter.widget-view+json": {
526-
"model_id": "cf835e468a03459f9bd2df0f1a3979ed",
526+
"model_id": "8d9bfeeba3ca4d11a56dccb28aacde23",
527527
"version_major": 2,
528528
"version_minor": 1
529529
},
530530
"text/plain": [
531-
"<bigframes.display.anywidget.TableWidget object at 0x7fa2cc0fc550>"
531+
"<bigframes.display.anywidget.TableWidget object at 0x7fc15c35c690>"
532532
]
533533
},
534534
"execution_count": 9,
@@ -563,7 +563,7 @@
563563
"data": {
564564
"text/html": [
565565
"✅ Completed. \n",
566-
" Query processed 85.9 kB in 18 seconds of slot time.\n",
566+
" Query processed 85.9 kB in 13 seconds of slot time.\n",
567567
" "
568568
],
569569
"text/plain": [
@@ -624,7 +624,7 @@
624624
{
625625
"data": {
626626
"application/vnd.jupyter.widget-view+json": {
627-
"model_id": "39a3ce333e8b4e13aa69fca9c0a08a4e",
627+
"model_id": "9fce25a077604e4882144d46d0d4ba45",
628628
"version_major": 2,
629629
"version_minor": 1
630630
},
@@ -671,6 +671,42 @@
671671
" <td>gs://gcs-public-data--labeled-patents/espacene...</td>\n",
672672
" <td>EU</td>\n",
673673
" <td>DE</td>\n",
674+
" <td>29.08.018</td>\n",
675+
" <td>E04H 6/12</td>\n",
676+
" <td>&lt;NA&gt;</td>\n",
677+
" <td>18157874.1</td>\n",
678+
" <td>21.02.2018</td>\n",
679+
" <td>22.02.2017</td>\n",
680+
" <td>Liedtke &amp; Partner Patentanwälte</td>\n",
681+
" <td>SHB Hebezeugbau GmbH</td>\n",
682+
" <td>VOLGER, Alexander</td>\n",
683+
" <td>STEUERUNGSSYSTEM FÜR AUTOMATISCHE PARKHÄUSER</td>\n",
684+
" <td>EP 3 366 869 A1</td>\n",
685+
" </tr>\n",
686+
" <tr>\n",
687+
" <th>1</th>\n",
688+
" <td>{'application_number': None, 'class_internatio...</td>\n",
689+
" <td>gs://gcs-public-data--labeled-patents/espacene...</td>\n",
690+
" <td>EU</td>\n",
691+
" <td>DE</td>\n",
692+
" <td>03.10.2018</td>\n",
693+
" <td>H05B 6/12</td>\n",
694+
" <td>&lt;NA&gt;</td>\n",
695+
" <td>18165514.3</td>\n",
696+
" <td>03.04.2018</td>\n",
697+
" <td>30.03.2017</td>\n",
698+
" <td>&lt;NA&gt;</td>\n",
699+
" <td>BSH Hausgeräte GmbH</td>\n",
700+
" <td>Acero Acero, Jesus</td>\n",
701+
" <td>VORRICHTUNG ZUR INDUKTIVEN ENERGIE√úBERTRAGUNG</td>\n",
702+
" <td>EP 3 383 141 A2</td>\n",
703+
" </tr>\n",
704+
" <tr>\n",
705+
" <th>2</th>\n",
706+
" <td>{'application_number': None, 'class_internatio...</td>\n",
707+
" <td>gs://gcs-public-data--labeled-patents/espacene...</td>\n",
708+
" <td>EU</td>\n",
709+
" <td>DE</td>\n",
674710
" <td>03.10.2018</td>\n",
675711
" <td>H01L 21/20</td>\n",
676712
" <td>&lt;NA&gt;</td>\n",
@@ -684,7 +720,7 @@
684720
" <td>EP 3 382 744 A1</td>\n",
685721
" </tr>\n",
686722
" <tr>\n",
687-
" <th>1</th>\n",
723+
" <th>3</th>\n",
688724
" <td>{'application_number': None, 'class_internatio...</td>\n",
689725
" <td>gs://gcs-public-data--labeled-patents/espacene...</td>\n",
690726
" <td>EU</td>\n",
@@ -702,25 +738,7 @@
702738
" <td>EP 3 382 553 A1</td>\n",
703739
" </tr>\n",
704740
" <tr>\n",
705-
" <th>2</th>\n",
706-
" <td>{'application_number': None, 'class_internatio...</td>\n",
707-
" <td>gs://gcs-public-data--labeled-patents/espacene...</td>\n",
708-
" <td>EU</td>\n",
709-
" <td>DE</td>\n",
710-
" <td>29.08.018</td>\n",
711-
" <td>E04H 6/12</td>\n",
712-
" <td>&lt;NA&gt;</td>\n",
713-
" <td>18157874.1</td>\n",
714-
" <td>21.02.2018</td>\n",
715-
" <td>22.02.2017</td>\n",
716-
" <td>Liedtke &amp; Partner Patentanwälte</td>\n",
717-
" <td>SHB Hebezeugbau GmbH</td>\n",
718-
" <td>VOLGER, Alexander</td>\n",
719-
" <td>STEUERUNGSSYSTEM FÜR AUTOMATISCHE PARKHÄUSER</td>\n",
720-
" <td>EP 3 366 869 A1</td>\n",
721-
" </tr>\n",
722-
" <tr>\n",
723-
" <th>3</th>\n",
741+
" <th>4</th>\n",
724742
" <td>{'application_number': None, 'class_internatio...</td>\n",
725743
" <td>gs://gcs-public-data--labeled-patents/espacene...</td>\n",
726744
" <td>EU</td>\n",
@@ -737,24 +755,6 @@
737755
" <td>MASTHÄHNCHENCONTAINER ALS BESTANDTEIL EINER E...</td>\n",
738756
" <td>EP 3 381 276 A1</td>\n",
739757
" </tr>\n",
740-
" <tr>\n",
741-
" <th>4</th>\n",
742-
" <td>{'application_number': None, 'class_internatio...</td>\n",
743-
" <td>gs://gcs-public-data--labeled-patents/espacene...</td>\n",
744-
" <td>EU</td>\n",
745-
" <td>DE</td>\n",
746-
" <td>03.10.2018</td>\n",
747-
" <td>H05B 6/12</td>\n",
748-
" <td>&lt;NA&gt;</td>\n",
749-
" <td>18165514.3</td>\n",
750-
" <td>03.04.2018</td>\n",
751-
" <td>30.03.2017</td>\n",
752-
" <td>&lt;NA&gt;</td>\n",
753-
" <td>BSH Hausgeräte GmbH</td>\n",
754-
" <td>Acero Acero, Jesus</td>\n",
755-
" <td>VORRICHTUNG ZUR INDUKTIVEN ENERGIE√úBERTRAGUNG</td>\n",
756-
" <td>EP 3 383 141 A2</td>\n",
757-
" </tr>\n",
758758
" </tbody>\n",
759759
"</table>\n",
760760
"<p>5 rows × 15 columns</p>\n",
@@ -776,32 +776,32 @@
776776
"4 gs://gcs-public-data--labeled-patents/espacene... EU DE \n",
777777
"\n",
778778
" publication_date class_international class_us application_number \\\n",
779-
"0 03.10.2018 H01L 21/20 <NA> 18166536.5 \n",
780-
"1 03.10.2018 G06F 11/30 <NA> 18157347.8 \n",
781-
"2 29.08.018 E04H 6/12 <NA> 18157874.1 \n",
782-
"3 03.10.2018 A01K 31/00 <NA> 18171005.4 \n",
783-
"4 03.10.2018 H05B 6/12 <NA> 18165514.3 \n",
779+
"0 29.08.018 E04H 6/12 <NA> 18157874.1 \n",
780+
"1 03.10.2018 H05B 6/12 <NA> 18165514.3 \n",
781+
"2 03.10.2018 H01L 21/20 <NA> 18166536.5 \n",
782+
"3 03.10.2018 G06F 11/30 <NA> 18157347.8 \n",
783+
"4 03.10.2018 A01K 31/00 <NA> 18171005.4 \n",
784784
"\n",
785785
" filing_date priority_date_eu representative_line_1_eu \\\n",
786-
"0 16.02.2016 <NA> Scheider, Sascha et al \n",
787-
"1 19.02.2018 31.03.2017 Hoffmann Eitle \n",
788-
"2 21.02.2018 22.02.2017 Liedtke & Partner Patentanwälte \n",
789-
"3 05.02.2015 05.02.2014 Stork Bamberger Patentanwälte \n",
790-
"4 03.04.2018 30.03.2017 <NA> \n",
786+
"0 21.02.2018 22.02.2017 Liedtke & Partner Patentanwälte \n",
787+
"1 03.04.2018 30.03.2017 <NA> \n",
788+
"2 16.02.2016 <NA> Scheider, Sascha et al \n",
789+
"3 19.02.2018 31.03.2017 Hoffmann Eitle \n",
790+
"4 05.02.2015 05.02.2014 Stork Bamberger Patentanwälte \n",
791791
"\n",
792792
" applicant_line_1 inventor_line_1 \\\n",
793-
"0 EV Group E. Thallner GmbH Kurz, Florian \n",
794-
"1 FUJITSU LIMITED Kukihara, Kensuke \n",
795-
"2 SHB Hebezeugbau GmbH VOLGER, Alexander \n",
796-
"3 Linco Food Systems A/S Thrane, Uffe \n",
797-
"4 BSH Hausgeräte GmbH Acero Acero, Jesus \n",
793+
"0 SHB Hebezeugbau GmbH VOLGER, Alexander \n",
794+
"1 BSH Hausgeräte GmbH Acero Acero, Jesus \n",
795+
"2 EV Group E. Thallner GmbH Kurz, Florian \n",
796+
"3 FUJITSU LIMITED Kukihara, Kensuke \n",
797+
"4 Linco Food Systems A/S Thrane, Uffe \n",
798798
"\n",
799799
" title_line_1 number \n",
800-
"0 VORRICHTUNG ZUM BONDEN VON SUBSTRATEN EP 3 382 744 A1 \n",
801-
"1 METHOD EXECUTED BY A COMPUTER, INFORMATION PRO... EP 3 382 553 A1 \n",
802-
"2 STEUERUNGSSYSTEM FÜR AUTOMATISCHE PARKHÄUSER EP 3 366 869 A1 \n",
803-
"3 MASTHÄHNCHENCONTAINER ALS BESTANDTEIL EINER E... EP 3 381 276 A1 \n",
804-
"4 VORRICHTUNG ZUR INDUKTIVEN ENERGIE√úBERTRAGUNG EP 3 383 141 A2 \n",
800+
"0 STEUERUNGSSYSTEM FÜR AUTOMATISCHE PARKHÄUSER EP 3 366 869 A1 \n",
801+
"1 VORRICHTUNG ZUR INDUKTIVEN ENERGIE√úBERTRAGUNG EP 3 383 141 A2 \n",
802+
"2 VORRICHTUNG ZUM BONDEN VON SUBSTRATEN EP 3 382 744 A1 \n",
803+
"3 METHOD EXECUTED BY A COMPUTER, INFORMATION PRO... EP 3 382 553 A1 \n",
804+
"4 MASTHÄHNCHENCONTAINER ALS BESTANDTEIL EINER E... EP 3 381 276 A1 \n",
805805
"\n",
806806
"[5 rows x 15 columns]"
807807
]

0 commit comments

Comments
 (0)