Skip to content

Commit e473176

Browse files
committed
fix arcadia compatibility
1 parent 42140da commit e473176

File tree

2 files changed

+25
-8
lines changed

2 files changed

+25
-8
lines changed

ydb/_grpc/common/__init__.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@
1010
protobuf_version = Version(google.protobuf.__version__)
1111

1212
# for compatible with arcadia
13-
if _utilities.check_module_exists("ydb.public.api"):
13+
if _utilities.check_module_exists("contrib.ydb.public.api"):
14+
from contrib.ydb.public.api.grpc import * # noqa
15+
16+
sys.modules["ydb._grpc.common"] = sys.modules["contrib.ydb.public.api.grpc"]
17+
18+
from contrib.ydb.public.api import protos
19+
20+
sys.modules["ydb._grpc.common.protos"] = sys.modules["contrib.ydb.public.api.protos"]
21+
elif _utilities.check_module_exists("ydb.public.api"):
1422
from ydb.public.api.grpc import * # noqa
1523

1624
sys.modules["ydb._grpc.common"] = sys.modules["ydb.public.api.grpc"]

ydb/draft/_apis.py

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,22 @@
1111
ydb_dynamic_config_pb2,
1212
)
1313
else:
14-
from .._grpc.common.draft import (
15-
ydb_dynamic_config_v1_pb2_grpc,
16-
)
17-
18-
from .._grpc.common.draft.protos import (
19-
ydb_dynamic_config_pb2,
20-
)
14+
try:
15+
from .._grpc.common.draft import (
16+
ydb_dynamic_config_v1_pb2_grpc,
17+
)
18+
19+
from .._grpc.common.draft.protos import (
20+
ydb_dynamic_config_pb2,
21+
)
22+
except ImportError:
23+
from .._grpc.common.draft import (
24+
ydb_dynamic_config_v1_pb2_grpc,
25+
)
26+
27+
from .._grpc.common.protos.draft import (
28+
ydb_dynamic_config_pb2,
29+
)
2130

2231

2332
ydb_dynamic_config = ydb_dynamic_config_pb2

0 commit comments

Comments
 (0)