Skip to content

[Python] Migrate off of deprecated cel::ErrorValue(absl::Status) constructor. #111

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
copybara-service merged 1 commit into from
Sep 28, 2026
+42 −36
Merged

[Python] Migrate off of deprecated cel::ErrorValue(absl::Status) constructor. #111

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bazel_dep(name = "bazel_skylib", version = "1.9.0")
bazel_dep(name = "cel-cpp", version = "0.16.1", repo_name = "com_google_cel_cpp")
git_override(
module_name = "cel-cpp",
commit = "2d4e7a2a3d8caaa6a4b17288d2d7f3f646ec7b9e",
commit = "addea6d6384b825984b39c715c92672ac510c293",
remote = "https://github.com/cel-expr/cel-cpp",
)

Expand Down
2 changes: 1 addition & 1 deletion cel_expr_python/py_cel_function.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ absl::StatusOr<cel::Value> PyCelFunctionAdapter::Invoke(
absl::Status status = PyErr_toStatus();
if (!status.ok()) {
Py_XDECREF(result);
return cel::ErrorValue(status);
return cel::ErrorValue::From(status, context.arena());
}

absl::StatusOr<cel::Value> cel_result = PyObjectToCelValue(
Expand Down
74 changes: 40 additions & 34 deletions cel_expr_python/py_cel_value.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ cel::Value PyCelValueProvider::Provide(
absl::StatusOr<cel::Value> converted_value = PyObjectToCelValue(
py_object_, type, [this]() { return name_; }, env_, arena);
if (!converted_value.ok()) {
return cel::ErrorValue(converted_value.status());
return cel::ErrorValue::From(converted_value.status(), arena);
}
return *converted_value;
}
Expand All @@ -193,7 +193,8 @@ void PyCelListItemAccessor::ResolveElementLocked() {
list.Get(index_, env_->GetDescriptorPool(), env_->GetMessageFactory(),
arena_->GetArena());
if (!element.ok()) {
element_value_ = cel::ErrorValue(element.status());
element_value_ =
cel::ErrorValue::From(element.status(), arena_->GetArena());
resolved_ = true;
return;
}
Expand Down Expand Up @@ -265,7 +266,7 @@ void PyCelMapItemAccessor::ResolveElementLocked() {
map.Get(key_, env_->GetDescriptorPool(), env_->GetMessageFactory(),
arena_->GetArena(), &element_value_);
if (!status.ok()) {
element_value_ = cel::ErrorValue(status);
element_value_ = cel::ErrorValue::From(status, arena_->GetArena());
resolved_ = true;
return;
}
Expand Down Expand Up @@ -393,8 +394,9 @@ PyObject* CelValueToPyObject(const cel::Value& cel_value,
}
if (!status.ok()) {
Py_DECREF(py_list);
return CelValueToPyObject(cel::ErrorValue(status), env, arena,
/*plain_value=*/plain_value);
return CelValueToPyObject(
cel::ErrorValue::From(status, arena->GetArena()), env, arena,
/*plain_value=*/plain_value);
}
return py_list;
}
Expand Down Expand Up @@ -498,11 +500,13 @@ static absl::string_view NormalizeTypeName(absl::string_view type_name) {

static cel::ErrorValue InvalidTypeError(
PyObject* py_object, absl::FunctionRef<std::string()> context,
const PyCelType& expected_type) {
const PyCelType& expected_type, google::protobuf::Arena* arena) {
PyTypeObject* type = Py_TYPE(py_object);
return cel::ErrorValue(absl::InvalidArgumentError(
absl::StrFormat("Unexpected value type for '%s': %s. (Expected %s)",
context(), type->tp_name, expected_type.GetName())));
return cel::ErrorValue::From(
absl::InvalidArgumentError(
absl::StrFormat("Unexpected value type for '%s': %s. (Expected %s)",
context(), type->tp_name, expected_type.GetName())),
arena);
}

static void EnsureDateTimeModuleImported() {
Expand Down Expand Up @@ -570,10 +574,10 @@ static cel::Value ProtoMessageToCelValue(
// lookups raised a Python exception in PyDescriptorDatabase.
absl::Status status = PyErr_toStatus();
if (!status.ok()) {
return cel::ErrorValue(status);
return cel::ErrorValue::From(status, arena);
}
if (!wrapped_message.ok()) {
return cel::ErrorValue(wrapped_message.status());
return cel::ErrorValue::From(wrapped_message.status(), arena);
}
return *wrapped_message;
}
Expand All @@ -584,9 +588,11 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
const std::shared_ptr<PyCelEnvInternal>& env, google::protobuf::Arena* arena,
bool bypass_type_check) {
if (!py_object) {
return cel::ErrorValue(absl::InvalidArgumentError(
absl::StrFormat("Unexpected None value for '%s'. (Expected %s)",
context(), expected_type.GetName())));
return cel::ErrorValue::From(
absl::InvalidArgumentError(
absl::StrFormat("Unexpected None value for '%s'. (Expected %s)",
context(), expected_type.GetName())),
arena);
}

switch (expected_type.GetKind()) {
Expand All @@ -605,40 +611,40 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
} else if (py_object == Py_False) {
return cel::BoolValue(false);
} else {
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}
}
case cel::Kind::kInt: {
if (bypass_type_check || PyNumber_Check(py_object)) {
int64_t value = PyLong_AsLongLong(py_object);
if (PyErr_Occurred()) {
return cel::ErrorValue(PyErr_toStatus());
return cel::ErrorValue::From(PyErr_toStatus(), arena);
}
return cel::IntValue(value);
} else {
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}
}
case cel::Kind::kUint: {
if (bypass_type_check || PyNumber_Check(py_object)) {
uint64_t value = PyLong_AsUnsignedLongLong(py_object);
if (PyErr_Occurred()) {
return cel::ErrorValue(PyErr_toStatus());
return cel::ErrorValue::From(PyErr_toStatus(), arena);
}
return cel::UintValue(value);
} else {
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}
}
case cel::Kind::kDouble: {
if (bypass_type_check || PyNumber_Check(py_object)) {
double value = PyFloat_AsDouble(py_object);
if (PyErr_Occurred()) {
return cel::ErrorValue(PyErr_toStatus());
return cel::ErrorValue::From(PyErr_toStatus(), arena);
}
return cel::DoubleValue(value);
} else {
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}
}
case cel::Kind::kString: {
Expand All @@ -648,7 +654,7 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
} else if (PyBytes_Check(py_object)) {
return cel::StringValue::From(PyBytes_AsString(py_object), arena);
} else {
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}
}
case cel::Kind::kBytes: {
Expand All @@ -659,7 +665,7 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
} else if (PyBytes_Check(py_object)) {
return cel::BytesValue::From(PyBytes_AsString(py_object), arena);
}
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}
case cel::Kind::kTimestamp: {
EnsureDateTimeModuleImported();
Expand All @@ -676,7 +682,7 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
absl::StatusOr<cel::TimestampValue> timestamp_value =
cel::SafeTimestampValue(time);
if (!timestamp_value.ok()) {
return cel::ErrorValue(timestamp_value.status());
return cel::ErrorValue::From(timestamp_value.status(), arena);
}
return *timestamp_value;
} else if (std::string_view(Py_TYPE(py_object)->tp_name) == "Timestamp") {
Expand Down Expand Up @@ -717,11 +723,11 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
absl::StatusOr<cel::TimestampValue> timestamp_value =
cel::SafeTimestampValue(time);
if (!timestamp_value.ok()) {
return cel::ErrorValue(timestamp_value.status());
return cel::ErrorValue::From(timestamp_value.status(), arena);
}
return *timestamp_value;
} else {
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}
}
case cel::Kind::kDuration: {
Expand All @@ -739,7 +745,7 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
absl::StatusOr<cel::DurationValue> duration_value =
cel::SafeDurationValue(duration);
if (!duration_value.ok()) {
return cel::ErrorValue(duration_value.status());
return cel::ErrorValue::From(duration_value.status(), arena);
}
return *duration_value;
} else if (std::string_view(Py_TYPE(py_object)->tp_name) == "Duration") {
Expand Down Expand Up @@ -780,11 +786,11 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
absl::StatusOr<cel::DurationValue> duration_value =
cel::SafeDurationValue(duration);
if (!duration_value.ok()) {
return cel::ErrorValue(duration_value.status());
return cel::ErrorValue::From(duration_value.status(), arena);
}
return *duration_value;
} else {
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}
}
case cel::Kind::kMessage: {
Expand All @@ -793,20 +799,20 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
if (!bypass_type_check && type.GetName() != expected_type.GetName() &&
NormalizeTypeName(type.GetName()) !=
NormalizeTypeName(expected_type.GetName())) {
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}

PyObject* serialized_bytes =
PyObject_CallMethod(py_object, "SerializePartialToString", "");
if (!serialized_bytes) {
PyErr_Clear();
return cel::ErrorValue(PyErr_toStatus());
return cel::ErrorValue::From(PyErr_toStatus(), arena);
}

if (!PyBytes_Check(serialized_bytes)) {
Py_DECREF(serialized_bytes);
// Expected SerializePartialToString to return bytes.
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}

cel::Value value =
Expand Down Expand Up @@ -843,7 +849,7 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
/*bypass_type_check=*/true);
}
}
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}
case cel::Kind::kMap: {
if (PyDict_Check(py_object)) {
Expand Down Expand Up @@ -890,7 +896,7 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
/*bypass_type_check=*/true);
}
}
return InvalidTypeError(py_object, context, expected_type);
return InvalidTypeError(py_object, context, expected_type, arena);
}
default: {
return absl::UnimplementedError(
Expand Down
Loading