diff --git a/pyiceberg/catalog/rest/__init__.py b/pyiceberg/catalog/rest/__init__.py index d284b06234..4b6e656ff5 100644 --- a/pyiceberg/catalog/rest/__init__.py +++ b/pyiceberg/catalog/rest/__init__.py @@ -18,6 +18,7 @@ import logging import os +import platform import sys import time import uuid @@ -1232,7 +1233,9 @@ def _config_headers(self, session: Session) -> None: header_properties = get_header_properties(self.properties) session.headers.update(header_properties) session.headers["Content-type"] = "application/json" - session.headers["User-Agent"] = f"PyIceberg/{__version__}" + session.headers["User-Agent"] = ( + f"pyiceberg/{__version__} ({platform.python_implementation().lower()} {platform.python_version()})" + ) session.headers["X-Client-Version"] = f"PyIceberg {__version__}" session.headers.setdefault("X-Iceberg-Access-Delegation", ACCESS_DELEGATION_DEFAULT) diff --git a/tests/catalog/test_rest.py b/tests/catalog/test_rest.py index 1160d2889a..68dab4d0fc 100644 --- a/tests/catalog/test_rest.py +++ b/tests/catalog/test_rest.py @@ -20,6 +20,7 @@ import base64 import os import pickle +import platform import uuid from collections.abc import Callable, Iterator from contextlib import contextmanager @@ -96,7 +97,7 @@ TEST_HEADERS = { "Content-type": "application/json", - "User-Agent": f"PyIceberg/{pyiceberg.__version__}", + "User-Agent": f"pyiceberg/{pyiceberg.__version__} ({platform.python_implementation().lower()} {platform.python_version()})", "Authorization": f"Bearer {TEST_TOKEN}", "X-Iceberg-Access-Delegation": "vended-credentials", } @@ -3265,6 +3266,18 @@ def test_auth_header(rest_mock: Mocker) -> None: ) +def test_user_agent_header(rest_mock: Mocker, monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setattr("pyiceberg.catalog.rest.__version__", "0.11.0") + for implementation, python_version, expected in [ + ("CPython", "3.11.4", "pyiceberg/0.11.0 (cpython 3.11.4)"), + ("PyPy", "3.10.16", "pyiceberg/0.11.0 (pypy 3.10.16)"), + ]: + monkeypatch.setattr(platform, "python_implementation", lambda implementation=implementation: implementation) + monkeypatch.setattr(platform, "python_version", lambda python_version=python_version: python_version) + catalog = RestCatalog("rest", uri=TEST_URI, warehouse="s3://some-bucket") + assert catalog._session.headers["User-Agent"] == expected + + def test_client_version_header(rest_mock: Mocker) -> None: catalog = RestCatalog("rest", uri=TEST_URI, warehouse="s3://some-bucket") assert catalog._session.headers.get("X-Client-Version") == f"PyIceberg {pyiceberg.__version__}"