Merge branch 'main' into merge-from-main

# Conflicts:
#	ydb/_apis.py

Author: rekby

test-requirements.txt

@@ -1,5 +1,6 @@
 attrs==21.2.0
 bcrypt==3.2.0
+black==22.12.0
 cached-property==1.5.2
 certifi==2022.12.7
 cffi==1.14.6

tox.ini

@@ -45,13 +45,11 @@ deps =
 
 [testenv:black-format]
 skip_install = true
-deps = black
 commands =
     black ydb examples tests --extend-exclude ydb/_grpc
 
 [testenv:black]
 skip_install = true
-deps = black
 commands =
     black --diff --check ydb examples tests --extend-exclude ydb/_grpc
 

ydb/_apis.py

@@ -1,26 +1,44 @@
 # -*- coding: utf-8 -*-
-from ydb._grpc.common import (
-    ydb_cms_v1_pb2_grpc,
-    ydb_discovery_v1_pb2_grpc,
-    ydb_scheme_v1_pb2_grpc,
-    ydb_table_v1_pb2_grpc,
-)
-from ydb._grpc.common.protos import (
-    ydb_status_codes_pb2,
-    ydb_discovery_pb2,
-    ydb_scheme_pb2,
-    ydb_table_pb2,
-    ydb_value_pb2,
-)
-from ydb._grpc.common.protos import ydb_operation_pb2
-from ydb._grpc.common.protos import ydb_common_pb2
-from ydb._grpc.common import ydb_operation_v1_pb2_grpc
-
-# Workaround for good IDE and universal runtime
+# Workaround for good IDE and universal for runtime
+# noinspection PyUnreachableCode
 if False:
-    from ydb._grpc.v4 import ydb_topic_v1_pb2_grpc
+    from ._grpc.v4 import (
+        ydb_cms_v1_pb2_grpc,
+        ydb_discovery_v1_pb2_grpc,
+        ydb_scheme_v1_pb2_grpc,
+        ydb_table_v1_pb2_grpc,
+        ydb_operation_v1_pb2_grpc,
+        ydb_topic_v1_pb2_grpc,
+    )
+
+    from ._grpc.v4.protos import (
+        ydb_status_codes_pb2,
+        ydb_discovery_pb2,
+        ydb_scheme_pb2,
+        ydb_table_pb2,
+        ydb_value_pb2,
+        ydb_operation_pb2,
+        ydb_common_pb2,
+    )
 else:
-    from ydb._grpc.common import ydb_topic_v1_pb2_grpc
+    from ._grpc.common import (
+        ydb_cms_v1_pb2_grpc,
+        ydb_discovery_v1_pb2_grpc,
+        ydb_scheme_v1_pb2_grpc,
+        ydb_table_v1_pb2_grpc,
+        ydb_operation_v1_pb2_grpc,
+        ydb_topic_v1_pb2_grpc,
+    )
+
+    from ._grpc.common.protos import (
+        ydb_status_codes_pb2,
+        ydb_discovery_pb2,
+        ydb_scheme_pb2,
+        ydb_table_pb2,
+        ydb_value_pb2,
+        ydb_operation_pb2,
+        ydb_common_pb2,
+    )
 
 
 StatusIds = ydb_status_codes_pb2.StatusIds

ydb/credentials.py

@@ -7,8 +7,15 @@
 from concurrent import futures
 import logging
 import time
-from ydb._grpc.common.protos import ydb_auth_pb2
-from ydb._grpc.common import ydb_auth_v1_pb2_grpc
+
+# Workaround for good IDE and universal for runtime
+# noinspection PyUnreachableCode
+if False:
+    from ._grpc.v4.protos import ydb_auth_pb2
+    from ._grpc.v4 import ydb_auth_v1_pb2_grpc
+else:
+    from ._grpc.common.protos import ydb_auth_pb2
+    from ._grpc.common import ydb_auth_v1_pb2_grpc
 
 
 YDB_AUTH_TICKET_HEADER = "x-ydb-auth-ticket"

ydb/export.py

@@ -3,8 +3,16 @@
 from . import _apis
 
 from . import settings_impl as s_impl
-from ydb._grpc.common.protos import ydb_export_pb2
-from ydb._grpc.common import ydb_export_v1_pb2_grpc
+
+# Workaround for good IDE and universal for runtime
+# noinspection PyUnreachableCode
+if False:
+    from ._grpc.v4.protos import ydb_export_pb2
+    from ._grpc.v4 import ydb_export_v1_pb2_grpc
+else:
+    from ._grpc.common.protos import ydb_export_pb2
+    from ._grpc.common import ydb_export_v1_pb2_grpc
+
 from . import operation
 
 _ExportToYt = "ExportToYt"

ydb/import_client.py

@@ -3,8 +3,17 @@
 from . import _apis
 
 from . import settings_impl as s_impl
-from ydb._grpc.common.protos import ydb_import_pb2
-from ydb._grpc.common import ydb_import_v1_pb2_grpc
+
+# Workaround for good IDE and universal for runtime
+# noinspection PyUnreachableCode
+if False:
+    from ._grpc.v4.protos import ydb_import_pb2
+    from ._grpc.v4 import ydb_import_v1_pb2_grpc
+else:
+    from ._grpc.common.protos import ydb_import_pb2
+    from ._grpc.common import ydb_import_v1_pb2_grpc
+
+
 from . import operation
 
 _ImportFromS3 = "ImportFromS3"

ydb/scripting.py

@@ -1,5 +1,13 @@
-from ydb._grpc.common.protos import ydb_scripting_pb2
-from ydb._grpc.common import ydb_scripting_v1_pb2_grpc
+# Workaround for good IDE and universal for runtime
+# noinspection PyUnreachableCode
+if False:
+    from ._grpc.v4.protos import ydb_scripting_pb2
+    from ._grpc.v4 import ydb_scripting_v1_pb2_grpc
+else:
+    from ._grpc.common.protos import ydb_scripting_pb2
+    from ._grpc.common import ydb_scripting_v1_pb2_grpc
+
+
 from . import issues, convert, settings