intermediate changes

ref:9091872
sync: https://proxy.sandbox.yandex-team.ru/2748294842

Author: arcadia-devtools

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.16 ##
+
+* alias `kikimr.public.sdk.python.client` is deprecated. use `import ydb` instead.
+* alias `kikimr.public.api` is deprecated, use `ydb.public.api` instead.
+* method `construct_credentials_from_environ` is now deprecated and will be removed in the future.
+
 ## 1.1.15 ##
 
 * override the default load balancing policy for discovery endpoint to the `round_robin` policy.

kikimr/__init__.py

@@ -0,0 +1,6 @@
+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")

kikimr/public/__init__.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from ydb import *  # noqa
+import sys
+import six
+import warnings
+
+warnings.warn("module kikimr.public.sdk.python.client is deprecated. please use ydb instead")
+
+
+for name, module in six.iteritems(sys.modules.copy()):
+    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

kikimr/public/api/__init__.py

@@ -0,0 +1,10 @@
+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

kikimr/public/sdk/__init__.py

@@ -0,0 +1,7 @@
+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']

kikimr/public/sdk/python/__init__.py

@@ -2,6 +2,7 @@
 import os
 
 from . import credentials, tracing
+import warnings
 
 
 def read_bytes(f):
@@ -18,22 +19,29 @@ def load_ydb_root_certificate():
 
 def construct_credentials_from_environ(tracer=None):
     tracer = tracer if tracer is not None else tracing.Tracer(None)
+    warnings.warn(
+        "using construct_credentials_from_environ method for credentials instantiation is deprecated and will be "
+        "removed in the future major releases. Please instantialize credentials by default or provide correct credentials "
+        "instance to the Driver."
+    )
+
     # dynamically import required authentication libraries
     if (
         os.getenv("USE_METADATA_CREDENTIALS") is not None
         and int(os.getenv("USE_METADATA_CREDENTIALS")) == 1
     ):
-        from kikimr.public.sdk.python import iam
+        import ydb.iam
 
         tracing.trace(tracer, {"credentials.metadata": True})
-        return iam.MetadataUrlCredentials()
+        return ydb.iam.MetadataUrlCredentials()
 
     if os.getenv("YDB_TOKEN") is not None:
         tracing.trace(tracer, {"credentials.access_token": True})
         return credentials.AuthTokenCredentials(os.getenv("YDB_TOKEN"))
 
     if os.getenv("SA_KEY_FILE") is not None:
-        from kikimr.public.sdk.python import iam
+
+        import ydb.iam
 
         tracing.trace(tracer, {"credentials.sa_key_file": True})
         root_certificates_file = os.getenv("SSL_ROOT_CERTIFICATES_FILE", None)
@@ -42,7 +50,7 @@ def construct_credentials_from_environ(tracer=None):
             iam_channel_credentials = {
                 "root_certificates": read_bytes(root_certificates_file)
             }
-        return iam.ServiceAccountCredentials.from_file(
+        return ydb.iam.ServiceAccountCredentials.from_file(
             os.getenv("SA_KEY_FILE"),
             iam_channel_credentials=iam_channel_credentials,
             iam_endpoint=os.getenv("IAM_ENDPOINT", "iam.api.cloud.yandex.net:443"),

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import ydb
 
-from . import credentials as credentials_impl, table, scheme, pool, auth_helpers
+from . import credentials as credentials_impl, table, scheme, pool
 import six
 import os
 
@@ -50,9 +50,9 @@ def default_credentials(credentials=None, tracer=None):
         service_account_key_file = os.getenv("YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS")
         if service_account_key_file is not None:
             ctx.trace({"credentials.service_account_key_file": True})
-            from kikimr.public.sdk.python import iam
+            import ydb.iam
 
-            return iam.ServiceAccountCredentials.from_file(service_account_key_file)
+            return ydb.iam.ServiceAccountCredentials.from_file(service_account_key_file)
 
         anonymous_credetials = os.getenv("YDB_ANONYMOUS_CREDENTIALS", "0") == "1"
         if anonymous_credetials:
@@ -62,24 +62,18 @@ def default_credentials(credentials=None, tracer=None):
         metadata_credentials = os.getenv("YDB_METADATA_CREDENTIALS", "0") == "1"
         if metadata_credentials:
             ctx.trace({"credentials.metadata": True})
-            from kikimr.public.sdk.python import iam
+            import ydb.iam
 
-            return iam.MetadataUrlCredentials(tracer=tracer)
+            return ydb.iam.MetadataUrlCredentials(tracer=tracer)
 
         access_token = os.getenv("YDB_ACCESS_TOKEN_CREDENTIALS")
         if access_token is not None:
             ctx.trace({"credentials.access_token": True})
             return credentials_impl.AuthTokenCredentials(access_token)
 
-        # (legacy instantiation)
-        creds = auth_helpers.construct_credentials_from_environ()
-        if creds is not None:
-            ctx.trace({"credentials.legacy_instantiation": True})
-            return creds
+        import ydb.iam
 
-        from kikimr.public.sdk.python import iam
-
-        return iam.MetadataUrlCredentials(tracer=tracer)
+        return ydb.iam.MetadataUrlCredentials(tracer=tracer)
 
 
 class DriverConfig(object):

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

@@ -20,6 +20,7 @@ class SchemeEntryType(enum.IntEnum):
     BLOCK_STORE_VOLUME = 6
     COORDINATION_NODE = 7
     SEQUENCE = 15
+    REPLICATION = 16
 
     @staticmethod
     def is_table(entry):

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

@@ -199,6 +199,7 @@ class YqlDialect(DefaultDialect):
         supports_alter = False
         max_identifier_length = 63
         supports_sane_rowcount = False
+        supports_statement_cache = False
 
         supports_native_enum = False
         supports_native_boolean = True