Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies = [
"pydantic-settings==2.10.1", # Config management
"a2a-sdk>=0.3.7,<1.0.0", # For Google Agent2Agent protocol
"deprecated==1.2.18",
"google-adk>=2.7.0,<2.12.0", # For basic agent architecture
"google-adk>=2.7.0,<2.15.0", # For basic agent architecture
# litellm and sqlalchemy are required by code paths veadk always uses
# (LiteLlm models, sessions). google-adk ships them in base on 1.x but moved
# them behind extras ([extensions]/[db]) on 2.x, so declare them directly to
Expand Down Expand Up @@ -126,7 +126,7 @@ pdf = [] # Backward-compatible alias; PDF support is now installed by default
eval = [
"prometheus-client>=0.22.1", # For exporting data to Prometheus pushgateway
"deepeval>=3.2.6", # For DeepEval-based evaluation
"google-adk[eval]>=2.7.0,<2.12.0", # For Google ADK-based evaluation
"google-adk[eval]>=2.7.0,<2.15.0", # For Google ADK-based evaluation
]
harness = [
"headroom",
Expand Down
97 changes: 91 additions & 6 deletions tests/cli/test_studio_startup_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -987,6 +987,97 @@ def test_studio_fast_api_defers_evaluation_storage_until_first_use() -> None:
)


def test_studio_deferred_genai_enums_match_installed_sdk() -> None:
root = Path(__file__).resolve().parents[2]
script = """
import sys

import veadk.cli.studio_start
from google.genai import types

enums = {name: getattr(types, name) for name in ("FinishReason", "BlockedReason")}
members = {
name: [(member.name, member.value) for member in enum]
for name, enum in enums.items()
}
assert not types._veadk_real_module_loaded()
assert enums["FinishReason"]("stop").value == "STOP"
assert enums["BlockedReason"]("safety").value == "SAFETY"

types.Content(parts=[types.Part(text="hello")])
real = sys.modules["google.genai.types"]
for name, enum in enums.items():
actual = getattr(real, name)
assert members[name] == [(member.name, member.value) for member in actual]
assert all(actual(member) == member for member in enum)
"""
result = subprocess.run(
[sys.executable, "-c", script],
cwd=root,
capture_output=True,
text=True,
)
assert result.returncode == 0, result.stderr


def test_studio_deferred_eval_prefix_matches_installed_adk() -> None:
root = Path(__file__).resolve().parents[2]
script = """
import sys

import veadk.cli.studio_start
from google.adk.cli import cli_eval

prefix = cli_eval.EVAL_SESSION_ID_PREFIX
legacy = cli_eval._LEGACY_EVAL_SESSION_ID_PREFIX
assert "google.adk.evaluation" not in sys.modules
real = cli_eval._load_real_module()
assert prefix == real.EVAL_SESSION_ID_PREFIX
assert legacy == getattr(real, "_LEGACY_EVAL_SESSION_ID_PREFIX", prefix)
"""
result = subprocess.run(
[sys.executable, "-c", script],
cwd=root,
capture_output=True,
text=True,
)
assert result.returncode == 0, result.stderr


def test_studio_deferred_adk_utilities_work_on_first_use() -> None:
root = Path(__file__).resolve().parents[2]
script = """
import asyncio

import veadk.cli.studio_start
from google.adk.cli.utils import evals
from google.adk.sessions.session import Session
from google.genai import types

assert not types._veadk_real_module_loaded()

async def run():
from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService

service = InMemoryArtifactService()
part = types.Part(inline_data=types.Blob(data=b"test", mime_type="text/plain"))
args = dict(app_name="app", user_id="user", session_id="session", filename="a.txt")
version = await service.save_artifact(**args, artifact=part)
assert await service.load_artifact(**args, version=version) == part

asyncio.run(run())
session = Session(id="session", app_name="app", user_id="user")
assert evals.convert_session_to_eval_invocations(session) == []
"""
result = subprocess.run(
[sys.executable, "-c", script],
cwd=root,
capture_output=True,
text=True,
)
assert result.returncode == 0, result.stderr


def test_studio_fast_api_defers_genai_models_until_first_request() -> None:
root = Path(__file__).resolve().parents[2]
script = """
Expand Down Expand Up @@ -1051,12 +1142,6 @@ def sample_tool(value: str) -> str:
}

from google.adk.telemetry import _experimental_semconv
from google.adk.telemetry import tracing

assert isinstance(
tracing._instrumented_with_opentelemetry_instrumentation_google_genai(),
bool,
)
transformers = getattr(_experimental_semconv, "transformers", None)
if transformers is None:
from google.genai import models as genai_models_module
Expand Down
26 changes: 19 additions & 7 deletions tests/test_adk_compat_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,38 @@
from veadk.tracing.telemetry.attributes.extractors.types import ToolAttributesParams


def test_adk_native_telemetry_is_suppressed_only_inside_veadk_context(monkeypatch):
@pytest.mark.parametrize("config_style", ["absent", "positional", "keyword"])
def test_adk_native_telemetry_is_suppressed_only_inside_veadk_context(
monkeypatch, config_style
):
"""Capability patch leaves plain ADK runs unchanged and is idempotent."""
from google.adk.telemetry import tracing as adk_tracing

monkeypatch.setattr(
adk_tracing, "_should_emit_native_telemetry", lambda agent: True
)
calls = []

def gate(agent, *args, **kwargs):
calls.append((agent, args, kwargs))
return True

monkeypatch.setattr(adk_tracing, "_should_emit_native_telemetry", gate)

patch_google_adk_telemetry()
wrapped = adk_tracing._should_emit_native_telemetry
wrapped = getattr(adk_tracing, "_should_emit_native_telemetry")
patch_google_adk_telemetry()

assert adk_tracing._should_emit_native_telemetry is wrapped
assert wrapped(object()) is True
agent, config = object(), object()
args = (config,) if config_style == "positional" else ()
kwargs = {"telemetry_config": config} if config_style == "keyword" else {}
assert wrapped(agent, *args, **kwargs) is True
assert calls == [(agent, args, kwargs)]

token = context_api.attach(
context_api.set_value("suppress_language_model_instrumentation", True)
)
try:
assert wrapped(object()) is False
assert wrapped(agent, *args, **kwargs) is False
assert len(calls) == 1
finally:
context_api.detach(token)

Expand Down
Loading