diff --git a/kikimr/__init__.py b/kikimr/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/kikimr/public/__init__.py b/kikimr/public/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/kikimr/public/api/__init__.py b/kikimr/public/api/__init__.py deleted file mode 100644 index c97daf69..00000000 --- a/kikimr/public/api/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -from ydb.public.api import * # noqa -import sys -import warnings - -sys.modules['kikimr.public.api'] = sys.modules['ydb.public.api'] -warnings.warn("using kikimr.public.api module is deprecated. please use ydb.public.api import instead") diff --git a/kikimr/public/sdk/__init__.py b/kikimr/public/sdk/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/kikimr/public/sdk/python/__init__.py b/kikimr/public/sdk/python/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/kikimr/public/sdk/python/client/__init__.py b/kikimr/public/sdk/python/client/__init__.py deleted file mode 100644 index 157c103e..00000000 --- a/kikimr/public/sdk/python/client/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from ydb import * # noqa -import sys -import warnings - -warnings.warn("module kikimr.public.sdk.python.client is deprecated. please use ydb instead") - - -for name, module in sys.modules.copy().items(): - if not name.startswith("ydb"): - continue - - if name.startswith("ydb.public"): - continue - - module_import_path = name.split('.') - if len(module_import_path) < 2: - continue - - sys.modules['kikimr.public.sdk.python.client.' + '.'.join(module_import_path[1:])] = module diff --git a/kikimr/public/sdk/python/client/frameworks/__init__.py b/kikimr/public/sdk/python/client/frameworks/__init__.py deleted file mode 100644 index e5c4940a..00000000 --- a/kikimr/public/sdk/python/client/frameworks/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -try: - from ydb.tornado import * # noqa - import sys - import warnings - - warnings.warn("module kikimr.public.sdk.python.client.frameworks is deprecated. please use ydb.tornado instead") - - sys.modules['kikimr.public.sdk.python.client.frameworks.tornado_helpers'] = sys.modules['ydb.tornado.tornado_helpers'] -except ImportError: - pass diff --git a/kikimr/public/sdk/python/iam/__init__.py b/kikimr/public/sdk/python/iam/__init__.py deleted file mode 100644 index 884d5c1b..00000000 --- a/kikimr/public/sdk/python/iam/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from ydb.iam import * # noqa -import sys -import warnings - -warnings.warn("using kikimr.public.sdk.python.iam module is deprecated. please use ydb.iam import instead") - -sys.modules['kikimr.public.sdk.python.iam.auth'] = sys.modules['ydb.iam.auth'] diff --git a/kikimr/stub.txt b/kikimr/stub.txt new file mode 100644 index 00000000..7467d31a --- /dev/null +++ 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 index 4a5ef87b..1a077800 100644 --- 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 deleted file mode 100644 index e69de29b..00000000 diff --git a/ydb/public/api/__init__.py b/ydb/public/api/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/ydb/public/api/grpc/__init__.py b/ydb/public/api/grpc/__init__.py deleted file mode 100644 index 08dd1066..00000000 --- a/ydb/public/api/grpc/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from ydb._grpc.common import * # noqa -import sys -import warnings - -sys.modules["ydb.public.api.grpc"] = sys.modules["ydb._grpc.common"] -warnings.warn( - "using ydb.public.api.grpc module is deprecated. Don't use direct grpc dependencies." -) diff --git a/ydb/public/api/protos/__init__.py b/ydb/public/api/protos/__init__.py deleted file mode 100644 index 204ff3b9..00000000 --- a/ydb/public/api/protos/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from ydb._grpc.common.protos import * # noqa -import sys -import warnings - -sys.modules["ydb.public.api.protos"] = sys.modules["ydb._grpc.common.protos"] -warnings.warn( - "using ydb.public.api.protos module is deprecated. Don't use direct grpc dependencies." -) diff --git a/ydb/public/stub.txt b/ydb/public/stub.txt new file mode 100644 index 00000000..6c4e84e7 --- /dev/null +++ b/ydb/public/stub.txt @@ -0,0 +1 @@ +the folder must not use for prevent issues with intersect with old protobuf generate packages.