fix imports

Author: rekby

ydb/_topic_writer/__init__.py

@@ -1 +0,0 @@
-from .topic_writer import *

ydb/_topic_writer/topic_writer_asyncio_test.py

@@ -12,26 +12,20 @@
 import pytest
 
 
-import ydb.aio
-from ydb import _apis, StatusCode, issues
-from ydb._topic_wrapper.common import QueueToIteratorAsyncIO, ServerStatus, IGrpcWrapperAsyncIO, IToProto, Codec
-from ydb._topic_writer import InternalMessage, PublicMessage, WriterSettings, PublicWriterSettings, \
+from .. import aio
+from .. import StatusCode, issues
+from .._topic_wrapper.common import ServerStatus, IGrpcWrapperAsyncIO, IToProto, Codec
+from .topic_writer import InternalMessage, PublicMessage, WriterSettings, PublicWriterSettings, \
     PublicWriterInitInfo, PublicWriteResult, TopicWriterError
 
-# Workaround for good IDE and universal runtime
-if False:
-    from ydb._grpc.v4.protos import ydb_topic_pb2, ydb_status_codes_pb2
-else:
-    from ydb._grpc.common.protos import ydb_topic_pb2, ydb_status_codes_pb2
-
 from .._topic_wrapper.writer import StreamWriteMessage
-from ydb._topic_writer.topic_writer_asyncio import WriterAsyncIOStream, WriterAsyncIOReconnector, TokenGetter, \
+from .topic_writer_asyncio import WriterAsyncIOStream, WriterAsyncIOReconnector, TokenGetter, \
     WriterAsyncIO
 
 
 @pytest.fixture
-def default_driver() -> ydb.aio.Driver:
-    driver = mock.Mock(spec=ydb.aio.Driver)
+def default_driver() -> aio.Driver:
+    driver = mock.Mock(spec=aio.Driver)
     driver._credentials = mock.Mock()
     return driver
 

ydb/_topic_writer/topic_writer_sync.py

@@ -5,11 +5,11 @@
 import threading
 from typing import Union, List, Optional, Coroutine
 
-import ydb
 from .._topic_wrapper.common import SupportedDriverType
-from ydb._topic_writer import PublicWriterSettings, TopicWriterError, PublicWriterInitInfo, PublicMessage, Writer, \
+from .topic_writer import PublicWriterSettings, TopicWriterError, PublicWriterInitInfo, PublicMessage, Writer, \
     PublicWriteResult
-from ydb._topic_writer.topic_writer_asyncio import WriterAsyncIO
+
+from .topic_writer_asyncio import WriterAsyncIO
 
 _shared_event_loop_lock = threading.Lock()
 _shared_event_loop = None  # type: Optional[asyncio.AbstractEventLoop]

ydb/topic.py

@@ -7,9 +7,10 @@
     Selector as TopicSelector,
 )
 
-from ydb._topic_writer import (
+from ydb._topic_writer.topic_writer import (
     Writer as TopicWriter,
     PublicWriterSettings as TopicWriterSettings,
+    PublicMessage as TopicWriterMessage,
 )
 
 from ydb._topic_writer.topic_writer_asyncio import WriterAsyncIO as TopicWriterAsyncIO