address review feedback:prefer auth manager,move constant

Author: 010Soham

pyiceberg/catalog/__init__.py

@@ -77,7 +77,6 @@
 _ENV_CONFIG = Config()
 
 TOKEN = "token"
-AUTH_MANAGER = "auth.manager"
 TYPE = "type"
 PY_CATALOG_IMPL = "py-catalog-impl"
 ICEBERG = "iceberg"

pyiceberg/catalog/rest/__init__.py

@@ -26,8 +26,8 @@
 from tenacity import RetryCallState, retry, retry_if_exception_type, stop_after_attempt
 
 from pyiceberg import __version__
-from pyiceberg.catalog import AUTH_MANAGER, BOTOCORE_SESSION, TOKEN, URI, WAREHOUSE_LOCATION, Catalog, PropertiesUpdateSummary
-from pyiceberg.catalog.rest.auth import AuthManager, AuthManagerAdapter, AuthManagerFactory, LegacyOAuth2AuthManager
+from pyiceberg.catalog import BOTOCORE_SESSION, TOKEN, URI, WAREHOUSE_LOCATION, Catalog, PropertiesUpdateSummary
+from pyiceberg.catalog.rest.auth import AUTH_MANAGER, AuthManager, AuthManagerAdapter, AuthManagerFactory, LegacyOAuth2AuthManager
 from pyiceberg.catalog.rest.response import _handle_non_200_response
 from pyiceberg.exceptions import (
     AuthorizationExpiredError,

pyiceberg/catalog/rest/auth.py

@@ -31,6 +31,8 @@
 from pyiceberg.catalog.rest.response import TokenResponse, _handle_non_200_response
 from pyiceberg.exceptions import OAuthError
 
+AUTH_MANAGER = "auth.manager"
+
 COLON = ":"
 logger = logging.getLogger(__name__)
 

pyiceberg/io/fsspec.py

@@ -36,7 +36,8 @@
 from fsspec.implementations.local import LocalFileSystem
 from requests import HTTPError
 
-from pyiceberg.catalog import AUTH_MANAGER, TOKEN, URI
+from pyiceberg.catalog import TOKEN, URI
+from pyiceberg.catalog.rest.auth import AUTH_MANAGER
 from pyiceberg.exceptions import SignError
 from pyiceberg.io import (
     ADLS_ACCOUNT_HOST,
@@ -124,12 +125,10 @@ def __call__(self, request: "AWSRequest", **_: Any) -> None:
         signer_headers: dict[str, str] = {}
 
         auth_header: str | None = None
-        if token := self.properties.get(TOKEN):
+        if auth_manager := self.properties.get(AUTH_MANAGER):
+            auth_header = auth_manager.auth_header()
+        elif token := self.properties.get(TOKEN):
             auth_header = f"Bearer {token}"
-        elif auth_manager := self.properties.get(AUTH_MANAGER):
-            header = getattr(auth_manager, "auth_header", None)
-            if callable(header):
-                auth_header = header()
 
         if auth_header:
             signer_headers["Authorization"] = auth_header

tests/io/test_fsspec.py

@@ -28,7 +28,7 @@
 from fsspec.spec import AbstractFileSystem
 from requests_mock import Mocker
 
-from pyiceberg.catalog import AUTH_MANAGER
+from pyiceberg.catalog.rest.auth import AUTH_MANAGER
 from pyiceberg.exceptions import SignError
 from pyiceberg.io import fsspec
 from pyiceberg.io.fsspec import FsspecFileIO, S3V4RestSigner