Merge pull request #207 remove magic of old package renaming, compati…

…ble with arcadia protobufs
ydb-platform · Mar 10, 2023 · b67866b · b67866b
2 parents b31efcb + 8175140
commit b67866b
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 68 deletions.
diff --git a/kikimr/__init__.py b/kikimr/__init__.py
diff --git a/kikimr/public/__init__.py b/kikimr/public/__init__.py
diff --git a/kikimr/public/api/__init__.py b/kikimr/public/api/__init__.py
diff --git a/kikimr/public/sdk/__init__.py b/kikimr/public/sdk/__init__.py
diff --git a/kikimr/public/sdk/python/__init__.py b/kikimr/public/sdk/python/__init__.py
diff --git a/kikimr/public/sdk/python/client/__init__.py b/kikimr/public/sdk/python/client/__init__.py
diff --git a/kikimr/public/sdk/python/client/frameworks/__init__.py b/kikimr/public/sdk/python/client/frameworks/__init__.py
diff --git a/kikimr/public/sdk/python/iam/__init__.py b/kikimr/public/sdk/python/iam/__init__.py
diff --git a/kikimr/stub.txt b/kikimr/stub.txt
@@ -0,0 +1 @@
+the folder must not use for prevent issues with intersect with old packages.
diff --git a/ydb/_grpc/common/__init__.py b/ydb/_grpc/common/__init__.py
@@ -1,4 +1,5 @@
 import sys
+import importlib.util
 
 import google.protobuf
 from packaging.version import Version
@@ -8,15 +9,30 @@
 # sdk code must always import from ydb._grpc.common
 protobuf_version = Version(google.protobuf.__version__)
 
-if protobuf_version < Version("4.0"):
-    from ydb._grpc.v3 import *  # noqa
-    from ydb._grpc.v3 import protos  # noqa
+# for compatible with arcadia
+if importlib.util.find_spec("ydb.public.api"):
+    from ydb.public.api.grpc import *  # noqa
 
-    sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v3"]
-    sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v3.protos"]
+    sys.modules["ydb._grpc.common"] = sys.modules["ydb.public.api.grpc"]
+
+    from ydb.public.api import protos
+
+    sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb.public.api.protos"]
 else:
-    from ydb._grpc.v4 import *  # noqa
-    from ydb._grpc.v4 import protos  # noqa
+    # common way, outside of arcadia
+    if protobuf_version < Version("4.0"):
+        from ydb._grpc.v3 import *  # noqa
+
+        sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v3"]
+
+        from ydb._grpc.v3 import protos  # noqa
+
+        sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v3.protos"]
+    else:
+        from ydb._grpc.v4 import *  # noqa
+
+        sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v4"]
+
+        from ydb._grpc.v4 import protos  # noqa
 
-    sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v4"]
-    sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v4.protos"]
+        sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v4.protos"]
diff --git a/ydb/public/__init__.py b/ydb/public/__init__.py
diff --git a/ydb/public/api/__init__.py b/ydb/public/api/__init__.py
diff --git a/ydb/public/api/grpc/__init__.py b/ydb/public/api/grpc/__init__.py
diff --git a/ydb/public/api/protos/__init__.py b/ydb/public/api/protos/__init__.py
diff --git a/ydb/public/stub.txt b/ydb/public/stub.txt
@@ -0,0 +1 @@
+the folder must not use for prevent issues with intersect with old protobuf generate packages.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		the folder must not use for prevent issues with intersect with old packages.