Skip to content
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.

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

fix: allow prepared_statement_cache_size for asyncpg #6324

Merged
merged 3 commits into from
Feb 11, 2025
Merged
Changes from 1 commit
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
30 changes: 19 additions & 11 deletions src/phoenix/db/engines.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from datetime import datetime
from enum import Enum
from sqlite3 import Connection
from typing import Any
from typing import Any, Mapping

import aiosqlite
import numpy as np
Expand Down Expand Up @@ -163,23 +163,15 @@ def aio_postgresql_engine(
log_to_stdout: bool = False,
log_migrations_to_stdout: bool = True,
) -> AsyncEngine:
url_query = dict(url.query)
sslmode = url_query.pop("sslmode", None) or url_query.pop("ssl", None)
engine = create_async_engine(
url=url.set(
# https://github.com/MagicStack/asyncpg/issues/737
query={**url_query, "ssl": sslmode} if sslmode else url_query,
),
url=url.set(query=_asyncpg_url_query(url.query)),
echo=log_to_stdout,
json_serializer=_dumps,
)
if not migrate:
return engine
sync_engine = sqlalchemy.create_engine(
url=url.set(
drivername="postgresql+psycopg",
query={**url_query, "sslmode": sslmode} if sslmode else url_query,
),
url=url.set(drivername="postgresql+psycopg", query=_psycopg_url_query(url.query)),
echo=log_migrations_to_stdout,
json_serializer=_dumps,
)
Expand All @@ -189,6 +181,22 @@ def aio_postgresql_engine(
return engine


def _asyncpg_url_query(url_query: Mapping[str, Any]) -> dict[str, Any]:
ans = dict(url_query)
if sslmode := ans.pop("sslmode", None) or ans.pop("ssl", None):
# https://github.com/MagicStack/asyncpg/issues/737
ans["ssl"] = sslmode
return ans


def _psycopg_url_query(url_query: Mapping[str, Any]) -> dict[str, Any]:
ans = dict(url_query)
if sslmode := ans.pop("sslmode", None) or ans.pop("ssl", None):
ans["sslmode"] = sslmode
ans.pop("prepared_statement_cache_size", None)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not allowed by psycopg

return ans


def _dumps(obj: Any) -> str:
return json.dumps(obj, cls=_Encoder)

Expand Down
Loading