working with adk web

Author: aabmass

adk-sql-agent/main.env

@@ -1,14 +1,9 @@
-OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED=true
-OTEL_SEMCONV_STABILITY_OPT_IN=gen_ai_latest_experimental
-# OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT=event_only
-
 GOOGLE_GENAI_USE_VERTEXAI=TRUE
 GOOGLE_CLOUD_LOCATION=us-central1
+GOOGLE_CLOUD_PROJECT=otel-starter-project
 
-ENABLE_GCS_PYTHON_CLIENT_OTEL_TRACES=true
-
-PORT=8000
 OTEL_INSTRUMENTATION_GENAI_UPLOAD_FORMAT='jsonl'
-GOOGLE_CLOUD_PROJECT=otel-starter-project
 OTEL_INSTRUMENTATION_GENAI_COMPLETION_HOOK=upload
 OTEL_INSTRUMENTATION_GENAI_UPLOAD_BASE_PATH="gs://otel-starter-project-genai-refs/v3"
+OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED=true
+OTEL_SEMCONV_STABILITY_OPT_IN=gen_ai_latest_experimental

adk-sql-agent/main.py

@@ -31,6 +31,7 @@ dependencies = [
     "opentelemetry-instrumentation-requests>=0.54b1",
     "opentelemetry-instrumentation-sqlite3>=0.54b1",
     "opentelemetry-instrumentation-vertexai>=2.0b0",
+    "opentelemetry-util-genai",
     "rich>=14.0.0",
 ]
 
@@ -41,3 +42,5 @@ dev = ["debugpy>=1.8.17", "ipython>=9.3.0", "pillow>=11.2.1"]
 fsspec = { git = "https://github.com/fsspec/filesystem_spec.git" }
 gcsfs = { git = "https://github.com/aabmass/gcsfs.git", branch = "remove-conflicts" }
 opentelemetry-exporter-gcp-logging = { git = "https://github.com/GoogleCloudPlatform/opentelemetry-operations-python.git", branch = "main", subdirectory = "opentelemetry-exporter-gcp-logging" }
+opentelemetry-instrumentation-google-genai = { path = "../instrumentation-genai/opentelemetry-instrumentation-google-genai", editable = true }
+opentelemetry-util-genai = { path = "../util/opentelemetry-util-genai", editable = true }

adk-sql-agent/pyproject.toml

@@ -0,0 +1,2 @@
+#!/bin/sh
+uv run --env-file main.env adk web --otel_to_cloud --host 0.0.0.0

adk-sql-agent/run.sh

@@ -78,7 +78,7 @@ def get_dbpath(thread_id: str) -> str:
 
 
 root_agent = Agent(
-    name="weather_time_agent",
+    name="sql_agent",
     model="gemini-2.5-flash",
     description=INTRO_TEXT,
     instruction=SYSTEM_PROMPT,

adk-sql-agent/sql_agent/agent.py

@@ -14,14 +14,16 @@
 
 
 import logging
-from typing import Any, NotRequired, TypedDict
-from opentelemetry import trace
 import sqlite3
-from google.adk.tools import ToolContext
+from typing import Any, NotRequired, TypedDict
 
 from google.genai import Client
 from google.genai import types as genai_types
 
+from opentelemetry import trace
+from opentelemetry.instrumentation.sqlite3 import SQLite3Instrumentor
+
+
 tracer = trace.get_tracer(__name__)
 logger = logging.getLogger(__name__)
 
@@ -35,11 +37,13 @@ class SqlRunResult(TypedDict):
 
 
 def create_run_sql_tool(dbpath: str):
+    instrumentor = SQLite3Instrumentor()
+
     @tracer.start_as_current_span("run_sql")
     def run_sql(sql_query: str) -> dict[str, Any]:
         """Runs a SQLite query. The SQL query can be DDL or DML. Returns the rows if it's a SELECT query."""
 
-        with sqlite3.connect(dbpath) as db:
+        with instrumentor.instrument_connection(sqlite3.connect(dbpath)) as db:
             try:
                 cursor = db.cursor()
                 cursor.execute(sql_query)
@@ -81,17 +85,25 @@ def run_sql(sql_query: str) -> dict[str, Any]:
 # Tool that calls gemini with an image
 @tracer.start_as_current_span("describe_uri_tool")
 def describe_uri_tool(uri: str, mime_type: str) -> dict[str, Any]:
-    """describe_uri_tool is a tool that takes a URI and mime type for the URI (you can guess
-    the type your best) and returns a description or error
+    """describe_uri_tool is a tool that takes a URI (http(s) or gs:// for GCS) and mime type
+    for the URI (you can guess the type your best) and returns a description or error.
     """
     client = Client()
-    res = client.models.generate_content(
-        model="gemini-2.0-flash-lite",
-        contents=[
-            genai_types.Part.from_text(
-                text="Describe the following attached file:"
-            ),
-            genai_types.Part.from_uri(file_uri=uri, mime_type=mime_type),
-        ],
-    )
-    return res.model_dump()
+
+    try:
+        res = client.models.generate_content(
+            model="gemini-2.0-flash-lite",
+            contents=[
+                genai_types.Part.from_text(
+                    text="Describe the following attached file:"
+                ),
+                genai_types.Part.from_uri(file_uri=uri, mime_type=mime_type),
+            ],
+        )
+    except Exception as e:
+        return {"error": str(e)}
+
+    if not res.candidates:
+        return {"error": "No candidates returned"}
+
+    return res.candidates[0].model_dump(mode="json")