prep for rebase

Author: slampy97

tests/coordination/test_coordination_client.py

@@ -5,7 +5,8 @@
 import pytest
 
 import ydb
-from ydb import aio, StatusCode, logger
+from ydb.aio.coordination import CoordinationClient as AioCoordinationClient
+from ydb import StatusCode, logger
 
 from ydb.coordination import (
     NodeConfig,
@@ -46,7 +47,7 @@ def sync_coordination_node(driver_sync):
 
 @pytest.fixture
 async def async_coordination_node(aio_connection):
-    client = aio.CoordinationClient(aio_connection)
+    client = AioCoordinationClient(aio_connection)
     node_path = "/local/test_node"
 
     try:

ydb/aio/coordination/client.py

@@ -1,15 +1,15 @@
 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
 
-from ydb.aio.coordination.lock import CoordinationLock
+from .lock import CoordinationLock
 
 
 class CoordinationClient(BaseCoordinationClient):

ydb/coordination/__init__.py

@@ -1,14 +1,3 @@
-from .coordination_client import CoordinationClient
-
-from ydb._grpc.grpcwrapper.ydb_coordination_public_types import (
-    NodeConfig,
-    ConsistencyMode,
-    RateLimiterCountersMode,
-    DescribeResult,
-    CreateSemaphoreResult,
-    DescribeLockResult,
-)
-
 __all__ = [
     "CoordinationClient",
     "NodeConfig",
@@ -18,3 +7,15 @@
     "CreateSemaphoreResult",
     "DescribeLockResult",
 ]
+
+from .client import CoordinationClient
+
+
+from .._grpc.grpcwrapper.ydb_coordination_public_types import (
+    NodeConfig,
+    ConsistencyMode,
+    RateLimiterCountersMode,
+    DescribeResult,
+    CreateSemaphoreResult,
+    DescribeLockResult,
+)

…coordination/base_coordination_client.py ydb/coordination/base.pyydb/coordination/base_coordination_client.py renamed to ydb/coordination/base.py 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 ydb/coordination/client.pyydb/coordination/coordination_client.py renamed to ydb/coordination/client.py

@@ -1,14 +1,14 @@
 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 ydb.coordination.lock_sync import CoordinationLockSync
+from .._grpc.grpcwrapper.ydb_coordination_public_types import NodeConfig
+from .base import BaseCoordinationClient
+from .lock_sync import CoordinationLockSync
 
 
 class CoordinationClient(BaseCoordinationClient):