From 145c0f40996e30f8bbb5e1ef59ea8cb010b9cd93 Mon Sep 17 00:00:00 2001
From: jrmccluskey <thejackmccluskey@gmail.com>
Date: Tue, 13 Jan 2026 15:53:43 -0500
Subject: [PATCH 1/5] Remove standalone uses of the apitools HttpError class

---
 sdks/python/apache_beam/dataframe/io_it_test.py |  6 +++---
 sdks/python/apache_beam/dataframe/io_test.py    |  6 +++---
 .../io/gcp/datastore/v1new/datastoreio.py       |  8 --------
 .../io/gcp/experimental/spannerio.py            | 11 -----------
 .../apache_beam/testing/pipeline_verifiers.py   |  6 +++---
 .../testing/pipeline_verifiers_test.py          | 17 +++++++----------
 6 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/sdks/python/apache_beam/dataframe/io_it_test.py b/sdks/python/apache_beam/dataframe/io_it_test.py
index 9f750e2ff58c..a6293e057b41 100644
--- a/sdks/python/apache_beam/dataframe/io_it_test.py
+++ b/sdks/python/apache_beam/dataframe/io_it_test.py
@@ -33,12 +33,12 @@
 _LOGGER = logging.getLogger(__name__)
 
 try:
-  from apitools.base.py.exceptions import HttpError
+  from google.api_core.exceptions import GoogleAPICallError
 except ImportError:
-  HttpError = None
+  GoogleAPICallError = None
 
 
-@unittest.skipIf(HttpError is None, 'GCP dependencies are not installed')
+@unittest.skipIf(GoogleAPICallError is None, 'GCP dependencies are not installed')
 class ReadUsingReadGbqTests(unittest.TestCase):
   @pytest.mark.it_postcommit
   def test_ReadGbq(self):
diff --git a/sdks/python/apache_beam/dataframe/io_test.py b/sdks/python/apache_beam/dataframe/io_test.py
index 92bb10225c78..072eed61b922 100644
--- a/sdks/python/apache_beam/dataframe/io_test.py
+++ b/sdks/python/apache_beam/dataframe/io_test.py
@@ -47,9 +47,9 @@
 from apache_beam.testing.util import equal_to
 
 try:
-  from apitools.base.py.exceptions import HttpError
+  from google.api_core.exceptions import GoogleAPICallError
 except ImportError:
-  HttpError = None
+  GoogleAPICallError = None
 
 # Get major, minor version
 PD_VERSION = tuple(map(int, pd.__version__.split('.')[0:2]))
@@ -440,7 +440,7 @@ def test_double_write(self):
                           set(self.read_all_lines(output + 'out2.csv*')))
 
 
-@unittest.skipIf(HttpError is None, 'GCP dependencies are not installed')
+@unittest.skipIf(GoogleAPICallError is None, 'GCP dependencies are not installed')
 class ReadGbqTransformTests(unittest.TestCase):
   @mock.patch.object(BigQueryWrapper, 'get_table')
   def test_bad_schema_public_api_direct_read(self, get_table):
diff --git a/sdks/python/apache_beam/io/gcp/datastore/v1new/datastoreio.py b/sdks/python/apache_beam/io/gcp/datastore/v1new/datastoreio.py
index 6f870b7cfeb7..32b79c8f10f7 100644
--- a/sdks/python/apache_beam/io/gcp/datastore/v1new/datastoreio.py
+++ b/sdks/python/apache_beam/io/gcp/datastore/v1new/datastoreio.py
@@ -53,7 +53,6 @@
 # Protect against environments where datastore library is not available.
 # pylint: disable=wrong-import-order, wrong-import-position
 try:
-  from apitools.base.py.exceptions import HttpError
   from google.api_core.exceptions import ClientError
   from google.api_core.exceptions import GoogleAPICallError
 except ImportError:
@@ -309,9 +308,6 @@ def process(self, query, *unused_args, **unused_kwargs):
         # e.code.value contains the numeric http status code.
         service_call_metric.call(e.code.value)
         raise
-      except HttpError as e:
-        service_call_metric.call(e)
-        raise
 
 
 class _Mutate(PTransform):
@@ -469,10 +465,6 @@ def write_mutations(self, throttler, rpc_stats_callback, throttle_delay=1):
         service_call_metric.call(e.code.value)
         rpc_stats_callback(errors=1)
         raise
-      except HttpError as e:
-        service_call_metric.call(e)
-        rpc_stats_callback(errors=1)
-        raise
 
     def process(self, element):
       client_element = self.element_to_client_batch_item(element)
diff --git a/sdks/python/apache_beam/io/gcp/experimental/spannerio.py b/sdks/python/apache_beam/io/gcp/experimental/spannerio.py
index c94c43a637d4..04800ff015c8 100644
--- a/sdks/python/apache_beam/io/gcp/experimental/spannerio.py
+++ b/sdks/python/apache_beam/io/gcp/experimental/spannerio.py
@@ -196,7 +196,6 @@
 # pylint: disable=wrong-import-order, wrong-import-position, ungrouped-imports
 # pylint: disable=unused-import
 try:
-  from apitools.base.py.exceptions import HttpError
   from google.api_core.exceptions import ClientError
   from google.api_core.exceptions import GoogleAPICallError
   from google.cloud.spanner import Client
@@ -437,9 +436,6 @@ def process(self, element, spanner_transaction):
       except (ClientError, GoogleAPICallError) as e:
         metric_action(metric_id, e.code.value)
         raise
-      except HttpError as e:
-        metric_action(metric_id, e)
-        raise
 
 
 @with_input_types(ReadOperation)
@@ -668,9 +664,6 @@ def process(self, element):
     except (ClientError, GoogleAPICallError) as e:
       self.service_metric(str(e.code.value))
       raise
-    except HttpError as e:
-      self.service_metric(str(e))
-      raise
 
   def teardown(self):
     if self._snapshot:
@@ -1271,10 +1264,6 @@ def process(self, element):
       for service_metric in self.service_metrics.values():
         service_metric.call(str(e.code.value))
       raise
-    except HttpError as e:
-      for service_metric in self.service_metrics.values():
-        service_metric.call(str(e))
-      raise
     else:
       for service_metric in self.service_metrics.values():
         service_metric.call('ok')
diff --git a/sdks/python/apache_beam/testing/pipeline_verifiers.py b/sdks/python/apache_beam/testing/pipeline_verifiers.py
index 225e6d0dbae1..6ffec9bd710b 100644
--- a/sdks/python/apache_beam/testing/pipeline_verifiers.py
+++ b/sdks/python/apache_beam/testing/pipeline_verifiers.py
@@ -41,9 +41,9 @@
 ]
 
 try:
-  from apitools.base.py.exceptions import HttpError
+  from google.api_core.exceptions import GoogleAPICallError
 except ImportError:
-  HttpError = None
+  GoogleAPICallError = None
 
 MAX_RETRIES = 4
 
@@ -76,7 +76,7 @@ def describe_mismatch(self, pipeline_result, mismatch_description):
 def retry_on_io_error_and_server_error(exception):
   """Filter allowing retries on file I/O errors and service error."""
   return isinstance(exception, IOError) or \
-          (HttpError is not None and isinstance(exception, HttpError))
+          (GoogleAPICallError is not None and isinstance(exception, GoogleAPICallError))
 
 
 class FileChecksumMatcher(BaseMatcher):
diff --git a/sdks/python/apache_beam/testing/pipeline_verifiers_test.py b/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
index cc286c33aaaa..1f35ffdf8c40 100644
--- a/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
+++ b/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
@@ -37,11 +37,12 @@
 try:
   # pylint: disable=wrong-import-order, wrong-import-position
   # pylint: disable=ungrouped-imports
-  from apitools.base.py.exceptions import HttpError
-
+  from google.api_core.exceptions import GoogleAPICallError
+  from google.api_core.exceptions import NotFound
   from apache_beam.io.gcp.gcsfilesystem import GCSFileSystem
 except ImportError:
-  HttpError = None
+  GoogleAPICallError = None
+  NotFound = None
   GCSFileSystem = None  # type: ignore
 
 
@@ -122,15 +123,11 @@ def test_file_checksum_matcher_read_failed(self, mock_match):
     self.assertEqual(verifiers.MAX_RETRIES + 1, mock_match.call_count)
 
   @patch.object(GCSFileSystem, 'match')
-  @unittest.skipIf(HttpError is None, 'google-apitools is not installed')
+  @unittest.skipIf(GoogleAPICallError is None, 'google-apitools is not installed')
   def test_file_checksum_matcher_service_error(self, mock_match):
-    mock_match.side_effect = HttpError(
-        response={'status': '404'},
-        url='',
-        content='Not Found',
-    )
+    mock_match.side_effect = NotFound('Not Found')
     matcher = verifiers.FileChecksumMatcher('gs://dummy/path', Mock())
-    with self.assertRaises(HttpError):
+    with self.assertRaises(NotFound):
       hc_assert_that(self._mock_result, matcher)
     self.assertTrue(mock_match.called)
     self.assertEqual(verifiers.MAX_RETRIES + 1, mock_match.call_count)

From 05937ea3ca64a781421dc26f5e022899c5f60407 Mon Sep 17 00:00:00 2001
From: Jack McCluskey <34928439+jrmccluskey@users.noreply.github.com>
Date: Wed, 14 Jan 2026 11:33:57 -0500
Subject: [PATCH 2/5] Update
 sdks/python/apache_beam/testing/pipeline_verifiers_test.py

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---
 sdks/python/apache_beam/testing/pipeline_verifiers_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdks/python/apache_beam/testing/pipeline_verifiers_test.py b/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
index 1f35ffdf8c40..20f07d5f93bd 100644
--- a/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
+++ b/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
@@ -123,7 +123,7 @@ def test_file_checksum_matcher_read_failed(self, mock_match):
     self.assertEqual(verifiers.MAX_RETRIES + 1, mock_match.call_count)
 
   @patch.object(GCSFileSystem, 'match')
-  @unittest.skipIf(GoogleAPICallError is None, 'google-apitools is not installed')
+  @unittest.skipIf(GoogleAPICallError is None, 'GCP dependencies are not installed')
   def test_file_checksum_matcher_service_error(self, mock_match):
     mock_match.side_effect = NotFound('Not Found')
     matcher = verifiers.FileChecksumMatcher('gs://dummy/path', Mock())

From f9e7a2f75f15ddb776ac22f15c170ea3e7f6a82e Mon Sep 17 00:00:00 2001
From: jrmccluskey <thejackmccluskey@gmail.com>
Date: Wed, 14 Jan 2026 13:16:41 -0500
Subject: [PATCH 3/5] linting and formatting

---
 sdks/python/apache_beam/dataframe/io_it_test.py            | 3 ++-
 sdks/python/apache_beam/dataframe/io_test.py               | 3 ++-
 sdks/python/apache_beam/testing/pipeline_verifiers.py      | 2 +-
 sdks/python/apache_beam/testing/pipeline_verifiers_test.py | 7 ++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sdks/python/apache_beam/dataframe/io_it_test.py b/sdks/python/apache_beam/dataframe/io_it_test.py
index a6293e057b41..da88ffb54760 100644
--- a/sdks/python/apache_beam/dataframe/io_it_test.py
+++ b/sdks/python/apache_beam/dataframe/io_it_test.py
@@ -38,7 +38,8 @@
   GoogleAPICallError = None
 
 
-@unittest.skipIf(GoogleAPICallError is None, 'GCP dependencies are not installed')
+@unittest.skipIf(
+    GoogleAPICallError is None, 'GCP dependencies are not installed')
 class ReadUsingReadGbqTests(unittest.TestCase):
   @pytest.mark.it_postcommit
   def test_ReadGbq(self):
diff --git a/sdks/python/apache_beam/dataframe/io_test.py b/sdks/python/apache_beam/dataframe/io_test.py
index 072eed61b922..313d955b4550 100644
--- a/sdks/python/apache_beam/dataframe/io_test.py
+++ b/sdks/python/apache_beam/dataframe/io_test.py
@@ -440,7 +440,8 @@ def test_double_write(self):
                           set(self.read_all_lines(output + 'out2.csv*')))
 
 
-@unittest.skipIf(GoogleAPICallError is None, 'GCP dependencies are not installed')
+@unittest.skipIf(
+    GoogleAPICallError is None, 'GCP dependencies are not installed')
 class ReadGbqTransformTests(unittest.TestCase):
   @mock.patch.object(BigQueryWrapper, 'get_table')
   def test_bad_schema_public_api_direct_read(self, get_table):
diff --git a/sdks/python/apache_beam/testing/pipeline_verifiers.py b/sdks/python/apache_beam/testing/pipeline_verifiers.py
index 6ffec9bd710b..3d1a2d0d0441 100644
--- a/sdks/python/apache_beam/testing/pipeline_verifiers.py
+++ b/sdks/python/apache_beam/testing/pipeline_verifiers.py
@@ -43,7 +43,7 @@
 try:
   from google.api_core.exceptions import GoogleAPICallError
 except ImportError:
-  GoogleAPICallError = None
+  GoogleAPICallError = None # type: ignore
 
 MAX_RETRIES = 4
 
diff --git a/sdks/python/apache_beam/testing/pipeline_verifiers_test.py b/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
index 20f07d5f93bd..e8bae207c39b 100644
--- a/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
+++ b/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
@@ -41,8 +41,8 @@
   from google.api_core.exceptions import NotFound
   from apache_beam.io.gcp.gcsfilesystem import GCSFileSystem
 except ImportError:
-  GoogleAPICallError = None
-  NotFound = None
+  GoogleAPICallError = None # type: ignore
+  NotFound = None # type: ignore
   GCSFileSystem = None  # type: ignore
 
 
@@ -123,7 +123,8 @@ def test_file_checksum_matcher_read_failed(self, mock_match):
     self.assertEqual(verifiers.MAX_RETRIES + 1, mock_match.call_count)
 
   @patch.object(GCSFileSystem, 'match')
-  @unittest.skipIf(GoogleAPICallError is None, 'GCP dependencies are not installed')
+  @unittest.skipIf(
+      GoogleAPICallError is None, 'GCP dependencies are not installed')
   def test_file_checksum_matcher_service_error(self, mock_match):
     mock_match.side_effect = NotFound('Not Found')
     matcher = verifiers.FileChecksumMatcher('gs://dummy/path', Mock())

From d9e894c343b2dd9e825e2e06065920cb431d1a20 Mon Sep 17 00:00:00 2001
From: jrmccluskey <thejackmccluskey@gmail.com>
Date: Wed, 14 Jan 2026 14:40:08 -0500
Subject: [PATCH 4/5] more linting and formatting

---
 sdks/python/apache_beam/testing/pipeline_verifiers.py      | 4 ++--
 sdks/python/apache_beam/testing/pipeline_verifiers_test.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdks/python/apache_beam/testing/pipeline_verifiers.py b/sdks/python/apache_beam/testing/pipeline_verifiers.py
index 3d1a2d0d0441..01929420a236 100644
--- a/sdks/python/apache_beam/testing/pipeline_verifiers.py
+++ b/sdks/python/apache_beam/testing/pipeline_verifiers.py
@@ -43,7 +43,7 @@
 try:
   from google.api_core.exceptions import GoogleAPICallError
 except ImportError:
-  GoogleAPICallError = None # type: ignore
+  GoogleAPICallError = None  # type: ignore
 
 MAX_RETRIES = 4
 
@@ -76,7 +76,7 @@ def describe_mismatch(self, pipeline_result, mismatch_description):
 def retry_on_io_error_and_server_error(exception):
   """Filter allowing retries on file I/O errors and service error."""
   return isinstance(exception, IOError) or \
-          (GoogleAPICallError is not None and isinstance(exception, GoogleAPICallError))
+          (GoogleAPICallError is not None and isinstance(exception, GoogleAPICallError)) # pylint: disable=line-too-long
 
 
 class FileChecksumMatcher(BaseMatcher):
diff --git a/sdks/python/apache_beam/testing/pipeline_verifiers_test.py b/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
index e8bae207c39b..6d204fb4c345 100644
--- a/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
+++ b/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
@@ -41,8 +41,8 @@
   from google.api_core.exceptions import NotFound
   from apache_beam.io.gcp.gcsfilesystem import GCSFileSystem
 except ImportError:
-  GoogleAPICallError = None # type: ignore
-  NotFound = None # type: ignore
+  GoogleAPICallError = None  # type: ignore
+  NotFound = None  # type: ignore
   GCSFileSystem = None  # type: ignore
 
 

From e19cba0fed5fd4c2a41d9f3751b6afcaa2132bbd Mon Sep 17 00:00:00 2001
From: jrmccluskey <thejackmccluskey@gmail.com>
Date: Wed, 14 Jan 2026 15:20:44 -0500
Subject: [PATCH 5/5] even more linting

---
 sdks/python/apache_beam/testing/pipeline_verifiers_test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdks/python/apache_beam/testing/pipeline_verifiers_test.py b/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
index 6d204fb4c345..35ca27d452ec 100644
--- a/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
+++ b/sdks/python/apache_beam/testing/pipeline_verifiers_test.py
@@ -39,6 +39,7 @@
   # pylint: disable=ungrouped-imports
   from google.api_core.exceptions import GoogleAPICallError
   from google.api_core.exceptions import NotFound
+
   from apache_beam.io.gcp.gcsfilesystem import GCSFileSystem
 except ImportError:
   GoogleAPICallError = None  # type: ignore