Skip to content

Add ability to propagate RetrySettings #27

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

Merged
vgvoleg merged 1 commit into from
Dec 11, 2025
Merged

Add ability to propagate RetrySettings #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions tests/test_cursors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ def sync_cursor(
session_pool_sync,
ydb.QuerySerializableReadWrite(),
request_settings=ydb.BaseRequestSettings(),
retry_settings=ydb.RetrySettings(),
)
yield cursor
cursor.close()
Expand Down Expand Up @@ -208,6 +209,7 @@ async def async_cursor(
session_pool,
ydb.QuerySerializableReadWrite(),
request_settings=ydb.BaseRequestSettings(),
retry_settings=ydb.RetrySettings(),
)
yield cursor
cursor.close()
Expand Down
9 changes: 9 additions & 0 deletions ydb_dbapi/connections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ def __init__(
self.request_settings: ydb.BaseRequestSettings = (
ydb.BaseRequestSettings()
)
self.retry_settings: ydb.RetrySettings = ydb.RetrySettings()

def set_isolation_level(self, isolation_level: IsolationLevel) -> None:
if self._tx_context and self._tx_context.tx_id:
Expand Down Expand Up @@ -151,6 +152,12 @@ def set_ydb_request_settings(self, value: ydb.BaseRequestSettings) -> None:
def get_ydb_request_settings(self) -> ydb.BaseRequestSettings:
return self.request_settings

def set_ydb_retry_settings(self, value: ydb.RetrySettings) -> None:
self.retry_settings = value

def get_ydb_retry_settings(self) -> ydb.RetrySettings:
return self.retry_settings

def _get_request_settings(self) -> ydb.BaseRequestSettings:
settings = self.request_settings.make_copy()

Expand Down Expand Up @@ -210,6 +217,7 @@ def cursor(self) -> Cursor:
tx_context=self._tx_context,
table_path_prefix=self.table_path_prefix,
request_settings=self.request_settings,
retry_settings=self.retry_settings,
)

def wait_ready(self, timeout: int = 10) -> None:
Expand Down Expand Up @@ -402,6 +410,7 @@ def cursor(self) -> AsyncCursor:
tx_context=self._tx_context,
table_path_prefix=self.table_path_prefix,
request_settings=self.request_settings,
retry_settings=self.retry_settings,
)

async def wait_ready(self, timeout: int = 10) -> None:
Expand Down
26 changes: 20 additions & 6 deletions ydb_dbapi/cursors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ def __init__(
session_pool: ydb.QuerySessionPool,
tx_mode: ydb.BaseQueryTxMode,
request_settings: ydb.BaseRequestSettings,
retry_settings: ydb.RetrySettings,
tx_context: ydb.QueryTxContext | None = None,
table_path_prefix: str = "",
) -> None:
Expand All @@ -207,9 +208,9 @@ def __init__(
self._session_pool = session_pool
self._tx_mode = tx_mode
self._request_settings = request_settings
self._retry_settings = retry_settings
self._tx_context = tx_context
self._table_path_prefix = table_path_prefix

self._stream: Iterator | None = None

def fetchone(self) -> tuple | None:
Expand Down Expand Up @@ -253,7 +254,10 @@ def callee(
)
)

return self._session_pool.retry_operation_sync(callee)
return self._session_pool.retry_operation_sync(
callee,
retry_settings=self._retry_settings,
)

@handle_ydb_errors
@invalidate_cursor_on_ydb_error
Expand All @@ -276,7 +280,10 @@ def callee(
)
)

return self._session_pool.retry_operation_sync(callee)
return self._session_pool.retry_operation_sync(
callee,
retry_settings=self._retry_settings,
)

@handle_ydb_errors
@invalidate_cursor_on_ydb_error
Expand Down Expand Up @@ -369,6 +376,7 @@ def __init__(
session_pool: ydb.aio.QuerySessionPool,
tx_mode: ydb.BaseQueryTxMode,
request_settings: ydb.BaseRequestSettings,
retry_settings: ydb.RetrySettings,
tx_context: ydb.aio.QueryTxContext | None = None,
table_path_prefix: str = "",
) -> None:
Expand All @@ -377,9 +385,9 @@ def __init__(
self._session_pool = session_pool
self._tx_mode = tx_mode
self._request_settings = request_settings
self._retry_settings = retry_settings
self._tx_context = tx_context
self._table_path_prefix = table_path_prefix

self._stream: AsyncIterator | None = None

def fetchone(self) -> tuple | None:
Expand Down Expand Up @@ -423,7 +431,10 @@ async def callee(
)
)

return await self._session_pool.retry_operation_async(callee)
return await self._session_pool.retry_operation_async(
callee,
retry_settings=self._retry_settings,
)

@handle_ydb_errors
@invalidate_cursor_on_ydb_error
Expand All @@ -446,7 +457,10 @@ async def callee(
)
)

return await self._session_pool.retry_operation_async(callee)
return await self._session_pool.retry_operation_async(
callee,
retry_settings=self._retry_settings,
)

@handle_ydb_errors
@invalidate_cursor_on_ydb_error
Expand Down