Merge pull request #450 from ydb-platform/fix_drafts_import

Move draft imports to draft folder

Author: vgvoleg

ydb/_apis.py

@@ -12,10 +12,6 @@
         ydb_topic_v1_pb2_grpc,
     )
 
-    from ._grpc.v4.draft import (
-        ydb_dynamic_config_v1_pb2_grpc,
-    )
-
     from ._grpc.v4.protos import (
         ydb_status_codes_pb2,
         ydb_discovery_pb2,
@@ -26,9 +22,6 @@
         ydb_common_pb2,
     )
 
-    from ._grpc.v4.draft.protos import (
-        ydb_dynamic_config_pb2,
-    )
 else:
     from ._grpc.common import (
         ydb_cms_v1_pb2_grpc,
@@ -39,10 +32,6 @@
         ydb_topic_v1_pb2_grpc,
     )
 
-    from ._grpc.common.draft import (
-        ydb_dynamic_config_v1_pb2_grpc,
-    )
-
     from ._grpc.common.protos import (
         ydb_status_codes_pb2,
         ydb_discovery_pb2,
@@ -53,10 +42,6 @@
         ydb_common_pb2,
     )
 
-    from ._grpc.common.draft.protos import (
-        ydb_dynamic_config_pb2,
-    )
-
 
 StatusIds = ydb_status_codes_pb2.StatusIds
 FeatureFlag = ydb_common_pb2.FeatureFlag
@@ -66,7 +51,6 @@
 ydb_table = ydb_table_pb2
 ydb_discovery = ydb_discovery_pb2
 ydb_operation = ydb_operation_pb2
-ydb_dynamic_config = ydb_dynamic_config_pb2
 
 
 class CmsService(object):
@@ -127,12 +111,3 @@ class TopicService(object):
     DropTopic = "DropTopic"
     StreamRead = "StreamRead"
     StreamWrite = "StreamWrite"
-
-
-class DynamicConfigService(object):
-    Stub = ydb_dynamic_config_v1_pb2_grpc.DynamicConfigServiceStub
-
-    ReplaceConfig = "ReplaceConfig"
-    SetConfig = "SetConfig"
-    GetConfig = "GetConfig"
-    GetNodeLabels = "GetNodeLabels"

ydb/draft/_apis.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+import typing
+
+# Workaround for good IDE and universal for runtime
+if typing.TYPE_CHECKING:
+    from .._grpc.v4.draft import (
+        ydb_dynamic_config_v1_pb2_grpc,
+    )
+
+    from .._grpc.v4.draft.protos import (
+        ydb_dynamic_config_pb2,
+    )
+else:
+    from .._grpc.common.draft import (
+        ydb_dynamic_config_v1_pb2_grpc,
+    )
+
+    from .._grpc.common.draft.protos import (
+        ydb_dynamic_config_pb2,
+    )
+
+
+ydb_dynamic_config = ydb_dynamic_config_pb2
+
+
+class DynamicConfigService(object):
+    Stub = ydb_dynamic_config_v1_pb2_grpc.DynamicConfigServiceStub
+
+    ReplaceConfig = "ReplaceConfig"
+    SetConfig = "SetConfig"
+    GetConfig = "GetConfig"
+    GetNodeLabels = "GetNodeLabels"

ydb/draft/dynamic_config.py

@@ -1,6 +1,7 @@
 import abc
 from abc import abstractmethod
-from .. import issues, operation, _apis
+from . import _apis
+from .. import issues, operation
 
 
 class IDynamicConfigClient(abc.ABC):