Intermediate changes

commit_hash:fe9bc3463c8ef03826121b2f65eee3e42222b89f

7 files changed, 25 insertions, 9 deletions

diff --git a/contrib/python/ydb/py3/.dist-info/METADATA b/contrib/python/ydb/py3/.dist-info/METADATA
index 1e16ba3e8dc..bf88c2eae95 100644
--- a/contrib/python/ydb/py3/.dist-info/METADATA
+++ b/contrib/python/ydb/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ydb
-Version: 3.18.17
+Version: 3.19.2
 Summary: YDB Python SDK
 Home-page: http://github.com/ydb-platform/ydb-python-sdk
 Author: Yandex LLC
@@ -16,7 +16,7 @@ License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: grpcio >=1.42.0
 Requires-Dist: packaging
-Requires-Dist: protobuf <5.0.0,>=3.13.0
+Requires-Dist: protobuf <6.0.0,>=3.13.0
 Requires-Dist: aiohttp <4
 Provides-Extra: yc
 Requires-Dist: yandexcloud ; extra == 'yc'
diff --git a/contrib/python/ydb/py3/.yandex_meta/yamaker.yaml b/contrib/python/ydb/py3/.yandex_meta/yamaker.yaml
index 90b9380b1e2..9a946e3f480 100644
--- a/contrib/python/ydb/py3/.yandex_meta/yamaker.yaml
+++ b/contrib/python/ydb/py3/.yandex_meta/yamaker.yaml
@@ -1,7 +1,7 @@
 exclude:
   - ydb/_grpc/v3/*
   - ydb/_grpc/v4/*
+  - ydb/_grpc/v5/*
 mark_as_tests:
   - "**/*_test.py"
   - ydb/_topic_common/test_helpers.py
-
diff --git a/contrib/python/ydb/py3/patches/01-arcadia-protobufs.patch b/contrib/python/ydb/py3/patches/01-arcadia-protobufs.patch
index 19914950e6b..a00b02b6881 100644
--- a/contrib/python/ydb/py3/patches/01-arcadia-protobufs.patch
+++ b/contrib/python/ydb/py3/patches/01-arcadia-protobufs.patch
@@ -1,6 +1,6 @@
 --- contrib/python/ydb/py3/ydb/_grpc/common/__init__.py	(index)
 +++ contrib/python/ydb/py3/ydb/_grpc/common/__init__.py	(working tree)
-@@ -1,46 +0,0 @@
+@@ -1,55 +0,0 @@
 -import sys
 -
 -import google.protobuf
@@ -39,7 +39,7 @@
 -        from ydb._grpc.v3 import protos  # noqa
 -
 -        sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v3.protos"]
--    else:
+-    elif protobuf_version < Version("5.0"):
 -        from ydb._grpc.v4 import *  # noqa
 -
 -        sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v4"]
@@ -47,3 +47,12 @@
 -        from ydb._grpc.v4 import protos  # noqa
 -
 -        sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v4.protos"]
+-
+-    else:
+-        from ydb._grpc.v5 import *  # noqa
+-
+-        sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v5"]
+-
+-        from ydb._grpc.v5 import protos  # noqa
+-
+-        sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v5.protos"]
diff --git a/contrib/python/ydb/py3/ya.make b/contrib/python/ydb/py3/ya.make
index d1d4c78a202..5b1a93f20f2 100644
--- a/contrib/python/ydb/py3/ya.make
+++ b/contrib/python/ydb/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(3.18.17)
+VERSION(3.19.2)
 
 LICENSE(Apache-2.0)
 
diff --git a/contrib/python/ydb/py3/ydb/_topic_reader/topic_reader_sync.py b/contrib/python/ydb/py3/ydb/_topic_reader/topic_reader_sync.py
index 3048d3c420f..eda1d374fc3 100644
--- a/contrib/python/ydb/py3/ydb/_topic_reader/topic_reader_sync.py
+++ b/contrib/python/ydb/py3/ydb/_topic_reader/topic_reader_sync.py
@@ -79,7 +79,7 @@ class TopicReaderSync:
         Returns a future, which will complete when the reader has at least one message in queue.
         If the reader already has a message - the future will complete immediately.
 
-        A message may expire before it gets read so that the attempt to receive the massage will fail
+        A message may expire before it gets read so that the attempt to receive the message will fail
         despite the future has signaled about its availability.
         """
         self._check_closed()
diff --git a/contrib/python/ydb/py3/ydb/aio/query/pool.py b/contrib/python/ydb/py3/ydb/aio/query/pool.py
index f6a84eb0b14..947db658726 100644
--- a/contrib/python/ydb/py3/ydb/aio/query/pool.py
+++ b/contrib/python/ydb/py3/ydb/aio/query/pool.py
@@ -90,8 +90,15 @@ class QuerySessionPool:
                 logger.debug(f"Acquired dead session from queue: {session._state.session_id}")
 
         logger.debug(f"Session pool is not large enough: {self._current_size} < {self._size}, will create new one.")
-        session = await self._create_new_session()
+
         self._current_size += 1
+        try:
+            session = await self._create_new_session()
+        except Exception as e:
+            logger.error("Failed to create new session")
+            self._current_size -= 1
+            raise e
+
         return session
 
     async def release(self, session: QuerySession) -> None:
diff --git a/contrib/python/ydb/py3/ydb/ydb_version.py b/contrib/python/ydb/py3/ydb/ydb_version.py
index 416d33e1771..b3fbda15002 100644
--- a/contrib/python/ydb/py3/ydb/ydb_version.py
+++ b/contrib/python/ydb/py3/ydb/ydb_version.py
@@ -1 +1 @@
-VERSION = "3.18.17"
+VERSION = "3.19.2"