Rename py_cel to cel_expr_python

PiperOrigin-RevId: 868298923

Author: dmitriplotnikov

README.md

@@ -1,4 +1,4 @@
-# CEL Python Wrapper (PyCEL)
+# CEL Python Wrapper (cel.expr.python)
 
 This is a Python wrapper for the CEL C++ implementation.
 
@@ -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

py_cel/BUILD cel_expr_python/BUILDpy_cel/BUILD renamed to cel_expr_python/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",
@@ -117,10 +117,10 @@ cc_library(
 )
 
 py_test(
-    name = "py_cel_test",
-    srcs = ["py_cel_test.py"],
+    name = "cel_test",
+    srcs = ["cel_test.py"],
     deps = [
-        ":py_cel",
+        ":cel",
         "//testing:proto2_test_all_types_py_pb2",
         "@com_google_absl_py//absl/testing:absltest",
         "@com_google_protobuf//:protobuf",

py_cel/py_cel_extension.h cel_expr_python/cel_extension.hpy_cel/py_cel_extension.h renamed to cel_expr_python/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 "cel_expr_python.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<>());                                            \
   }
 

py_cel/py_cel_test.py cel_expr_python/cel_test.pypy_cel/py_cel_test.py renamed to cel_expr_python/cel_test.py

@@ -23,11 +23,11 @@
 from google.protobuf import duration_pb2 as duration_pb
 from google.protobuf import timestamp_pb2 as timestamp_pb
 from absl.testing import absltest
-from py_cel import py_cel as cel
+from cel_expr_python import cel
 from cel.expr.conformance.proto2 import test_all_types_pb2 as test_all_types_pb
 
 
-class PyCelTest(absltest.TestCase):
+class CelTest(absltest.TestCase):
 
   def setUp(self):
     super().setUp()
@@ -604,7 +604,7 @@ def testDynType_nonCelType(self):
     res = self._eval("var_dyn", {"var_dyn": self})
     self.assertEqual(res.type(), cel.Type.ERROR)
     self.assertIn(
-        "Non-CEL value type for 'var_dyn': PyCelTest",
+        "Non-CEL value type for 'var_dyn': CelTest",
         res.value(),
     )
 
@@ -804,7 +804,7 @@ def FindFileContainingSymbol(self, symbol_name: str):  # pylint: disable=invalid
     raise LookupError("Could not find file containing symbol: %s" % symbol_name)
 
 
-class PyCelWithoutProtoSupportTest(absltest.TestCase):
+class CelWithoutProtoSupportTest(absltest.TestCase):
   """Test that the environment can be created without proto support."""
 
   def setUp(self):

py_cel/ext/BUILD cel_expr_python/ext/BUILDpy_cel/ext/BUILD renamed to cel_expr_python/ext/BUILD

@@ -8,11 +8,11 @@ pybind_extension(
         "ext_bindings.cc",
     ],
     data = [
-        "//py_cel",
+        "//cel_expr_python:cel",
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
+        "//cel_expr_python:cel_extension",
         "@com_google_absl//absl/status",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//extensions:bindings_ext",
@@ -26,11 +26,11 @@ pybind_extension(
         "ext_encoders.cc",
     ],
     data = [
-        "//py_cel",
+        "//cel_expr_python:cel",
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
+        "//cel_expr_python:cel_extension",
         "@com_google_absl//absl/status",
         "@com_google_cel_cpp//checker:type_checker_builder",
         "@com_google_cel_cpp//compiler",
@@ -47,12 +47,12 @@ pybind_extension(
         "ext_math.cc",
     ],
     data = [
-        "//py_cel",
+        "//cel_expr_python:cel",
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
-        "//py_cel:status_macros",
+        "//cel_expr_python:cel_extension",
+        "//cel_expr_python:status_macros",
         "@com_google_absl//absl/base:nullability",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
@@ -80,11 +80,11 @@ pybind_extension(
         "ext_optional.cc",
     ],
     data = [
-        "//py_cel",
+        "//cel_expr_python:cel",
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
+        "//cel_expr_python:cel_extension",
         "@com_google_absl//absl/status",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//compiler:optional",
@@ -101,11 +101,11 @@ pybind_extension(
         "ext_proto.cc",
     ],
     data = [
-        "//py_cel",
+        "//cel_expr_python:cel",
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
+        "//cel_expr_python:cel_extension",
         "@com_google_absl//absl/status",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//extensions:proto_ext",
@@ -119,11 +119,11 @@ pybind_extension(
         "ext_string.cc",
     ],
     data = [
-        "//py_cel",
+        "//cel_expr_python:cel",
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//py_cel:py_cel_extension",
+        "//cel_expr_python:cel_extension",
         "@com_google_absl//absl/status",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//extensions:strings",

py_cel/ext/ext_bindings.cc cel_expr_python/ext/ext_bindings.ccpy_cel/ext/ext_bindings.cc renamed to cel_expr_python/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 "cel_expr_python/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,

py_cel/ext/ext_encoders.cc cel_expr_python/ext/ext_encoders.ccpy_cel/ext/ext_encoders.cc renamed to cel_expr_python/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 "cel_expr_python/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,

py_cel/ext/ext_math.cc cel_expr_python/ext/ext_math.ccpy_cel/ext/ext_math.cc renamed to cel_expr_python/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/status_macros.h"
+#include "cel_expr_python/cel_extension.h"
+#include "cel_expr_python/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,

py_cel/ext/ext_optional.cc cel_expr_python/ext/ext_optional.ccpy_cel/ext/ext_optional.cc renamed to cel_expr_python/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 "cel_expr_python/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,

py_cel/ext/ext_proto.cc cel_expr_python/ext/ext_proto.ccpy_cel/ext/ext_proto.cc renamed to cel_expr_python/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 "cel_expr_python/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,