Internal change

PiperOrigin-RevId: 917337474

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,25 +45,34 @@ 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>`
 single_version_override(
     module_name = "antlr4-cpp-runtime",
     patch_cmds = [
-        "mv VERSION VERSION.txt",
+        "python -c \"import os; os.rename('VERSION', 'VERSION.txt') if os.path.exists('VERSION') else None\"",
+        "python -c \"import os; os.rename('version', 'version.txt') if os.path.exists('version') else None\"",
     ],
 )
 
-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")

cel_expr_python/BUILD

@@ -125,6 +125,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/ext/BUILD

@@ -16,6 +16,7 @@ pybind_extension(
         "//cel_expr_python:cel_extension",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//extensions:bindings_ext",
+        "@python_headers_custom//:headers",
     ],
 )
 
@@ -36,6 +37,7 @@ pybind_extension(
         "@com_google_cel_cpp//extensions:encoders",
         "@com_google_cel_cpp//runtime:runtime_builder",
         "@com_google_cel_cpp//runtime:runtime_options",
+        "@python_headers_custom//:headers",
     ],
 )
 
@@ -58,6 +60,7 @@ pybind_extension(
         "@com_google_cel_cpp//extensions:math_ext_decls",
         "@com_google_cel_cpp//runtime:runtime_builder",
         "@com_google_cel_cpp//runtime:runtime_options",
+        "@python_headers_custom//:headers",
     ],
 )
 
@@ -81,6 +84,7 @@ pybind_extension(
         "@com_google_cel_cpp//runtime:optional_types",
         "@com_google_cel_cpp//runtime:runtime_builder",
         "@com_google_cel_cpp//runtime:runtime_options",
+        "@python_headers_custom//:headers",
     ],
 )
 
@@ -98,6 +102,7 @@ pybind_extension(
         "//cel_expr_python:cel_extension",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//extensions:proto_ext",
+        "@python_headers_custom//:headers",
     ],
 )
 
@@ -119,5 +124,6 @@ pybind_extension(
         "@com_google_cel_cpp//extensions:strings",
         "@com_google_cel_cpp//runtime:runtime_builder",
         "@com_google_cel_cpp//runtime:runtime_options",
+        "@python_headers_custom//:headers",
     ],
 )

cel_expr_python/local_repo_extension.bzl

@@ -0,0 +1,43 @@
+"""Module extension to create a local repository for custom headers."""
+
+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")
+
+    # Check if include/python3.11 exists (dynamic pathing for POSIX vs Windows)
+    if ctx.path("include/python3.11").exists:
+        include_path = "include/python3.11"
+    else:
+        include_path = "include"
+
+    # Create BUILD file with dynamic includes
+    ctx.file("BUILD.bazel", """
+cc_library(
+    name = "headers",
+    hdrs = glob(["{include_path}/**"]),
+    includes = ["{include_path}"],
+    visibility = ["//visibility:public"],
+)
+""".format(include_path = include_path))
+
+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",
+        # Use the platform-independent host repository alias!
+        build_file_label = "@@rules_python++python+python_3_11_host//:BUILD.bazel",
+    )
+
+local_repo_ext = module_extension(
+    implementation = _local_repo_extension_impl,
+)

release/kokoro/build_windows.cfg

@@ -2,7 +2,7 @@
 # proto-message: BuildConfig
 
 build_file: "cel-python/release/kokoro/presubmit_windows.bat"
-timeout_mins: 30
+timeout_mins: 120
 
 container_properties {
   docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/windows/windows2019/full@sha256:c9995cdda2206803409164f9682f47e0027b8836076591a960373e3cdb1847e1"

release/kokoro/download_patches.py

@@ -0,0 +1,119 @@
+import json
+import os
+import sys
+import time
+import urllib.error
+import urllib.request
+
+def find_modules(node, modules=None):
+    if modules is None:
+        modules = set()
+    
+    if isinstance(node, dict):
+        name = node.get("name")
+        version = node.get("version")
+        if name and version and name != "cel-python" and name != "cel-cpp":
+            modules.add((name, version))
+        
+        for val in node.values():
+            find_modules(val, modules)
+    elif isinstance(node, list):
+        for item in node:
+            find_modules(item, modules)
+            
+    return modules
+
+def urlopen_with_retry(url, headers=None, timeout=30, max_retries=5, backoff_factor=2):
+    if headers is None:
+        headers = {"User-Agent": "Mozilla/5.0"}
+    
+    req = urllib.request.Request(url, headers=headers)
+    
+    retries = 0
+    delay = 1
+    while True:
+        try:
+            # Use standard urlopen (respects proxy settings)
+            return urllib.request.urlopen(req, timeout=timeout)
+        except (urllib.error.URLError, ConnectionError, TimeoutError, Exception) as e:
+            retries += 1
+            if retries > max_retries:
+                print(f"Failed to fetch {url} after {max_retries} attempts.", file=sys.stderr)
+                raise e
+            print(f"Error fetching {url} (attempt {retries}/{max_retries}): {e}. Retrying in {delay}s...", file=sys.stderr)
+            time.sleep(delay)
+            delay *= backoff_factor
+
+def main():
+    if len(sys.argv) < 3:
+        print("Usage: python download_patches.py <graph.json> <distdir_base_path>", file=sys.stderr)
+        sys.exit(1)
+        
+    graph_path = sys.argv[1]
+    distdir_base = sys.argv[2]
+    
+    if not os.path.exists(graph_path):
+        print(f"Error: {graph_path} not found.", file=sys.stderr)
+        sys.exit(1)
+        
+    with open(graph_path, "r") as f:
+        graph = json.load(f)
+        
+    modules = find_modules(graph)
+    print(f"Found {len(modules)} unique transitive modules.", file=sys.stderr)
+    
+    patches_found = []
+    
+    for name, version in sorted(modules):
+        url = f"https://bcr.bazel.build/modules/{name}/{version}/source.json"
+        try:
+            with urlopen_with_retry(url, timeout=30) as response:
+                source_data = json.loads(response.read().decode())
+                patches = source_data.get("patches")
+                if patches:
+                    print(f"Module {name}@{version} has patches: {list(patches.keys())}", file=sys.stderr)
+                    for patch_name in patches.keys():
+                        patch_url = f"https://bcr.bazel.build/modules/{name}/{version}/patches/{patch_name}"
+                        patches_found.append({
+                            "module": name,
+                            "version": version,
+                            "patch_name": patch_name,
+                            "url": patch_url
+                        })
+        except urllib.error.HTTPError as e:
+            if e.code != 404:
+                print(f"HTTP Error for {name}@{version}: {e.code}", file=sys.stderr)
+        except Exception as e:
+            print(f"Error fetching {name}@{version}: {e}", file=sys.stderr)
+            
+    print(f"Found {len(patches_found)} patches to download.", file=sys.stderr)
+    
+    distdir_dirs = set()
+    
+    for patch in patches_found:
+        module_clean = patch["module"].replace("-", "_")
+        dir_name = os.path.join(distdir_base, module_clean)
+        distdir_dirs.add(dir_name)
+        
+        os.makedirs(dir_name, exist_ok=True)
+        dest_file = os.path.join(dir_name, patch["patch_name"])
+        
+        print(f"Downloading {patch['url']} to {dest_file}...", file=sys.stderr)
+        try:
+            with urlopen_with_retry(patch["url"], timeout=30) as response, open(dest_file, "wb") as out:
+                out.write(response.read())
+        except Exception as e:
+            print(f"Failed to download {patch['url']}: {e}", file=sys.stderr)
+            sys.exit(1)
+            
+    # Generate the env setting command for batch
+    distdir_flags = []
+    for d in sorted(distdir_dirs):
+        d_win = d.replace("/", "\\")
+        distdir_flags.append(f"--distdir={d_win}")
+        
+    flags_str = " ".join(distdir_flags)
+    print(f'@set "DISTDIR_FLAGS={flags_str}"')
+
+if __name__ == "__main__":
+    main()