google-api-core 2.28.0__tar.gz → 2.29.0__tar.gz

{google_api_core-2.28.0/google_api_core.egg-info → google_api_core-2.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-api-core
-Version: 2.28.0
+Version: 2.29.0
 Summary: Google API client core library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache 2.0
@@ -30,6 +30,7 @@ Requires-Dist: proto-plus<2.0.0,>=1.22.3
 Requires-Dist: proto-plus<2.0.0,>=1.25.0; python_version >= "3.13"
 Requires-Dist: google-auth<3.0.0,>=2.14.1
 Requires-Dist: requests<3.0.0,>=2.18.0
+Requires-Dist: importlib_metadata>=1.4; python_version < "3.8"
 Provides-Extra: async-rest
 Requires-Dist: google-auth[aiohttp]<3.0.0,>=2.35.0; extra == "async-rest"
 Provides-Extra: grpc

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/__init__.py

@@ -30,6 +30,7 @@ __version__ = api_core_version.__version__
 # expose dependency checks for external callers
 check_python_version = _python_version_support.check_python_version
 check_dependency_versions = _python_package_support.check_dependency_versions
+parse_version_to_tuple = _python_package_support.parse_version_to_tuple
 warn_deprecation_for_versions_less_than = (
     _python_package_support.warn_deprecation_for_versions_less_than
 )

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/_python_package_support.py

@@ -16,7 +16,7 @@
 
 import warnings
 import sys
-from typing import Optional
+from typing import Optional, Tuple
 
 from collections import namedtuple
 
@@ -25,7 +25,14 @@ from ._python_version_support import (
     _get_distribution_and_import_packages,
 )
 
-from packaging.version import parse as parse_version
+if sys.version_info >= (3, 8):
+    from importlib import metadata
+else:
+    # TODO(https://github.com/googleapis/python-api-core/issues/835): Remove
+    # this code path once we drop support for Python 3.7
+    import importlib_metadata as metadata
+
+ParsedVersion = Tuple[int, ...]
 
 # Here we list all the packages for which we want to issue warnings
 # about deprecated and unsupported versions.
@@ -48,42 +55,56 @@ DependencyVersion = namedtuple("DependencyVersion", ["version", "version_string"
 UNKNOWN_VERSION_STRING = "--"
 
 
+def parse_version_to_tuple(version_string: str) -> ParsedVersion:
+    """Safely converts a semantic version string to a comparable tuple of integers.
+
+    Example: "4.25.8" -> (4, 25, 8)
+    Ignores non-numeric parts and handles common version formats.
+
+    Args:
+        version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
+
+    Returns:
+        Tuple of integers for the parsed version string.
+    """
+    parts = []
+    for part in version_string.split("."):
+        try:
+            parts.append(int(part))
+        except ValueError:
+            # If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
+            # This is a simplification compared to 'packaging.parse_version', but sufficient
+            # for comparing strictly numeric semantic versions.
+            break
+    return tuple(parts)
+
+
 def get_dependency_version(
     dependency_name: str,
 ) -> DependencyVersion:
     """Get the parsed version of an installed package dependency.
 
     This function checks for an installed package and returns its version
-    as a `packaging.version.Version` object for safe comparison. It handles
+    as a comparable tuple of integers object for safe comparison. It handles
     both modern (Python 3.8+) and legacy (Python 3.7) environments.
 
     Args:
         dependency_name: The distribution name of the package (e.g., 'requests').
 
     Returns:
-        A DependencyVersion namedtuple with `version` and
+        A DependencyVersion namedtuple with `version`  (a tuple of integers) and
         `version_string` attributes, or `DependencyVersion(None,
         UNKNOWN_VERSION_STRING)` if the package is not found or
         another error occurs during version discovery.
 
     """
     try:
-        if sys.version_info >= (3, 8):
-            from importlib import metadata
-
-            version_string = metadata.version(dependency_name)
-            return DependencyVersion(parse_version(version_string), version_string)
-
-        # TODO(https://github.com/googleapis/python-api-core/issues/835): Remove
-        # this code path once we drop support for Python 3.7
-        else:  # pragma: NO COVER
-            # Use pkg_resources, which is part of setuptools.
-            import pkg_resources
-
-            version_string = pkg_resources.get_distribution(dependency_name).version
-            return DependencyVersion(parse_version(version_string), version_string)
-
+        version_string: str = metadata.version(dependency_name)
+        parsed_version = parse_version_to_tuple(version_string)
+        return DependencyVersion(parsed_version, version_string)
     except Exception:
+        # Catch exceptions from metadata.version() (e.g., PackageNotFoundError)
+        # or errors during parse_version_to_tuple
         return DependencyVersion(None, UNKNOWN_VERSION_STRING)
 
 
@@ -132,10 +153,14 @@ def warn_deprecation_for_versions_less_than(
         or not minimum_fully_supported_version
     ):  # pragma: NO COVER
         return
+
     dependency_version = get_dependency_version(dependency_import_package)
     if not dependency_version.version:
         return
-    if dependency_version.version < parse_version(minimum_fully_supported_version):
+
+    if dependency_version.version < parse_version_to_tuple(
+        minimum_fully_supported_version
+    ):
         (
             dependency_package,
             dependency_distribution_package,

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/_python_version_support.py

@@ -16,12 +16,16 @@
 
 import datetime
 import enum
+import logging
 import warnings
 import sys
 import textwrap
 from typing import Any, List, NamedTuple, Optional, Dict, Tuple
 
 
+_LOGGER = logging.getLogger(__name__)
+
+
 class PythonVersionStatus(enum.Enum):
     """Support status of a Python version in this client library artifact release.
 
@@ -147,9 +151,11 @@ def _flatten_message(text: str) -> str:
     return " ".join(textwrap.dedent(text).strip().split())
 
 
-# TODO(https://github.com/googleapis/python-api-core/issues/835): Remove once we
-# no longer support Python 3.7
-if sys.version_info < (3, 8):
+# TODO(https://github.com/googleapis/python-api-core/issues/835):
+# Remove once we no longer support Python 3.9.
+# `importlib.metadata.packages_distributions()` is only supported in Python 3.10 and newer
+# https://docs.python.org/3/library/importlib.metadata.html#importlib.metadata.packages_distributions
+if sys.version_info < (3, 10):
 
     def _get_pypi_package_name(module_name):  # pragma: NO COVER
         """Determine the PyPI package name for a given module name."""
@@ -168,11 +174,14 @@ else:
             if module_name in module_to_distributions:  # pragma: NO COVER
                 # The value is a list of distribution names, take the first one
                 return module_to_distributions[module_name][0]
-            else:
-                return None  # Module not found in the mapping
-        except Exception as e:
-            print(f"An error occurred: {e}")
-            return None
+        except Exception as e:  # pragma: NO COVER
+            _LOGGER.info(
+                "An error occurred while determining PyPI package name for %s: %s",
+                module_name,
+                e,
+            )
+
+        return None
 
 
 def _get_distribution_and_import_packages(import_package: str) -> Tuple[str, Any]:

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/bidi.py

@@ -281,11 +281,11 @@ class BidiRpc(BidiRpcBase):
 
     def close(self):
         """Closes the stream."""
-        if self.call is None:
-            return
+        if self.call is not None:
+            self.call.cancel()
 
+        # Put None in request queue to signal termination.
         self._request_queue.put(None)
-        self.call.cancel()
         self._request_generator = None
         self._initial_request = None
         self._callbacks = []

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/bidi_async.py

@@ -197,11 +197,11 @@ class AsyncBidiRpc(BidiRpcBase):
 
     async def close(self) -> None:
         """Closes the stream."""
-        if self.call is None:
-            return
+        if self.call is not None:
+            self.call.cancel()
 
+        # Put None in request queue to signal termination.
         await self._request_queue.put(None)
-        self.call.cancel()
         self._request_generator = None
         self._initial_request = None
         self._callbacks = []

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/grpc_helpers_async.py

@@ -220,7 +220,7 @@ def create_channel(
     default_host=None,
     compression=None,
     attempt_direct_path: Optional[bool] = False,
-    **kwargs
+    **kwargs,
 ):
     """Create an AsyncIO secure channel with credentials.
 

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/operation.py

@@ -78,7 +78,7 @@ class Operation(polling.PollingFuture):
         result_type,
         metadata_type=None,
         polling=polling.DEFAULT_POLLING,
-        **kwargs
+        **kwargs,
     ):
         super(Operation, self).__init__(polling=polling, **kwargs)
         self._operation = operation

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/operations_v1/abstract_operations_base_client.py

@@ -300,16 +300,22 @@ class AbstractOperationsBaseClient(metaclass=AbstractOperationsBaseClientMeta):
             client_options = client_options_lib.ClientOptions()
 
         # Create SSL credentials for mutual TLS if needed.
-        use_client_cert = os.getenv(
-            "GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"
-        ).lower()
-        if use_client_cert not in ("true", "false"):
-            raise ValueError(
-                "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
-            )
+        if hasattr(mtls, "should_use_client_cert"):
+            use_client_cert = mtls.should_use_client_cert()
+        else:
+            # if unsupported, fallback to reading from env var
+            use_client_cert_str = os.getenv(
+                "GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"
+            ).lower()
+            if use_client_cert_str not in ("true", "false"):
+                raise ValueError(
+                    "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be"
+                    " either `true` or `false`"
+                )
+            use_client_cert = use_client_cert_str == "true"
         client_cert_source_func = None
         is_mtls = False
-        if use_client_cert == "true":
+        if use_client_cert:
             if client_options.client_cert_source:
                 is_mtls = True
                 client_cert_source_func = client_options.client_cert_source

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/operations_v1/pagers.py

@@ -48,7 +48,7 @@ class ListOperationsPager(ListOperationsPagerBase):
         request: operations_pb2.ListOperationsRequest,
         response: operations_pb2.ListOperationsResponse,
         *,
-        metadata: Sequence[Tuple[str, str]] = ()
+        metadata: Sequence[Tuple[str, str]] = (),
     ):
         super().__init__(
             method=method, request=request, response=response, metadata=metadata

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/operations_v1/pagers_async.py

@@ -48,7 +48,7 @@ class ListOperationsAsyncPager(ListOperationsPagerBase):
         request: operations_pb2.ListOperationsRequest,
         response: operations_pb2.ListOperationsResponse,
         *,
-        metadata: Sequence[Tuple[str, str]] = ()
+        metadata: Sequence[Tuple[str, str]] = (),
     ):
         super().__init__(
             method=method, request=request, response=response, metadata=metadata

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/operations_v1/pagers_base.py

@@ -47,7 +47,7 @@ class ListOperationsPagerBase:
         request: operations_pb2.ListOperationsRequest,
         response: operations_pb2.ListOperationsResponse,
         *,
-        metadata: Sequence[Tuple[str, str]] = ()
+        metadata: Sequence[Tuple[str, str]] = (),
     ):
         """Instantiate the pager.
 

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/operations_v1/transports/base.py

@@ -119,8 +119,6 @@ class OperationsTransport(abc.ABC):
             host += ":443"  # pragma: NO COVER
         self._host = host
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
 
@@ -133,12 +131,17 @@ class OperationsTransport(abc.ABC):
 
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
-                credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
+                credentials_file,
+                scopes=scopes,
+                quota_project_id=quota_project_id,
+                default_scopes=self.AUTH_SCOPES,
             )
 
         elif credentials is None:
             credentials, _ = google.auth.default(
-                **scopes_kwargs, quota_project_id=quota_project_id
+                scopes=scopes,
+                quota_project_id=quota_project_id,
+                default_scopes=self.AUTH_SCOPES,
             )
 
         # If the credentials are service account credentials, then always try to use self signed JWT.

{google_api_core-2.28.0 → google_api_core-2.29.0}/google/api_core/version.py

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

{google_api_core-2.28.0 → google_api_core-2.29.0/google_api_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-api-core
-Version: 2.28.0
+Version: 2.29.0
 Summary: Google API client core library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache 2.0
@@ -30,6 +30,7 @@ Requires-Dist: proto-plus<2.0.0,>=1.22.3
 Requires-Dist: proto-plus<2.0.0,>=1.25.0; python_version >= "3.13"
 Requires-Dist: google-auth<3.0.0,>=2.14.1
 Requires-Dist: requests<3.0.0,>=2.18.0
+Requires-Dist: importlib_metadata>=1.4; python_version < "3.8"
 Provides-Extra: async-rest
 Requires-Dist: google-auth[aiohttp]<3.0.0,>=2.35.0; extra == "async-rest"
 Provides-Extra: grpc

{google_api_core-2.28.0 → google_api_core-2.29.0}/google_api_core.egg-info/requires.txt

@@ -4,6 +4,9 @@ proto-plus<2.0.0,>=1.22.3
 google-auth<3.0.0,>=2.14.1
 requests<3.0.0,>=2.18.0
 
+[:python_version < "3.8"]
+importlib_metadata>=1.4
+
 [:python_version >= "3.13"]
 proto-plus<2.0.0,>=1.25.0
 

{google_api_core-2.28.0 → google_api_core-2.29.0}/pyproject.toml

@@ -51,6 +51,9 @@ dependencies = [
   "proto-plus >= 1.25.0, < 2.0.0; python_version >= '3.13'",
   "google-auth >= 2.14.1, < 3.0.0",
   "requests >= 2.18.0, < 3.0.0",
+  # TODO(https://github.com/googleapis/python-api-core/issues/835): Remove
+  # `importlib_metadata` once we drop support for Python 3.7
+  "importlib_metadata>=1.4; python_version<'3.8'",
 ]
 dynamic = ["version"]
 
@@ -80,7 +83,7 @@ version = { attr = "google.api_core.version.__version__" }
 include = ["google*"]
 
 [tool.mypy]
-python_version = "3.7"
+python_version = "3.14"
 namespace_packages = true
 ignore_missing_imports = true
 
@@ -88,6 +91,8 @@ ignore_missing_imports = true
 filterwarnings = [
   # treat all warnings as errors
   "error",
+  # Prevent Python version warnings from interfering with tests
+  "ignore:.* Python version .*:FutureWarning",
   # Remove once https://github.com/pytest-dev/pytest-cov/issues/621 is fixed
   "ignore:.*The --rsyncdir command line argument and rsyncdirs config variable are deprecated:DeprecationWarning",
   # Remove once https://github.com/protocolbuffers/protobuf/issues/12186 is fixed

google_api_core-2.29.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{google_api_core-2.28.0 → google_api_core-2.29.0}/tests/asyncio/gapic/test_method_async.py

@@ -260,7 +260,7 @@ async def test_wrap_method_with_overriding_timeout_as_a_number():
     actual_timeout = method.call_args[1]["timeout"]
     metadata = method.call_args[1]["metadata"]
     assert metadata == mock.ANY
-    assert actual_timeout == pytest.approx(22, abs=0.01)
+    assert actual_timeout == pytest.approx(22, abs=0.05)
 
 
 @pytest.mark.asyncio

{google_api_core-2.28.0 → google_api_core-2.29.0}/tests/asyncio/test_bidi_async.py

@@ -255,6 +255,21 @@ class TestAsyncBidiRpc:
         assert bidi_rpc._initial_request is None
         assert not bidi_rpc._callbacks
 
+    @pytest.mark.asyncio
+    async def test_close_with_no_rpc(self):
+        bidi_rpc = bidi_async.AsyncBidiRpc(None)
+
+        await bidi_rpc.close()
+
+        assert bidi_rpc.call is None
+        assert bidi_rpc.is_active is False
+        # ensure the request queue was signaled to stop.
+        assert bidi_rpc.pending_requests == 1
+        assert await bidi_rpc._request_queue.get() is None
+        # ensure request and callbacks are cleaned up
+        assert bidi_rpc._initial_request is None
+        assert not bidi_rpc._callbacks
+
     @pytest.mark.asyncio
     async def test_close_no_rpc(self):
         bidi_rpc = bidi_async.AsyncBidiRpc(None)

{google_api_core-2.28.0 → google_api_core-2.29.0}/tests/asyncio/test_grpc_helpers_async.py

@@ -17,6 +17,7 @@ try:
     from unittest.mock import AsyncMock  # pragma: NO COVER  # noqa: F401
 except ImportError:  # pragma: NO COVER
     import mock  # type: ignore
+from ..helpers import warn_deprecated_credentials_file
 import pytest  # noqa: I202
 
 try:
@@ -522,11 +523,12 @@ def test_create_channel_explicit_with_duplicate_credentials():
     target = "example:443"
 
     with pytest.raises(exceptions.DuplicateCredentialArgs) as excinfo:
-        grpc_helpers_async.create_channel(
-            target,
-            credentials_file="credentials.json",
-            credentials=mock.sentinel.credentials,
-        )
+        with warn_deprecated_credentials_file():
+            grpc_helpers_async.create_channel(
+                target,
+                credentials_file="credentials.json",
+                credentials=mock.sentinel.credentials,
+            )
 
     assert "mutually exclusive" in str(excinfo.value)
 
@@ -641,9 +643,10 @@ def test_create_channel_with_credentials_file(
     credentials_file = "/path/to/credentials/file.json"
     composite_creds = composite_creds_call.return_value
 
-    channel = grpc_helpers_async.create_channel(
-        target, credentials_file=credentials_file
-    )
+    with warn_deprecated_credentials_file():
+        channel = grpc_helpers_async.create_channel(
+            target, credentials_file=credentials_file
+        )
 
     google.auth.load_credentials_from_file.assert_called_once_with(
         credentials_file, scopes=None, default_scopes=None
@@ -670,9 +673,10 @@ def test_create_channel_with_credentials_file_and_scopes(
     credentials_file = "/path/to/credentials/file.json"
     composite_creds = composite_creds_call.return_value
 
-    channel = grpc_helpers_async.create_channel(
-        target, credentials_file=credentials_file, scopes=scopes
-    )
+    with warn_deprecated_credentials_file():
+        channel = grpc_helpers_async.create_channel(
+            target, credentials_file=credentials_file, scopes=scopes
+        )
 
     google.auth.load_credentials_from_file.assert_called_once_with(
         credentials_file, scopes=scopes, default_scopes=None
@@ -699,9 +703,10 @@ def test_create_channel_with_credentials_file_and_default_scopes(
     credentials_file = "/path/to/credentials/file.json"
     composite_creds = composite_creds_call.return_value
 
-    channel = grpc_helpers_async.create_channel(
-        target, credentials_file=credentials_file, default_scopes=default_scopes
-    )
+    with warn_deprecated_credentials_file():
+        channel = grpc_helpers_async.create_channel(
+            target, credentials_file=credentials_file, default_scopes=default_scopes
+        )
 
     google.auth.load_credentials_from_file.assert_called_once_with(
         credentials_file, scopes=None, default_scopes=default_scopes

{google_api_core-2.28.0 → google_api_core-2.29.0}/tests/asyncio/test_rest_streaming_async.py

@@ -292,7 +292,6 @@ async def test_next_escaped_characters_in_string(
 @pytest.mark.asyncio
 @pytest.mark.parametrize("response_type", [EchoResponse, httpbody_pb2.HttpBody])
 async def test_next_not_array(response_type):
-
     data = '{"hello": 0}'
     with mock.patch.object(
         ResponseMock, "content", return_value=mock_async_gen(data)
@@ -352,7 +351,6 @@ async def test_check_buffer(response_type, return_value):
 @pytest.mark.asyncio
 @pytest.mark.parametrize("response_type", [EchoResponse, httpbody_pb2.HttpBody])
 async def test_next_html(response_type):
-
     data = "<!DOCTYPE html><html></html>"
     with mock.patch.object(
         ResponseMock, "content", return_value=mock_async_gen(data)

{google_api_core-2.28.0 → google_api_core-2.29.0}/tests/helpers.py

@@ -14,7 +14,9 @@
 
 """Helpers for tests"""
 
+import functools
 import logging
+import pytest  # noqa: I202
 from typing import List
 
 import proto
@@ -69,3 +71,12 @@ def parse_responses(response_message_cls, all_responses: List[proto.Message]) ->
     logging.info(f"Sending JSON stream: {json_responses}")
     ret_val = "[{}]".format(",".join(json_responses))
     return bytes(ret_val, "utf-8")
+
+
+warn_deprecated_credentials_file = functools.partial(
+    # This is used to test that the auth credentials file deprecation
+    # warning is emitted as expected.
+    pytest.warns,
+    DeprecationWarning,
+    match="argument is deprecated because of a potential security risk",
+)

{google_api_core-2.28.0 → google_api_core-2.29.0}/tests/unit/gapic/test_method.py

@@ -192,6 +192,7 @@ def test_wrap_method_with_overriding_retry_timeout_compression(unused_sleep):
     )
 
 
+@pytest.mark.skip(reason="Known flaky due to floating point comparison. #866")
 def test_wrap_method_with_overriding_timeout_as_a_number():
     method = mock.Mock(spec=["__call__"], return_value=42)
     default_retry = retry.Retry()
@@ -200,6 +201,8 @@ def test_wrap_method_with_overriding_timeout_as_a_number():
         method, default_retry, default_timeout
     )
 
+    # Using "result = wrapped_method(timeout=22)" fails since wrapped_method
+    # does floating point calculations that results in 21.987.. instead of 22
     result = wrapped_method(timeout=22)
 
     assert result == 42
@@ -210,6 +213,24 @@ def test_wrap_method_with_overriding_timeout_as_a_number():
     assert actual_timeout == pytest.approx(22, abs=0.01)
 
 
+def test_wrap_method_with_overriding_constant_timeout():
+    method = mock.Mock(spec=["__call__"], return_value=42)
+    default_retry = retry.Retry()
+    default_timeout = timeout.ConstantTimeout(60)
+    wrapped_method = google.api_core.gapic_v1.method.wrap_method(
+        method, default_retry, default_timeout
+    )
+
+    result = wrapped_method(timeout=timeout.ConstantTimeout(22))
+
+    assert result == 42
+
+    actual_timeout = method.call_args[1]["timeout"]
+    metadata = method.call_args[1]["metadata"]
+    assert metadata == mock.ANY
+    assert actual_timeout == 22
+
+
 def test_wrap_method_with_call():
     method = mock.Mock()
     mock_call = mock.Mock()

{google_api_core-2.28.0 → google_api_core-2.29.0}/tests/unit/gapic/test_routing_header.py

@@ -90,8 +90,8 @@ def test__urlencode_param(key, value, expected):
 def test__urlencode_param_caching_performance():
     import time
 
-    key = "key" * 100
-    value = "value" * 100
+    key = "key" * 10000
+    value = "value" * 10000
     # time with empty cache
     start_time = time.perf_counter()
     routing_header._urlencode_param(key, value)