let requests handle the params

Author: jayceslesar

pyiceberg/catalog/rest/__init__.py

@@ -99,7 +99,7 @@ class Endpoints:
     register_table = "namespaces/{namespace}/register"
     load_table: str = "namespaces/{namespace}/tables/{table}"
     update_table: str = "namespaces/{namespace}/tables/{table}"
-    drop_table: str = "namespaces/{namespace}/tables/{table}?purgeRequested={purge}"
+    drop_table: str = "namespaces/{namespace}/tables/{table}"
     table_exists: str = "namespaces/{namespace}/tables/{table}"
     get_token: str = "oauth/tokens"
     rename_table: str = "tables/rename"
@@ -108,30 +108,6 @@ class Endpoints:
     view_exists: str = "namespaces/{namespace}/views/{view}"
 
 
-ENDPOINT_PARAMS_MAP: dict[str, tuple[str]] = {
-    Endpoints.drop_table: ("purgeRequested",),
-}
-
-
-def _get_endpoint_params(endpoint: str, **kwargs: Any) -> dict[str, Any] | None:
-    """Get the query parameters for the endpoint."""
-    if not kwargs or endpoint not in ENDPOINT_PARAMS_MAP:
-        return None
-
-    snake_case_query_params = {
-        param: CAMEL_TO_SNAKE_CASE_PATTERN.sub("_", param).lower() for param in ENDPOINT_PARAMS_MAP[endpoint]
-    }
-
-    _params = {}
-    for camel, snake in snake_case_query_params.items():
-        if snake in kwargs:
-            if kwargs[snake] is None:
-                continue
-            _params[camel] = kwargs[snake]
-
-    return _params
-
-
 class IdentifierKind(Enum):
     TABLE = "table"
     VIEW = "view"
@@ -644,9 +620,9 @@ def load_table(self, identifier: Union[str, Identifier]) -> Table:
 
     @retry(**_RETRY_ARGS)
     def drop_table(self, identifier: Union[str, Identifier], purge_requested: bool = False) -> None:
-        params = _get_endpoint_params(Endpoints.drop_table, purge_requested=purge_requested)
         response = self._session.delete(
-            self.url(Endpoints.drop_table, prefixed=True, **self._split_identifier_for_path(identifier)), params=params
+            self.url(Endpoints.drop_table, prefixed=True, **self._split_identifier_for_path(identifier)),
+            params={"purgeRequested": purge_requested},
         )
         try:
             response.raise_for_status()

tests/catalog/test_rest.py

@@ -24,7 +24,7 @@
 
 import pyiceberg
 from pyiceberg.catalog import PropertiesUpdateSummary, load_catalog
-from pyiceberg.catalog.rest import OAUTH2_SERVER_URI, SNAPSHOT_LOADING_MODE, Endpoints, RestCatalog, _get_endpoint_params
+from pyiceberg.catalog.rest import OAUTH2_SERVER_URI, SNAPSHOT_LOADING_MODE, RestCatalog
 from pyiceberg.exceptions import (
     AuthorizationExpiredError,
     NamespaceAlreadyExistsError,
@@ -1621,15 +1621,3 @@ def test_drop_view_204(rest_mock: Mocker) -> None:
         request_headers=TEST_HEADERS,
     )
     RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN).drop_view(("some_namespace", "some_view"))
-
-
-def test_get_endpoint_params() -> None:
-    params = _get_endpoint_params(Endpoints.drop_table, purge_requested=True)
-    assert params == {
-        "purgeRequested": True,
-    }
-
-
-def test_get_endpoint_with_no_params() -> None:
-    params = _get_endpoint_params(Endpoints.namespace_exists, purge_requested=True)
-    assert params is None