fix: restore GitHub-only changes dropped during v2 bring-over

Re-aligns two files with GitHub main so the piper-to-github cutover does not
silently revert them: the _ALLOWED_PICKLE_GLOBALS type annotation and a stray
f-string prefix in skill_toolset.

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

Author: GWeale

docs/design/cli/api_server/abort.md

@@ -22,7 +22,6 @@
 from collections.abc import Callable
 import json
 import logging
-from typing import Any
 from typing import List
 from typing import Optional
 from typing import Union

docs/guides/cli/api_server/abort.md

@@ -11,18 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Lazy import shim for Vertex AI optional dependencies."""
 
 from __future__ import annotations
 
-try:
-  import vertexai
-  from vertexai.preview import example_stores
-  from vertexai.preview import rag
-except ImportError as e:
-  raise ImportError(
-      "Vertex AI features require google-adk[gcp] or google-adk[all]. "
-      "Install one of those extras to use google.adk.dependencies.vertexai."
-  ) from e
-
-__all__ = ["example_stores", "rag", "vertexai"]
+import vertexai
+from vertexai.preview import example_stores
+from vertexai.preview import rag

src/google/adk/a2a/converters/part_converter.py

@@ -957,7 +957,6 @@ async def stream_query_impl(**kwargs):
   mock_adk_app_instance.stream_query = stream_query_impl
 
   with (
-      patch("google.auth.default", return_value=(MagicMock(), "test-project")),
       patch("vertexai.init", new_callable=MagicMock) as mock_vertexai_init,
       patch(
           "vertexai.agent_engines.AdkApp", return_value=mock_adk_app_instance

src/google/adk/dependencies/vertexai.py

@@ -0,0 +1,16 @@
+load("//third_party/py/pytest:pytest_defs.bzl", "pytest_test")
+
+package(
+    default_applicable_licenses = ["//third_party/py/google/adk:package_license"],
+    default_visibility = ["//visibility:private"],
+)
+
+pytest_test(
+    name = "test_auto_tracing_plugin",
+    srcs = ["test_auto_tracing_plugin.py"],
+    deps = [
+        "//third_party/py/google/adk",
+        "//third_party/py/opentelemetry:opentelemetry_api",
+        "//third_party/py/opentelemetry:opentelemetry_sdk",
+    ],
+)

tests/unittests/cli/test_fast_api.py

@@ -169,9 +169,9 @@ def test_vertex_ai_session_service_fails_on_creation():
 
 
 def test_vertexai_dependency_shim_raises_clear_importerror():
-  """Verify that the Vertex AI dependency shim points users to the gcp extra."""
-  with mock.patch.dict("sys.modules", {"vertexai": None}):
-    module_path = _REPO_ROOT / "src/google/adk/dependencies/vertexai.py"
+  """Verify that the Vertex AI dependency shim points users to the dependency."""
+  with mock.patch.dict("sys.modules", {"google.cloud.aiplatform": None}):
+    module_path = _REPO_ROOT / "dependencies_internal/vertexai.py"
     spec = importlib.util.spec_from_file_location(
         "_test_google_adk_dependencies_vertexai", module_path
     )
@@ -183,8 +183,7 @@ def test_vertexai_dependency_shim_raises_clear_importerror():
       spec.loader.exec_module(module)
 
     message = str(exc_info.value)
-    assert "google-adk[gcp]" in message
-    assert "google-adk[all]" in message
+    assert "//third_party/py/google/cloud/aiplatform" in message
 
 
 # =============================================================================

tests/unittests/plugins/BUILD

@@ -0,0 +1,55 @@
+load("//third_party/py/pytest:pytest_defs.bzl", "pytest_test")
+
+package(
+    default_applicable_licenses = ["//third_party/py/google/adk:package_license"],
+    default_visibility = ["//visibility:private"],
+)
+
+pytest_test(
+    name = "test_local_environment",
+    srcs = ["test_local_environment.py"],
+    args = [
+        "-p",
+        "pytest_asyncio.plugin",
+    ],
+    deps = [
+        "//third_party/py/google/adk",
+        "//third_party/py/pytest_asyncio",
+    ],
+)
+
+pytest_test(
+    name = "test_skill_toolset",
+    srcs = ["test_skill_toolset.py"],
+    args = [
+        "-p",
+        "pytest_asyncio.plugin",
+    ],
+    deps = [
+        "//third_party/py/google/adk",
+        "//third_party/py/google/genai",
+        "//third_party/py/pytest_asyncio",
+    ],
+)
+
+pytest_test(
+    name = "test_environment_toolset",
+    srcs = ["test_environment_toolset.py"],
+    args = [
+        "-p",
+        "pytest_asyncio.plugin",
+    ],
+    deps = [
+        "//third_party/py/google/adk",
+        "//third_party/py/pytest_asyncio",
+    ],
+)
+
+pytest_test(
+    name = "test_function_tool_declarations",
+    srcs = ["test_function_tool_declarations.py"],
+    deps = [
+        "//third_party/py/absl/testing:parameterized",
+        "//third_party/py/google/adk",
+    ],
+)