Merge branch 'main' into fix_mem_leak

parthea · web-flow · commit 34babf1a0821 · 2025-01-22T16:28:03.000-05:00
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 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,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:2ed982f884312e4883e01b5ab8af8b6935f0216a5a2d82928d273081fc3be562
-# created: 2024-11-12T12:09:45.821174897Z
+  digest: sha256:04c35dc5f49f0f503a306397d6d043685f8d2bb822ab515818c4208d7fb2db3a
+# created: 2025-01-16T15:24:11.364245182Z
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
-        python-version: "3.9"
+        python-version: "3.10"
     - name: Install nox
       run: |
         python -m pip install --upgrade setuptools pip wheel
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -8,7 +8,10 @@ on:
 jobs:
   run-unittests:
     name: unit${{ matrix.option }}-${{ matrix.python }}
-    runs-on: ubuntu-latest
+    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2303): use `ubuntu-latest` once this bug is fixed.
+    # Use ubuntu-22.04 until Python 3.7 is removed from the test matrix
+    # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         option: ["", "_grpc_gcp", "_wo_grpc", "_w_prerelease_deps", "_w_async_rest_extra"]
diff --git a/.kokoro/docker/docs/requirements.in b/.kokoro/docker/docs/requirements.in
@@ -1 +1,2 @@
 nox
+gcp-docuploader
diff --git a/.kokoro/docker/docs/requirements.txt b/.kokoro/docker/docs/requirements.txt
diff --git a/.kokoro/publish-docs.sh b/.kokoro/publish-docs.sh
@@ -20,10 +20,6 @@ export PYTHONUNBUFFERED=1
 
 export PATH="${HOME}/.local/bin:${PATH}"
 
-# Install nox
-python3.10 -m pip install --require-hashes -r .kokoro/requirements.txt
-python3.10 -m nox --version
-
 # build docs
 nox -s docs
 
diff --git a/google/api_core/exceptions.py b/google/api_core/exceptions.py
@@ -517,14 +517,14 @@ def format_http_response_error(
     errors = payload.get("error", {}).get("errors", ())
     # In JSON, details are already formatted in developer-friendly way.
     details = payload.get("error", {}).get("details", ())
-    error_info = list(
+    error_info_list = list(
         filter(
             lambda detail: detail.get("@type", "")
             == "type.googleapis.com/google.rpc.ErrorInfo",
             details,
         )
     )
-    error_info = error_info[0] if error_info else None
+    error_info = error_info_list[0] if error_info_list else None
     message = _format_rest_error_message(error_message, method, url)
 
     exception = from_http_status(
diff --git a/google/api_core/grpc_helpers_async.py b/google/api_core/grpc_helpers_async.py
@@ -152,9 +152,9 @@ class _WrappedStreamStreamCall(
 
 
 # public type alias denoting the return type of async streaming gapic calls
-GrpcAsyncStream = _WrappedStreamResponseMixin[P]
+GrpcAsyncStream = _WrappedStreamResponseMixin
 # public type alias denoting the return type of unary gapic calls
-AwaitableGrpcCall = _WrappedUnaryResponseMixin[P]
+AwaitableGrpcCall = _WrappedUnaryResponseMixin
 
 
 def _wrap_unary_errors(callable_):
diff --git a/google/api_core/retry/retry_unary.py b/google/api_core/retry/retry_unary.py
@@ -83,7 +83,7 @@ def check_if_exists():
 
 
 def retry_target(
-    target: Callable[_P, _R],
+    target: Callable[[], _R],
     predicate: Callable[[Exception], bool],
     sleep_generator: Iterable[float],
     timeout: float | None = None,
diff --git a/google/api_core/retry/retry_unary_async.py b/google/api_core/retry/retry_unary_async.py
@@ -94,7 +94,7 @@ async def check_if_exists():
 
 
 async def retry_target(
-    target: Callable[_P, Awaitable[_R]],
+    target: Callable[[], Awaitable[_R]],
     predicate: Callable[[Exception], bool],
     sleep_generator: Iterable[float],
     timeout: float | None = None,
diff --git a/google/api_core/timeout.py b/google/api_core/timeout.py
@@ -102,8 +102,7 @@ def __call__(self, func):
         def func_with_timeout(*args, **kwargs):
             """Wrapped function that adds timeout."""
 
-            remaining_timeout = self._timeout
-            if remaining_timeout is not None:
+            if self._timeout is not None:
                 # All calculations are in seconds
                 now_timestamp = self._clock().timestamp()
 
@@ -114,8 +113,19 @@ def func_with_timeout(*args, **kwargs):
                     now_timestamp = first_attempt_timestamp
 
                 time_since_first_attempt = now_timestamp - first_attempt_timestamp
-                # Avoid setting negative timeout
-                kwargs["timeout"] = max(0, self._timeout - time_since_first_attempt)
+                remaining_timeout = self._timeout - time_since_first_attempt
+
+                # Although the `deadline` parameter in `google.api_core.retry.Retry`
+                # is deprecated, and should be treated the same as the `timeout`,
+                # it is still possible for the `deadline` argument in
+                # `google.api_core.retry.Retry` to be larger than the `timeout`.
+                # See https://github.com/googleapis/python-api-core/issues/654
+                # Only positive non-zero timeouts are supported.
+                # Revert back to the initial timeout for negative or 0 timeout values.
+                if remaining_timeout < 1:
+                    remaining_timeout = self._timeout
+
+                kwargs["timeout"] = remaining_timeout
 
             return func(*args, **kwargs)
 
diff --git a/noxfile.py b/noxfile.py
@@ -275,9 +275,7 @@ def pytype(session):
 @nox.session(python=DEFAULT_PYTHON_VERSION)
 def mypy(session):
     """Run type-checking."""
-    # TODO(https://github.com/googleapis/python-api-core/issues/682):
-    # Use the latest version of mypy instead of mypy<1.11.0
-    session.install(".[grpc,async_rest]", "mypy<1.11.0")
+    session.install(".[grpc,async_rest]", "mypy")
     session.install(
         "types-setuptools",
         "types-requests",
diff --git a/renovate.json b/renovate.json
@@ -5,7 +5,7 @@
     ":preserveSemverRanges",
     ":disableDependencyDashboard"
   ],
-  "ignorePaths": [".pre-commit-config.yaml", ".kokoro/requirements.txt", "setup.py"],
+  "ignorePaths": [".pre-commit-config.yaml", ".kokoro/requirements.txt", "setup.py", ".github/workflows/unittest.yml"],
   "pip_requirements": {
     "fileMatch": ["requirements-test.txt", "samples/[\\S/]*constraints.txt", "samples/[\\S/]*constraints-test.txt"]
   }
diff --git a/tests/asyncio/test_grpc_helpers_async.py b/tests/asyncio/test_grpc_helpers_async.py
@@ -319,7 +319,7 @@ def test_awaitable_grpc_call():
     """
     AwaitableGrpcCall type should be an Awaitable and a grpc.aio.Call.
     """
-    instance = grpc_helpers_async.AwaitableGrpcCall[int]()
+    instance = grpc_helpers_async.AwaitableGrpcCall()
     assert isinstance(instance, grpc.aio.Call)
     # should implement __await__
     assert hasattr(instance, "__await__")
diff --git a/tests/unit/test_timeout.py b/tests/unit/test_timeout.py
@@ -84,9 +84,9 @@ def _clock():
         wrapped()
         target.assert_called_with(timeout=3.0)
         wrapped()
-        target.assert_called_with(timeout=0.0)
+        target.assert_called_with(timeout=42.0)
         wrapped()
-        target.assert_called_with(timeout=0.0)
+        target.assert_called_with(timeout=42.0)
 
     def test_apply_no_timeout(self):
         target = mock.Mock(spec=["__call__", "__name__"], __name__="target")
