fix: bound integration HTTP waits

Several synchronous API Hub and Application Integration requests had no timeout, so an unavailable endpoint could block agent execution indefinitely. One API Hub fallback error also printed the literal {path} instead of the rejected path. This applies a 30-second timeout to the affected GET and POST calls and preserves the rejected path in the error.

Co-authored-by: George Weale <gweale@google.com>
PiperOrigin-RevId: 952369892

Author: GWeale

src/google/adk/tools/apihub_tool/clients/apihub_client.py

@@ -32,6 +32,8 @@
 from google.oauth2 import service_account
 import requests
 
+_DEFAULT_REQUEST_TIMEOUT_SECONDS = 30
+
 
 class BaseAPIHubClient(ABC):
   """Base class for API Hub clients."""
@@ -116,7 +118,7 @@ def get_spec_content(self, path: str) -> str:
       spec_content = self._fetch_spec(api_spec_resource_name)
       return spec_content
 
-    raise ValueError("No API Hub resource found in path: {path}")
+    raise ValueError(f"No API Hub resource found in path: {path}")
 
   def list_apis(self, project: str, location: str) -> List[Dict[str, Any]]:
     """Lists all APIs in the specified project and location.
@@ -133,7 +135,9 @@ def list_apis(self, project: str, location: str) -> List[Dict[str, Any]]:
         "accept": "application/json, text/plain, */*",
         "Authorization": f"Bearer {self._get_access_token()}",
     }
-    response = requests.get(url, headers=headers)
+    response = requests.get(
+        url, headers=headers, timeout=_DEFAULT_REQUEST_TIMEOUT_SECONDS
+    )
     response.raise_for_status()
     apis = response.json().get("apis", [])
     return apis
@@ -153,7 +157,9 @@ def get_api(self, api_resource_name: str) -> Dict[str, Any]:
         "accept": "application/json, text/plain, */*",
         "Authorization": f"Bearer {self._get_access_token()}",
     }
-    response = requests.get(url, headers=headers)
+    response = requests.get(
+        url, headers=headers, timeout=_DEFAULT_REQUEST_TIMEOUT_SECONDS
+    )
     response.raise_for_status()
     apis = response.json()
     return apis
@@ -173,7 +179,9 @@ def get_api_version(self, api_version_name: str) -> Dict[str, Any]:
         "accept": "application/json, text/plain, */*",
         "Authorization": f"Bearer {self._get_access_token()}",
     }
-    response = requests.get(url, headers=headers)
+    response = requests.get(
+        url, headers=headers, timeout=_DEFAULT_REQUEST_TIMEOUT_SECONDS
+    )
     response.raise_for_status()
     return response.json()
 
@@ -192,7 +200,9 @@ def _fetch_spec(self, api_spec_resource_name: str) -> str:
         "accept": "application/json, text/plain, */*",
         "Authorization": f"Bearer {self._get_access_token()}",
     }
-    response = requests.get(url, headers=headers)
+    response = requests.get(
+        url, headers=headers, timeout=_DEFAULT_REQUEST_TIMEOUT_SECONDS
+    )
     response.raise_for_status()
     content_base64 = response.json().get("contents", "")
     if content_base64:

src/google/adk/tools/application_integration_tool/clients/connections_client.py

@@ -36,6 +36,7 @@
 _DEFAULT_MTLS_INTEGRATIONS_ENDPOINT_TEMPLATE = (
     "integrations.mtls.googleapis.com"
 )
+_DEFAULT_REQUEST_TIMEOUT_SECONDS = 30
 
 
 class ConnectionsClient:
@@ -886,7 +887,9 @@ def _execute_api_call(self, url):
           "Authorization": f"Bearer {self._get_access_token()}",
       }
 
-      response = requests.get(url, headers=headers)
+      response = requests.get(
+          url, headers=headers, timeout=_DEFAULT_REQUEST_TIMEOUT_SECONDS
+      )
       response.raise_for_status()
       return response
 

src/google/adk/tools/application_integration_tool/clients/integration_client.py

@@ -34,6 +34,7 @@
 _DEFAULT_MTLS_INTEGRATIONS_REGIONAL_ENDPOINT_TEMPLATE = (
     "{location}-integrations.mtls.googleapis.com"
 )
+_DEFAULT_REQUEST_TIMEOUT_SECONDS = 30
 
 
 class IntegrationClient:
@@ -118,7 +119,12 @@ def get_openapi_spec_for_integration(self):
           ],
           "fileFormat": "JSON",
       }
-      response = requests.post(url, headers=headers, json=data)
+      response = requests.post(
+          url,
+          headers=headers,
+          json=data,
+          timeout=_DEFAULT_REQUEST_TIMEOUT_SECONDS,
+      )
       response.raise_for_status()
       spec = response.json().get("openApiSpec", {})
       return json.loads(spec)

tests/unittests/tools/apihub_tool/clients/test_apihub_client.py

@@ -74,6 +74,7 @@ def test_list_apis(self, mock_get, client):
             "accept": "application/json, text/plain, */*",
             "Authorization": "Bearer mocked_token",
         },
+        timeout=30,
     )
 
   @patch("requests.get")
@@ -105,6 +106,7 @@ def test_get_api(self, mock_get, client):
             "accept": "application/json, text/plain, */*",
             "Authorization": "Bearer mocked_token",
         },
+        timeout=30,
     )
 
   @patch("requests.get")
@@ -127,6 +129,7 @@ def test_get_api_version(self, mock_get, client):
             "accept": "application/json, text/plain, */*",
             "Authorization": "Bearer mocked_token",
         },
+        timeout=30,
     )
 
   @patch("requests.get")
@@ -151,6 +154,7 @@ def test_get_spec_content(self, mock_get, client):
             "accept": "application/json, text/plain, */*",
             "Authorization": "Bearer mocked_token",
         },
+        timeout=30,
     )
 
   @patch("requests.get")
@@ -519,6 +523,17 @@ def test_get_spec_content_invalid_path(self, mock_get, client):
     ):
       client.get_spec_content("invalid-path")
 
+  def test_get_spec_content_includes_path_in_fallback_error(self, client):
+    with (
+        patch.object(
+            client, "_extract_resource_name", return_value=(None, None, None)
+        ),
+        pytest.raises(
+            ValueError, match="No API Hub resource found in path: actual-path"
+        ),
+    ):
+      client.get_spec_content("actual-path")
+
 
 if __name__ == "__main__":
   pytest.main([__file__])

tests/unittests/tools/application_integration_tool/clients/test_connections_client.py

@@ -110,6 +110,7 @@ def test_execute_api_call_success(
               "Content-Type": "application/json",
               "Authorization": f"Bearer {mock_credentials.token}",
           },
+          timeout=30,
       )
 
   def test_execute_api_call_credential_error(

tests/unittests/tools/application_integration_tool/clients/test_integration_client.py

@@ -162,6 +162,7 @@ def test_get_openapi_spec_for_integration_success(
               }],
               "fileFormat": "JSON",
           },
+          timeout=30,
       )
 
   def test_get_openapi_spec_for_integration_success_mtls(
@@ -218,6 +219,7 @@ def test_get_openapi_spec_for_integration_success_mtls(
               }],
               "fileFormat": "JSON",
           },
+          timeout=30,
       )
 
   def test_get_openapi_spec_for_integration_credential_error(