Revert previous fixes and upgrade TFX stack to 1.21.0

.github/trigger_files/beam_CloudML_Benchmarks_Dataflow.json

@@ -1,4 +1,4 @@
 {
     "comment": "Modify this file in a trivial way to cause this test suite to run.",
-    "modification": 5
+    "modification": 3
 }

sdks/python/apache_beam/examples/ml_transform/mltransform_one_hot_encoding_test.py

@@ -104,7 +104,6 @@ def test_format_json_output_with_dict(self):
     self.assertEqual(parsed['category'], 'test')
     self.assertEqual(parsed['value'], 123)
 
-  @pytest.mark.uses_tft
   def test_end_to_end_pipeline_local(self):
     """Integration test running the full pipeline locally."""
     extra_opts = {
@@ -140,7 +139,6 @@ def test_end_to_end_pipeline_local(self):
       self.assertIn('color', record)
       self.assertIn('size', record)
 
-  @pytest.mark.uses_tft
   def test_pipeline_with_missing_columns(self):
     """Test pipeline handles records with missing columns gracefully."""
     # Create input with some missing columns

sdks/python/apache_beam/testing/benchmarks/cloudml/requirements.txt

@@ -15,15 +15,12 @@
 #    limitations under the License.
 #
 
-# Core TFT dependencies with version bounds.
-# Note: To avoid pip ResolutionTooDeep errors, always install using the constraints file:
-# pip install -c constraints.txt -r requirements.txt
-dill>=0.3,<0.5
-tfx_bsl>=1.15,<1.17
-tensorflow-transform>=1.15,<1.17
-tensorflow>=2.15,<2.16
-numpy>=1.22.0,<2.0
-tensorflow-metadata>=1.15,<1.16
-pyarrow>=10,<11
-tensorflow-serving-api>=2.15,<2.16
-tf-keras>=2.15,<2.16
+dill==0.4.1
+tfx_bsl==1.21.0
+tensorflow-transform==1.21.0
+tensorflow-metadata==1.21.0
+tensorflow
+numpy
+pyarrow
+tensorflow-serving-api
+tf-keras

sdks/python/test-suites/dataflow/common.gradle

@@ -573,9 +573,7 @@ task installTFTRequirements {
     exec {
       workingDir "$rootProject.projectDir/sdks/python/apache_beam/testing/benchmarks/cloudml/"
       executable 'sh'
-      // Use constraints file to pin versions while allowing pip to
-      // resolve compatible versions within the specified ranges in requirements.txt
-      args '-c', ". ${envdir}/bin/activate && pip install -c constraints.txt -r requirements.txt"
+      args '-c', ". ${envdir}/bin/activate && pip install -r requirements.txt"
     }
   }
 }