Add `StatusNotOk` `.code`, `.message` & `BuildStatusNotOk`

Currently `.code`, `.message` are simple members (ideally these would be properties).

PiperOrigin-RevId: 452017363

pybind11_abseil/register_status_bindings.cc

@@ -93,21 +93,15 @@ void def_status_factory(
       arg("message"));
       arg("message"));
 }
 }
 
 
-// Allows exception to raise an instance, with custom parameters and attributes.
-template <typename type>
-class exception_with_attributes : public exception<type> {
- public:
-  using exception<type>::exception;
-
-  // Could be merged into pybind11::exception<type>.
-  void operator()(tuple args, dict kwargs, dict attributes) {
-    object exc = object::operator()(*args, **kwargs);
-    for (const auto& item : attributes) {
-      exc.attr(item.first) = item.second;
-    }
-    PyErr_SetObject(this->ptr(), exc.ptr());
-  }
-};
+object BuildStatusNotOk(handle PyStatusNotOk, const StatusNotOk& e) {
+  object py_e = PyStatusNotOk(e.what());
+  py_e.attr("status") = cast(google::NoThrowStatus<absl::Status>(e.status()));
+  // code is int by choice. Sorry it would be a major API break to make this an
+  // enum. Use status.code() to obtain the enum.
+  py_e.attr("code") = cast(e.status().raw_code());
+  py_e.attr("message") = cast(e.status().message());
+  return py_e;
+}
 
 
 }  // namespace
 }  // namespace
 
 
@@ -182,24 +176,25 @@ void RegisterStatusBindings(module m) {
   def_status_factory(m, "unimplemented_error", WrapUnimplementedError);
   def_status_factory(m, "unimplemented_error", WrapUnimplementedError);
   def_status_factory(m, "unknown_error", WrapUnknownError);
   def_status_factory(m, "unknown_error", WrapUnknownError);
 
 
-  // Register the exception.
-  static exception_with_attributes<StatusNotOk> status_not_ok(m, "StatusNotOk");
+  // Generate the Python exception type.
+  static exception<StatusNotOk> PyStatusNotOk(m, "StatusNotOk");
 
 
-  // Register a custom handler which converts a C++ StatusNotOk to a Python
-  // StatusNotOk exception and adds the status field.
+  // Register a custom handler which converts a C++ StatusNotOk to a
+  // PyStatusNotOk.
   register_exception_translator([](std::exception_ptr p) {
   register_exception_translator([](std::exception_ptr p) {
     try {
     try {
       if (p) std::rethrow_exception(p);
       if (p) std::rethrow_exception(p);
-    } catch (StatusNotOk& e) {
-      auto rvalue_e = std::move(e);
-      auto py_status = cast(
-          google::NoThrowStatus<const absl::Status&>(rvalue_e.status()));
-      status_not_ok(
-          pybind11::make_tuple(rvalue_e.what()),       // args
-          pybind11::dict(),                            // kwargs
-          pybind11::dict(arg("status") = py_status));  // attributes
+    } catch (const StatusNotOk& e) {
+      PyErr_SetObject(PyStatusNotOk.ptr(),
+                      BuildStatusNotOk(PyStatusNotOk, e).ptr());
     }
     }
   });
   });
+
+  m.def("BuildStatusNotOk", [](int code, const std::string& msg) {
+    return BuildStatusNotOk(
+        PyStatusNotOk,
+        StatusNotOk(absl::Status(static_cast<absl::StatusCode>(code), msg)));
+  });
 }
 }
 
 
 }  // namespace internal
 }  // namespace internal

pybind11_abseil/tests/status_test.py

@@ -35,6 +35,21 @@ class StatusTest(absltest.TestCase):
       status_example.return_status(status.StatusCode.CANCELLED, 'test')
       status_example.return_status(status.StatusCode.CANCELLED, 'test')
     self.assertEqual(cm.exception.status.code(), status.StatusCode.CANCELLED)
     self.assertEqual(cm.exception.status.code(), status.StatusCode.CANCELLED)
     self.assertEqual(cm.exception.status.message(), 'test')
     self.assertEqual(cm.exception.status.message(), 'test')
+    self.assertEqual(cm.exception.code, int(status.StatusCode.CANCELLED))
+    self.assertEqual(cm.exception.message, 'test')
+
+  def test_build_status_not_ok_enum(self):
+    e = status.BuildStatusNotOk(status.StatusCode.INVALID_ARGUMENT, 'Msg enum.')
+    self.assertEqual(e.status.code(), status.StatusCode.INVALID_ARGUMENT)
+    self.assertEqual(e.code, int(status.StatusCode.INVALID_ARGUMENT))
+    self.assertEqual(e.message, 'Msg enum.')
+
+  def test_build_status_not_ok_int(self):
+    e = status.BuildStatusNotOk(
+        int(status.StatusCode.ALREADY_EXISTS), 'Msg int.')
+    self.assertEqual(e.status.code(), status.StatusCode.ALREADY_EXISTS)
+    self.assertEqual(e.code, int(status.StatusCode.ALREADY_EXISTS))
+    self.assertEqual(e.message, 'Msg int.')
 
 
   def test_return_not_ok_twice(self):
   def test_return_not_ok_twice(self):
     # Each exception is a different instance with different messages.
     # Each exception is a different instance with different messages.