Skip to content
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

fix: exception name in python #5453

Merged
merged 2 commits into from
Dec 25, 2024
Merged

fix: exception name in python #5453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8c43a1
fix exception name in python
trim21 Dec 25, 2024
10e61d3
Merge branch 'main' into python-error-name
trim21 Dec 25, 2024
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
67 changes: 43 additions & 24 deletions bindings/python/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,55 @@ use pyo3::exceptions::PyException;

use crate::*;

create_exception!(opendal, Error, PyException, "OpenDAL Base Exception");
create_exception!(opendal, UnexpectedError, Error, "Unexpected errors");
create_exception!(opendal, UnsupportedError, Error, "Unsupported operation");
create_exception!(opendal, ConfigInvalidError, Error, "Config is invalid");
create_exception!(opendal, NotFoundError, Error, "Not found");
create_exception!(opendal, PermissionDeniedError, Error, "Permission denied");
create_exception!(opendal, IsADirectoryError, Error, "Is a directory");
create_exception!(opendal, NotADirectoryError, Error, "Not a directory");
create_exception!(opendal, AlreadyExistsError, Error, "Already exists");
create_exception!(opendal, IsSameFileError, Error, "Is same file");
create_exception!(
opendal,
ConditionNotMatchError,
opendal.exceptions,
Error,
PyException,
"OpenDAL Base Exception"
);
create_exception!(opendal.exceptions, Unexpected, Error, "Unexpected errors");
create_exception!(
opendal.exceptions,
Unsupported,
Error,
"Unsupported operation"
);
create_exception!(
opendal.exceptions,
ConfigInvalid,
Error,
"Config is invalid"
);
create_exception!(opendal.exceptions, NotFound, Error, "Not found");
create_exception!(
opendal.exceptions,
PermissionDenied,
Error,
"Permission denied"
);
create_exception!(opendal.exceptions, IsADirectory, Error, "Is a directory");
create_exception!(opendal.exceptions, NotADirectory, Error, "Not a directory");
create_exception!(opendal.exceptions, AlreadyExists, Error, "Already exists");
create_exception!(opendal.exceptions, IsSameFile, Error, "Is same file");
create_exception!(
opendal.exceptions,
ConditionNotMatch,
Error,
"Condition not match"
);

pub fn format_pyerr(err: ocore::Error) -> PyErr {
use ocore::ErrorKind::*;
match err.kind() {
Unexpected => UnexpectedError::new_err(err.to_string()),
Unsupported => UnsupportedError::new_err(err.to_string()),
ConfigInvalid => ConfigInvalidError::new_err(err.to_string()),
NotFound => NotFoundError::new_err(err.to_string()),
PermissionDenied => PermissionDeniedError::new_err(err.to_string()),
IsADirectory => IsADirectoryError::new_err(err.to_string()),
NotADirectory => NotADirectoryError::new_err(err.to_string()),
AlreadyExists => AlreadyExistsError::new_err(err.to_string()),
IsSameFile => IsSameFileError::new_err(err.to_string()),
ConditionNotMatch => ConditionNotMatchError::new_err(err.to_string()),
_ => UnexpectedError::new_err(err.to_string()),
ocore::ErrorKind::Unexpected => Unexpected::new_err(err.to_string()),
ocore::ErrorKind::Unsupported => Unsupported::new_err(err.to_string()),
ocore::ErrorKind::ConfigInvalid => ConfigInvalid::new_err(err.to_string()),
ocore::ErrorKind::NotFound => NotFound::new_err(err.to_string()),
ocore::ErrorKind::PermissionDenied => PermissionDenied::new_err(err.to_string()),
ocore::ErrorKind::IsADirectory => IsADirectory::new_err(err.to_string()),
ocore::ErrorKind::NotADirectory => NotADirectory::new_err(err.to_string()),
ocore::ErrorKind::AlreadyExists => AlreadyExists::new_err(err.to_string()),
ocore::ErrorKind::IsSameFile => IsSameFile::new_err(err.to_string()),
ocore::ErrorKind::ConditionNotMatch => ConditionNotMatch::new_err(err.to_string()),
_ => Unexpected::new_err(err.to_string()),
}
}
20 changes: 10 additions & 10 deletions bindings/python/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,16 @@ fn _opendal(py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {

let exception_module = PyModule::new(py, "exceptions")?;
exception_module.add("Error", py.get_type::<Error>())?;
exception_module.add("Unexpected", py.get_type::<UnexpectedError>())?;
exception_module.add("Unsupported", py.get_type::<UnsupportedError>())?;
exception_module.add("ConfigInvalid", py.get_type::<ConfigInvalidError>())?;
exception_module.add("NotFound", py.get_type::<NotFoundError>())?;
exception_module.add("PermissionDenied", py.get_type::<PermissionDeniedError>())?;
exception_module.add("IsADirectory", py.get_type::<IsADirectoryError>())?;
exception_module.add("NotADirectory", py.get_type::<NotADirectoryError>())?;
exception_module.add("AlreadyExists", py.get_type::<AlreadyExistsError>())?;
exception_module.add("IsSameFile", py.get_type::<IsSameFileError>())?;
exception_module.add("ConditionNotMatch", py.get_type::<ConditionNotMatchError>())?;
exception_module.add("Unexpected", py.get_type::<Unexpected>())?;
exception_module.add("Unsupported", py.get_type::<Unsupported>())?;
exception_module.add("ConfigInvalid", py.get_type::<ConfigInvalid>())?;
exception_module.add("NotFound", py.get_type::<NotFound>())?;
exception_module.add("PermissionDenied", py.get_type::<PermissionDenied>())?;
exception_module.add("IsADirectory", py.get_type::<IsADirectory>())?;
exception_module.add("NotADirectory", py.get_type::<NotADirectory>())?;
exception_module.add("AlreadyExists", py.get_type::<AlreadyExists>())?;
exception_module.add("IsSameFile", py.get_type::<IsSameFile>())?;
exception_module.add("ConditionNotMatch", py.get_type::<ConditionNotMatch>())?;
m.add_submodule(&exception_module)?;
py.import("sys")?
.getattr("modules")?
Expand Down
8 changes: 4 additions & 4 deletions bindings/python/src/operator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ impl Operator {
let w = this.writer(&path).map_err(format_pyerr)?;
Ok(File::new_writer(w))
} else {
Err(UnsupportedError::new_err(format!(
Err(Unsupported::new_err(format!(
"OpenDAL doesn't support mode: {mode}"
)))
}
Expand Down Expand Up @@ -304,7 +304,7 @@ impl AsyncOperator {
let w = this.writer(&path).await.map_err(format_pyerr)?;
Ok(AsyncFile::new_writer(w))
} else {
Err(UnsupportedError::new_err(format!(
Err(Unsupported::new_err(format!(
"OpenDAL doesn't support mode: {mode}"
)))
}
Expand Down Expand Up @@ -578,9 +578,9 @@ impl PresignedRequest {
let k = k.as_str();
let v = v
.to_str()
.map_err(|err| UnexpectedError::new_err(err.to_string()))?;
.map_err(|err| Unexpected::new_err(err.to_string()))?;
if headers.insert(k, v).is_some() {
return Err(UnexpectedError::new_err("duplicate header"));
return Err(Unexpected::new_err("duplicate header"));
}
}
Ok(headers)
Expand Down
Loading