You've already forked adk-python
mirror of
https://github.com/encounter/adk-python.git
synced 2026-03-30 10:57:20 -07:00
657acfadbb
Merge https://github.com/google/adk-python/pull/3926 ### Link to Issue or Description of Change **1. Link to an existing issue (if applicable):** - Related: #3916 **2. Or, if no issue exists, describe the change:** **Problem:** While `DatabaseSessionService` already supports PostgreSQL through SQLAlchemy, there is no documentation or sample code showing users how to configure and use it. **Solution:** Add a comprehensive sample under `contributing/samples/postgres_session_service/` that demonstrates: - How to configure `DatabaseSessionService` with PostgreSQL - The auto-generated database schema (sessions, events, app_states, user_states tables) - Connection URL format and configuration options - A working sample agent with session persistence ### Testing Plan **Unit Tests:** - [x] I have added or updated unit tests for my change. - [x] All unit tests pass locally. This is a documentation-only change (new sample), so no new unit tests are required. Existing tests continue to pass. **Manual End-to-End (E2E) Tests:** Tested locally with the following steps: 1. Started PostgreSQL using `docker compose up -d` 2. Set environment variables: ```bash export POSTGRES_URL=postgresql+asyncpg://postgres:postgres@localhost:5432/adk_sessions export GOOGLE_CLOUD_PROJECT=$(gcloud config get-value project) export GOOGLE_CLOUD_LOCATION=us-central1 export GOOGLE_GENAI_USE_VERTEXAI=true ``` 3. Ran `pip install google-adk asyncpg greenlet` to install the required packages 4. Ran `python main.py` - session created successfully 5. Ran `python main.py` again - previous session resumed with event history 6. Verified tables and rows created in PostgreSQL (sessions, events, app_states, user_states) ### Checklist - [x] I have read the https://github.com/google/adk-python/blob/main/CONTRIBUTING.md document. - [x] I have performed a self-review of my own code. - [x] I have commented my code, particularly in hard-to-understand areas. - [x] I have added tests that prove my fix is effective or that my feature works. - [x] New and existing unit tests pass locally with my changes. - [x] I have manually tested my changes end-to-end. - [x] Any dependent changes have been merged and published in downstream modules. ### Additional context This PR adds documentation and a working sample for an already-supported feature. The DatabaseSessionService class already handles PostgreSQL through its DynamicJSON type decorator which uses JSONB for PostgreSQL. Files added: - contributing/samples/postgres_session_service/README.md - Comprehensive guide - contributing/samples/postgres_session_service/agent.py - Sample agent - contributing/samples/postgres_session_service/main.py - Usage example - contributing/samples/postgres_session_service/compose.yml - Local PostgreSQL setup - contributing/samples/postgres_session_service/\_\_init\_\_.py - Package init Co-authored-by: Liang Wu <wuliang@google.com> COPYBARA_INTEGRATE_REVIEW=https://github.com/google/adk-python/pull/3926 from hiroakis:feat-support-pg-for-conversation a5279d4fb2a63699f384c670928d77d882c25a25 PiperOrigin-RevId: 868816317
96 lines
3.0 KiB
Python
96 lines
3.0 KiB
Python
# Copyright 2026 Google LLC
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# 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.
|
|
|
|
"""Example demonstrating PostgreSQL session persistence with DatabaseSessionService."""
|
|
|
|
import asyncio
|
|
import os
|
|
|
|
import agent
|
|
from dotenv import load_dotenv
|
|
from google.adk.runners import Runner
|
|
from google.adk.sessions.database_session_service import DatabaseSessionService
|
|
from google.adk.sessions.session import Session
|
|
from google.genai import types
|
|
|
|
load_dotenv(override=True)
|
|
|
|
|
|
async def main():
|
|
"""Main function demonstrating PostgreSQL session persistence."""
|
|
postgres_url = os.environ.get("POSTGRES_URL")
|
|
if not postgres_url:
|
|
raise ValueError(
|
|
"POSTGRES_URL environment variable not set. "
|
|
"Please create a .env file with"
|
|
" POSTGRES_URL=postgresql+asyncpg://user:password@localhost:5432/adk_sessions"
|
|
)
|
|
|
|
app_name = "postgres_session_demo"
|
|
user_id = "demo_user"
|
|
session_id = "persistent-session"
|
|
|
|
# Initialize PostgreSQL-backed session service
|
|
session_service = DatabaseSessionService(postgres_url)
|
|
|
|
runner = Runner(
|
|
app_name=app_name,
|
|
agent=agent.root_agent,
|
|
session_service=session_service,
|
|
)
|
|
|
|
# Try to get existing session or create new one
|
|
session = await session_service.get_session(
|
|
app_name=app_name,
|
|
user_id=user_id,
|
|
session_id=session_id,
|
|
)
|
|
|
|
if session:
|
|
print(f"Resuming existing session: {session.id}")
|
|
print(f"Previous events count: {len(session.events)}")
|
|
else:
|
|
session = await session_service.create_session(
|
|
app_name=app_name,
|
|
user_id=user_id,
|
|
session_id=session_id,
|
|
)
|
|
print(f"Created new session: {session.id}")
|
|
|
|
async def run_prompt(session: Session, new_message: str):
|
|
"""Send a prompt to the agent and print the response."""
|
|
content = types.Content(
|
|
role="user", parts=[types.Part.from_text(text=new_message)]
|
|
)
|
|
print(f"User: {new_message}")
|
|
async for event in runner.run_async(
|
|
user_id=user_id,
|
|
session_id=session.id,
|
|
new_message=content,
|
|
):
|
|
if event.content and event.content.parts and event.content.parts[0].text:
|
|
print(f"{event.author}: {event.content.parts[0].text}")
|
|
|
|
print("------------------------------------")
|
|
await run_prompt(session, "What time is it? Please remember this.")
|
|
print("------------------------------------")
|
|
await run_prompt(session, "What did I just ask you?")
|
|
print("------------------------------------")
|
|
|
|
print("\nSession persisted to PostgreSQL. Run again to see event history.")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
asyncio.run(main())
|