snowflake-cli-labs 2.6.0rc0__py3-none-any.whl → 2.6.1__py3-none-any.whl

snowflake/cli/__about__.py

@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "2.6.0rc0"
+VERSION = "2.6.1"

snowflake/cli/api/config.py

@@ -114,6 +114,8 @@ def config_init(config_file: Optional[Path]):
     Initializes the app configuration. Config provided via cli flag takes precedence.
     If config file does not exist we create an empty one.
     """
+    from snowflake.cli.app.loggers import create_initial_loggers
+
     if config_file:
         CONFIG_MANAGER.file_path = config_file
     else:
@@ -121,6 +123,7 @@ def config_init(config_file: Optional[Path]):
     if not CONFIG_MANAGER.file_path.exists():
         _initialise_config(CONFIG_MANAGER.file_path)
     _read_config_file()
+    create_initial_loggers()
 
 
 def add_connection(name: str, connection_config: ConnectionConfig):

snowflake/cli/api/rest_api.py

@@ -16,16 +16,27 @@ from __future__ import annotations
 
 import json
 import logging
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, Optional
 
+from click import ClickException
 from snowflake.cli.api.constants import SF_REST_API_URL_PREFIX
 from snowflake.connector.connection import SnowflakeConnection
-from snowflake.connector.errors import InterfaceError
+from snowflake.connector.errors import BadRequest, InterfaceError
 from snowflake.connector.network import SnowflakeRestful
 
 log = logging.getLogger(__name__)
 
 
+def _pluralize_object_type(object_type: str) -> str:
+    """
+    Pluralize object type without depending on OBJECT_TO_NAMES.
+    """
+    if object_type.endswith("y"):
+        return object_type[:-1].lower() + "ies"
+    else:
+        return object_type.lower() + "s"
+
+
 class RestApi:
     def __init__(self, connection: SnowflakeConnection):
         self.conn = connection
@@ -43,6 +54,13 @@ class RestApi:
                 return False
             raise err
 
+    def _fetch_endpoint_exists(self, url: str) -> bool:
+        try:
+            result = self.send_rest_request(url, method="get")
+            return bool(result)
+        except BadRequest:
+            return False
+
     def send_rest_request(
         self, url: str, method: str, data: Optional[Dict[str, Any]] = None
     ):
@@ -75,12 +93,18 @@ class RestApi:
             no_retry=True,
         )
 
-    def determine_url_for_create_query(
-        self, *, plural_object_type: str
-    ) -> Optional[str]:
+    def _database_exists(self, db_name: str) -> bool:
+        url = f"{SF_REST_API_URL_PREFIX}/databases/{db_name}"
+        return self._fetch_endpoint_exists(url)
+
+    def _schema_exists(self, db_name: str, schema_name: str) -> bool:
+        url = f"{SF_REST_API_URL_PREFIX}/databases/{db_name}/schemas/{schema_name}"
+        return self._fetch_endpoint_exists(url)
+
+    def determine_url_for_create_query(self, object_type: str) -> str:
         """
         Determine an url for creating an object of given type via REST API.
-        The function returns None if URL cannot be determined.
+        If URL cannot be determined, the function throws CannotDetermineCreateURLException exception.
 
         URLs we check:
          * /api/v2/<type>/
@@ -92,22 +116,57 @@ class RestApi:
          To check whether an URL exists, we send read-only GET request (LIST endpoint,
          which should imply CREATE endpoint).
         """
-        urls_to_be_checked: List[Optional[str]] = [
-            f"{SF_REST_API_URL_PREFIX}/{plural_object_type}/",
-            (
-                f"{SF_REST_API_URL_PREFIX}/databases/{self.conn.database}/{plural_object_type}/"
-                if self.conn.database
-                else None
-            ),
-            (
-                f"{SF_REST_API_URL_PREFIX}/databases/{self.conn.database}/schemas/{self.conn.schema}/{plural_object_type}/"
-                if self.conn.database and self.conn.schema
-                else None
-            ),
-        ]
-
-        for url in urls_to_be_checked:
-            if url and self.get_endpoint_exists(url):
-                return url
-
-        return None
+        plural_object_type = _pluralize_object_type(object_type)
+
+        if self.get_endpoint_exists(
+            url := f"{SF_REST_API_URL_PREFIX}/{plural_object_type}/"
+        ):
+            return url
+
+        db = self.conn.database
+        if not db:
+            raise DatabaseNotDefinedException(
+                "Database not defined in connection. Please try again with `--database` flag."
+            )
+        if not self._database_exists(db):
+            raise DatabaseNotExistsException(f"Database '{db}' does not exist.")
+        if self.get_endpoint_exists(
+            url := f"{SF_REST_API_URL_PREFIX}/databases/{db}/{plural_object_type}/"
+        ):
+            return url
+
+        schema = self.conn.schema
+        if not schema:
+            raise SchemaNotDefinedException(
+                "Schema not defined in connection. Please try again with `--schema` flag."
+            )
+        if not self._schema_exists(db_name=db, schema_name=schema):
+            raise SchemaNotExistsException(f"Schema '{schema}' does not exist.")
+        if self.get_endpoint_exists(
+            url := f"{SF_REST_API_URL_PREFIX}/databases/{self.conn.database}/schemas/{self.conn.schema}/{plural_object_type}/"
+        ):
+            return url
+
+        raise CannotDetermineCreateURLException(
+            f"Create operation for type {object_type} is not supported. Try using `sql -q 'CREATE ...'` command."
+        )
+
+
+class DatabaseNotDefinedException(ClickException):
+    pass
+
+
+class SchemaNotDefinedException(ClickException):
+    pass
+
+
+class DatabaseNotExistsException(ClickException):
+    pass
+
+
+class SchemaNotExistsException(ClickException):
+    pass
+
+
+class CannotDetermineCreateURLException(ClickException):
+    pass

snowflake/cli/app/cli_app.py

@@ -30,7 +30,6 @@ from snowflake.cli.api.config import config_init
 from snowflake.cli.api.output.formats import OutputFormat
 from snowflake.cli.api.output.types import CollectionResult
 from snowflake.cli.api.secure_path import SecurePath
-from snowflake.cli.app import loggers
 from snowflake.cli.app.api_impl.plugin.plugin_config_provider_impl import (
     PluginConfigProviderImpl,
 )
@@ -89,7 +88,6 @@ def _commands_registration_callback(value: bool):
 @_commands_registration.before
 def _config_init_callback(configuration_file: Optional[Path]):
     config_init(configuration_file)
-    loggers.create_initial_loggers()
 
 
 @_commands_registration.before

snowflake/cli/app/loggers.py

@@ -20,9 +20,6 @@ from dataclasses import asdict, dataclass, field
 from typing import Any, Dict, List
 
 import typer
-from snowflake.cli.api.config import (
-    get_logs_config,
-)
 from snowflake.cli.api.exceptions import InvalidLogsConfiguration
 from snowflake.cli.api.secure_path import SecurePath
 from snowflake.connector.errors import ConfigSourceError
@@ -103,6 +100,10 @@ def _remove_underscore_prefixes_from_keys(d: Dict[str, Any]) -> None:
 
 class FileLogsConfig:
     def __init__(self, debug: bool) -> None:
+        from snowflake.cli.api.config import (
+            get_logs_config,
+        )
+
         config = get_logs_config()
 
         self.path: SecurePath = SecurePath(config["path"])
@@ -142,8 +143,9 @@ def create_initial_loggers():
     config = InitialLoggingConfig()
     try:
         file_logs_config = FileLogsConfig(debug=False)
-        config.handlers["file"]["filename"] = file_logs_config.filename
-        _configurate_logging(config)
+        if file_logs_config.save_logs:
+            config.handlers["file"]["filename"] = file_logs_config.filename
+            _configurate_logging(config)
     except ConfigSourceError:
         pass
 

snowflake/cli/plugins/object/commands.py

@@ -33,7 +33,7 @@ app = SnowTyperFactory(
 
 NameArgument = typer.Argument(help="Name of the object")
 ObjectArgument = typer.Argument(
-    help="Type of object. For example table, procedure, streamlit.",
+    help="Type of object. For example table, database, compute-pool.",
     case_sensitive=False,
     show_default=False,
 )

snowflake/cli/plugins/object/manager.py

@@ -36,16 +36,6 @@ def _get_object_names(object_type: str) -> ObjectNames:
     return OBJECT_TO_NAMES[object_type]
 
 
-def _pluralize_object_type(object_type: str) -> str:
-    """
-    Pluralize object type without depending on OBJECT_TO_NAMES.
-    """
-    if object_type.endswith("y"):
-        return object_type[:-1].lower() + "ies"
-    else:
-        return object_type.lower() + "s"
-
-
 class ObjectManager(SqlExecutionMixin):
     def show(
         self,
@@ -85,11 +75,8 @@ class ObjectManager(SqlExecutionMixin):
 
     def create(self, object_type: str, object_data: Dict[str, Any]) -> str:
         rest = RestApi(self._conn)
-        url = rest.determine_url_for_create_query(
-            plural_object_type=_pluralize_object_type(object_type)
-        )
-        if not url:
-            return f"Create operation for type {object_type} is not supported. Try using `sql -q 'CREATE ...'` command"
+        url = rest.determine_url_for_create_query(object_type=object_type)
+
         try:
             response = rest.send_rest_request(url=url, method="post", data=object_data)
             # workaround as SnowflakeRestful class ignores some errors, dropping their info and returns {} instead.

{snowflake_cli_labs-2.6.0rc0.dist-info → snowflake_cli_labs-2.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snowflake-cli-labs
-Version: 2.6.0rc0
+Version: 2.6.1
 Summary: Snowflake CLI
 Project-URL: Source code, https://github.com/snowflakedb/snowflake-cli
 Project-URL: Bug Tracker, https://github.com/snowflakedb/snowflake-cli/issues

{snowflake_cli_labs-2.6.0rc0.dist-info → snowflake_cli_labs-2.6.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
-snowflake/cli/__about__.py,sha256=JN5HxvQSBUfsDQGYTb5W4pThCvEDkHY3R9tcLgRZ_8g,636
+snowflake/cli/__about__.py,sha256=hHAuylb0wGYbADN1G-eyVMxlkwOx6WgGwIIu5v9ZVV4,633
 snowflake/cli/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
 snowflake/cli/api/__init__.py,sha256=kD6lYv5et7QJvW7vzvLN9p2ibfD7pjh9KRWsp2QoYqo,1330
 snowflake/cli/api/cli_global_context.py,sha256=pelnxYpGV6Hg_lTpUC860Xt1c8VFXDS55LL0ockmphc,11410
-snowflake/cli/api/config.py,sha256=15i7iYmYc4Z6E65MPjWtkGchZT7Fd54Sa-zpfqBw7X8,10856
+snowflake/cli/api/config.py,sha256=_dCeNdKhkeF5QQbpBg5s32Xhu2Xa490ixjn9rmCRcxU,10951
 snowflake/cli/api/constants.py,sha256=nVcX-NNZBFUIDX3Gbgm_YKjzv8tgcd1JdYvicV-nL_A,2964
 snowflake/cli/api/exceptions.py,sha256=syNz7HdRVs3hAVC2NUaQINlSo-Ge-WEceuFvLoau2eQ,5118
 snowflake/cli/api/feature_flags.py,sha256=1bBlILOtTn7wSqk0jY3CdwOSCV5lMZF6FxT3HuoYvAI,1418
 snowflake/cli/api/identifiers.py,sha256=_Q53mRIkXCow2mqnXgF7LdMpp-DXvTN8FrKb0rnq8nA,5036
-snowflake/cli/api/rest_api.py,sha256=fYGr9GwMbpR2Y75OqH3nf4czp9G9_MXiRTjav_HshFk,4137
+snowflake/cli/api/rest_api.py,sha256=X2hYq-J2mZJmVIEeCUvdk8ccTiV86ltVlj9ac5ZmIak,6070
 snowflake/cli/api/sanitizers.py,sha256=7EKqVQ3KOob0IFFoc_GmXPYpRhgnmIqhnJSvHPgxM5I,1211
 snowflake/cli/api/secure_path.py,sha256=-H2UD1ERc31cCoXyKVQDT0EzjRRLunuOBTfVA49-wc8,13058
 snowflake/cli/api/secure_utils.py,sha256=7fBLtlckmKMPaPRgXfb9XN66tXLX5GdnWw8dL2ZmNKw,1102
@@ -64,9 +64,9 @@ snowflake/cli/api/utils/rendering.py,sha256=g5Sqc5OsjaRABtU6igFInNbnvpts5PTp4SM4
 snowflake/cli/api/utils/types.py,sha256=fVKuls8axKSsBzPqWwrkwkwoXXmedqxNJKqfXrrGyBM,1190
 snowflake/cli/app/__init__.py,sha256=CR_uTgoqHnU1XdyRhm5iQsS86yWXGVx5Ht7aGSDNFmc,765
 snowflake/cli/app/__main__.py,sha256=KrWQBN5trQZUBqC9nQLeQDq134JLkFC0AfmDxRD3U38,833
-snowflake/cli/app/cli_app.py,sha256=ekEU6IAjkANK3xrHVgh82QhH7FFTXxNvTmud4gKuKDE,8224
+snowflake/cli/app/cli_app.py,sha256=culZ_65q5eFKR35ScLRNh1z-TbPtJ0-CMVjPjd_ChLs,8149
 snowflake/cli/app/constants.py,sha256=WCqViioXdOt0Cykf-KK42cBLfqHKTfYobMJJ-AC7kSs,698
-snowflake/cli/app/loggers.py,sha256=5DnwA2ot7WXERyEQ-Z_RnwDgrouFkZG7TdvzTXlJ5UI,6494
+snowflake/cli/app/loggers.py,sha256=tHf5OT-Hj3_LjsZhSphheRwKVc9-pUXuv_BA_6EII8w,6566
 snowflake/cli/app/main_typer.py,sha256=4VQqUCxTGHrc21I2nt-Lel6_T_NS8uwkuAntHjrkx3w,2101
 snowflake/cli/app/printing.py,sha256=H6yclrM5lD55jQ5DXueVBz2bsNyY8UVXwuQ0Aw6ykiA,5322
 snowflake/cli/app/snow_connector.py,sha256=4ZOa7TufXOpnRH5_AKpx6pDcZU8ioz4wo3oE6i3uZhs,8453
@@ -143,9 +143,9 @@ snowflake/cli/plugins/notebook/plugin_spec.py,sha256=dzmt9GvlDfcFXmM8plhmoQoOtxG
 snowflake/cli/plugins/notebook/types.py,sha256=dWXZAsDEzH8iEQPws_w-XTYASynouA1hrHz62zocduw,622
 snowflake/cli/plugins/object/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
 snowflake/cli/plugins/object/command_aliases.py,sha256=AhInra53zxJDamKWwdWAmJcjH1C6o41CEcvk6QqiPV8,3111
-snowflake/cli/plugins/object/commands.py,sha256=TpRo2Bf8svW9EBEhDmfyOXVcix3EHxWYm2WsOnriWDs,5767
+snowflake/cli/plugins/object/commands.py,sha256=ok3UIhckd_14b2QaZfKAO-qLjlTbPqFmnQPNFn72H8Y,5769
 snowflake/cli/plugins/object/common.py,sha256=x1V8fiVnh7ohHHq0_NaGFtUvTz0soVRSGm-oCIuhJHs,2608
-snowflake/cli/plugins/object/manager.py,sha256=Wd-x71vDnlqPsZy5N0e-dTyTo3bO3rXLxFyWMLYK1ik,4331
+snowflake/cli/plugins/object/manager.py,sha256=Mb_oW85YvyG-EUIPB9sbmNNBE8FAuLnGG-PjBLGwWH0,3871
 snowflake/cli/plugins/object/plugin_spec.py,sha256=nqOiA-qCm2mBGSow4mDvf4A6TKQVwIz5YTGZSxQpr2Q,994
 snowflake/cli/plugins/object_stage_deprecated/__init__.py,sha256=RLQpA97914b74tTgiUft4JM_LvM8zVLWGgDy3Cq2sc8,608
 snowflake/cli/plugins/object_stage_deprecated/commands.py,sha256=_lsUcmu1mYj9HurpLLBpoJspwiEtWbnglXPPTCqGcVk,3835
@@ -210,8 +210,8 @@ snowflake/cli/templates/default_streamlit/snowflake.yml,sha256=yWFU-vqJ7Z17K3loU
 snowflake/cli/templates/default_streamlit/streamlit_app.py,sha256=BtWuwdkgcMiYt21ghyi6Y1b_ITcIunN13ulUknvQbgI,688
 snowflake/cli/templates/default_streamlit/common/hello.py,sha256=3kZSJggAWSYgi06NuI_5USV06mcCOBEzzz2DYeNGpc0,617
 snowflake/cli/templates/default_streamlit/pages/my_page.py,sha256=wj2nMJmpAH_e9hOHoAUxyG4q17vyeVdnBtaXv_5KG24,628
-snowflake_cli_labs-2.6.0rc0.dist-info/METADATA,sha256=SuypB1DowrAO5g0QAalA18GNN6pd29l_CJ3NhaSJH-o,17730
-snowflake_cli_labs-2.6.0rc0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-snowflake_cli_labs-2.6.0rc0.dist-info/entry_points.txt,sha256=_qdnT44fYFbH78kb6Em5jr2_26amIg3UIAvSdmqT6TY,57
-snowflake_cli_labs-2.6.0rc0.dist-info/licenses/LICENSE,sha256=mJMA3Uz2AbjU_kVggo1CAx01XhBsI7BSi2H7ggUg_-c,11344
-snowflake_cli_labs-2.6.0rc0.dist-info/RECORD,,
+snowflake_cli_labs-2.6.1.dist-info/METADATA,sha256=X8DfxpBbg5VTbXdDNDkQ7jwU8QR9MbQHRq1x2wmc7iU,17727
+snowflake_cli_labs-2.6.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+snowflake_cli_labs-2.6.1.dist-info/entry_points.txt,sha256=_qdnT44fYFbH78kb6Em5jr2_26amIg3UIAvSdmqT6TY,57
+snowflake_cli_labs-2.6.1.dist-info/licenses/LICENSE,sha256=mJMA3Uz2AbjU_kVggo1CAx01XhBsI7BSi2H7ggUg_-c,11344
+snowflake_cli_labs-2.6.1.dist-info/RECORD,,