NotificationsYou must be signed in to change notification settings
Fork321
Star786

Commit1cb3e55

authored

fix: use REST API in cell magic when requested (#892)

Fixes#876.The `--use_rest_api` option did not work as expected and this commit fixes it.**PR checklist:**- [x] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/python-bigquery/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea- [x] Ensure the tests and linter pass- [x] Code coverage does not decrease (if any source code was changed)- [x] Appropriate docs were updated (if necessary)

1 parent72a52f0 commit1cb3e55Copy full SHA for 1cb3e55

File tree

2 files changed

+25

-8

lines changed

google/cloud/bigquery/magics
- magics.py
tests/unit
- test_magics.py

2 files changed

+25

-8

lines changed

`‎google/cloud/bigquery/magics/magics.py‎`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,9 @@ def _cell_magic(line, query):`
`671`	`671`	`_handle_error(ex,args.destination_var)`
`672`	`672`	`return`
`673`	`673`
`674`		`-result=rows.to_dataframe(bqstorage_client=bqstorage_client)`
	`674`	`+result=rows.to_dataframe(`
	`675`	`+bqstorage_client=bqstorage_client,create_bqstorage_client=False,`
	`676`	`+ )`
`675`	`677`	`ifargs.destination_var:`
`676`	`678`	`IPython.get_ipython().push({args.destination_var:result})`
`677`	`679`	`return`
`@@ -728,11 +730,15 @@ def _cell_magic(line, query):`
`728`	`730`
`729`	`731`	`ifmax_results:`
`730`	`732`	`result=query_job.result(max_results=max_results).to_dataframe(`
`731`		`-bqstorage_client=bqstorage_client,progress_bar_type=progress_bar`
	`733`	`+bqstorage_client=None,`
	`734`	`+create_bqstorage_client=False,`
	`735`	`+progress_bar_type=progress_bar,`
`732`	`736`	`)`
`733`	`737`	`else:`
`734`	`738`	`result=query_job.to_dataframe(`
`735`		`-bqstorage_client=bqstorage_client,progress_bar_type=progress_bar`
	`739`	`+bqstorage_client=bqstorage_client,`
	`740`	`+create_bqstorage_client=False,`
	`741`	`+progress_bar_type=progress_bar,`
`736`	`742`	`)`
`737`	`743`
`738`	`744`	`ifargs.destination_var:`

`‎tests/unit/test_magics.py‎`

Lines changed: 16 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,9 @@ def warning_match(warning):`
`660`	`660`	`assertclient_info.user_agent=="ipython-"+IPython.__version__`
`661`	`661`
`662`	`662`	`query_job_mock.to_dataframe.assert_called_once_with(`
`663`		`-bqstorage_client=bqstorage_instance_mock,progress_bar_type="tqdm"`
	`663`	`+bqstorage_client=bqstorage_instance_mock,`
	`664`	`+create_bqstorage_client=mock.ANY,`
	`665`	`+progress_bar_type="tqdm",`
`664`	`666`	`)`
`665`	`667`
`666`	`668`	`assertisinstance(return_value,pandas.DataFrame)`
`@@ -703,7 +705,9 @@ def test_bigquery_magic_with_rest_client_requested(monkeypatch):`
`703`	`705`
`704`	`706`	`bqstorage_mock.assert_not_called()`
`705`	`707`	`query_job_mock.to_dataframe.assert_called_once_with(`
`706`		`-bqstorage_client=None,progress_bar_type="tqdm"`
	`708`	`+bqstorage_client=None,`
	`709`	`+create_bqstorage_client=False,`
	`710`	`+progress_bar_type="tqdm",`
`707`	`711`	`)`
`708`	`712`
`709`	`713`	`assertisinstance(return_value,pandas.DataFrame)`
`@@ -757,7 +761,12 @@ def test_bigquery_magic_w_max_results_valid_calls_queryjob_result():`
`757`	`761`	`client_query_mock.return_value=query_job_mock`
`758`	`762`	`ip.run_cell_magic("bigquery","--max_results=5",sql)`
`759`	`763`
`760`		`-query_job_mock.result.assert_called_with(max_results=5)`
	`764`	`+query_job_mock.result.assert_called_with(max_results=5)`
	`765`	`+query_job_mock.result.return_value.to_dataframe.assert_called_once_with(`
	`766`	`+bqstorage_client=None,`
	`767`	`+create_bqstorage_client=False,`
	`768`	`+progress_bar_type=mock.ANY,`
	`769`	`+ )`
`761`	`770`
`762`	`771`
`763`	`772`	`@pytest.mark.usefixtures("ipython_interactive")`
`@@ -929,7 +938,7 @@ def test_bigquery_magic_w_table_id_and_bqstorage_client():`
`929`	`938`
`930`	`939`	`ip.run_cell_magic("bigquery","--max_results=5",table_id)`
`931`	`940`	`row_iterator_mock.to_dataframe.assert_called_once_with(`
`932`		`-bqstorage_client=bqstorage_instance_mock`
	`941`	`+bqstorage_client=bqstorage_instance_mock,create_bqstorage_client=mock.ANY,`
`933`	`942`	`)`
`934`	`943`
`935`	`944`
`@@ -1246,7 +1255,9 @@ def test_bigquery_magic_w_progress_bar_type_w_context_setter(monkeypatch):`
`1246`	`1255`
`1247`	`1256`	`bqstorage_mock.assert_not_called()`
`1248`	`1257`	`query_job_mock.to_dataframe.assert_called_once_with(`
`1249`		`-bqstorage_client=None,progress_bar_type=magics.context.progress_bar_type`
	`1258`	`+bqstorage_client=None,`
	`1259`	`+create_bqstorage_client=False,`
	`1260`	`+progress_bar_type=magics.context.progress_bar_type,`
`1250`	`1261`	`)`
`1251`	`1262`
`1252`	`1263`	`assertisinstance(return_value,pandas.DataFrame)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1cb3e55

File tree

2 files changed

2 files changed

`‎google/cloud/bigquery/magics/magics.py‎`

`‎tests/unit/test_magics.py‎`

0 commit comments