Rename py_cel to cel_expr_python

PiperOrigin-RevId: 868938372

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.
 
@@ -7,7 +7,7 @@ This is a Python wrapper for the CEL C++ implementation.
 ### Importing CEL module
 
 ```python
-from py_cel import py_cel
+from cel_expr_python import cel
 ```
 
 ### Creating and configuring Cel
@@ -16,12 +16,12 @@ To create a CEL environment, you need to define
 variable types that can be used in expressions.
 
 ```python
-cel_env = py_cel.NewEnv(variables={"x": py_cel.Type.INT, "y": py_cel.Type.INT})
+cel_env = cel.NewEnv(variables={"x": cel.Type.INT, "y": cel.Type.INT})
 ```
 
 #### Optional configuration parameters
 
-The `py_cel.NewEnv` constructor also accepts the following optional parameters:
+The `cel.NewEnv` constructor also accepts the following optional parameters:
 
 *   `pool` (`descriptor_pool.DescriptorPool`): The descriptor pool used for
     resolving protobuf message types within CEL expressions. If not provided,
@@ -115,7 +115,7 @@ of the associated objects are released until the last object using the arena is
 garbage-collected in Python.
 
 ```python
-arena = py_cel.Arena()
+arena = cel.Arena()
 
 activation1 = cel_env.Activation({"x": 7, "y": 4}, arena)
 # evaluate some expressions
@@ -135,19 +135,19 @@ You can pass protobuf messages as variables to an activation; CEL
 expressions can return protobuf messages.
 
 First, ensure your proto messages are available in the descriptor pool used by
-`py_cel.NewEnv`, by importing your proto library in Python:
+`cel.NewEnv`, by importing your proto library in Python:
 
 from cel.expr.conformance.proto2 import test_all_types_pb2 as test_pb
 
-Then declare any variables of message type using `py_cel.Type` with their fully
+Then declare any variables of message type using `cel.Type` with their fully
 qualified name.
 
 ```python
 # Declare 'msg_var' as a message type.
-cel = py_cel.NewEnv(
+cel = cel.NewEnv(
     pool,
     variables={
-        "msg_var": py_cel.Type("cel.expr.conformance.proto2.TestAllTypes"),
+        "msg_var": cel.Type("cel.expr.conformance.proto2.TestAllTypes"),
     },
 )
 ```
@@ -192,13 +192,13 @@ Resulting message value: 123
 
 #### Standard extensions
 
-Standard extensions are available under `py_cel.ext`.
+Standard extensions are available under `cel_expr_python.ext`.
 
 ```python
-from py_cel.ext import ext_math
+from cel_expr_python.ext import ext_math
 
-cel = py_cel.NewEnv(pool, extensions=[ext_math.ExtMath()])
-expr = cel_env.compile("math.sqrt(4)")
+env = cel.NewEnv(pool, extensions=[ext_math.ExtMath()])
+expr = env.compile("math.sqrt(4)")
 ```
 
 #### Defining a custom extension in Python
@@ -209,24 +209,24 @@ You can define custom functions and pass them as an extension.
 def my_func_impl(x):
   return x + 1
 
-my_ext = py_cel.CelExtension(
+my_ext = cel.CelExtension(
     "my_extension",
     [
-        py_cel.FunctionDecl(
+        cel.FunctionDecl(
             "my_func",
             [
-                py_cel.Overload(
+                cel.Overload(
                     "my_func_int",
-                    py_cel.Type.INT,
-                    [py_cel.Type.INT],
+                    cel.Type.INT,
+                    [cel.Type.INT],
                     impl=my_func_impl,
                 )
             ],
         )
     ],
 )
 
-cel_env = py_cel.NewEnv(pool, extensions=[my_ext])
+cel_env = cel.NewEnv(pool, extensions=[my_ext])
 expr = cel_env.compile("my_func(1)")
 ```
 
@@ -311,23 +311,23 @@ pybind_extension(
     name = "translation_cel_ext",
     srcs = ["translation_cel_ext.cc"],
     data = [
-        "@py_cel:py_cel",
+        "@cel_expr_python:cel",
     ]
     deps = [
-        "@py_cel:py_cel",
-        "@py_cel:py_cel_extension",
-        "@py_cel:status_macros",
+        "@cel_expr_python:cel",
+        "@cel_expr_python:cel_extension",
+        "@cel_expr_python:status_macros",
         ...
     ],
 )
 ```
 
-Now you can use the extension in PyCel:
+Now you can use the extension in cel_expr_python:
 
 ```python
 import translation_cel_ext
 
-cel_env = py_cel.NewEnv(variables={},
+cel_env = cel.NewEnv(variables={},
   extensions=[translation_cel_ext.TranslationCelExtension()])
 
 expr = cel_env.compile("'Hello, world!'.translate('en', 'es')")
@@ -341,16 +341,16 @@ simply leave the implementation parameter unspecified:
 
 ```python
 
-my_ext = py_cel.CelExtension(
+my_ext = cel.CelExtension(
     "my_extension",
     [
-        py_cel.FunctionDecl(
+        cel.FunctionDecl(
             "my_func",
             [
-                py_cel.Overload(
+                cel.Overload(
                     "my_func_int",
-                    py_cel.Type.INT,
-                    [py_cel.Type.INT],
+                    cel.Type.INT,
+                    [cel.Type.INT],
                     # Note: no impl provided here.
                 )
             ],
@@ -380,7 +380,7 @@ If the extension is written in C++, use the `RegisterLazyFunction` function:
 Now you can bind the function at runtime:
 
 ```python
-cel_env = py_cel.NewEnv(variables={}, extensions=[my_ext])
+cel_env = cel.NewEnv(variables={}, extensions=[my_ext])
 expr = cel_env.compile("my_func(42)")
 
 multiplier = 2

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

@@ -10,7 +10,7 @@ exports_files(["LICENSE"])
 
 # For Python programs using CEL.
 pybind_extension(
-    name = "py_cel",
+    name = "cel",
     srcs = [
         "py_cel_activation.cc",
         "py_cel_activation.h",
@@ -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/cel_extension.h cel_expr_python/cel_extension.hpy_cel/cel_extension.h renamed to cel_expr_python/cel_extension.h

@@ -59,7 +59,7 @@ class CelExtension {
   std::string name_;
 };
 
-#define 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

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: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: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: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: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: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: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,7 +15,7 @@
 #include "absl/status/status.h"
 #include "compiler/compiler.h"
 #include "extensions/bindings_ext.h"
-#include "py_cel/cel_extension.h"
+#include "cel_expr_python/cel_extension.h"
 #include "google/protobuf/descriptor.h"
 
 namespace cel_python {

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,7 +18,7 @@
 #include "extensions/encoders.h"
 #include "runtime/runtime_builder.h"
 #include "runtime/runtime_options.h"
-#include "py_cel/cel_extension.h"
+#include "cel_expr_python/cel_extension.h"
 #include "google/protobuf/descriptor.h"
 
 namespace cel_python {

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,8 +18,8 @@
 #include "extensions/math_ext_decls.h"
 #include "runtime/runtime_builder.h"
 #include "runtime/runtime_options.h"
-#include "py_cel/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 {

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,7 +18,7 @@
 #include "runtime/optional_types.h"
 #include "runtime/runtime_builder.h"
 #include "runtime/runtime_options.h"
-#include "py_cel/cel_extension.h"
+#include "cel_expr_python/cel_extension.h"
 #include "google/protobuf/descriptor.h"
 
 namespace cel_python {

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,7 +15,7 @@
 #include "absl/status/status.h"
 #include "compiler/compiler.h"
 #include "extensions/proto_ext.h"
-#include "py_cel/cel_extension.h"
+#include "cel_expr_python/cel_extension.h"
 #include "google/protobuf/descriptor.h"
 
 namespace cel_python {