From b4505f395c08b5979f71fb54a04331315c04348d Mon Sep 17 00:00:00 2001 From: Oleg Ovcharuk Date: Wed, 9 Oct 2024 11:32:19 +0300 Subject: [PATCH 1/2] fix arcadia compatibility --- ydb/_grpc/common/__init__.py | 10 +++++++++- ydb/draft/_apis.py | 12 ++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ydb/_grpc/common/__init__.py b/ydb/_grpc/common/__init__.py index 3b56178b..bab864e0 100644 --- a/ydb/_grpc/common/__init__.py +++ b/ydb/_grpc/common/__init__.py @@ -10,7 +10,15 @@ protobuf_version = Version(google.protobuf.__version__) # for compatible with arcadia -if _utilities.check_module_exists("ydb.public.api"): +if _utilities.check_module_exists("contrib.ydb.public.api"): + from contrib.ydb.public.api.grpc import * # noqa + + sys.modules["ydb._grpc.common"] = sys.modules["contrib.ydb.public.api.grpc"] + + from contrib.ydb.public.api import protos + + sys.modules["ydb._grpc.common.protos"] = sys.modules["contrib.ydb.public.api.protos"] +elif _utilities.check_module_exists("ydb.public.api"): from ydb.public.api.grpc import * # noqa sys.modules["ydb._grpc.common"] = sys.modules["ydb.public.api.grpc"] diff --git a/ydb/draft/_apis.py b/ydb/draft/_apis.py index 5b878677..d7b93b0a 100644 --- a/ydb/draft/_apis.py +++ b/ydb/draft/_apis.py @@ -14,10 +14,14 @@ from .._grpc.common.draft import ( ydb_dynamic_config_v1_pb2_grpc, ) - - from .._grpc.common.draft.protos import ( - ydb_dynamic_config_pb2, - ) + try: + from .._grpc.common.draft.protos import ( + ydb_dynamic_config_pb2, + ) + except ImportError: + from .._grpc.common.protos.draft import ( + ydb_dynamic_config_pb2, + ) ydb_dynamic_config = ydb_dynamic_config_pb2 From 4d6ce5c5cfbb486072f13e2c577caa44d3fb6830 Mon Sep 17 00:00:00 2001 From: Oleg Ovcharuk Date: Wed, 9 Oct 2024 13:58:10 +0300 Subject: [PATCH 2/2] style fixes --- ydb/draft/_apis.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ydb/draft/_apis.py b/ydb/draft/_apis.py index d7b93b0a..e3f63387 100644 --- a/ydb/draft/_apis.py +++ b/ydb/draft/_apis.py @@ -14,6 +14,7 @@ from .._grpc.common.draft import ( ydb_dynamic_config_v1_pb2_grpc, ) + try: from .._grpc.common.draft.protos import ( ydb_dynamic_config_pb2,