Merge pull request #149 move topic grpc wrapper code to one file

Author: rekby

tox.ini

@@ -46,12 +46,12 @@ deps =
 [testenv:black-format]
 skip_install = true
 commands =
-    black ydb examples tests --extend-exclude ydb/_grpc
+    black ydb examples tests --extend-exclude "ydb/_grpc/v3|ydb/_grpc/v4"
 
 [testenv:black]
 skip_install = true
 commands =
-    black --diff --check ydb examples tests --extend-exclude ydb/_grpc
+    black --diff --check ydb examples tests --extend-exclude "ydb/_grpc/v3|ydb/_grpc/v4"
 
 [testenv:pylint]
 deps = pylint

ydb/_grpc/common/__init__.py

@@ -9,12 +9,14 @@
 protobuf_version = Version(google.protobuf.__version__)
 
 if protobuf_version < Version("4.0"):
-    from ydb._grpc.v3 import * # noqa
-    from ydb._grpc.v3 import protos # noqa
+    from ydb._grpc.v3 import *  # noqa
+    from ydb._grpc.v3 import protos  # noqa
+
     sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v3"]
     sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v3.protos"]
 else:
-    from ydb._grpc.v4 import * # noqa
-    from ydb._grpc.v4 import protos # noqa
+    from ydb._grpc.v4 import *  # noqa
+    from ydb._grpc.v4 import protos  # noqa
+
     sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v4"]
     sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v4.protos"]

ydb/_topic_wrapper/__init__.py ydb/_grpc/grpcwrapper/__init__.pyydb/_topic_wrapper/__init__.py renamed to ydb/_grpc/grpcwrapper/__init__.py

@@ -2,46 +2,20 @@
 import asyncio
 import typing
 from dataclasses import dataclass
-from enum import IntEnum
 
 import grpc
 from google.protobuf.message import Message
 
 import ydb.aio
 
-from .. import issues, connection
-
-# Workaround for good autocomplete in IDE and universal import at runtime
+# Workaround for good IDE and universal for runtime
 # noinspection PyUnreachableCode
 if False:
-    from ydb._grpc.v4.protos import (
-        ydb_issue_message_pb2,
-        ydb_topic_pb2,
-    )
+    from ..v4.protos import ydb_topic_pb2, ydb_issue_message_pb2
 else:
-    # noinspection PyUnresolvedReferences
-    from ydb._grpc.common.protos import (
-        ydb_issue_message_pb2,
-        ydb_topic_pb2,
-    )
-
-
-class Codec(IntEnum):
-    CODEC_UNSPECIFIED = 0
-    CODEC_RAW = 1
-    CODEC_GZIP = 2
-    CODEC_LZOP = 3
-    CODEC_ZSTD = 4
+    from ..common.protos import ydb_topic_pb2, ydb_issue_message_pb2
 
-
-class IToProto(abc.ABC):
-    @abc.abstractmethod
-    def to_proto(self) -> Message:
-        pass
-
-
-class UnknownGrpcMessageError(ydb.Error):
-    pass
+from ... import issues, connection
 
 
 class IFromProto(abc.ABC):
@@ -51,17 +25,14 @@ def from_proto(msg: Message) -> typing.Any:
         pass
 
 
-@dataclass
-class OffsetsRange(IFromProto):
-    start: int
-    end: int
+class IToProto(abc.ABC):
+    @abc.abstractmethod
+    def to_proto(self) -> Message:
+        pass
 
-    @staticmethod
-    def from_proto(msg: ydb_topic_pb2.OffsetsRange) -> "OffsetsRange":
-        return OffsetsRange(
-            start=msg.start,
-            end=msg.end,
-        )
+
+class UnknownGrpcMessageError(issues.Error):
+    pass
 
 
 class QueueToIteratorAsyncIO:
@@ -119,19 +90,6 @@ async def __anext__(self):
             raise StopIteration()
 
 
-class IteratorToQueueAsyncIO:
-    __slots__ = ("_iterator",)
-
-    def __init__(self, iterator: typing.AsyncIterator[typing.Any]):
-        self._iterator = iterator
-
-    async def get(self) -> typing.Any:
-        try:
-            return self._iterator.__anext__()
-        except StopAsyncIteration:
-            raise asyncio.QueueEmpty()
-
-
 class IGrpcWrapperAsyncIO(abc.ABC):
     @abc.abstractmethod
     async def receive(self) -> typing.Any:
@@ -239,26 +197,6 @@ def issue_to_str(cls, issue: ydb_issue_message_pb2.IssueMessage):
         return res
 
 
-@dataclass
-class UpdateTokenRequest(IToProto):
-    token: str
-
-    def to_proto(self) -> Message:
-        res = ydb_topic_pb2.UpdateTokenRequest()
-        res.token = self.token
-        return res
-
-
-@dataclass
-class UpdateTokenResponse(IFromProto):
-    @staticmethod
-    def from_proto(msg: ydb_topic_pb2.UpdateTokenResponse) -> typing.Any:
-        return UpdateTokenResponse()
-
-
-TokenGetterFuncType = typing.Optional[typing.Callable[[], str]]
-
-
 def callback_from_asyncio(
     callback: typing.Union[typing.Callable, typing.Coroutine]
 ) -> [asyncio.Future, asyncio.Task]: