Merge branch 'main' into feat-external-runtime-options

Author: chalmerlowe

google/cloud/bigquery/job/base.py

@@ -1044,8 +1044,7 @@ def result(  # type: ignore  # (incompatible with supertype)
         if self.state is None:
             self._begin(retry=retry, timeout=timeout)
 
-        kwargs = {} if retry is DEFAULT_RETRY else {"retry": retry}
-        return super(_AsyncJob, self).result(timeout=timeout, **kwargs)
+        return super(_AsyncJob, self).result(timeout=timeout, retry=retry)
 
     def cancelled(self):
         """Check if the job has been cancelled.

samples/desktopapp/requirements.txt

@@ -1,2 +1,2 @@
-google-cloud-bigquery==3.37.0
+google-cloud-bigquery==3.38.0
 google-auth-oauthlib==1.2.2

samples/geography/requirements.txt

@@ -3,7 +3,7 @@ certifi==2025.8.3
 cffi==2.0.0
 charset-normalizer==3.4.3
 click===8.1.8; python_version == '3.9'
-click==8.2.1; python_version >= '3.10'
+click==8.3.0; python_version >= '3.10'
 click-plugins==1.1.1.2
 cligj==0.7.2
 db-dtypes==1.4.3
@@ -12,32 +12,32 @@ geojson==3.2.0
 geopandas===1.0.1; python_version <= '3.9'
 geopandas==1.1.1; python_version >= '3.10'
 google-api-core==2.25.1
-google-auth==2.40.3
-google-cloud-bigquery==3.37.0
+google-auth==2.41.0
+google-cloud-bigquery==3.38.0
 google-cloud-bigquery-storage==2.33.1
 google-cloud-core==2.4.3
 google-crc32c==1.7.1
 google-resumable-media==2.7.2
 googleapis-common-protos==1.70.0
-grpcio==1.74.0
+grpcio==1.75.1
 idna==3.10
 munch==4.0.0
 mypy-extensions==1.1.0
 packaging==25.0
-pandas==2.3.2
+pandas==2.3.3
 proto-plus==1.26.1
 pyarrow==21.0.0
 pyasn1==0.6.1
 pyasn1-modules==0.4.2
 pycparser==2.23
-pyparsing==3.2.4
+pyparsing==3.2.5
 python-dateutil==2.9.0.post0
 pytz==2025.2
-PyYAML==6.0.2
+PyYAML==6.0.3
 requests==2.32.5
 rsa==4.9.1
 Shapely===2.0.7; python_version == '3.9'
-Shapely==2.1.1; python_version >= '3.10'
+Shapely==2.1.2; python_version >= '3.10'
 six==1.17.0
 typing-extensions==4.15.0
 typing-inspect==0.9.0

samples/magics/requirements.txt

@@ -1,6 +1,6 @@
 bigquery_magics==0.10.3
 db-dtypes==1.4.3
-google.cloud.bigquery==3.37.0
+google.cloud.bigquery==3.38.0
 google-cloud-bigquery-storage==2.33.1
 ipython===8.18.1
-pandas==2.3.2
+pandas==2.3.3

samples/notebooks/requirements.txt

@@ -1,9 +1,9 @@
 bigquery-magics==0.10.3
 db-dtypes==1.4.3
-google-cloud-bigquery==3.37.0
+google-cloud-bigquery==3.38.0
 google-cloud-bigquery-storage==2.33.1
 ipython===8.18.1; python_version == '3.9'
-ipython==9.5.0; python_version >= '3.10'
+ipython==9.6.0; python_version >= '3.10'
 matplotlib===3.9.2; python_version == '3.9'
 matplotlib==3.10.6; python_version >= '3.10'
-pandas==2.3.2
+pandas==2.3.3

samples/snippets/requirements.txt

@@ -1,2 +1,2 @@
 # samples/snippets should be runnable with no "extras"
-google-cloud-bigquery==3.37.0
+google-cloud-bigquery==3.38.0

tests/unit/test_job_retry.py

@@ -615,3 +615,80 @@ def test_query_and_wait_retries_job_for_DDL_queries(global_time_lock):
     _, kwargs = calls[3]
     assert kwargs["method"] == "POST"
     assert kwargs["path"] == query_request_path
+
+
+@pytest.mark.parametrize(
+    "result_retry_param",
+    [
+        pytest.param(
+            {},
+            id="default retry {}",
+        ),
+        pytest.param(
+            {
+                "retry": google.cloud.bigquery.retry.DEFAULT_RETRY.with_timeout(
+                    timeout=10.0
+                )
+            },
+            id="custom retry object with timeout 10.0",
+        ),
+    ],
+)
+def test_retry_load_job_result(result_retry_param, PROJECT, DS_ID):
+    from google.cloud.bigquery.dataset import DatasetReference
+    from google.cloud.bigquery.job.load import LoadJob
+    import google.cloud.bigquery.retry
+
+    client = make_client()
+    conn = client._connection = make_connection(
+        dict(
+            status=dict(state="RUNNING"),
+            jobReference={"jobId": "id_1"},
+        ),
+        google.api_core.exceptions.ServiceUnavailable("retry me"),
+        dict(
+            status=dict(state="DONE"),
+            jobReference={"jobId": "id_1"},
+            statistics={"load": {"outputRows": 1}},
+        ),
+    )
+
+    table_ref = DatasetReference(project=PROJECT, dataset_id=DS_ID).table("new_table")
+    job = LoadJob("id_1", source_uris=None, destination=table_ref, client=client)
+
+    with mock.patch.object(
+        client, "_call_api", wraps=client._call_api
+    ) as wrapped_call_api:
+        result = job.result(**result_retry_param)
+
+    assert job.state == "DONE"
+    assert result.output_rows == 1
+
+    # Check that _call_api was called multiple times due to retry
+    assert wrapped_call_api.call_count > 1
+
+    # Verify the retry object used in the calls to _call_api
+    expected_retry = result_retry_param.get(
+        "retry", google.cloud.bigquery.retry.DEFAULT_RETRY
+    )
+
+    for call in wrapped_call_api.mock_calls:
+        name, args, kwargs = call
+        # The retry object is the first positional argument to _call_api
+        called_retry = args[0]
+
+        # We only care about the calls made during the job.result() polling
+        if kwargs.get("method") == "GET" and "jobs/id_1" in kwargs.get("path", ""):
+            assert called_retry._predicate == expected_retry._predicate
+            assert called_retry._initial == expected_retry._initial
+            assert called_retry._maximum == expected_retry._maximum
+            assert called_retry._multiplier == expected_retry._multiplier
+            assert called_retry._deadline == expected_retry._deadline
+            if "retry" in result_retry_param:
+                # Specifically check the timeout for the custom retry case
+                assert called_retry._timeout == 10.0
+            else:
+                assert called_retry._timeout == expected_retry._timeout
+
+    # The number of api_request calls should still be 3
+    assert conn.api_request.call_count == 3