Upgrade Struct2Tensor to TF 2.21.0 and Python 3.12/3.13

Author: vkarampudi

.bazelrc

@@ -13,3 +13,13 @@ build --protocopt=--experimental_allow_proto3_optional
 # parameter 'user_link_flags' is deprecated and will be removed soon.
 # It may be temporarily re-enabled by setting --incompatible_require_linker_input_cc_api=false
 build --incompatible_require_linker_input_cc_api=false
+
+# Force use of protoc from com_google_protobuf
+build --proto_compiler=@com_google_protobuf//:protoc
+
+# Add include path for Protobuf headers
+build --cxxopt="-Iexternal/com_google_protobuf/src"
+build --host_cxxopt="-Iexternal/com_google_protobuf/src"
+
+# Disable Bzlmod to avoid conflicts with WORKSPACE
+common --noenable_bzlmod

.bazelversion

@@ -1 +1 @@
-6.5.0
+7.7.0

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
     - name: Checkout

.github/workflows/conda-build.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
     - name: Checkout

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
     - name: Checkout

RELEASE.md

@@ -4,8 +4,17 @@
 
 ## Major Features and Improvements
 
+*   Upgraded to support TensorFlow 2.21.0.
+*   Added support for Python 3.12 and 3.13.
+*   Dropped support for Python 3.9.
+
 ## Bug Fixes and Other Changes
 
+*   Aligned Protobuf dependency to `>=6.0.0,<7.0.0`.
+*   Updated PyArrow dependency to `>=14`.
+*   Fixed C++ test build issues by defining missing `ASSERT_OK` and `EXPECT_OK` macros, replacing `LOG(FATAL)` with `abort()`, and fixing invalid Protobuf includes.
+*   Fixed Python test failures by updating `assertRaisesRegex` to expect `RuntimeError` wrapping `ValueError` in Beam pipelines.
+
 ## Known Issues
 
 ## Breaking Changes

WORKSPACE

@@ -2,6 +2,24 @@ workspace(name = "tensorflow_data_validation")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+_PROTOBUF_COMMIT = "6.31.1"
+
+http_archive(
+    name = "com_google_protobuf",
+    sha256 = "6e09bbc950ba60c3a7b30280210cd285af8d7d8ed5e0a6ed101c72aff22e8d88",
+    strip_prefix = "protobuf-%s" % _PROTOBUF_COMMIT,
+    urls = [
+        "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v%s.zip" % _PROTOBUF_COMMIT,
+    ],
+    patch_cmds = [
+        "touch BUILD",
+    ],
+)
+
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
 http_archive(
     name = "zlib",
     build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
@@ -21,24 +39,24 @@ http_archive(
 # Generic Bazel Support                                                        #
 ################################################################################
 
-http_archive(
-    name = "rules_proto",
-    sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
-    strip_prefix = "rules_proto-6.0.2",
-    url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
-)
-
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
-
-rules_proto_dependencies()
-
-load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
-
-rules_proto_setup()
-
-load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
-
-rules_proto_toolchains()
+# http_archive(
+#     name = "rules_proto",
+#     sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
+#     strip_prefix = "rules_proto-6.0.2",
+#     url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
+# )
+# 
+# load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
+# 
+# rules_proto_dependencies()
+# 
+# load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
+# 
+# rules_proto_setup()
+# 
+# load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
+# 
+# rules_proto_toolchains()
 
 # Install version 0.9.0 of rules_foreign_cc, as default version causes an
 # invalid escape sequence error to be raised, which can't be avoided with
@@ -61,27 +79,29 @@ rules_foreign_cc_dependencies()
 
 http_archive(
     name = "bazel_skylib",
-    sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
+    sha256 = "3b5b49006181f5f8ff626ef8ddceaa95e9bb8ad294f7b5d7b11ea9f7ddaf8c59",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.9.0/bazel-skylib-1.9.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.9.0/bazel-skylib-1.9.0.tar.gz",
     ],
 )
 
-_PROTOBUF_COMMIT = "4.25.6"  # 4.25.6
-
 http_archive(
-    name = "com_google_protobuf",
-    sha256 = "ff6e9c3db65f985461d200c96c771328b6186ee0b10bc7cb2bbc87cf02ebd864",
-    strip_prefix = "protobuf-%s" % _PROTOBUF_COMMIT,
-    urls = [
-        "https://github.com/protocolbuffers/protobuf/archive/v4.25.6.zip",
-    ],
+    name = "rules_python",
+    sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311",
+    strip_prefix = "rules_python-0.31.0",
+    url = "https://github.com/bazelbuild/rules_python/releases/download/0.31.0/rules_python-0.31.0.tar.gz",
+)
+
+load("@rules_python//python:repositories.bzl", "py_repositories")
+py_repositories()
+
+local_repository(
+    name = "compatibility_proxy",
+    path = "third_party/dummy_compatibility_proxy",
 )
 
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
-protobuf_deps()
 
 # Use the last commit on the relevant release branch to update.
 # LINT.IfChange(arrow_archive_version)
@@ -101,9 +121,28 @@ http_archive(
 
 http_archive(
     name = "com_google_absl",
-    urls = ["https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.1.tar.gz"],
-    strip_prefix = "abseil-cpp-20230802.1",
-    sha256 = "987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed",
+    urls = ["https://github.com/abseil/abseil-cpp/archive/refs/tags/20250127.2.tar.gz"],
+    strip_prefix = "abseil-cpp-20250127.2",
+    sha256 = "f5a67394128fb4d9a18124820026014591942d9c882d9055d4d2412b13bf1c91",
+    patch_cmds = [
+        "sed -i '/@rules_cc\\/\\/cc\\/compiler:emscripten/d' absl/debugging/BUILD.bazel",
+        "sed -i '/@rules_cc\\/\\/cc\\/compiler:emscripten/d' absl/base/BUILD.bazel",
+        "sed -i '/@rules_cc\\/\\/cc\\/compiler:emscripten/d' absl/random/internal/BUILD.bazel",
+        "sed -i '/@rules_cc\\/\\/cc\\/compiler:emscripten/d' absl/synchronization/BUILD.bazel",
+    ],
+)
+
+http_archive(
+    name = "abseil-cpp",
+    urls = ["https://github.com/abseil/abseil-cpp/archive/refs/tags/20250127.2.tar.gz"],
+    strip_prefix = "abseil-cpp-20250127.2",
+    sha256 = "f5a67394128fb4d9a18124820026014591942d9c882d9055d4d2412b13bf1c91",
+    patch_cmds = [
+        "sed -i '/@rules_cc\\/\\/cc\\/compiler:emscripten/d' absl/debugging/BUILD.bazel",
+        "sed -i '/@rules_cc\\/\\/cc\\/compiler:emscripten/d' absl/base/BUILD.bazel",
+        "sed -i '/@rules_cc\\/\\/cc\\/compiler:emscripten/d' absl/random/internal/BUILD.bazel",
+        "sed -i '/@rules_cc\\/\\/cc\\/compiler:emscripten/d' absl/synchronization/BUILD.bazel",
+    ],
 )
 
 
@@ -128,14 +167,15 @@ http_archive(
 
 # TODO(b/177694034): Follow the new format for tensorflow import after TF 2.5.
 #here
-TENSORFLOW_COMMIT = "3c92ac03cab816044f7b18a86eb86aa01a294d95"  # 2.17.1
+# Corresponds to tag v2.21.0
+TENSORFLOW_COMMIT = "a481b10260dfdf833a1b16007eead49c1d7febf3"
 
 http_archive(
     name = "org_tensorflow_no_deps",
     patches = [
         "//third_party:tensorflow_expose_example_proto.patch",
     ],
-    sha256 = "317dd95c4830a408b14f3e802698eb68d70d81c7c7cfcd3d28b0ba023fe84a68",
+    sha256 = "ef3568bb4865d6c1b2564fb5689c19b6b9a5311572cd1f2ff9198636a8520921",
     strip_prefix = "tensorflow-%s" % TENSORFLOW_COMMIT,
     urls = [
         "https://github.com/tensorflow/tensorflow/archive/%s.tar.gz" % TENSORFLOW_COMMIT,
@@ -152,6 +192,13 @@ http_archive(
     urls = ["https://github.com/pybind/pybind11/archive/%s.zip" % PYBIND11_COMMIT],
 )
 
+http_archive(
+    name = "com_google_googletest",
+    urls = ["https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz"],
+    strip_prefix = "googletest-1.14.0",
+    sha256 = "8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7",
+)
+
 load("//third_party:python_configure.bzl", "local_python_configure")
 
 local_python_configure(name = "local_config_python")
@@ -236,7 +283,7 @@ http_archive(
 # Specify the minimum required bazel version.
 load("@bazel_skylib//lib:versions.bzl", "versions")
 
-versions.check("6.5.0")
+versions.check("7.7.0")
 
 # Please add all new TensorFlow Data Validation dependencies in workspace.bzl.
 load("//tensorflow_data_validation:workspace.bzl", "tf_data_validation_workspace")

setup.py

@@ -64,6 +64,8 @@ class _BazelBuildCommand(setuptools.Command):
     file.
     """
 
+    user_options = []
+
     def initialize_options(self):
         pass
 
@@ -179,9 +181,10 @@ def select_constraint(default, nightly=None, git_master=None):
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: 3 :: Only",
         "Topic :: Scientific/Engineering",
         "Topic :: Scientific/Engineering :: Artificial Intelligence",
@@ -195,19 +198,17 @@ def select_constraint(default, nightly=None, git_master=None):
     # six, and protobuf) with TF.
     install_requires=[
         "absl-py>=0.9,<2.0.0",
-        'apache-beam[gcp]>=2.53,<3;python_version>="3.11"',
-        'apache-beam[gcp]>=2.50,<2.51;python_version<"3.11"',
+        'apache-beam[gcp]>=2.53,<3',
         # TODO(b/139941423): Consider using multi-processing provided by
         # Beam's DirectRunner.
         "joblib>=1.2.0",  # Dependency for multi-processing.
         "numpy>=1.22.0",
         "pandas>=1.0,<2",
-        'protobuf>=4.25.2,<6.0.0;python_version>="3.11"',
-        'protobuf>=4.21.6,<6.0.0;python_version<"3.11"',
-        "pyarrow>=10,<11",
+        'protobuf>=6.0.0,<7.0.0',
+        "pyarrow>=14",
         "pyfarmhash>=0.2.2,<0.4",
         "six>=1.12,<2",
-        "tensorflow>=2.17,<2.18",
+        "tensorflow>=2.21,<2.22",
         "tensorflow-metadata"
         + select_constraint(
             default=">=1.17.1,<1.18",
@@ -233,7 +234,7 @@ def select_constraint(default, nightly=None, git_master=None):
         ],
         "all": _make_all_extra_requirements(),
     },
-    python_requires=">=3.9,<4",
+    python_requires=">=3.10,<4",
     packages=find_packages(),
     include_package_data=True,
     package_data={"": ["*.lib", "*.pyd", "*.so"]},

tensorflow_data_validation/BUILD

@@ -38,3 +38,9 @@ sh_binary(
         ],
     }),
 )
+
+py_library(
+    name = "tensorflow_data_validation",
+    srcs = glob(["*.py"], exclude=["*_test.py"]),
+    visibility = ["//visibility:public"],
+)

tensorflow_data_validation/anomalies/BUILD

@@ -357,7 +357,6 @@ cc_library(
     deps = [
         ":map_util",
         ":path",
-        "//third_party/tensorflow/tsl/platform:protobuf",
         "@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:metadata_v0_proto_cc_pb2",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:optional",