Rename py_cel_extension to cel_extension

dmitriplotnikov · copybara-github · commit 60f2a0891af6 · 2026-02-10T19:04:02.000-08:00
PiperOrigin-RevId: 868369366
diff --git a/README.md b/README.md
@@ -233,7 +233,7 @@ expr = cel_env.compile("my_func(1)")
 #### Defining a custom extension in C++
 
 To define a custom extension in C++, define a class extending
-`cel_python::PyCelExtension`. There are two methods you will need to implement:
+`cel_python::CelExtension`. There are two methods you will need to implement:
 `ConfigureCompiler` and `ConfigureRuntime`. The implementations of these methods
 use the same API as extensions written for the C++ CEL runtime. In fact,
 extensions written for the C++ runtime can be used unchanged with PyCEL - you
@@ -297,7 +297,7 @@ absl::Status ConfigureRuntime(cel::RuntimeBuilder& runtime_builder,
 }
 ```
 
-Once you have the custom subclass of `cel_python::PyCelExtension`, add this line
+Once you have the custom subclass of `cel_python::CelExtension`, add this line
 to turn this class into a Python module:
 
 ```cpp
diff --git a/custom_ext/BUILD b/custom_ext/BUILD
@@ -12,7 +12,7 @@ pybind_extension(
     ],
     deps = [
         "//py_cel",
-        "//py_cel:py_cel_extension",
+        "//py_cel:cel_extension",
         "//py_cel:status_macros",
         "@com_google_absl//absl/base:nullability",
         "@com_google_absl//absl/status",
diff --git a/custom_ext/sample_cel_ext.cc b/custom_ext/sample_cel_ext.cc
@@ -23,7 +23,7 @@
 #include "runtime/function_adapter.h"
 #include "runtime/runtime_builder.h"
 #include "runtime/runtime_options.h"
-#include "py_cel/py_cel_extension.h"
+#include "py_cel/cel_extension.h"
 #include "py_cel/status_macros.h"
 #include "google/protobuf/arena.h"
 #include "google/protobuf/descriptor.h"
@@ -63,10 +63,10 @@ static absl::StatusOr<StringValue> Translate(
 
 }  // namespace
 
-class SampleCelExtension : public cel_python::PyCelExtension {
+class SampleCelExtension : public cel_python::CelExtension {
  public:
   explicit SampleCelExtension()
-      : cel_python::PyCelExtension("sample.cel.cpp.ext") {}
+      : cel_python::CelExtension("sample.cel.cpp.ext") {}
 
   absl::Status ConfigureCompiler(
       cel::CompilerBuilder& compiler_builder,
diff --git a/py_cel/BUILD b/py_cel/BUILD
@@ -45,7 +45,7 @@ pybind_extension(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        ":py_cel_extension",
+        ":cel_extension",
         ":status_macros",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/base:no_destructor",
@@ -95,8 +95,8 @@ pybind_extension(
 
 # For pybind11-based CEL extensions.
 pybind_library(
-    name = "py_cel_extension",
-    hdrs = ["py_cel_extension.h"],
+    name = "cel_extension",
+    hdrs = ["cel_extension.h"],
     visibility = ["//visibility:public"],
     deps = [
         "@com_google_absl//absl/status",
diff --git a/py_cel/cel_extension.h b/py_cel/cel_extension.h
@@ -37,10 +37,10 @@ namespace cel_python {
 
 // Base class used for pybind11-based extensions. It is not instantiable from
 // Python.
-class PyCelExtension {
+class CelExtension {
  public:
-  explicit PyCelExtension(std::string name) : name_(std::move(name)) {};
-  virtual ~PyCelExtension() = default;
+  explicit CelExtension(std::string name) : name_(std::move(name)) {};
+  virtual ~CelExtension() = default;
 
   virtual absl::Status ConfigureCompiler(
       cel::CompilerBuilder& compiler_builder,
@@ -59,7 +59,7 @@ class PyCelExtension {
   std::string name_;
 };
 
-#define PY_CEL_MODULE_NAME "py_cel"
+#define CEL_MODULE_NAME "py_cel"
 
 // Macro for defining a pybind11 module for a CEL extension. The macro takes two
 // arguments: the name of the module and the name of the extension class. It
@@ -70,16 +70,16 @@ class PyCelExtension {
 //
 // Example:
 //
-//   class SampleCelExtension : public cel_python::PyCelExtension {
+//   class SampleCelExtension : public cel_python::CelExtension {
 //     ...
 //   };
 //
 //   CEL_EXTENSION_MODULE(sample_cel_ext, SampleCelExtension);
 //
 #define CEL_EXTENSION_MODULE(module_name, class_name)                        \
   PYBIND11_MODULE(module_name, m) {                                          \
-    pybind11::module_::import(PY_CEL_MODULE_NAME);                           \
-    pybind11::class_<class_name, cel_python::PyCelExtension>(m, #class_name) \
+    pybind11::module_::import(CEL_MODULE_NAME);                           \
+    pybind11::class_<class_name, cel_python::CelExtension>(m, #class_name) \
         .def(pybind11::init<>());                                            \
   }
 
diff --git a/py_cel/ext/BUILD b/py_cel/ext/BUILD
@@ -12,7 +12,7 @@ pybind_extension(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
+        "//py_cel:cel_extension",
         "@com_google_absl//absl/status",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//extensions:bindings_ext",
@@ -30,7 +30,7 @@ pybind_extension(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
+        "//py_cel:cel_extension",
         "@com_google_absl//absl/status",
         "@com_google_cel_cpp//checker:type_checker_builder",
         "@com_google_cel_cpp//compiler",
@@ -51,7 +51,7 @@ pybind_extension(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
+        "//py_cel:cel_extension",
         "//py_cel:status_macros",
         "@com_google_absl//absl/base:nullability",
         "@com_google_absl//absl/status",
@@ -84,7 +84,7 @@ pybind_extension(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
+        "//py_cel:cel_extension",
         "@com_google_absl//absl/status",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//compiler:optional",
@@ -105,7 +105,7 @@ pybind_extension(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
+        "//py_cel:cel_extension",
         "@com_google_absl//absl/status",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//extensions:proto_ext",
@@ -123,7 +123,7 @@ pybind_extension(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
+        "//py_cel:cel_extension",
         "@com_google_absl//absl/status",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//extensions:strings",
diff --git a/py_cel/ext/ext_bindings.cc b/py_cel/ext/ext_bindings.cc
@@ -15,14 +15,14 @@
 #include "absl/status/status.h"
 #include "compiler/compiler.h"
 #include "extensions/bindings_ext.h"
-#include "py_cel/py_cel_extension.h"
+#include "py_cel/cel_extension.h"
 #include "google/protobuf/descriptor.h"
 
 namespace cel_python {
 
-class ExtBindings : public PyCelExtension {
+class ExtBindings : public CelExtension {
  public:
-  explicit ExtBindings() : PyCelExtension("cel.lib.ext.cel.bindings") {}
+  explicit ExtBindings() : CelExtension("cel.lib.ext.cel.bindings") {}
 
   absl::Status ConfigureCompiler(
       cel::CompilerBuilder& compiler_builder,
diff --git a/py_cel/ext/ext_encoders.cc b/py_cel/ext/ext_encoders.cc
@@ -18,14 +18,14 @@
 #include "extensions/encoders.h"
 #include "runtime/runtime_builder.h"
 #include "runtime/runtime_options.h"
-#include "py_cel/py_cel_extension.h"
+#include "py_cel/cel_extension.h"
 #include "google/protobuf/descriptor.h"
 
 namespace cel_python {
 
-class ExtEncoders : public PyCelExtension {
+class ExtEncoders : public CelExtension {
  public:
-  explicit ExtEncoders() : PyCelExtension("cel.lib.ext.encoders") {}
+  explicit ExtEncoders() : CelExtension("cel.lib.ext.encoders") {}
 
   absl::Status ConfigureCompiler(
       cel::CompilerBuilder& compiler_builder,
diff --git a/py_cel/ext/ext_math.cc b/py_cel/ext/ext_math.cc
@@ -18,15 +18,15 @@
 #include "extensions/math_ext_decls.h"
 #include "runtime/runtime_builder.h"
 #include "runtime/runtime_options.h"
-#include "py_cel/py_cel_extension.h"
+#include "py_cel/cel_extension.h"
 #include "py_cel/status_macros.h"
 #include "google/protobuf/descriptor.h"
 
 namespace cel_python {
 
-class ExtMath : public PyCelExtension {
+class ExtMath : public CelExtension {
  public:
-  explicit ExtMath() : PyCelExtension("cel.lib.ext.math") {}
+  explicit ExtMath() : CelExtension("cel.lib.ext.math") {}
 
   absl::Status ConfigureCompiler(
       cel::CompilerBuilder& compiler_builder,
diff --git a/py_cel/ext/ext_optional.cc b/py_cel/ext/ext_optional.cc
@@ -18,14 +18,14 @@
 #include "runtime/optional_types.h"
 #include "runtime/runtime_builder.h"
 #include "runtime/runtime_options.h"
-#include "py_cel/py_cel_extension.h"
+#include "py_cel/cel_extension.h"
 #include "google/protobuf/descriptor.h"
 
 namespace cel_python {
 
-class ExtOptional : public PyCelExtension {
+class ExtOptional : public CelExtension {
  public:
-  explicit ExtOptional() : PyCelExtension("cel.lib.optional") {}
+  explicit ExtOptional() : CelExtension("cel.lib.optional") {}
 
   absl::Status ConfigureCompiler(
       cel::CompilerBuilder& compiler_builder,
diff --git a/py_cel/ext/ext_proto.cc b/py_cel/ext/ext_proto.cc
@@ -15,14 +15,14 @@
 #include "absl/status/status.h"
 #include "compiler/compiler.h"
 #include "extensions/proto_ext.h"
-#include "py_cel/py_cel_extension.h"
+#include "py_cel/cel_extension.h"
 #include "google/protobuf/descriptor.h"
 
 namespace cel_python {
 
-class ExtProto : public PyCelExtension {
+class ExtProto : public CelExtension {
  public:
-  explicit ExtProto() : PyCelExtension("cel.lib.ext.proto") {}
+  explicit ExtProto() : CelExtension("cel.lib.ext.proto") {}
 
   absl::Status ConfigureCompiler(
       cel::CompilerBuilder& compiler_builder,
diff --git a/py_cel/ext/ext_string.cc b/py_cel/ext/ext_string.cc
@@ -17,14 +17,14 @@
 #include "extensions/strings.h"
 #include "runtime/runtime_builder.h"
 #include "runtime/runtime_options.h"
-#include "py_cel/py_cel_extension.h"
+#include "py_cel/cel_extension.h"
 #include "google/protobuf/descriptor.h"
 
 namespace cel_python {
 
-class ExtString : public PyCelExtension {
+class ExtString : public CelExtension {
  public:
-  explicit ExtString() : PyCelExtension("cel.lib.ext.string") {}
+  explicit ExtString() : CelExtension("cel.lib.ext.string") {}
 
   absl::Status ConfigureCompiler(
       cel::CompilerBuilder& compiler_builder,
diff --git a/py_cel/py_cel_env_internal.cc b/py_cel/py_cel_env_internal.cc
@@ -35,7 +35,7 @@
 #include "runtime/runtime_builder.h"
 #include "runtime/runtime_options.h"
 #include "runtime/standard_runtime_builder_factory.h"
-#include "py_cel/py_cel_extension.h"
+#include "py_cel/cel_extension.h"
 #include "py_cel/py_cel_python_extension.h"
 #include "py_cel/py_cel_type.h"
 #include "py_cel/py_descriptor_database.h"
@@ -58,7 +58,7 @@ PyCelEnvInternal::PyCelEnvInternal(
       variable_types_(std::move(variableTypes)),
       container_(std::move(container)) {
   for (PyObject* ext : extensions) {
-    extensions_.push_back(std::make_unique<PyCelExtensionHandle>(ext));
+    extensions_.push_back(std::make_unique<CelExtensionHandle>(ext));
   }
 }
 
@@ -76,9 +76,9 @@ absl::StatusOr<const cel::Compiler*> PyCelEnvInternal::GetCompiler(
   compiler_builder->GetCheckerBuilder().set_container(env->container_);
   PY_CEL_RETURN_IF_ERROR(
       compiler_builder->AddLibrary(cel::StandardCompilerLibrary()));
-  for (std::unique_ptr<PyCelExtensionHandle>& extension_handle :
+  for (std::unique_ptr<CelExtensionHandle>& extension_handle :
        env->extensions_) {
-    PY_CEL_ASSIGN_OR_RETURN(PyCelExtension * extension,
+    PY_CEL_ASSIGN_OR_RETURN(CelExtension * extension,
                             extension_handle->GetExtension(env));
     PY_CEL_RETURN_IF_ERROR(
         extension->ConfigureCompiler(*compiler_builder, env->descriptor_pool_));
@@ -121,9 +121,9 @@ absl::StatusOr<const cel::Runtime*> PyCelEnvInternal::GetRuntime(
       cel::CreateStandardRuntimeBuilder(&env->descriptor_pool_, opts));
   PY_CEL_RETURN_IF_ERROR(cel::EnableReferenceResolver(
       builder, cel::ReferenceResolverEnabled::kAlways));
-  for (std::unique_ptr<PyCelExtensionHandle>& extension_handle :
+  for (std::unique_ptr<CelExtensionHandle>& extension_handle :
        env->extensions_) {
-    PY_CEL_ASSIGN_OR_RETURN(PyCelExtension * extension,
+    PY_CEL_ASSIGN_OR_RETURN(CelExtension * extension,
                             extension_handle->GetExtension(env));
     PY_CEL_RETURN_IF_ERROR(extension->ConfigureRuntime(builder, opts));
   }
@@ -144,19 +144,19 @@ const PyCelType& PyCelEnvInternal::GetVariableType(
   return PyCelType::Dyn();
 }
 
-PyCelExtensionHandle::PyCelExtensionHandle(PyObject* extension)
+CelExtensionHandle::CelExtensionHandle(PyObject* extension)
     : py_extension_(extension), cel_extension_(nullptr) {
   ABSL_CHECK(PyGILState_Check());
   Py_INCREF(py_extension_);
 }
 
-PyCelExtensionHandle::~PyCelExtensionHandle() {
+CelExtensionHandle::~CelExtensionHandle() {
   auto gil_state = PyGILState_Ensure();
   Py_DECREF(py_extension_);
   PyGILState_Release(gil_state);
 }
 
-absl::StatusOr<PyCelExtension*> PyCelExtensionHandle::GetExtension(
+absl::StatusOr<CelExtension*> CelExtensionHandle::GetExtension(
     const std::shared_ptr<PyCelEnvInternal>& env) {
   if (cel_extension_) {
     return cel_extension_;
@@ -166,7 +166,7 @@ absl::StatusOr<PyCelExtension*> PyCelExtensionHandle::GetExtension(
     return absl::InvalidArgumentError("Provided extension is None");
   }
 
-  // First, check if the object is a PyCelExtension (extension implemented in
+  // First, check if the object is a CelExtension (extension implemented in
   // Python)
   absl::Status status_py_cel_extension;
   try {
@@ -177,11 +177,11 @@ absl::StatusOr<PyCelExtension*> PyCelExtensionHandle::GetExtension(
   }
 
   // If that fails, check if the object is a pybind11 wrapper for
-  // PyCelExtension.
+  // CelExtension.
   absl::Status status_cc_cel_extension;
   try {
     pybind11::handle handle = pybind11::handle(py_extension_);
-    return handle.cast<PyCelExtension*>();
+    return handle.cast<CelExtension*>();
   } catch (const pybind11::cast_error& e) {
     status_cc_cel_extension = absl::InvalidArgumentError(e.what());
   }
diff --git a/py_cel/py_cel_env_internal.h b/py_cel/py_cel_env_internal.h
diff --git a/py_cel/py_cel_python_extension.cc b/py_cel/py_cel_python_extension.cc
diff --git a/py_cel/py_cel_python_extension.h b/py_cel/py_cel_python_extension.h
