fix review remarks plus styles checks

Author: slampy97

tests/coordination/test_coordination_client.py

@@ -1,13 +1,13 @@
 import pytest
 
 import ydb
+from ydb import aio
 
 from ydb.coordination import (
     NodeConfig,
     ConsistencyMode,
     RateLimiterCountersMode,
     CoordinationClient,
-    AsyncCoordinationClient,
 )
 
 
@@ -33,9 +33,8 @@ def test_coordination_node_lifecycle(self, driver_sync: ydb.Driver):
         )
         client.create_node(node_path, initial_config)
 
-        node_descr = client.describe_node(node_path)
-        assert node_descr.path == node_path
-        assert node_descr.config == initial_config
+        node_conf = client.describe_node(node_path)
+        assert node_conf == initial_config
 
         updated_config = NodeConfig(
             session_grace_period_millis=12345,
@@ -46,17 +45,16 @@ def test_coordination_node_lifecycle(self, driver_sync: ydb.Driver):
         )
         client.alter_node(node_path, updated_config)
 
-        node_descr = client.describe_node(node_path)
-        assert node_descr.path == node_path
-        assert node_descr.config == updated_config
+        node_conf = client.describe_node(node_path)
+        assert node_conf == updated_config
 
         client.delete_node(node_path)
 
         with pytest.raises(ydb.SchemeError):
             client.describe_node(node_path)
 
     async def test_coordination_node_lifecycle_async(self, aio_connection):
-        client = AsyncCoordinationClient(aio_connection)
+        client = aio.CoordinationClient(aio_connection)
         node_path = "/local/test_node_lifecycle"
 
         try:
@@ -76,9 +74,8 @@ async def test_coordination_node_lifecycle_async(self, aio_connection):
         )
         await client.create_node(node_path, initial_config)
 
-        node_descr = await client.describe_node(node_path)
-        assert node_descr.path == node_path
-        assert node_descr.config == initial_config
+        node_conf = await client.describe_node(node_path)
+        assert node_conf == initial_config
 
         updated_config = NodeConfig(
             session_grace_period_millis=12345,
@@ -89,9 +86,8 @@ async def test_coordination_node_lifecycle_async(self, aio_connection):
         )
         await client.alter_node(node_path, updated_config)
 
-        node_descr = await client.describe_node(node_path)
-        assert node_descr.path == node_path
-        assert node_descr.config == updated_config
+        node_conf = await client.describe_node(node_path)
+        assert node_conf == updated_config
 
         await client.delete_node(node_path)
 

ydb/_grpc/grpcwrapper/ydb_coordination_public_types.py

@@ -49,13 +49,9 @@ def to_proto(self) -> ydb_coordination_pb2.Config:
         )
 
 
-@dataclass
-class NodeDescription:
-    path: str
-    config: NodeConfig
-
+class DescribeResult:
     @staticmethod
-    def from_proto(path: str, response_pb: ydb_coordination_pb2.DescribeNodeResponse) -> "NodeDescription":
+    def from_proto(msg: ydb_coordination_pb2.DescribeNodeResponse) -> "NodeConfig":
         result = ydb_coordination_pb2.DescribeNodeResult()
-        response_pb.operation.result.Unpack(result)
-        return NodeDescription(path=path, config=NodeConfig.from_proto(result.config))
+        msg.operation.result.Unpack(result)
+        return NodeConfig.from_proto(result.config)

ydb/aio/__init__.py

@@ -1,3 +1,4 @@
 from .driver import Driver  # noqa
 from .table import SessionPool, retry_operation  # noqa
 from .query import QuerySessionPool, QuerySession, QueryTxContext  # noqa
+from .coordination_client import CoordinationClient  # noqa

ydb/coordination/coordination_client_async.py renamed to ydb/aio/coordination_client.py

@@ -6,37 +6,33 @@
     AlterNodeRequest,
     DropNodeRequest,
 )
-from ydb._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig, NodeDescription
+from ydb._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig
 from ydb.coordination.base_coordination_client import BaseCoordinationClient
 
 
-class AsyncCoordinationClient(BaseCoordinationClient):
+class CoordinationClient(BaseCoordinationClient):
     async def create_node(self, path: str, config: Optional[NodeConfig] = None, settings=None):
         return await self._call_create(
             CreateNodeRequest(path=path, config=config).to_proto(),
             settings=settings,
-            wrap_args=(self,),
         )
 
-    async def describe_node(self, path: str, settings=None) -> NodeDescription:
+    async def describe_node(self, path: str, settings=None) -> NodeConfig:
         return await self._call_describe(
             DescribeNodeRequest(path=path).to_proto(),
             settings=settings,
-            wrap_args=(self, path),
         )
 
     async def alter_node(self, path: str, new_config: NodeConfig, settings=None):
         return await self._call_alter(
             AlterNodeRequest(path=path, config=new_config).to_proto(),
             settings=settings,
-            wrap_args=(self,),
         )
 
     async def delete_node(self, path: str, settings=None):
         return await self._call_delete(
             DropNodeRequest(path=path).to_proto(),
             settings=settings,
-            wrap_args=(self,),
         )
 
     async def lock(self):

ydb/coordination/__init__.py

@@ -1,18 +1,10 @@
 from .coordination_client import CoordinationClient
-from .coordination_client_async import AsyncCoordinationClient
 
 from ydb._grpc.grpcwrapper.ydb_coordination_public_types import (
     NodeConfig,
-    NodeDescription,
     ConsistencyMode,
     RateLimiterCountersMode,
+    DescribeResult,
 )
 
-__all__ = [
-    "CoordinationClient",
-    "NodeConfig",
-    "NodeDescription",
-    "ConsistencyMode",
-    "RateLimiterCountersMode",
-    "AsyncCoordinationClient",
-]
+__all__ = ["CoordinationClient", "NodeConfig", "ConsistencyMode", "RateLimiterCountersMode", "DescribeResult"]

ydb/coordination/base_coordination_client.py

@@ -1,64 +1,65 @@
 from ydb import _apis, issues
-from ydb._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig, NodeDescription
+from ydb._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig, DescribeResult
+import logging
 
 
-def wrapper_create_node(rpc_state, response_pb, client: "BaseCoordinationClient"):
+logger = logging.getLogger(__name__)
+
+
+def wrapper_create_node(rpc_state, response_pb):
     issues._process_response(response_pb.operation)
 
 
-def wrapper_describe_node(rpc_state, response_pb, client: "BaseCoordinationClient", path: str) -> NodeDescription:
+def wrapper_describe_node(rpc_state, response_pb) -> NodeConfig:
     issues._process_response(response_pb.operation)
-    return NodeDescription.from_proto(path, response_pb)
+    return DescribeResult.from_proto(response_pb)
 
 
-def wrapper_delete_node(rpc_state, response_pb, client: "BaseCoordinationClient"):
+def wrapper_delete_node(rpc_state, response_pb):
     issues._process_response(response_pb.operation)
 
 
-def wrapper_alter_node(rpc_state, response_pb, client: "BaseCoordinationClient"):
+def wrapper_alter_node(rpc_state, response_pb):
     issues._process_response(response_pb.operation)
 
 
 class BaseCoordinationClient:
     def __init__(self, driver):
+        logger.warning("Experimental API: interface may change in future releases.")
         self._driver = driver
 
-    def _call_create(self, request, settings=None, wrap_args=None):
+    def _call_create(self, request, settings=None):
         return self._driver(
             request,
             _apis.CoordinationService.Stub,
             _apis.CoordinationService.CreateNode,
             wrap_result=wrapper_create_node,
-            wrap_args=wrap_args,
             settings=settings,
         )
 
-    def _call_describe(self, request, settings=None, wrap_args=None):
+    def _call_describe(self, request, settings=None):
         return self._driver(
             request,
             _apis.CoordinationService.Stub,
             _apis.CoordinationService.DescribeNode,
             wrap_result=wrapper_describe_node,
-            wrap_args=wrap_args,
             settings=settings,
         )
 
-    def _call_alter(self, request, settings=None, wrap_args=None):
+    def _call_alter(self, request, settings=None):
         return self._driver(
             request,
             _apis.CoordinationService.Stub,
             _apis.CoordinationService.AlterNode,
             wrap_result=wrapper_alter_node,
-            wrap_args=wrap_args,
             settings=settings,
         )
 
-    def _call_delete(self, request, settings=None, wrap_args=None):
+    def _call_delete(self, request, settings=None):
         return self._driver(
             request,
             _apis.CoordinationService.Stub,
             _apis.CoordinationService.DropNode,
             wrap_result=wrapper_delete_node,
-            wrap_args=wrap_args,
             settings=settings,
         )

ydb/coordination/coordination_client.py

@@ -6,7 +6,7 @@
     AlterNodeRequest,
     DropNodeRequest,
 )
-from ydb._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig, NodeDescription
+from ydb._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig
 from ydb.coordination.base_coordination_client import BaseCoordinationClient
 
 
@@ -15,28 +15,24 @@ def create_node(self, path: str, config: Optional[NodeConfig], settings=None):
         return self._call_create(
             CreateNodeRequest(path=path, config=config).to_proto(),
             settings=settings,
-            wrap_args=(self,),
         )
 
-    def describe_node(self, path: str, settings=None) -> NodeDescription:
+    def describe_node(self, path: str, settings=None) -> NodeConfig:
         return self._call_describe(
             DescribeNodeRequest(path=path).to_proto(),
             settings=settings,
-            wrap_args=(self, path),
         )
 
     def alter_node(self, path: str, new_config: NodeConfig, settings=None):
         return self._call_alter(
             AlterNodeRequest(path=path, config=new_config).to_proto(),
             settings=settings,
-            wrap_args=(self,),
         )
 
     def delete_node(self, path: str, settings=None):
         return self._call_delete(
             DropNodeRequest(path=path).to_proto(),
             settings=settings,
-            wrap_args=(self,),
         )
 
     def lock(self):