Skip to content

Commit b67866b

Browse files
authored
Merge pull request #207 remove magic of old package renaming, compatible with arcadia protobufs
2 parents b31efcb + 8175140 commit b67866b

File tree

15 files changed

+27
-68
lines changed

15 files changed

+27
-68
lines changed

kikimr/__init__.py

Whitespace-only changes.

kikimr/public/__init__.py

Whitespace-only changes.

kikimr/public/api/__init__.py

Lines changed: 0 additions & 6 deletions
This file was deleted.

kikimr/public/sdk/__init__.py

Whitespace-only changes.

kikimr/public/sdk/python/__init__.py

Whitespace-only changes.

kikimr/public/sdk/python/client/__init__.py

Lines changed: 0 additions & 20 deletions
This file was deleted.

kikimr/public/sdk/python/client/frameworks/__init__.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

kikimr/public/sdk/python/iam/__init__.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

kikimr/stub.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
the folder must not use for prevent issues with intersect with old packages.

ydb/_grpc/common/__init__.py

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import sys
2+
import importlib.util
23

34
import google.protobuf
45
from packaging.version import Version
@@ -8,15 +9,30 @@
89
# sdk code must always import from ydb._grpc.common
910
protobuf_version = Version(google.protobuf.__version__)
1011

11-
if protobuf_version < Version("4.0"):
12-
from ydb._grpc.v3 import * # noqa
13-
from ydb._grpc.v3 import protos # noqa
12+
# for compatible with arcadia
13+
if importlib.util.find_spec("ydb.public.api"):
14+
from ydb.public.api.grpc import * # noqa
1415

15-
sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v3"]
16-
sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v3.protos"]
16+
sys.modules["ydb._grpc.common"] = sys.modules["ydb.public.api.grpc"]
17+
18+
from ydb.public.api import protos
19+
20+
sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb.public.api.protos"]
1721
else:
18-
from ydb._grpc.v4 import * # noqa
19-
from ydb._grpc.v4 import protos # noqa
22+
# common way, outside of arcadia
23+
if protobuf_version < Version("4.0"):
24+
from ydb._grpc.v3 import * # noqa
25+
26+
sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v3"]
27+
28+
from ydb._grpc.v3 import protos # noqa
29+
30+
sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v3.protos"]
31+
else:
32+
from ydb._grpc.v4 import * # noqa
33+
34+
sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v4"]
35+
36+
from ydb._grpc.v4 import protos # noqa
2037

21-
sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v4"]
22-
sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v4.protos"]
38+
sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v4.protos"]

0 commit comments

Comments
 (0)