Skip to content

REST: Delegate parsing to Pydantic #1847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fokko merged 1 commit into from
Mar 25, 2025
Merged

REST: Delegate parsing to Pydantic #1847

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions pyiceberg/catalog/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ def _fetch_access_token(self, session: Session, credential: str) -> str:
except HTTPError as exc:
self._handle_non_200_response(exc, {400: OAuthError, 401: OAuthError})

return TokenResponse(**response.json()).access_token
return TokenResponse.model_validate_json(response.text).access_token

def _fetch_config(self) -> None:
params = {}
Expand All @@ -383,7 +383,7 @@ def _fetch_config(self) -> None:
response.raise_for_status()
except HTTPError as exc:
self._handle_non_200_response(exc, {})
config_response = ConfigResponse(**response.json())
config_response = ConfigResponse.model_validate_json(response.text)

config = config_response.defaults
config.update(self.properties)
Expand Down Expand Up @@ -443,14 +443,14 @@ def _handle_non_200_response(self, exc: HTTPError, error_handler: Dict[int, Type
try:
if exception == OAuthError:
# The OAuthErrorResponse has a different format
error = OAuthErrorResponse(**exc.response.json())
error = OAuthErrorResponse.model_validate_json(exc.response.text)
response = str(error.error)
if description := error.error_description:
response += f": {description}"
if uri := error.error_uri:
response += f" ({uri})"
else:
error = ErrorResponse(**exc.response.json()).error
error = ErrorResponse.model_validate_json(exc.response.text).error
response = f"{error.type}: {error.message}"
except JSONDecodeError:
# In the case we don't have a proper response
Expand Down Expand Up @@ -588,7 +588,7 @@ def _create_table(
response.raise_for_status()
except HTTPError as exc:
self._handle_non_200_response(exc, {409: TableAlreadyExistsError})
return TableResponse(**response.json())
return TableResponse.model_validate_json(response.text)

@retry(**_RETRY_ARGS)
def create_table(
Expand Down Expand Up @@ -662,7 +662,7 @@ def register_table(self, identifier: Union[str, Identifier], metadata_location:
except HTTPError as exc:
self._handle_non_200_response(exc, {409: TableAlreadyExistsError})

table_response = TableResponse(**response.json())
table_response = TableResponse.model_validate_json(response.text)
return self._response_to_table(self.identifier_to_tuple(identifier), table_response)

@retry(**_RETRY_ARGS)
Expand All @@ -674,7 +674,7 @@ def list_tables(self, namespace: Union[str, Identifier]) -> List[Identifier]:
response.raise_for_status()
except HTTPError as exc:
self._handle_non_200_response(exc, {404: NoSuchNamespaceError})
return [(*table.namespace, table.name) for table in ListTablesResponse(**response.json()).identifiers]
return [(*table.namespace, table.name) for table in ListTablesResponse.model_validate_json(response.text).identifiers]

@retry(**_RETRY_ARGS)
def load_table(self, identifier: Union[str, Identifier]) -> Table:
Expand All @@ -684,7 +684,7 @@ def load_table(self, identifier: Union[str, Identifier]) -> Table:
except HTTPError as exc:
self._handle_non_200_response(exc, {404: NoSuchTableError})

table_response = TableResponse(**response.json())
table_response = TableResponse.model_validate_json(response.text)
return self._response_to_table(self.identifier_to_tuple(identifier), table_response)

@retry(**_RETRY_ARGS)
Expand Down Expand Up @@ -735,7 +735,7 @@ def list_views(self, namespace: Union[str, Identifier]) -> List[Identifier]:
response.raise_for_status()
except HTTPError as exc:
self._handle_non_200_response(exc, {404: NoSuchNamespaceError})
return [(*view.namespace, view.name) for view in ListViewsResponse(**response.json()).identifiers]
return [(*view.namespace, view.name) for view in ListViewsResponse.model_validate_json(response.text).identifiers]

@retry(**_RETRY_ARGS)
def commit_table(
Expand Down Expand Up @@ -781,7 +781,7 @@ def commit_table(
504: CommitStateUnknownException,
},
)
return CommitTableResponse(**response.json())
return CommitTableResponse.model_validate_json(response.text)

@retry(**_RETRY_ARGS)
def create_namespace(self, namespace: Union[str, Identifier], properties: Properties = EMPTY_DICT) -> None:
Expand Down Expand Up @@ -818,7 +818,7 @@ def list_namespaces(self, namespace: Union[str, Identifier] = ()) -> List[Identi
except HTTPError as exc:
self._handle_non_200_response(exc, {})

return ListNamespaceResponse(**response.json()).namespaces
return ListNamespaceResponse.model_validate_json(response.text).namespaces

@retry(**_RETRY_ARGS)
def load_namespace_properties(self, namespace: Union[str, Identifier]) -> Properties:
Expand All @@ -830,7 +830,7 @@ def load_namespace_properties(self, namespace: Union[str, Identifier]) -> Proper
except HTTPError as exc:
self._handle_non_200_response(exc, {404: NoSuchNamespaceError})

return NamespaceResponse(**response.json()).properties
return NamespaceResponse.model_validate_json(response.text).properties

@retry(**_RETRY_ARGS)
def update_namespace_properties(
Expand All @@ -844,7 +844,7 @@ def update_namespace_properties(
response.raise_for_status()
except HTTPError as exc:
self._handle_non_200_response(exc, {404: NoSuchNamespaceError})
parsed_response = UpdateNamespacePropertiesResponse(**response.json())
parsed_response = UpdateNamespacePropertiesResponse.model_validate_json(response.text)
return PropertiesUpdateSummary(
removed=parsed_response.removed,
updated=parsed_response.updated,
Expand Down