Skip to content

fix: Refactor ADK store SQL table creation methods to be asynchronous #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: Refactor ADK store SQL table creation methods to be asynchronous #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10db745
fix: Refactor ADK store SQL table creation methods to be asynchronous
cofin Oct 21, 2025
5b36526
fix: assertions
cofin Oct 21, 2025
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repos:
- id: mixed-line-ending
- id: trailing-whitespace
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: "v0.14.0"
rev: "v0.14.1"
hooks:
- id: ruff
args: ["--fix"]
Expand Down
13 changes: 6 additions & 7 deletions sqlspec/adapters/aiosqlite/adk/store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def __init__(self, config: "AiosqliteConfig") -> None:
"""
super().__init__(config)

def _get_create_sessions_table_sql(self) -> str:
async def _get_create_sessions_table_sql(self) -> str:
"""Get SQLite CREATE TABLE SQL for sessions.

Returns:
Expand All @@ -163,7 +163,7 @@ def _get_create_sessions_table_sql(self) -> str:
ON {self._session_table}(update_time DESC);
"""

def _get_create_events_table_sql(self) -> str:
async def _get_create_events_table_sql(self) -> str:
"""Get SQLite CREATE TABLE SQL for events.

Returns:
Expand Down Expand Up @@ -228,11 +228,10 @@ async def _enable_foreign_keys(self, connection: Any) -> None:

async def create_tables(self) -> None:
"""Create both sessions and events tables if they don't exist."""
async with self._config.provide_connection() as conn:
await self._enable_foreign_keys(conn)
await conn.executescript(self._get_create_sessions_table_sql())
await conn.executescript(self._get_create_events_table_sql())
await conn.commit()
async with self._config.provide_session() as driver:
await self._enable_foreign_keys(driver.connection)
await driver.execute_script(await self._get_create_sessions_table_sql())
await driver.execute_script(await self._get_create_events_table_sql())
logger.debug("Created ADK tables: %s, %s", self._session_table, self._events_table)

async def create_session(
Expand Down
10 changes: 5 additions & 5 deletions sqlspec/adapters/asyncmy/adk/store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def _parse_owner_id_column_for_mysql(self, column_ddl: str) -> "tuple[str, str]"

return (col_def, fk_constraint)

def _get_create_sessions_table_sql(self) -> str:
async def _get_create_sessions_table_sql(self) -> str:
"""Get MySQL CREATE TABLE SQL for sessions.

Returns:
Expand Down Expand Up @@ -145,7 +145,7 @@ def _get_create_sessions_table_sql(self) -> str:
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
"""

def _get_create_events_table_sql(self) -> str:
async def _get_create_events_table_sql(self) -> str:
"""Get MySQL CREATE TABLE SQL for events.

Returns:
Expand Down Expand Up @@ -199,9 +199,9 @@ def _get_drop_tables_sql(self) -> "list[str]":

async def create_tables(self) -> None:
"""Create both sessions and events tables if they don't exist."""
async with self._config.provide_connection() as conn, conn.cursor() as cursor:
await cursor.execute(self._get_create_sessions_table_sql())
await cursor.execute(self._get_create_events_table_sql())
async with self._config.provide_session() as driver:
await driver.execute_script(await self._get_create_sessions_table_sql())
await driver.execute_script(await self._get_create_events_table_sql())
logger.debug("Created ADK tables: %s, %s", self._session_table, self._events_table)

async def create_session(
Expand Down
10 changes: 5 additions & 5 deletions sqlspec/adapters/asyncpg/adk/store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def __init__(self, config: AsyncConfigT) -> None:
"""
super().__init__(config)

def _get_create_sessions_table_sql(self) -> str:
async def _get_create_sessions_table_sql(self) -> str:
"""Get PostgreSQL CREATE TABLE SQL for sessions.

Returns:
Expand Down Expand Up @@ -125,7 +125,7 @@ def _get_create_sessions_table_sql(self) -> str:
WHERE state != '{{}}'::jsonb;
"""

def _get_create_events_table_sql(self) -> str:
async def _get_create_events_table_sql(self) -> str:
"""Get PostgreSQL CREATE TABLE SQL for events.

Returns:
Expand Down Expand Up @@ -181,9 +181,9 @@ def _get_drop_tables_sql(self) -> "list[str]":

async def create_tables(self) -> None:
"""Create both sessions and events tables if they don't exist."""
async with self.config.provide_connection() as conn:
await conn.execute(self._get_create_sessions_table_sql())
await conn.execute(self._get_create_events_table_sql())
async with self.config.provide_session() as driver:
await driver.execute_script(await self._get_create_sessions_table_sql())
await driver.execute_script(await self._get_create_events_table_sql())
logger.debug("Created ADK tables: %s, %s", self._session_table, self._events_table)

async def create_session(
Expand Down
12 changes: 6 additions & 6 deletions sqlspec/adapters/bigquery/adk/store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from sqlspec.extensions.adk import BaseAsyncADKStore, EventRecord, SessionRecord
from sqlspec.utils.logging import get_logger
from sqlspec.utils.serializers import from_json, to_json
from sqlspec.utils.sync_tools import async_
from sqlspec.utils.sync_tools import async_, run_

if TYPE_CHECKING:
from sqlspec.adapters.bigquery.config import BigQueryConfig
Expand Down Expand Up @@ -102,7 +102,7 @@ def _get_full_table_name(self, table_name: str) -> str:
return f"`{self._dataset_id}.{table_name}`"
return f"`{table_name}`"

def _get_create_sessions_table_sql(self) -> str:
async def _get_create_sessions_table_sql(self) -> str:
"""Get BigQuery CREATE TABLE SQL for sessions.

Returns:
Expand Down Expand Up @@ -136,7 +136,7 @@ def _get_create_sessions_table_sql(self) -> str:
CLUSTER BY app_name, user_id
"""

def _get_create_events_table_sql(self) -> str:
async def _get_create_events_table_sql(self) -> str:
"""Get BigQuery CREATE TABLE SQL for events.

Returns:
Expand Down Expand Up @@ -193,9 +193,9 @@ def _get_drop_tables_sql(self) -> "list[str]":

def _create_tables(self) -> None:
"""Synchronous implementation of create_tables."""
with self._config.provide_connection() as conn:
conn.query(self._get_create_sessions_table_sql()).result()
conn.query(self._get_create_events_table_sql()).result()
with self._config.provide_session() as driver:
driver.execute_script(run_(self._get_create_sessions_table_sql)())
driver.execute_script(run_(self._get_create_events_table_sql)())
logger.debug("Created BigQuery ADK tables: %s, %s", self._session_table, self._events_table)

async def create_tables(self) -> None:
Expand Down
Loading
Loading