Support passing cel.ExpressionContainer to cel.NewEnv to allow specifying aliases and abbreviations for namespace resolution.

PiperOrigin-RevId: 912692728

Author: dmitriplotnikov

MODULE.bazel

@@ -3,23 +3,27 @@ module(
 )
 
 # https://registry.bazel.build/modules/abseil-cpp
-bazel_dep(name = "abseil-cpp", version = "20250814.1", repo_name = "com_google_absl")
+bazel_dep(name = "abseil-cpp", version = "20260107.0", repo_name = "com_google_absl")
 
 # https://registry.bazel.build/modules/abseil-py
-bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "com_google_absl_py")
+bazel_dep(name = "abseil-py", version = "2.4.0", repo_name = "com_google_absl_py")
 
 # https://github.com/bazelbuild/bazel-skylib
-bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "bazel_skylib", version = "1.9.0")
 
 # https://registry.bazel.build/modules/cel-cpp
 bazel_dep(name = "cel-cpp", version = "0.15.0", repo_name = "com_google_cel_cpp")
-single_version_override(
+git_override(
     module_name = "cel-cpp",
+    commit = "2e6e9ff4493bfbe0baf883107f3fb7ce6f675d88",
     patch_cmds = [
         # ABSL_CONST_INIT is incompatible with MSVC-CL with the /std:c++20 option
         "sed -i 's/ABSL_CONST_INIT //g' common/values/optional_value.cc",
     ],
-    version = "0.15.0",
+    patch_cmds_win = [
+        "python -c \"import sys; path='common/values/optional_value.cc'; content=open(path).read(); open(path,'w').write(content.replace('ABSL_CONST_INIT ',''))\"",
+    ],
+    remote = "https://github.com/google/cel-cpp",
 )
 
 # https://registry.bazel.build/modules/cel-spec
@@ -32,7 +36,7 @@ bazel_dep(name = "googletest", version = "1.17.0.bcr.2", repo_name = "com_google
 bazel_dep(name = "platforms", version = "1.0.0")
 
 # https://registry.bazel.build/modules/protobuf
-bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
 
 # https://registry.bazel.build/modules/pybind11_abseil
 bazel_dep(name = "pybind11_abseil", version = "202402.0")
@@ -41,13 +45,13 @@ bazel_dep(name = "pybind11_abseil", version = "202402.0")
 bazel_dep(name = "pybind11_bazel", version = "3.0.0")
 
 # https://registry.bazel.build/modules/rules_cc
-bazel_dep(name = "rules_cc", version = "0.2.14")
+bazel_dep(name = "rules_cc", version = "0.2.16")
 
 # https://registry.bazel.build/modules/rules_proto
 bazel_dep(name = "rules_proto", version = "7.1.0")
 
 # https://registry.bazel.build/modules/rules_python
-bazel_dep(name = "rules_python", version = "1.7.0")
+bazel_dep(name = "rules_python", version = "1.9.0")
 
 # On Windows the file system is case-insensitive, which creates a collision between
 # antlr4-cpp-runtime/VERSION and the system `#include <version>`
@@ -58,8 +62,16 @@ single_version_override(
     ],
 )
 
-python_rules = use_extension("@rules_python//python/extensions:python.bzl", "python")
-python_rules.toolchain(
-    is_default = True,
-    python_version = "3.11",
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+python.defaults(python_version = "3.11")
+python.toolchain(python_version = "3.11")
+use_repo(python, "pythons_hub")
+
+pybind11_internal_configure = use_extension(
+    "@pybind11_bazel//:internal_configure.bzl",
+    "internal_configure_extension",
 )
+use_repo(pybind11_internal_configure, "pybind11")
+
+local_repo_ext = use_extension("//cel_expr_python:local_repo_extension.bzl", "local_repo_ext")
+use_repo(local_repo_ext, "python_headers_custom")

README.md

@@ -26,9 +26,27 @@ 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,
     a default pool (`descriptor_pool.Default()`) is used.
-*   `container` (str): The container name used for name resolution. For example,
+*   `container` (`str` or `cel.ExpressionContainer`): The container name used
+    for name resolution. For example,
     if `container` is `"foo.bar"`, then `Baz` will resolve to
     `foo.bar.Baz`.
+
+    You can also pass a `cel.ExpressionContainer` to configure abbreviations
+    and aliases:
+
+    ```python
+    container = cel.ExpressionContainer(
+        name="foo.bar",
+        abbreviations=["foo.bar.baz"],
+        aliases={"my_alias": "full.name.of.something"}
+    )
+    cel_env = cel.NewEnv(container=container)
+    ```
+
+    *   `abbreviations`: A list of fully qualified names that can be referred
+        to by their last component.
+    *   `aliases`: A dictionary mapping an alias name to a fully qualified
+        name.
 *   `extensions` (list): A list of extension objects to load. This can include
     standard extensions (like `math` or `string` libraries) or custom extensions
     defined in Python or C++.

cel_expr_python/BUILD

@@ -66,10 +66,10 @@ pybind_extension(
         "@com_google_absl//absl/types:optional",
         "@com_google_absl//absl/types:span",
         "@com_google_cel_cpp//checker:type_checker_builder",
-        "@com_google_cel_cpp//checker:type_checker_builder_factory",
         "@com_google_cel_cpp//checker:validation_result",
         "@com_google_cel_cpp//common:ast",
         "@com_google_cel_cpp//common:ast_proto",
+        "@com_google_cel_cpp//common:container",
         "@com_google_cel_cpp//common:decl",
         "@com_google_cel_cpp//common:function_descriptor",
         "@com_google_cel_cpp//common:kind",
@@ -87,8 +87,6 @@ pybind_extension(
         "@com_google_cel_cpp//env:env_yaml",
         "@com_google_cel_cpp//env:runtime_std_extensions",
         "@com_google_cel_cpp//extensions/protobuf:runtime_adapter",
-        "@com_google_cel_cpp//parser",
-        "@com_google_cel_cpp//parser:options",
         "@com_google_cel_cpp//parser:parser_interface",
         "@com_google_cel_cpp//runtime",
         "@com_google_cel_cpp//runtime:activation",
@@ -102,6 +100,7 @@ pybind_extension(
         "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto",
         "@com_google_protobuf//:protobuf",
         "@pybind11_abseil//pybind11_abseil:absl_casters",
+        "@python_headers_custom//:headers",
     ],
 )
 
@@ -127,6 +126,7 @@ pybind_library(
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//runtime:runtime_builder",
         "@com_google_cel_cpp//runtime:runtime_options",
+        "@python_headers_custom//:headers",
     ],
 )
 

cel_expr_python/cel.pyi

@@ -15,6 +15,10 @@ class CelExtensionBase:
 class EnvConfig:
   def to_yaml(self) -> str: ...
 
+class ExpressionContainer:
+  def __init__(self, name: str = ..., abbreviations: Sequence[str] | None = ..., aliases: Mapping[str, str] | None = ...) -> None: ...
+  def container(self) -> str: ...
+
 class Env:
   def Activation(self, data: Mapping[str, Any] | None = ..., functions: Sequence[Function] | None = ..., arena: _InternalArena = ...) -> Activation: ...
   def compile(self, expression: str, disable_check: bool = ...) -> Expression: ...
@@ -80,6 +84,6 @@ class _InternalArena:
 
 def Arena() -> _InternalArena: ...
 
-def NewEnv(descriptor_pool: proto_descriptor_pool.DescriptorPool | Any | None = ..., config: EnvConfig | None = ..., variables: Mapping[str, Type] | None = ..., extensions: Sequence[CelExtensionBase] | None = ..., container: str | None = ..., functions: Sequence[FunctionDecl] | None = ..., function_impls: Mapping[str, Callable[..., Any]] | None = ...) -> Env: ...
+def NewEnv(descriptor_pool: proto_descriptor_pool.DescriptorPool | Any | None = ..., config: EnvConfig | None = ..., variables: Mapping[str, Type] | None = ..., extensions: Sequence[CelExtensionBase] | None = ..., container: str | ExpressionContainer | None = ..., functions: Sequence[FunctionDecl] | None = ..., function_impls: Mapping[str, Callable[..., Any]] | None = ...) -> Env: ...
 
 def NewEnvConfigFromYaml(yaml: str) -> EnvConfig: ...

cel_expr_python/cel_env_test.py

@@ -108,6 +108,147 @@ def test_config_export_container(self):
         """),
     )
 
+  def test_expression_container_abbreviations_and_aliases(self):
+    expr_container = cel.ExpressionContainer(
+        "test.container", abbreviations=["x.y.foo"], aliases={"abc": "x.y.bar"}
+    )
+
+    env: cel.Env = cel.NewEnv(
+        container=expr_container,
+        variables={
+            "x.y.foo": cel.Type.INT,
+            "x.y.bar": cel.Type.STRING,
+        },
+    )
+
+    res = env.compile("foo").eval(data={"x.y.foo": 42})
+    self.assertEqual(res.value(), 42)
+    res = env.compile("abc").eval(data={"x.y.bar": "chocolate"})
+    self.assertEqual(res.value(), "chocolate")
+
+    yaml: str = env.config().to_yaml()
+    self.assertEqual(
+        normalize_yaml(yaml),
+        normalize_yaml("""
+          container:
+            name: "test.container"
+            abbreviations:
+              - "x.y.foo"
+            aliases:
+              - alias: "abc"
+                qualified_name: "x.y.bar"
+          variables:
+            - name: "x.y.bar"
+              type_name: "string"
+            - name: "x.y.foo"
+              type_name: "int"
+        """),
+    )
+
+  def test_abbreviations_and_aliases_from_yaml(self):
+    env: cel.Env = cel.NewEnv(config=cel.NewEnvConfigFromYaml("""
+        container:
+          name: "test.container"
+          abbreviations:
+            - "x.y.foo"
+          aliases:
+            - alias: "abc"
+              qualified_name: "x.y.bar"
+        variables:
+          - name: "x.y.bar"
+            type_name: "string"
+          - name: "x.y.foo"
+            type_name: "int"
+      """))
+
+    res = env.compile("foo").eval(data={"x.y.foo": 42})
+    self.assertEqual(res.value(), 42)
+    res = env.compile("abc").eval(data={"x.y.bar": "chocolate"})
+    self.assertEqual(res.value(), "chocolate")
+
+  def test_abbreviations_and_aliases_combined(self):
+    env: cel.Env = cel.NewEnv(
+        config=cel.NewEnvConfigFromYaml("""
+          container:
+            name: "test.container"
+            abbreviations:
+              - "x.y.foo"
+            aliases:
+              - alias: "abc"
+                qualified_name: "x.y.bar"
+          variables:
+            - name: "x.y.bar"
+              type_name: "string"
+            - name: "x.y.foo"
+              type_name: "int"
+            - name: "a.b.qux"
+              type_name: "string"
+            - name: "a.b.baz"
+              type_name: "int"
+        """),
+        container=cel.ExpressionContainer(
+            "test.container",
+            abbreviations=["a.b.baz"],
+            aliases={"def": "a.b.qux"},
+        ),
+    )
+
+    res = env.compile("foo").eval(data={"x.y.foo": 42})
+    self.assertEqual(res.value(), 42)
+    res = env.compile("baz").eval(data={"a.b.baz": 24})
+    self.assertEqual(res.value(), 24)
+
+    res = env.compile("abc").eval(data={"x.y.bar": "chocolate"})
+    self.assertEqual(res.value(), "chocolate")
+    res = env.compile("def").eval(data={"a.b.qux": "vanilla"})
+    self.assertEqual(res.value(), "vanilla")
+
+    yaml: str = env.config().to_yaml()
+    self.assertEqual(
+        normalize_yaml(yaml),
+        normalize_yaml("""
+          container:
+            name: "test.container"
+            abbreviations:
+              - "a.b.baz"
+              - "x.y.foo"
+            aliases:
+              - alias: "abc"
+                qualified_name: "x.y.bar"
+              - alias: "def"
+                qualified_name: "a.b.qux"
+          variables:
+            - name: "a.b.baz"
+              type_name: "int"
+            - name: "a.b.qux"
+              type_name: "string"
+            - name: "x.y.bar"
+              type_name: "string"
+            - name: "x.y.foo"
+              type_name: "int"
+        """),
+    )
+
+  def test_alias_redefinition_error(self):
+    with self.assertRaises(Exception) as e:
+      cel.NewEnv(
+          container=cel.ExpressionContainer(
+              "test.container", aliases={"abc": "x.y.bar"}
+          ),
+          config=cel.NewEnvConfigFromYaml("""
+            container:
+              name: "test.container"
+              aliases:
+                - alias: "abc"
+                  qualified_name: "x.y.baz"
+          """),
+      )
+    self.assertIn(
+        "Alias 'abc' is already defined with a different qualified name:"
+        " x.y.baz",
+        str(e.exception),
+    )
+
   def test_config_export_variables(self):
     config: cel.Env = cel.NewEnv(
         variables={

cel_expr_python/local_repo_extension.bzl

@@ -0,0 +1,34 @@
+def _custom_headers_repo_impl(ctx):
+    # Resolve label to path
+    build_file_path = ctx.path(ctx.attr.build_file_label)
+    repo_dir = build_file_path.dirname
+
+    # Symlink the include directory
+    ctx.symlink(repo_dir.get_child("include"), "include")
+
+    # Create BUILD file
+    ctx.file("BUILD.bazel", """
+cc_library(
+    name = "headers",
+    hdrs = glob(["include/python3.11/**"]),
+    includes = ["include/python3.11"],
+    visibility = ["//visibility:public"],
+)
+""")
+
+custom_headers_repo = repository_rule(
+    implementation = _custom_headers_repo_impl,
+    attrs = {
+        "build_file_label": attr.label(mandatory = True),
+    },
+)
+
+def _local_repo_extension_impl(ctx):
+    custom_headers_repo(
+        name = "python_headers_custom",
+        build_file_label = "@@rules_python++python+python_3_11_x86_64-unknown-linux-gnu//:BUILD.bazel",
+    )
+
+local_repo_ext = module_extension(
+    implementation = _local_repo_extension_impl,
+)