Merge pull request #730 from ydb-platform/coordination_service_refactor_package

Refactor coordination service package

Author: vgvoleg

tests/coordination/test_coordination_client.py

@@ -1,7 +1,7 @@
 import pytest
 
 import ydb
-from ydb import aio
+from ydb.aio.coordination import CoordinationClient as AioCoordinationClient
 
 from ydb.coordination import (
     NodeConfig,
@@ -54,7 +54,7 @@ def test_coordination_node_lifecycle(self, driver_sync: ydb.Driver):
             client.describe_node(node_path)
 
     async def test_coordination_node_lifecycle_async(self, aio_connection):
-        client = aio.CoordinationClient(aio_connection)
+        client = AioCoordinationClient(aio_connection)
         node_path = "/local/test_node_lifecycle"
 
         try:

ydb/aio/__init__.py

@@ -1,4 +1,5 @@
 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
+
+# from .coordination import CoordinationClient  # noqa

ydb/aio/coordination/__init__.py

@@ -0,0 +1,5 @@
+__all__ = [
+    "CoordinationClient",
+]
+
+from .client import CoordinationClient

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

@@ -1,13 +1,13 @@
 from typing import Optional
 
-from ydb._grpc.grpcwrapper.ydb_coordination import (
+from ..._grpc.grpcwrapper.ydb_coordination import (
     CreateNodeRequest,
     DescribeNodeRequest,
     AlterNodeRequest,
     DropNodeRequest,
 )
-from ydb._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig
-from ydb.coordination.base_coordination_client import BaseCoordinationClient
+from ..._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig
+from ...coordination.base import BaseCoordinationClient
 
 
 class CoordinationClient(BaseCoordinationClient):

ydb/coordination/__init__.py

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

ydb/coordination/base_coordination_client.py renamed to ydb/coordination/base.py

@@ -1,5 +1,5 @@
-from ydb import _apis, issues
-from ydb._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig, DescribeResult
+from .. import _apis, issues
+from .._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig, DescribeResult
 import logging
 
 

ydb/coordination/coordination_client.py renamed to ydb/coordination/client.py

@@ -1,13 +1,13 @@
 from typing import Optional
 
-from ydb._grpc.grpcwrapper.ydb_coordination import (
+from .._grpc.grpcwrapper.ydb_coordination import (
     CreateNodeRequest,
     DescribeNodeRequest,
     AlterNodeRequest,
     DropNodeRequest,
 )
-from ydb._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig
-from ydb.coordination.base_coordination_client import BaseCoordinationClient
+from .._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig
+from .base import BaseCoordinationClient
 
 
 class CoordinationClient(BaseCoordinationClient):