Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 37 additions & 16 deletions ydb/_apis.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,42 @@
# -*- 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 for runtime
# noinspection PyUnreachableCode
if False:
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,
)

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 ._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,
)

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
FeatureFlag = ydb_common_pb2.FeatureFlag
Expand Down
11 changes: 9 additions & 2 deletions ydb/credentials.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 10 additions & 2 deletions ydb/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 11 additions & 2 deletions ydb/import_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 10 additions & 2 deletions ydb/scripting.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down