Merge branch 'main' into parthea-patch-1

.github/.OwlBot.lock.yaml

@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:5ea6d0ab82c956b50962f91d94e206d3921537ae5fe1549ec5326381d8905cfa
-# created: 2024-01-15T16:32:08.142785673Z
+  digest: sha256:3741fd1f5f5150378563c76afa06bcc12777b5fe54c5ee01115218f83872134f
+# created: 2024-03-15T16:26:15.743347415Z

.kokoro/build.sh

@@ -33,13 +33,6 @@ export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
 # Setup project id.
 export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")
 
-# Remove old nox
-python3 -m pip uninstall --yes --quiet nox-automation
-
-# Install nox
-python3 -m pip install --upgrade --quiet nox
-python3 -m nox --version
-
 # If this is a continuous build, send the test log to the FlakyBot.
 # See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
 if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then

.kokoro/docker/docs/Dockerfile

@@ -80,4 +80,8 @@ RUN wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
 # Test pip
 RUN python3 -m pip
 
+# Install build requirements
+COPY requirements.txt /requirements.txt
+RUN python3 -m pip install --require-hashes -r requirements.txt
+
 CMD ["python3.8"]

.kokoro/docker/docs/requirements.in

@@ -0,0 +1 @@
+nox

.kokoro/docker/docs/requirements.txt

@@ -0,0 +1,38 @@
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    pip-compile --allow-unsafe --generate-hashes requirements.in
+#
+argcomplete==3.2.3 \
+    --hash=sha256:bf7900329262e481be5a15f56f19736b376df6f82ed27576fa893652c5de6c23 \
+    --hash=sha256:c12355e0494c76a2a7b73e3a59b09024ca0ba1e279fb9ed6c1b82d5b74b6a70c
+    # via nox
+colorlog==6.8.2 \
+    --hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \
+    --hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33
+    # via nox
+distlib==0.3.8 \
+    --hash=sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784 \
+    --hash=sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64
+    # via virtualenv
+filelock==3.13.1 \
+    --hash=sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e \
+    --hash=sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c
+    # via virtualenv
+nox==2024.3.2 \
+    --hash=sha256:e53514173ac0b98dd47585096a55572fe504fecede58ced708979184d05440be \
+    --hash=sha256:f521ae08a15adbf5e11f16cb34e8d0e6ea521e0b92868f684e91677deb974553
+    # via -r requirements.in
+packaging==24.0 \
+    --hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \
+    --hash=sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9
+    # via nox
+platformdirs==4.2.0 \
+    --hash=sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068 \
+    --hash=sha256:ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768
+    # via virtualenv
+virtualenv==20.25.1 \
+    --hash=sha256:961c026ac520bac5f69acb8ea063e8a4f071bcc9457b9c1f28f6b085c511583a \
+    --hash=sha256:e08e13ecdca7a0bd53798f356d5831434afa5b07b93f0abdf0797b7a06ffe197
+    # via nox

.kokoro/requirements.txt

@@ -93,30 +93,39 @@ colorlog==6.7.0 \
     # via
     #   gcp-docuploader
     #   nox
-cryptography==41.0.6 \
-    --hash=sha256:068bc551698c234742c40049e46840843f3d98ad7ce265fd2bd4ec0d11306596 \
-    --hash=sha256:0f27acb55a4e77b9be8d550d762b0513ef3fc658cd3eb15110ebbcbd626db12c \
-    --hash=sha256:2132d5865eea673fe6712c2ed5fb4fa49dba10768bb4cc798345748380ee3660 \
-    --hash=sha256:3288acccef021e3c3c10d58933f44e8602cf04dba96d9796d70d537bb2f4bbc4 \
-    --hash=sha256:35f3f288e83c3f6f10752467c48919a7a94b7d88cc00b0668372a0d2ad4f8ead \
-    --hash=sha256:398ae1fc711b5eb78e977daa3cbf47cec20f2c08c5da129b7a296055fbb22aed \
-    --hash=sha256:422e3e31d63743855e43e5a6fcc8b4acab860f560f9321b0ee6269cc7ed70cc3 \
-    --hash=sha256:48783b7e2bef51224020efb61b42704207dde583d7e371ef8fc2a5fb6c0aabc7 \
-    --hash=sha256:4d03186af98b1c01a4eda396b137f29e4e3fb0173e30f885e27acec8823c1b09 \
-    --hash=sha256:5daeb18e7886a358064a68dbcaf441c036cbdb7da52ae744e7b9207b04d3908c \
-    --hash=sha256:60e746b11b937911dc70d164060d28d273e31853bb359e2b2033c9e93e6f3c43 \
-    --hash=sha256:742ae5e9a2310e9dade7932f9576606836ed174da3c7d26bc3d3ab4bd49b9f65 \
-    --hash=sha256:7e00fb556bda398b99b0da289ce7053639d33b572847181d6483ad89835115f6 \
-    --hash=sha256:85abd057699b98fce40b41737afb234fef05c67e116f6f3650782c10862c43da \
-    --hash=sha256:8efb2af8d4ba9dbc9c9dd8f04d19a7abb5b49eab1f3694e7b5a16a5fc2856f5c \
-    --hash=sha256:ae236bb8760c1e55b7a39b6d4d32d2279bc6c7c8500b7d5a13b6fb9fc97be35b \
-    --hash=sha256:afda76d84b053923c27ede5edc1ed7d53e3c9f475ebaf63c68e69f1403c405a8 \
-    --hash=sha256:b27a7fd4229abef715e064269d98a7e2909ebf92eb6912a9603c7e14c181928c \
-    --hash=sha256:b648fe2a45e426aaee684ddca2632f62ec4613ef362f4d681a9a6283d10e079d \
-    --hash=sha256:c5a550dc7a3b50b116323e3d376241829fd326ac47bc195e04eb33a8170902a9 \
-    --hash=sha256:da46e2b5df770070412c46f87bac0849b8d685c5f2679771de277a422c7d0b86 \
-    --hash=sha256:f39812f70fc5c71a15aa3c97b2bbe213c3f2a460b79bd21c40d033bb34a9bf36 \
-    --hash=sha256:ff369dd19e8fe0528b02e8df9f2aeb2479f89b1270d90f96a63500afe9af5cae
+cryptography==42.0.4 \
+    --hash=sha256:01911714117642a3f1792c7f376db572aadadbafcd8d75bb527166009c9f1d1b \
+    --hash=sha256:0e89f7b84f421c56e7ff69f11c441ebda73b8a8e6488d322ef71746224c20fce \
+    --hash=sha256:12d341bd42cdb7d4937b0cabbdf2a94f949413ac4504904d0cdbdce4a22cbf88 \
+    --hash=sha256:15a1fb843c48b4a604663fa30af60818cd28f895572386e5f9b8a665874c26e7 \
+    --hash=sha256:1cdcdbd117681c88d717437ada72bdd5be9de117f96e3f4d50dab3f59fd9ab20 \
+    --hash=sha256:1df6fcbf60560d2113b5ed90f072dc0b108d64750d4cbd46a21ec882c7aefce9 \
+    --hash=sha256:3c6048f217533d89f2f8f4f0fe3044bf0b2090453b7b73d0b77db47b80af8dff \
+    --hash=sha256:3e970a2119507d0b104f0a8e281521ad28fc26f2820687b3436b8c9a5fcf20d1 \
+    --hash=sha256:44a64043f743485925d3bcac548d05df0f9bb445c5fcca6681889c7c3ab12764 \
+    --hash=sha256:4e36685cb634af55e0677d435d425043967ac2f3790ec652b2b88ad03b85c27b \
+    --hash=sha256:5f8907fcf57392cd917892ae83708761c6ff3c37a8e835d7246ff0ad251d9298 \
+    --hash=sha256:69b22ab6506a3fe483d67d1ed878e1602bdd5912a134e6202c1ec672233241c1 \
+    --hash=sha256:6bfadd884e7280df24d26f2186e4e07556a05d37393b0f220a840b083dc6a824 \
+    --hash=sha256:6d0fbe73728c44ca3a241eff9aefe6496ab2656d6e7a4ea2459865f2e8613257 \
+    --hash=sha256:6ffb03d419edcab93b4b19c22ee80c007fb2d708429cecebf1dd3258956a563a \
+    --hash=sha256:810bcf151caefc03e51a3d61e53335cd5c7316c0a105cc695f0959f2c638b129 \
+    --hash=sha256:831a4b37accef30cccd34fcb916a5d7b5be3cbbe27268a02832c3e450aea39cb \
+    --hash=sha256:887623fe0d70f48ab3f5e4dbf234986b1329a64c066d719432d0698522749929 \
+    --hash=sha256:a0298bdc6e98ca21382afe914c642620370ce0470a01e1bef6dd9b5354c36854 \
+    --hash=sha256:a1327f280c824ff7885bdeef8578f74690e9079267c1c8bd7dc5cc5aa065ae52 \
+    --hash=sha256:c1f25b252d2c87088abc8bbc4f1ecbf7c919e05508a7e8628e6875c40bc70923 \
+    --hash=sha256:c3a5cbc620e1e17009f30dd34cb0d85c987afd21c41a74352d1719be33380885 \
+    --hash=sha256:ce8613beaffc7c14f091497346ef117c1798c202b01153a8cc7b8e2ebaaf41c0 \
+    --hash=sha256:d2a27aca5597c8a71abbe10209184e1a8e91c1fd470b5070a2ea60cafec35bcd \
+    --hash=sha256:dad9c385ba8ee025bb0d856714f71d7840020fe176ae0229de618f14dae7a6e2 \
+    --hash=sha256:db4b65b02f59035037fde0998974d84244a64c3265bdef32a827ab9b63d61b18 \
+    --hash=sha256:e09469a2cec88fb7b078e16d4adec594414397e8879a4341c6ace96013463d5b \
+    --hash=sha256:e53dc41cda40b248ebc40b83b31516487f7db95ab8ceac1f042626bc43a2f992 \
+    --hash=sha256:f1e85a178384bf19e36779d91ff35c7617c885da487d689b05c1366f9933ad74 \
+    --hash=sha256:f47be41843200f7faec0683ad751e5ef11b9a56a220d57f300376cd8aba81660 \
+    --hash=sha256:fb0cef872d8193e487fc6bdb08559c3aa41b659a7d9be48b2e10747f47863925 \
+    --hash=sha256:ffc73996c4fca3d2b6c1c8c12bfd3ad00def8621da24f547626bf06441400449
     # via
     #   gcp-releasetool
     #   secretstorage

docs/conf.py

@@ -24,9 +24,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
 import shlex
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

google/cloud/bigquery_storage/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,52 +19,53 @@
 
 
 from google.cloud.bigquery_storage_v1 import BigQueryReadClient
+from google.cloud.bigquery_storage_v1 import gapic_types as types
+from google.cloud.bigquery_storage_v1.services.big_query_write.async_client import (
+    BigQueryWriteAsyncClient,
+)
 from google.cloud.bigquery_storage_v1.services.big_query_write.client import (
     BigQueryWriteClient,
 )
-from google.cloud.bigquery_storage_v1.services.big_query_write.async_client import (
-    BigQueryWriteAsyncClient,
+from google.cloud.bigquery_storage_v1.types.arrow import (
+    ArrowRecordBatch,
+    ArrowSchema,
+    ArrowSerializationOptions,
 )
-
-from google.cloud.bigquery_storage_v1 import gapic_types as types
-from google.cloud.bigquery_storage_v1.types.arrow import ArrowRecordBatch
-from google.cloud.bigquery_storage_v1.types.arrow import ArrowSchema
-from google.cloud.bigquery_storage_v1.types.arrow import ArrowSerializationOptions
-from google.cloud.bigquery_storage_v1.types.avro import AvroRows
-from google.cloud.bigquery_storage_v1.types.avro import AvroSchema
-from google.cloud.bigquery_storage_v1.types.avro import AvroSerializationOptions
-from google.cloud.bigquery_storage_v1.types.protobuf import ProtoRows
-from google.cloud.bigquery_storage_v1.types.protobuf import ProtoSchema
-from google.cloud.bigquery_storage_v1.types.storage import AppendRowsRequest
-from google.cloud.bigquery_storage_v1.types.storage import AppendRowsResponse
-from google.cloud.bigquery_storage_v1.types.storage import (
-    BatchCommitWriteStreamsRequest,
+from google.cloud.bigquery_storage_v1.types.avro import (
+    AvroRows,
+    AvroSchema,
+    AvroSerializationOptions,
 )
+from google.cloud.bigquery_storage_v1.types.protobuf import ProtoRows, ProtoSchema
 from google.cloud.bigquery_storage_v1.types.storage import (
+    AppendRowsRequest,
+    AppendRowsResponse,
+    BatchCommitWriteStreamsRequest,
     BatchCommitWriteStreamsResponse,
+    CreateReadSessionRequest,
+    CreateWriteStreamRequest,
+    FinalizeWriteStreamRequest,
+    FinalizeWriteStreamResponse,
+    FlushRowsRequest,
+    FlushRowsResponse,
+    GetWriteStreamRequest,
+    ReadRowsRequest,
+    ReadRowsResponse,
+    RowError,
+    SplitReadStreamRequest,
+    SplitReadStreamResponse,
+    StorageError,
+    StreamStats,
+    ThrottleState,
+)
+from google.cloud.bigquery_storage_v1.types.stream import (
+    DataFormat,
+    ReadSession,
+    ReadStream,
+    WriteStream,
+    WriteStreamView,
 )
-from google.cloud.bigquery_storage_v1.types.storage import CreateReadSessionRequest
-from google.cloud.bigquery_storage_v1.types.storage import CreateWriteStreamRequest
-from google.cloud.bigquery_storage_v1.types.storage import FinalizeWriteStreamRequest
-from google.cloud.bigquery_storage_v1.types.storage import FinalizeWriteStreamResponse
-from google.cloud.bigquery_storage_v1.types.storage import FlushRowsRequest
-from google.cloud.bigquery_storage_v1.types.storage import FlushRowsResponse
-from google.cloud.bigquery_storage_v1.types.storage import GetWriteStreamRequest
-from google.cloud.bigquery_storage_v1.types.storage import ReadRowsRequest
-from google.cloud.bigquery_storage_v1.types.storage import ReadRowsResponse
-from google.cloud.bigquery_storage_v1.types.storage import RowError
-from google.cloud.bigquery_storage_v1.types.storage import SplitReadStreamRequest
-from google.cloud.bigquery_storage_v1.types.storage import SplitReadStreamResponse
-from google.cloud.bigquery_storage_v1.types.storage import StorageError
-from google.cloud.bigquery_storage_v1.types.storage import StreamStats
-from google.cloud.bigquery_storage_v1.types.storage import ThrottleState
-from google.cloud.bigquery_storage_v1.types.stream import ReadSession
-from google.cloud.bigquery_storage_v1.types.stream import ReadStream
-from google.cloud.bigquery_storage_v1.types.stream import WriteStream
-from google.cloud.bigquery_storage_v1.types.stream import DataFormat
-from google.cloud.bigquery_storage_v1.types.stream import WriteStreamView
-from google.cloud.bigquery_storage_v1.types.table import TableFieldSchema
-from google.cloud.bigquery_storage_v1.types.table import TableSchema
+from google.cloud.bigquery_storage_v1.types.table import TableFieldSchema, TableSchema
 
 __all__ = (
     "BigQueryReadClient",

google/cloud/bigquery_storage_v1/__init__.py

@@ -20,8 +20,7 @@
 
 __version__ = package_version.__version__
 
-from google.cloud.bigquery_storage_v1 import client
-from google.cloud.bigquery_storage_v1 import types
+from google.cloud.bigquery_storage_v1 import client, types
 
 
 class BigQueryReadClient(client.BigQueryReadClient):
@@ -38,4 +37,5 @@ class BigQueryWriteClient(client.BigQueryWriteClient):
     "types",
     # google.cloud.bigquery_storage_v1.client
     "BigQueryReadClient",
+    "BigQueryWriteClient",
 )

google/cloud/bigquery_storage_v1/client.py

@@ -24,9 +24,7 @@
 import google.api_core.gapic_v1.method
 
 from google.cloud.bigquery_storage_v1 import reader
-from google.cloud.bigquery_storage_v1.services import big_query_read
-from google.cloud.bigquery_storage_v1.services import big_query_write
-
+from google.cloud.bigquery_storage_v1.services import big_query_read, big_query_write
 
 _SCOPES = (
     "https://www.googleapis.com/auth/bigquery",

google/cloud/bigquery_storage_v1/gapic_types.py

@@ -20,15 +20,11 @@
 import inspect
 import sys
 
-import proto
-
-from google.cloud.bigquery_storage_v1.types import arrow
-from google.cloud.bigquery_storage_v1.types import avro
-from google.cloud.bigquery_storage_v1.types import storage
-from google.cloud.bigquery_storage_v1.types import stream
-
 from google.protobuf import message as protobuf_message
 from google.protobuf import timestamp_pb2
+import proto
+
+from google.cloud.bigquery_storage_v1.types import arrow, avro, storage, stream
 
 
 # The current api core helper does not find new proto messages of type proto.Message,

google/cloud/bigquery_storage_v1/reader.py

@@ -228,11 +228,11 @@ def rows(self, read_session=None):
             read_session ( \
                 Optional[~google.cloud.bigquery_storage_v1.types.ReadSession] \
             ):
-                DEPRECATED.
-
                 This argument was used to specify the schema of the rows in the
                 stream, but now the first message in a read stream contains
-                this information.
+                this information. When row_restriction is applied, some streams
+                may be empty without read_session info. Provide this argument
+                to avoid an error. For more information, see https://github.com/googleapis/python-bigquery-storage/issues/733
 
         Returns:
             Iterable[Mapping]:
@@ -250,11 +250,11 @@ def to_arrow(self, read_session=None):
             read_session ( \
                 ~google.cloud.bigquery_storage_v1.types.ReadSession \
             ):
-                DEPRECATED.
-
                 This argument was used to specify the schema of the rows in the
                 stream, but now the first message in a read stream contains
-                this information.
+                this information. When row_restriction is applied, some streams
+                may be empty without read_session info. Provide this argument
+                to avoid an error. For more information, see https://github.com/googleapis/python-bigquery-storage/issues/733
 
         Returns:
             pyarrow.Table:
@@ -276,11 +276,11 @@ def to_dataframe(self, read_session=None, dtypes=None):
             read_session ( \
                 ~google.cloud.bigquery_storage_v1.types.ReadSession \
             ):
-                DEPRECATED.
-
                 This argument was used to specify the schema of the rows in the
                 stream, but now the first message in a read stream contains
-                this information.
+                this information. When row_restriction is applied, some streams
+                may be empty without read_session info. Provide this argument
+                to avoid an error. For more information, see https://github.com/googleapis/python-bigquery-storage/issues/733
             dtypes ( \
                 Map[str, Union[str, pandas.Series.dtype]] \
             ):
@@ -308,11 +308,11 @@ class ReadRowsIterable(object):
         read_session ( \
             Optional[~google.cloud.bigquery_storage_v1.types.ReadSession] \
         ):
-            DEPRECATED.
-
             This argument was used to specify the schema of the rows in the
             stream, but now the first message in a read stream contains
-            this information.
+            this information. When row_restriction is applied, some streams
+            may be empty without read_session info. Provide this argument
+            to avoid an error. For more information, see https://github.com/googleapis/python-bigquery-storage/issues/733ß
     """
 
     # This class is modelled after the google.cloud.bigquery.table.RowIterator

google/cloud/bigquery_storage_v1/services/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

google/cloud/bigquery_storage_v1/services/big_query_read/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .client import BigQueryReadClient
 from .async_client import BigQueryReadAsyncClient
+from .client import BigQueryReadClient
 
 __all__ = (
     "BigQueryReadClient",