diff --git a/tests/coordination/test_coordination_client.py b/tests/coordination/test_coordination_client.py index 98fb6768..460c1139 100644 --- a/tests/coordination/test_coordination_client.py +++ b/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: diff --git a/ydb/aio/__init__.py b/ydb/aio/__init__.py index d38d9e73..4e4192a8 100644 --- a/ydb/aio/__init__.py +++ b/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 diff --git a/ydb/aio/coordination/__init__.py b/ydb/aio/coordination/__init__.py new file mode 100644 index 00000000..f6d48237 --- /dev/null +++ b/ydb/aio/coordination/__init__.py @@ -0,0 +1,5 @@ +__all__ = [ + "CoordinationClient", +] + +from .client import CoordinationClient diff --git a/ydb/aio/coordination_client.py b/ydb/aio/coordination/client.py similarity index 84% rename from ydb/aio/coordination_client.py rename to ydb/aio/coordination/client.py index 9aab6785..b36b8950 100644 --- a/ydb/aio/coordination_client.py +++ b/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): diff --git a/ydb/coordination/__init__.py b/ydb/coordination/__init__.py index 55834e89..fd994c56 100644 --- a/ydb/coordination/__init__.py +++ b/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"] diff --git a/ydb/coordination/base_coordination_client.py b/ydb/coordination/base.py similarity index 93% rename from ydb/coordination/base_coordination_client.py rename to ydb/coordination/base.py index d2b5bf8c..0be7cb8f 100644 --- a/ydb/coordination/base_coordination_client.py +++ b/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 diff --git a/ydb/coordination/coordination_client.py b/ydb/coordination/client.py similarity index 84% rename from ydb/coordination/coordination_client.py rename to ydb/coordination/client.py index 24dd999d..549528d9 100644 --- a/ydb/coordination/coordination_client.py +++ b/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):