google-cloud-bigquery 3.45.1__tar.gz → 3.45.2__tar.gz

{google_cloud_bigquery-3.45.1/google_cloud_bigquery.egg-info → google_cloud_bigquery-3.45.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-bigquery
-Version: 3.45.1
+Version: 3.45.2
 Summary: Google BigQuery API client library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache 2.0

{google_cloud_bigquery-3.45.1 → google_cloud_bigquery-3.45.2}/google/cloud/bigquery/client.py

@@ -78,6 +78,9 @@ from google.cloud.bigquery import (
     job,
 )
 from google.cloud.bigquery import exceptions as bq_exceptions
+from google.cloud.bigquery import (
+    version as bq_version,
+)
 from google.cloud.bigquery._helpers import (
     _DEFAULT_HOST,
     _DEFAULT_HOST_TEMPLATE,
@@ -148,7 +151,7 @@ _MULTIPART_URL_TEMPLATE = _BASE_UPLOAD_TEMPLATE + "multipart"
 _RESUMABLE_URL_TEMPLATE = _BASE_UPLOAD_TEMPLATE + "resumable"
 _GENERIC_CONTENT_TYPE = "*/*"
 _READ_LESS_THAN_SIZE = (
-    "Size {:d} was specified but the file-like object only had " "{:d} bytes remaining."
+    "Size {:d} was specified but the file-like object only had {:d} bytes remaining."
 )
 _NEED_TABLE_ARGUMENT = (
     "The table argument should be a table ID string, Table, or TableReference"
@@ -641,9 +644,16 @@ class Client(ClientWithProject):
             pandas_gbq = None  # type: ignore
 
         if pandas_gbq is None:
-            user_agent = "pandas-gbq/0.0.0"
+            # Even if pandas-gbq isn't installed, attribute all
+            # to_dataframe/to_arrow usage the same as we do the recommended
+            # (pandas-gbq) code paths.
+            pandas_user_agent = "pandas-gbq/0.0.0"
         else:
-            user_agent = f"pandas-gbq/{pandas_gbq.__version__}"
+            pandas_user_agent = f"pandas-gbq/{pandas_gbq.__version__}"
+
+        # Track the google-cloud-bigquery version as "legacy" because this code
+        # path is intended to be migrated to pandas-gbq itself.
+        user_agent = f"legacy-gcb/{bq_version.__version__} {pandas_user_agent}"
 
         if client_info is None:
             amended_client_info = google.api_core.gapic_v1.client_info.ClientInfo(

{google_cloud_bigquery-3.45.1 → google_cloud_bigquery-3.45.2}/google/cloud/bigquery/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.45.1"
+__version__ = "3.45.2"

{google_cloud_bigquery-3.45.1 → google_cloud_bigquery-3.45.2/google_cloud_bigquery.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-bigquery
-Version: 3.45.1
+Version: 3.45.2
 Summary: Google BigQuery API client library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache 2.0

{google_cloud_bigquery-3.45.1 → google_cloud_bigquery-3.45.2}/tests/unit/test_client.py

@@ -54,7 +54,7 @@ import google.cloud.bigquery.retry
 import google.cloud.bigquery.table
 from google.api_core import client_info
 from google.cloud import bigquery
-from google.cloud.bigquery import ParquetOptions, exceptions
+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 @@ class TestClient(unittest.TestCase):
         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 @@ class TestClient(unittest.TestCase):
         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}):
+        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, "app-agent pandas-gbq/0.13.0"
+            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 @@ class TestClient(unittest.TestCase):
             user_agent="app-agent"
         )
 
-        with mock.patch(
-            "google.cloud.bigquery_storage.BigQueryReadClient", mock_client
-        ), mock.patch.dict(sys.modules, {"pandas_gbq": 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, "app-agent pandas-gbq/0.0.0")
+        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 @@ class TestClient(unittest.TestCase):
         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}):
+        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, "pandas-gbq/0.0.0")
+        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 @@ class TestClient(unittest.TestCase):
 
         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}):
+        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, "pandas-gbq/0.0.0")
+        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 @@ class TestClientUpload(object):
             SchemaField("unknown_col", "BYTES"),
         )
         job_config = job.LoadJobConfig(schema=schema)
-        with load_patch as load_table_from_file, pytest.raises(
-            ValueError
-        ) as exc_context:
+        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 @@ class TestClientUpload(object):
         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",
+        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 @@ class TestClientUpload(object):
 
         client = self._make_client()
 
-        emoji = "\U0001F3E6"
+        emoji = "\U0001f3e6"
         json_row = {"emoji": emoji}
         json_rows = [json_row]
 

{google_cloud_bigquery-3.45.1 → google_cloud_bigquery-3.45.2}/tests/unit/test_table.py

@@ -16,6 +16,7 @@ import copy
 import datetime
 import logging
 import re
+import sys
 import time
 import types
 import unittest
@@ -376,9 +377,7 @@ class TestTableReference(unittest.TestCase):
     def test___repr__(self):
         dataset = DatasetReference("project1", "dataset1")
         table1 = self._make_one(dataset, "table1")
-        expected = (
-            "TableReference(DatasetReference('project1', 'dataset1'), " "'table1')"
-        )
+        expected = "TableReference(DatasetReference('project1', 'dataset1'), 'table1')"
         self.assertEqual(repr(table1), expected)
 
     def test___str__(self):
@@ -1831,9 +1830,7 @@ class TestTable(unittest.TestCase, _SchemaBase):
         dataset = DatasetReference("project1", "dataset1")
         table1 = self._make_one(TableReference(dataset, "table1"))
         expected = (
-            "Table(TableReference("
-            "DatasetReference('project1', 'dataset1'), "
-            "'table1'))"
+            "Table(TableReference(DatasetReference('project1', 'dataset1'), 'table1'))"
         )
         self.assertEqual(repr(table1), expected)
 
@@ -2893,7 +2890,8 @@ class TestRowIterator(unittest.TestCase):
 
     def test__should_use_bqstorage_returns_false_if_page_token_set(self):
         iterator = self._make_one(
-            page_token="abc", first_page_response=None  # not cached
+            page_token="abc",
+            first_page_response=None,  # not cached
         )
         result = iterator._should_use_bqstorage(
             bqstorage_client=None, create_bqstorage_client=True
@@ -2902,7 +2900,8 @@ class TestRowIterator(unittest.TestCase):
 
     def test__should_use_bqstorage_returns_false_if_max_results_set(self):
         iterator = self._make_one(
-            max_results=10, first_page_response=None  # not cached
+            max_results=10,
+            first_page_response=None,  # not cached
         )
         result = iterator._should_use_bqstorage(
             bqstorage_client=None, create_bqstorage_client=True
@@ -3548,6 +3547,117 @@ class TestRowIterator(unittest.TestCase):
         mock_client._ensure_bqstorage_client.assert_called_once()
         bqstorage_client._transport.close.assert_called_once()
 
+    def test_to_arrow_create_read_session_user_agent(self):
+        pytest.importorskip("numpy")
+        pytest.importorskip("pyarrow")
+        pytest.importorskip("google.cloud.bigquery_storage")
+        import google.auth.credentials
+        from google.cloud import bigquery_storage
+        from google.cloud.bigquery import client as client_module
+        from google.cloud.bigquery import schema, version
+        from google.cloud.bigquery import table as mut
+        from google.cloud.bigquery_storage_v1.services.big_query_read.transports import (
+            grpc as big_query_read_grpc_transport,
+        )
+
+        mock_channel = mock.MagicMock()
+        mock_unary = mock.MagicMock()
+        mock_channel.unary_unary.return_value = mock_unary
+        mock_session = bigquery_storage.types.ReadSession(
+            name="projects/proj/locations/us/sessions/s1",
+            streams=[],
+        )
+        mock_unary.with_call.return_value = (mock_session, mock.MagicMock())
+
+        mock_pandas_gbq = mock.Mock()
+        mock_pandas_gbq.__version__ = "0.13.0"
+
+        with (
+            mock.patch.object(
+                big_query_read_grpc_transport.BigQueryReadGrpcTransport,
+                "create_channel",
+                return_value=mock_channel,
+            ),
+            mock.patch.dict(sys.modules, {"pandas_gbq": mock_pandas_gbq}),
+        ):
+            client = client_module.Client(
+                project="proj",
+                credentials=mock.Mock(spec=google.auth.credentials.Credentials),
+            )
+            row_iterator = mut.RowIterator(
+                client,
+                None,  # api_request: ignored
+                None,  # path: ignored
+                [schema.SchemaField("colA", "STRING")],
+                table=mut.TableReference.from_string("proj.dset.tbl"),
+                total_rows=0,
+            )
+            row_iterator.to_arrow(create_bqstorage_client=True)
+
+        mock_unary.with_call.assert_called_once()
+        _, kwargs = mock_unary.with_call.call_args
+        metadata_dict = dict(kwargs["metadata"])
+        self.assertIn("x-goog-api-client", metadata_dict)
+        user_agent = metadata_dict["x-goog-api-client"]
+        self.assertIn(
+            f"legacy-gcb/{version.__version__} pandas-gbq/0.13.0",
+            user_agent,
+        )
+
+    def test_to_arrow_create_read_session_user_agent_pandas_gbq_not_installed(self):
+        pytest.importorskip("numpy")
+        pytest.importorskip("pyarrow")
+        pytest.importorskip("google.cloud.bigquery_storage")
+        import google.auth.credentials
+        from google.cloud import bigquery_storage
+        from google.cloud.bigquery import client as client_module
+        from google.cloud.bigquery import schema, version
+        from google.cloud.bigquery import table as mut
+        from google.cloud.bigquery_storage_v1.services.big_query_read.transports import (
+            grpc as big_query_read_grpc_transport,
+        )
+
+        mock_channel = mock.MagicMock()
+        mock_unary = mock.MagicMock()
+        mock_channel.unary_unary.return_value = mock_unary
+        mock_session = bigquery_storage.types.ReadSession(
+            name="projects/proj/locations/us/sessions/s1",
+            streams=[],
+        )
+        mock_unary.with_call.return_value = (mock_session, mock.MagicMock())
+
+        with (
+            mock.patch.object(
+                big_query_read_grpc_transport.BigQueryReadGrpcTransport,
+                "create_channel",
+                return_value=mock_channel,
+            ),
+            mock.patch.dict(sys.modules, {"pandas_gbq": None}),
+        ):
+            client = client_module.Client(
+                project="proj",
+                credentials=mock.Mock(spec=google.auth.credentials.Credentials),
+            )
+            row_iterator = mut.RowIterator(
+                client,
+                None,  # api_request: ignored
+                None,  # path: ignored
+                [schema.SchemaField("colA", "STRING")],
+                table=mut.TableReference.from_string("proj.dset.tbl"),
+                total_rows=0,
+            )
+            row_iterator.to_arrow(create_bqstorage_client=True)
+
+        mock_unary.with_call.assert_called_once()
+        _, kwargs = mock_unary.with_call.call_args
+        metadata_dict = dict(kwargs["metadata"])
+        self.assertIn("x-goog-api-client", metadata_dict)
+        user_agent = metadata_dict["x-goog-api-client"]
+        self.assertIn(
+            f"legacy-gcb/{version.__version__} pandas-gbq/0.0.0",
+            user_agent,
+        )
+
     def test_to_arrow_ensure_bqstorage_client_wo_bqstorage(self):
         pytest.importorskip("numpy")
         pyarrow = pytest.importorskip(
@@ -4903,6 +5013,117 @@ class TestRowIterator(unittest.TestCase):
         mock_client._ensure_bqstorage_client.assert_called_once()
         bqstorage_client._transport.close.assert_called_once()
 
+    def test_to_dataframe_create_read_session_user_agent(self):
+        pytest.importorskip("numpy")
+        pytest.importorskip("pandas")
+        pytest.importorskip("google.cloud.bigquery_storage")
+        import google.auth.credentials
+        from google.cloud import bigquery_storage
+        from google.cloud.bigquery import client as client_module
+        from google.cloud.bigquery import schema, version
+        from google.cloud.bigquery import table as mut
+        from google.cloud.bigquery_storage_v1.services.big_query_read.transports import (
+            grpc as big_query_read_grpc_transport,
+        )
+
+        mock_channel = mock.MagicMock()
+        mock_unary = mock.MagicMock()
+        mock_channel.unary_unary.return_value = mock_unary
+        mock_session = bigquery_storage.types.ReadSession(
+            name="projects/proj/locations/us/sessions/s1",
+            streams=[],
+        )
+        mock_unary.with_call.return_value = (mock_session, mock.MagicMock())
+
+        mock_pandas_gbq = mock.Mock()
+        mock_pandas_gbq.__version__ = "0.13.0"
+
+        with (
+            mock.patch.object(
+                big_query_read_grpc_transport.BigQueryReadGrpcTransport,
+                "create_channel",
+                return_value=mock_channel,
+            ),
+            mock.patch.dict(sys.modules, {"pandas_gbq": mock_pandas_gbq}),
+        ):
+            client = client_module.Client(
+                project="proj",
+                credentials=mock.Mock(spec=google.auth.credentials.Credentials),
+            )
+            row_iterator = mut.RowIterator(
+                client,
+                None,  # api_request: ignored
+                None,  # path: ignored
+                [schema.SchemaField("colA", "STRING")],
+                table=mut.TableReference.from_string("proj.dset.tbl"),
+                total_rows=0,
+            )
+            row_iterator.to_dataframe(create_bqstorage_client=True)
+
+        mock_unary.with_call.assert_called_once()
+        _, kwargs = mock_unary.with_call.call_args
+        metadata_dict = dict(kwargs["metadata"])
+        self.assertIn("x-goog-api-client", metadata_dict)
+        user_agent = metadata_dict["x-goog-api-client"]
+        self.assertIn(
+            f"legacy-gcb/{version.__version__} pandas-gbq/0.13.0",
+            user_agent,
+        )
+
+    def test_to_dataframe_create_read_session_user_agent_pandas_gbq_not_installed(self):
+        pytest.importorskip("numpy")
+        pytest.importorskip("pandas")
+        pytest.importorskip("google.cloud.bigquery_storage")
+        import google.auth.credentials
+        from google.cloud import bigquery_storage
+        from google.cloud.bigquery import client as client_module
+        from google.cloud.bigquery import schema, version
+        from google.cloud.bigquery import table as mut
+        from google.cloud.bigquery_storage_v1.services.big_query_read.transports import (
+            grpc as big_query_read_grpc_transport,
+        )
+
+        mock_channel = mock.MagicMock()
+        mock_unary = mock.MagicMock()
+        mock_channel.unary_unary.return_value = mock_unary
+        mock_session = bigquery_storage.types.ReadSession(
+            name="projects/proj/locations/us/sessions/s1",
+            streams=[],
+        )
+        mock_unary.with_call.return_value = (mock_session, mock.MagicMock())
+
+        with (
+            mock.patch.object(
+                big_query_read_grpc_transport.BigQueryReadGrpcTransport,
+                "create_channel",
+                return_value=mock_channel,
+            ),
+            mock.patch.dict(sys.modules, {"pandas_gbq": None}),
+        ):
+            client = client_module.Client(
+                project="proj",
+                credentials=mock.Mock(spec=google.auth.credentials.Credentials),
+            )
+            row_iterator = mut.RowIterator(
+                client,
+                None,  # api_request: ignored
+                None,  # path: ignored
+                [schema.SchemaField("colA", "STRING")],
+                table=mut.TableReference.from_string("proj.dset.tbl"),
+                total_rows=0,
+            )
+            row_iterator.to_dataframe(create_bqstorage_client=True)
+
+        mock_unary.with_call.assert_called_once()
+        _, kwargs = mock_unary.with_call.call_args
+        metadata_dict = dict(kwargs["metadata"])
+        self.assertIn("x-goog-api-client", metadata_dict)
+        user_agent = metadata_dict["x-goog-api-client"]
+        self.assertIn(
+            f"legacy-gcb/{version.__version__} pandas-gbq/0.0.0",
+            user_agent,
+        )
+
     def test_to_dataframe_w_bqstorage_no_streams(self):
         pytest.importorskip("numpy")
         pytest.importorskip("pandas")
@@ -5622,8 +5843,7 @@ class TestRowIterator(unittest.TestCase):
         with self.assertRaisesRegex(
             TypeError,
             re.escape(
-                "There must be at least one GEOGRAPHY column"
-                " to create a GeoDataFrame"
+                "There must be at least one GEOGRAPHY column to create a GeoDataFrame"
             ),
         ):
             row_iterator.to_geodataframe(create_bqstorage_client=False)