fix: disambiguate google-cloud-bigquery to_dataframe usage from pandas-gbq in ua.
#18369
+295
−40
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,7 +54,7 @@ | |
| import google.cloud.bigquery.table | ||
| from google.api_core import client_info | ||
| from google.cloud import bigquery | ||
| from google.cloud.bigquery import ParquetOptions, exceptions, version | ||
| from google.cloud.bigquery.dataset import Dataset, DatasetReference | ||
| from google.cloud.bigquery.enums import DatasetView, TimestampPrecision, UpdateMode | ||
| from google.cloud.bigquery.retry import DEFAULT_TIMEOUT | ||
|
|
@@ -840,6 +840,9 @@ def test_ensure_bqstorage_client_creating_new_instance(self): | |
| self.assertIs(kwargs["client_options"], mock.sentinel.client_options) | ||
| self.assertIn("test-agent", kwargs["client_info"].user_agent) | ||
| self.assertIn("pandas-gbq", kwargs["client_info"].user_agent) | ||
| self.assertIn( | ||
| f"legacy-gcb/{version.__version__}", kwargs["client_info"].user_agent | ||
| ) | ||
|
|
||
| def test_ensure_bqstorage_client_pandas_gbq_installed(self): | ||
| bigquery_storage = pytest.importorskip("google.cloud.bigquery_storage") | ||
|
|
@@ -857,15 +860,17 @@ def test_ensure_bqstorage_client_pandas_gbq_installed(self): | |
| mock_pandas = mock.Mock() | ||
| mock_pandas.__version__ = "0.13.0" | ||
|
|
||
| with ( | ||
| mock.patch("google.cloud.bigquery_storage.BigQueryReadClient", mock_client), | ||
| mock.patch.dict(sys.modules, {"pandas_gbq": mock_pandas}), | ||
| ): | ||
| client._ensure_bqstorage_client(client_info=client_info) | ||
|
|
||
| mock_client.assert_called_once() | ||
| _, kwargs = mock_client.call_args | ||
| self.assertEqual( | ||
| kwargs["client_info"].user_agent, | ||
| f"app-agent legacy-gcb/{version.__version__} pandas-gbq/0.13.0", | ||
| ) | ||
|
|
||
| def test_ensure_bqstorage_client_pandas_gbq_not_installed(self): | ||
|
|
@@ -881,14 +886,18 @@ def test_ensure_bqstorage_client_pandas_gbq_not_installed(self): | |
| user_agent="app-agent" | ||
| ) | ||
|
|
||
| with ( | ||
| mock.patch("google.cloud.bigquery_storage.BigQueryReadClient", mock_client), | ||
| mock.patch.dict(sys.modules, {"pandas_gbq": None}), | ||
| ): | ||
| client._ensure_bqstorage_client(client_info=client_info) | ||
|
|
||
| mock_client.assert_called_once() | ||
| _, kwargs = mock_client.call_args | ||
| self.assertEqual( | ||
| kwargs["client_info"].user_agent, | ||
| f"app-agent legacy-gcb/{version.__version__} pandas-gbq/0.0.0", | ||
| ) | ||
|
|
||
| def test_ensure_bqstorage_client_client_info_none(self): | ||
| bigquery_storage = pytest.importorskip("google.cloud.bigquery_storage") | ||
|
|
@@ -898,14 +907,18 @@ def test_ensure_bqstorage_client_client_info_none(self): | |
| creds = _make_credentials() | ||
| client = self._make_one(project=self.PROJECT, credentials=creds) | ||
|
|
||
| with ( | ||
| mock.patch("google.cloud.bigquery_storage.BigQueryReadClient", mock_client), | ||
| mock.patch.dict(sys.modules, {"pandas_gbq": None}), | ||
| ): | ||
| client._ensure_bqstorage_client(client_info=None) | ||
|
|
||
| mock_client.assert_called_once() | ||
| _, kwargs = mock_client.call_args | ||
| self.assertEqual( | ||
| kwargs["client_info"].user_agent, | ||
| f"legacy-gcb/{version.__version__} pandas-gbq/0.0.0", | ||
| ) | ||
|
|
||
| def test_ensure_bqstorage_client_client_info_user_agent_none(self): | ||
| bigquery_storage = pytest.importorskip("google.cloud.bigquery_storage") | ||
|
|
@@ -919,14 +932,18 @@ def test_ensure_bqstorage_client_client_info_user_agent_none(self): | |
|
|
||
| client_info = google.api_core.gapic_v1.client_info.ClientInfo(user_agent=None) | ||
|
|
||
| with ( | ||
| mock.patch("google.cloud.bigquery_storage.BigQueryReadClient", mock_client), | ||
| mock.patch.dict(sys.modules, {"pandas_gbq": None}), | ||
| ): | ||
| client._ensure_bqstorage_client(client_info=client_info) | ||
|
|
||
| mock_client.assert_called_once() | ||
| _, kwargs = mock_client.call_args | ||
| self.assertEqual( | ||
| kwargs["client_info"].user_agent, | ||
| f"legacy-gcb/{version.__version__} pandas-gbq/0.0.0", | ||
| ) | ||
|
|
||
| def test_ensure_bqstorage_client_missing_dependency(self): | ||
| creds = _make_credentials() | ||
|
|
@@ -9157,9 +9174,10 @@ def test_load_table_from_dataframe_w_partial_schema_extra_types(self): | |
| SchemaField("unknown_col", "BYTES"), | ||
| ) | ||
| job_config = job.LoadJobConfig(schema=schema) | ||
| with ( | ||
| load_patch as load_table_from_file, | ||
| pytest.raises(ValueError) as exc_context, | ||
| ): | ||
| client.load_table_from_dataframe( | ||
| dataframe, self.TABLE_REF, job_config=job_config, location=self.LOCATION | ||
| ) | ||
|
|
@@ -9429,9 +9447,13 @@ def test_load_table_from_dataframe_emits_pending_deprecation_warning(self): | |
| get_table_patch = mock.patch( | ||
| "google.cloud.bigquery.client.Client.get_table", autospec=True | ||
| ) | ||
| with ( | ||
| load_patch, | ||
| get_table_patch, | ||
| pytest.warns( | ||
| PendingDeprecationWarning, | ||
| match="Loading DataFrames via google-cloud-bigquery is deprecated", | ||
| ), | ||
| ): | ||
| client.load_table_from_dataframe(dataframe, self.TABLE_REF) | ||
|
|
||
|
|
@@ -9853,7 +9875,7 @@ def test_load_table_from_json_unicode_emoji_data_case(self): | |
|
|
||
| client = self._make_client() | ||
|
|
||
| emoji = "\U0001f3e6" | ||
| json_row = {"emoji": emoji} | ||
| json_rows = [json_row] | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Importing the
versionmodule asversioncan easily lead to shadowing issues or confusion becauseversionis a very common variable and parameter name throughout this codebase. Consider aliasing it tobq_versionto prevent potential naming conflicts.