several fixes plus wrappers

Author: slampy97

First_look_on_api_and_examples_from_zookeeper.patch

@@ -1,33 +1,24 @@
 import ydb
-from ydb._grpc.v4.protos import ydb_coordination_pb2
 
 
 def test_coordination_nodes(driver_sync: ydb.Driver):
     client = driver_sync.coordination_client
     node_path = "/local/test_node"
 
     try:
-        drop_res = client.delete_node(node_path)
-        print(f"Node deleted (pre-clean), operation id: {drop_res.operation.id}")
+        client.delete_node(node_path)
     except ydb.SchemeError:
         pass
 
-    create_res = client.create_node(node_path)
-    assert create_res.operation.id is not None
-    print(f"Node created, operation id: {create_res.operation.id}")
+    client.create_node(node_path)
 
-    describe_res = client.describe_node(node_path)
-    assert describe_res.operation.id is not None
-    print(f"Node described, operation id: {describe_res.operation.id}")
+    node = client.describe_node(node_path)
 
-    describe_result_proto = ydb_coordination_pb2.DescribeNodeResult()
-    describe_res.operation.result.Unpack(describe_result_proto)
+    assert node.status == ydb.StatusCode.SUCCESS, f"Unexpected operation status: {node.status}"
 
-    print(f"Node path: {describe_result_proto.path}")
-    if describe_result_proto.HasField("config"):
-        print(f"Node config: {describe_result_proto.config}")
+    assert node.path.split("/")[-1] == "test_node", "Node name mismatch"
 
-    # --- Удаляем узел ---
-    drop_res = client.delete_node(node_path)
-    assert drop_res.operation.id is not None
-    print(f"Node deleted, operation id: {drop_res.operation.id}")
+
+    assert node.config is not None, "Node config is missing"
+
+    client.delete_node(node_path)

ydb/coordination/tests/__init__.py renamed to tests/coordination/__init__.py

@@ -147,11 +147,4 @@ class CoordinationService(object):
     CreateNode = "CreateNode"
     AlterNode = "AlterNode"
     DropNode = "DropNode"
-    DescribeNode = "DescribeNode"
-
-    Request = ydb_coordination.CreateNodeRequest
-    Response = ydb_coordination.CreateNodeResponse
-    DescribeRequest = ydb_coordination.DescribeNodeRequest
-    DescribeResponse = ydb_coordination.DescribeNodeResponse
-    DropRequest = ydb_coordination.DropNodeRequest
-    DropResponse = ydb_coordination.DropNodeResponse
+    DescribeNode = "DescribeNode"

tests/coordination/coordination_client.py

@@ -1,54 +1,49 @@
 import typing
 from typing import Optional
 
-import ydb
 from ydb import _apis, issues
 
-from .coordination_lock import CoordinationLock
-from .сoordination_session import CoordinationSession
 
+from .operations import DescribeNodeOperation, CreateNodeOperation, DropNodeOperation
 
-def wrapper_create_node(rpc_state, response_pb, *_args, **_kwargs):
-    from .._grpc.grpcwrapper.ydb_coordination import CreateNodeResponse
 
+if typing.TYPE_CHECKING:
+    import ydb
+
+
+def wrapper_create_node(rpc_state, response_pb, path, *_args, **_kwargs):
     issues._process_response(response_pb.operation)
-    return CreateNodeResponse.from_proto(response_pb)
+    return CreateNodeOperation(rpc_state, response_pb, path)
 
 
 def wrapper_describe_node(rpc_state, response_pb, *_args, **_kwargs):
-    from .._grpc.grpcwrapper.ydb_coordination import DescribeNodeResponse
-
     issues._process_response(response_pb.operation)
-    return DescribeNodeResponse.from_proto(response_pb)
-
+    return DescribeNodeOperation(rpc_state, response_pb)
 
-def wrapper_delete_node(rpc_state, response_pb, *_args, **_kwargs):
-    from .._grpc.grpcwrapper.ydb_coordination import DropNodeResponse
 
+def wrapper_delete_node(rpc_state, response_pb, path, *_args, **_kwargs):
     issues._process_response(response_pb.operation)
-    return DropNodeResponse.from_proto(response_pb)
+    return DropNodeOperation(rpc_state, response_pb, path)
 
 
 class CoordinationClient:
     def __init__(self, driver: "ydb.Driver"):
         self._driver = driver
 
-    def session(self) -> "CoordinationSession":
-        return CoordinationSession(self._driver)
-
     def _call_node(
             self,
             request,
             rpc_method,
             wrapper_fn,
+            wrap_args=(),
             settings: Optional["ydb.BaseRequestSettings"] = None,
     ):
         return self._driver(
             request,
             _apis.CoordinationService.Stub,
             rpc_method,
             wrap_result=wrapper_fn,
-            wrap_args=(),
+            wrap_args=wrap_args,
             settings=settings,
         )
 
@@ -58,7 +53,7 @@ def create_node(
             config: typing.Optional[typing.Any] = None,
             operation_params: typing.Optional[typing.Any] = None,
             settings: Optional["ydb.BaseRequestSettings"] = None,
-    ) -> _apis.ydb_coordination.CreateNodeResponse:
+    ) -> CreateNodeOperation:
         request = _apis.ydb_coordination.CreateNodeRequest(
             path=path,
             config=config,
@@ -68,15 +63,16 @@ def create_node(
             request,
             _apis.CoordinationService.CreateNode,
             wrapper_create_node,
-            settings,
+            wrap_args=(path,),
+            settings=settings,
         )
 
     def describe_node(
         self,
         path: str,
         operation_params: typing.Optional[typing.Any] = None,
         settings: Optional["ydb.BaseRequestSettings"] = None,
-    ) -> _apis.ydb_coordination.DescribeNodeResponse:
+    ) -> DescribeNodeOperation:
         request = _apis.ydb_coordination.DescribeNodeRequest(
             path=path,
             operation_params=operation_params,
@@ -85,15 +81,16 @@ def describe_node(
             request,
             _apis.CoordinationService.DescribeNode,
             wrapper_describe_node,
-            settings,
+            wrap_args=(path,),
+            settings=settings,
         )
 
     def delete_node(
             self,
             path: str,
             operation_params: typing.Optional[typing.Any] = None,
             settings: Optional["ydb.BaseRequestSettings"] = None,
-    ) -> _apis.ydb_coordination.DropNodeResponse:
+    ):
         request = _apis.ydb_coordination.DropNodeRequest(
             path=path,
             operation_params=operation_params,
@@ -102,13 +99,7 @@ def delete_node(
             request,
             _apis.CoordinationService.DropNode,
             wrapper_delete_node,
-            settings,
+            wrap_args=(path,),
+            settings=settings,
         )
 
-    def lock(
-        self,
-        path: str,
-        timeout: int = 5000,
-        count: int = 1,
-    ) -> "CoordinationLock":
-        return CoordinationLock(self.session(), path, timeout, count)

ydb/_apis.py

@@ -0,0 +1,50 @@
+from ydb import operation as ydb_op
+from ydb import _apis
+
+class DescribeNodeOperation(ydb_op.Operation):
+    def __init__(self, rpc_state, response, driver=None):
+        super().__init__(rpc_state, response, driver)
+
+        self.status = response.operation.status
+
+        result = _apis.ydb_coordination.DescribeNodeResult()
+        response.operation.result.Unpack(result)
+
+        node_info = result.self
+        self.path = node_info.name
+        self.node_owner = node_info.owner
+        self.effective_permissions = node_info.effective_permissions
+        self.config = result.config
+
+        if self.config:
+            self.session_grace_period_millis = self.config.session_grace_period_millis
+            self.attach_consistency_mode = self.config.attach_consistency_mode
+            self.read_consistency_mode = self.config.read_consistency_mode
+        else:
+            self.session_grace_period_millis = None
+            self.attach_consistency_mode = None
+            self.read_consistency_mode = None
+
+    def __repr__(self):
+        return f"DescribeNodeOperation<id={self.id}, path={self.path}, status={self.status}>"
+
+    __str__ = __repr__
+
+
+class CreateNodeOperation(ydb_op.Operation):
+    def __init__(self, rpc_state, response, path, driver=None):
+        super().__init__(rpc_state, response, driver)
+        self.path = path
+        self.status = response.operation.status
+
+    def __repr__(self):
+        return f"CreateNodeOperation<id={self.id}, path={self.path}, status={self.status}>"
+
+class DropNodeOperation(ydb_op.Operation):
+    def __init__(self, rpc_state, response, path, driver=None):
+        super().__init__(rpc_state, response, driver)
+        self.path = path
+        self.status = response.operation.status
+
+    def __repr__(self):
+        return f"DropNodeOperation<id={self.id}, path={self.path}, status={self.status}>"