chore: pre-emptive v2-compatible test/code fixes for ADK migration

tests/unit/vertex_adk/test_agent_engine_templates_adk.py

@@ -63,7 +63,7 @@ def __init__(self, name: str, model: str):
 _TEST_AGENT = Agent(name=_TEST_AGENT_NAME, model=_TEST_MODEL)
 _TEST_SESSION = {
     "id": "ca18c25a-644b-4e13-9b24-78c150ec3eb9",
-    "app_name": "default-app-name",
+    "app_name": "default_app_name",
     "user_id": _TEST_USER_ID,
     "events": [
         {
@@ -325,8 +325,6 @@ def test_adk_version(self):
                 agent_engines.AdkApp(agent=_TEST_AGENT)
 
     def setup_method(self):
-        importlib.reload(initializer)
-        importlib.reload(vertexai)
         vertexai.init(project=_TEST_PROJECT, location=_TEST_LOCATION)
 
     def teardown_method(self):
@@ -1067,8 +1065,6 @@ def update_agent_engine_mock():
 @pytest.mark.usefixtures("google_auth_mock")
 class TestAgentEngines:
     def setup_method(self):
-        importlib.reload(initializer)
-        importlib.reload(aiplatform)
         aiplatform.init(
             project=_TEST_PROJECT,
             location=_TEST_LOCATION,

vertexai/agent_engines/templates/adk.py

@@ -32,68 +32,68 @@
 import warnings
 
 if TYPE_CHECKING:
-    try:
-        from google.adk.events.event import Event
+  try:
+    from google.adk.events.event import Event
 
-        Event = Event
-    except (ImportError, AttributeError):
-        Event = Any
+    Event = Event
+  except (ImportError, AttributeError):
+    Event = Any
 
-    try:
-        from google.adk.apps import App
+  try:
+    from google.adk.apps import App
 
-        App = App
-    except (ImportError, AttributeError):
-        App = Any
+    App = App
+  except (ImportError, AttributeError):
+    App = Any
 
-    try:
-        from google.adk.agents import BaseAgent
+  try:
+    from google.adk.agents import BaseAgent
 
-        BaseAgent = BaseAgent
-    except (ImportError, AttributeError):
-        BaseAgent = Any
+    BaseAgent = BaseAgent
+  except (ImportError, AttributeError):
+    BaseAgent = Any
 
-    try:
-        from google.adk.plugins.base_plugin import BasePlugin
+  try:
+    from google.adk.plugins.base_plugin import BasePlugin
 
-        BasePlugin = BasePlugin
-    except (ImportError, AttributeError):
-        BasePlugin = Any
+    BasePlugin = BasePlugin
+  except (ImportError, AttributeError):
+    BasePlugin = Any
 
-    try:
-        from google.adk.sessions import BaseSessionService
+  try:
+    from google.adk.sessions import BaseSessionService
 
-        BaseSessionService = BaseSessionService
-    except (ImportError, AttributeError):
-        BaseSessionService = Any
+    BaseSessionService = BaseSessionService
+  except (ImportError, AttributeError):
+    BaseSessionService = Any
 
-    try:
-        from google.adk.artifacts import BaseArtifactService
+  try:
+    from google.adk.artifacts import BaseArtifactService
 
-        BaseArtifactService = BaseArtifactService
-    except (ImportError, AttributeError):
-        BaseArtifactService = Any
+    BaseArtifactService = BaseArtifactService
+  except (ImportError, AttributeError):
+    BaseArtifactService = Any
 
-    try:
-        from google.adk.memory import BaseMemoryService
+  try:
+    from google.adk.memory import BaseMemoryService
 
-        BaseMemoryService = BaseMemoryService
-    except (ImportError, AttributeError):
-        BaseMemoryService = Any
+    BaseMemoryService = BaseMemoryService
+  except (ImportError, AttributeError):
+    BaseMemoryService = Any
 
-    try:
-        from opentelemetry.sdk import trace
+  try:
+    from opentelemetry.sdk import trace
 
-        TracerProvider = trace.TracerProvider
-        SpanProcessor = trace.SpanProcessor
-        SynchronousMultiSpanProcessor = trace.SynchronousMultiSpanProcessor
-    except (ImportError, AttributeError):
-        TracerProvider = Any
-        SpanProcessor = Any
-        SynchronousMultiSpanProcessor = Any
+    TracerProvider = trace.TracerProvider
+    SpanProcessor = trace.SpanProcessor
+    SynchronousMultiSpanProcessor = trace.SynchronousMultiSpanProcessor
+  except (ImportError, AttributeError):
+    TracerProvider = Any
+    SpanProcessor = Any
+    SynchronousMultiSpanProcessor = Any
 
 
-_DEFAULT_APP_NAME = "default-app-name"
+_DEFAULT_APP_NAME = "default_app_name"
 _DEFAULT_USER_ID = "default-user-id"
 _TELEMETRY_API_DISABLED_WARNING = (
     "Tracing integration for Agent Engine has migrated to a new API.\n"