snowflake-cli-labs 2.7.0rc0__tar.gz → 2.7.0rc2__tar.gz

{snowflake_cli_labs-2.7.0rc0 → snowflake_cli_labs-2.7.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snowflake-cli-labs
-Version: 2.7.0rc0
+Version: 2.7.0rc2
 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.7.0rc0 → snowflake_cli_labs-2.7.0rc2}/src/snowflake/cli/__about__.py

@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "2.7.0rc0"
+VERSION = "2.7.0rc2"

{snowflake_cli_labs-2.7.0rc0 → snowflake_cli_labs-2.7.0rc2}/src/snowflake/cli/api/commands/project_initialisation.py

@@ -57,8 +57,8 @@ def add_init_command(
 
     init.__doc__ = (
         f"Initializes this directory with a sample set "
-        f"of files for creating a {project_type_doc} project."
-        f"This command is deprecated and will be removed soon."
+        f"of files for creating a {project_type_doc} project. "
+        f"This command is deprecated and will be removed soon. "
         f"Please use 'snow init' instead"
     )
 

{snowflake_cli_labs-2.7.0rc0 → snowflake_cli_labs-2.7.0rc2}/src/snowflake/cli/api/config.py

@@ -78,6 +78,7 @@ class ConnectionConfig:
     role: Optional[str] = None
     authenticator: Optional[str] = None
     private_key_path: Optional[str] = None
+    token_file_path: Optional[str] = None
 
     _other_settings: dict = field(default_factory=lambda: {})
 

{snowflake_cli_labs-2.7.0rc0 → snowflake_cli_labs-2.7.0rc2}/src/snowflake/cli/api/feature_flags.py

@@ -48,4 +48,9 @@ class FeatureFlag(FeatureFlagMixin):
     ENABLE_STREAMLIT_EMBEDDED_STAGE = BooleanFlag(
         "ENABLE_STREAMLIT_EMBEDDED_STAGE", False
     )
-    ENABLE_PROJECT_DEFINITION_V2 = BooleanFlag("ENABLE_PROJECT_DEFINITION_V2", False)
+    ENABLE_STREAMLIT_NO_CHECKOUTS = BooleanFlag("ENABLE_STREAMLIT_NO_CHECKOUTS", False)
+    ENABLE_STREAMLIT_VERSIONED_STAGE = BooleanFlag(
+        "ENABLE_STREAMLIT_VERSIONED_STAGE", False
+    )
+    # TODO: remove in 3.0
+    ENABLE_PROJECT_DEFINITION_V2 = BooleanFlag("ENABLE_PROJECT_DEFINITION_V2", True)

{snowflake_cli_labs-2.7.0rc0 → snowflake_cli_labs-2.7.0rc2}/src/snowflake/cli/plugins/connection/commands.py

@@ -219,6 +219,14 @@ def add(
         prompt="Path to private key file",
         help="Path to file containing private key",
     ),
+    token_file_path: str = typer.Option(
+        EmptyInput(),
+        "--token-file-path",
+        "-t",
+        click_type=OptionalPrompt(),
+        prompt="Path to token file",
+        help="Path to file with an OAuth token that should be used when connecting to Snowflake",
+    ),
     set_as_default: bool = typer.Option(
         False,
         "--default",
@@ -246,6 +254,7 @@ def add(
             role=role,
             authenticator=authenticator,
             private_key_path=private_key_path,
+            token_file_path=token_file_path,
         ),
     )
     if set_as_default:

{snowflake_cli_labs-2.7.0rc0 → snowflake_cli_labs-2.7.0rc2}/src/snowflake/cli/plugins/streamlit/manager.py

@@ -121,10 +121,11 @@ class StreamlitManager(SqlExecutionMixin):
         # for backwards compatibility - quoted stage path might be case-sensitive
         # https://docs.snowflake.com/en/sql-reference/identifiers-syntax#double-quoted-identifiers
         streamlit_name_for_root_location = streamlit_id.name
-
+        use_versioned_stage = FeatureFlag.ENABLE_STREAMLIT_VERSIONED_STAGE.is_enabled()
         if (
             experimental_behaviour_enabled()
             or FeatureFlag.ENABLE_STREAMLIT_EMBEDDED_STAGE.is_enabled()
+            or use_versioned_stage
         ):
             """
             1. Create streamlit object
@@ -141,19 +142,30 @@ class StreamlitManager(SqlExecutionMixin):
                 title=title,
             )
             try:
-                self._execute_query(
-                    f"ALTER streamlit {streamlit_id.identifier} CHECKOUT"
-                )
+                if use_versioned_stage:
+                    self._execute_query(
+                        f"ALTER STREAMLIT {streamlit_id.identifier} ADD LIVE VERSION FROM LAST"
+                    )
+                elif not FeatureFlag.ENABLE_STREAMLIT_NO_CHECKOUTS.is_enabled():
+                    self._execute_query(
+                        f"ALTER streamlit {streamlit_id.identifier} CHECKOUT"
+                    )
             except ProgrammingError as e:
-                # If an error is raised because a CHECKOUT has already occurred,
-                # simply skip it and continue
-                if "Checkout already exists" in str(e):
+                # If an error is raised because a CHECKOUT has already occurred or a LIVE VERSION already exists, simply skip it and continue
+                if "Checkout already exists" in str(
+                    e
+                ) or "There is already a live version" in str(e):
                     log.info("Checkout already exists, continuing")
                 else:
                     raise
+
             stage_path = streamlit_id.identifier
             embedded_stage_name = f"snow://streamlit/{stage_path}"
-            root_location = f"{embedded_stage_name}/default_checkout"
+            if use_versioned_stage:
+                # "LIVE" is the only supported version for now, but this may change later.
+                root_location = f"{embedded_stage_name}/versions/live"
+            else:
+                root_location = f"{embedded_stage_name}/default_checkout"
 
             self._put_streamlit_files(
                 root_location,

{snowflake_cli_labs-2.7.0rc0 → snowflake_cli_labs-2.7.0rc2}/tests/__snapshots__/test_help_messages.ambr

@@ -1106,6 +1106,10 @@
   |                                        [default: optional]                   |
   | --private-key            -k      TEXT  Path to file containing private key   |
   |                                        [default: optional]                   |
+  | --token-file-path        -t      TEXT  Path to file with an OAuth token that |
+  |                                        should be used when connecting to     |
+  |                                        Snowflake                             |
+  |                                        [default: optional]                   |
   | --default                              If provided the connection will be    |
   |                                        configured as default connection.     |
   | --help                                 Show this message and exit.           |
@@ -3625,7 +3629,7 @@
                                                                                   
    (deprecated)                                                                   
    Initializes this directory with a sample set of files for creating a Snowpark  
-   project.This command is deprecated and will be removed soon.Please use 'snow   
+   project. This command is deprecated and will be removed soon. Please use 'snow 
    init' instead                                                                  
                                                                                   
   +- Arguments ------------------------------------------------------------------+
@@ -4012,9 +4016,9 @@
   | execute    Executes a procedure or function in a specified                   |
   |            environment.                                                      |
   | init       Initializes this directory with a sample set of     (deprecated)  |
-  |            files for creating a Snowpark project.This command                |
-  |            is deprecated and will be removed soon.Please use                 |
-  |            'snow init' instead                                               |
+  |            files for creating a Snowpark project. This                       |
+  |            command is deprecated and will be removed soon.                   |
+  |            Please use 'snow init' instead                                    |
   | list       Lists all available procedures or functions.                      |
   | package    Manages custom Python packages for Snowpark                       |
   +------------------------------------------------------------------------------+
@@ -7917,7 +7921,7 @@
                                                                                   
    (deprecated)                                                                   
    Initializes this directory with a sample set of files for creating a Streamlit 
-   app project.This command is deprecated and will be removed soon.Please use     
+   app project. This command is deprecated and will be removed soon. Please use   
    'snow init' instead                                                            
                                                                                   
   +- Arguments ------------------------------------------------------------------+
@@ -8115,9 +8119,9 @@
   | drop       Drops streamlit with given name.                                  |
   | get-url    Returns a URL to the specified Streamlit app                      |
   | init       Initializes this directory with a sample set of     (deprecated)  |
-  |            files for creating a Streamlit app project.This                   |
-  |            command is deprecated and will be removed                         |
-  |            soon.Please use 'snow init' instead                               |
+  |            files for creating a Streamlit app project. This                  |
+  |            command is deprecated and will be removed soon.                   |
+  |            Please use 'snow init' instead                                    |
   | list       Lists all available streamlits.                                   |
   | share      Shares a Streamlit app with another role.                         |
   +------------------------------------------------------------------------------+
@@ -8385,9 +8389,9 @@
   | execute    Executes a procedure or function in a specified                   |
   |            environment.                                                      |
   | init       Initializes this directory with a sample set of     (deprecated)  |
-  |            files for creating a Snowpark project.This command                |
-  |            is deprecated and will be removed soon.Please use                 |
-  |            'snow init' instead                                               |
+  |            files for creating a Snowpark project. This                       |
+  |            command is deprecated and will be removed soon.                   |
+  |            Please use 'snow init' instead                                    |
   | list       Lists all available procedures or functions.                      |
   | package    Manages custom Python packages for Snowpark                       |
   +------------------------------------------------------------------------------+
@@ -8588,9 +8592,9 @@
   | drop       Drops streamlit with given name.                                  |
   | get-url    Returns a URL to the specified Streamlit app                      |
   | init       Initializes this directory with a sample set of     (deprecated)  |
-  |            files for creating a Streamlit app project.This                   |
-  |            command is deprecated and will be removed                         |
-  |            soon.Please use 'snow init' instead                               |
+  |            files for creating a Streamlit app project. This                  |
+  |            command is deprecated and will be removed soon.                   |
+  |            Please use 'snow init' instead                                    |
   | list       Lists all available streamlits.                                   |
   | share      Shares a Streamlit app with another role.                         |
   +------------------------------------------------------------------------------+

{snowflake_cli_labs-2.7.0rc0 → snowflake_cli_labs-2.7.0rc2}/tests/project/test_config.py

@@ -167,5 +167,7 @@ def test_project_definition_v2_is_disabled():
 def test_project_definition_v2_is_enabled_with_feature_flag():
     with mock_config_key("enable_project_definition_v2", True):
         assert FeatureFlag.ENABLE_STREAMLIT_EMBEDDED_STAGE.is_enabled() == False
+        assert FeatureFlag.ENABLE_STREAMLIT_NO_CHECKOUTS.is_enabled() == False
+        assert FeatureFlag.ENABLE_STREAMLIT_VERSIONED_STAGE.is_enabled() == False
         assert FeatureFlag.ENABLE_PROJECT_DEFINITION_V2.is_enabled() == True
         build_project_definition(**{"definition_version": "2", "entities": {}})

{snowflake_cli_labs-2.7.0rc0 → snowflake_cli_labs-2.7.0rc2}/tests/streamlit/test_commands.py

@@ -442,8 +442,16 @@ def test_deploy_all_streamlit_files_not_defaults(
 
 
 @mock.patch("snowflake.connector.connect")
+@pytest.mark.parametrize("enable_streamlit_versioned_stage", [True, False])
+@pytest.mark.parametrize("enable_streamlit_no_checkouts", [True, False])
 def test_deploy_streamlit_main_and_pages_files_experimental(
-    mock_connector, mock_cursor, runner, mock_ctx, project_directory
+    mock_connector,
+    mock_cursor,
+    runner,
+    mock_ctx,
+    project_directory,
+    enable_streamlit_versioned_stage,
+    enable_streamlit_no_checkouts,
 ):
     ctx = mock_ctx(
         mock_cursor(
@@ -457,29 +465,51 @@ def test_deploy_streamlit_main_and_pages_files_experimental(
     )
     mock_connector.return_value = ctx
 
-    with project_directory("example_streamlit"):
-        result = runner.invoke(["streamlit", "deploy", "--experimental"])
+    with mock.patch(
+        "snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_STREAMLIT_VERSIONED_STAGE.is_enabled",
+        return_value=enable_streamlit_versioned_stage,
+    ), mock.patch(
+        "snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_STREAMLIT_NO_CHECKOUTS.is_enabled",
+        return_value=enable_streamlit_no_checkouts,
+    ):
+        with project_directory("example_streamlit"):
+            result = runner.invoke(["streamlit", "deploy", "--experimental"])
+
+    if enable_streamlit_versioned_stage:
+        root_path = (
+            f"snow://streamlit/MockDatabase.MockSchema.{STREAMLIT_NAME}/versions/live"
+        )
+        post_create_command = f"ALTER STREAMLIT MockDatabase.MockSchema.{STREAMLIT_NAME} ADD LIVE VERSION FROM LAST"
+    else:
+        root_path = f"snow://streamlit/MockDatabase.MockSchema.{STREAMLIT_NAME}/default_checkout"
+        if enable_streamlit_no_checkouts:
+            post_create_command = None
+        else:
+            post_create_command = (
+                f"ALTER streamlit MockDatabase.MockSchema.{STREAMLIT_NAME} CHECKOUT"
+            )
 
-    root_path = (
-        f"snow://streamlit/MockDatabase.MockSchema.{STREAMLIT_NAME}/default_checkout"
-    )
     assert result.exit_code == 0, result.output
     assert ctx.get_queries() == [
-        dedent(
-            f"""
+        cmd
+        for cmd in [
+            dedent(
+                f"""
             CREATE STREAMLIT IF NOT EXISTS IDENTIFIER('MockDatabase.MockSchema.{STREAMLIT_NAME}')
             MAIN_FILE = 'streamlit_app.py'
             QUERY_WAREHOUSE = test_warehouse
             TITLE = 'My Fancy Streamlit'
             """
-        ).strip(),
-        f"ALTER streamlit MockDatabase.MockSchema.{STREAMLIT_NAME} CHECKOUT",
-        _put_query("streamlit_app.py", root_path),
-        _put_query("environment.yml", f"{root_path}"),
-        _put_query("pages/*.py", f"{root_path}/pages"),
-        f"select system$get_snowsight_host()",
-        REGIONLESS_QUERY,
-        f"select current_account_name()",
+            ).strip(),
+            post_create_command,
+            _put_query("streamlit_app.py", root_path),
+            _put_query("environment.yml", f"{root_path}"),
+            _put_query("pages/*.py", f"{root_path}/pages"),
+            "select system$get_snowsight_host()",
+            REGIONLESS_QUERY,
+            "select current_account_name()",
+        ]
+        if cmd is not None
     ]
 
 
@@ -529,7 +559,7 @@ def test_deploy_streamlit_main_and_pages_files_experimental_double_deploy(
         f"snow://streamlit/MockDatabase.MockSchema.{STREAMLIT_NAME}/default_checkout"
     )
 
-    # Same as normal, except no CHECKOUT query
+    # Same as normal, except no ALTER query
     assert ctx.get_queries() == [
         dedent(
             f"""
@@ -542,15 +572,21 @@ def test_deploy_streamlit_main_and_pages_files_experimental_double_deploy(
         _put_query("streamlit_app.py", root_path),
         _put_query("environment.yml", f"{root_path}"),
         _put_query("pages/*.py", f"{root_path}/pages"),
-        f"select system$get_snowsight_host()",
+        "select system$get_snowsight_host()",
         REGIONLESS_QUERY,
-        f"select current_account_name()",
+        "select current_account_name()",
     ]
 
 
 @mock.patch("snowflake.connector.connect")
+@pytest.mark.parametrize("enable_streamlit_versioned_stage", [True, False])
 def test_deploy_streamlit_main_and_pages_files_experimental_no_stage(
-    mock_connector, mock_cursor, runner, mock_ctx, project_directory
+    mock_connector,
+    mock_cursor,
+    runner,
+    mock_ctx,
+    project_directory,
+    enable_streamlit_versioned_stage,
 ):
     ctx = mock_ctx(
         mock_cursor(
@@ -564,12 +600,24 @@ def test_deploy_streamlit_main_and_pages_files_experimental_no_stage(
     )
     mock_connector.return_value = ctx
 
-    with project_directory("example_streamlit_no_stage"):
-        result = runner.invoke(["streamlit", "deploy", "--experimental"])
+    with mock.patch(
+        "snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_STREAMLIT_VERSIONED_STAGE.is_enabled",
+        return_value=enable_streamlit_versioned_stage,
+    ):
+        with project_directory("example_streamlit_no_stage"):
+            result = runner.invoke(["streamlit", "deploy", "--experimental"])
+
+    if enable_streamlit_versioned_stage:
+        root_path = (
+            f"snow://streamlit/MockDatabase.MockSchema.{STREAMLIT_NAME}/versions/live"
+        )
+        post_create_command = f"ALTER STREAMLIT MockDatabase.MockSchema.{STREAMLIT_NAME} ADD LIVE VERSION FROM LAST"
+    else:
+        root_path = f"snow://streamlit/MockDatabase.MockSchema.{STREAMLIT_NAME}/default_checkout"
+        post_create_command = (
+            f"ALTER streamlit MockDatabase.MockSchema.{STREAMLIT_NAME} CHECKOUT"
+        )
 
-    root_path = (
-        f"snow://streamlit/MockDatabase.MockSchema.{STREAMLIT_NAME}/default_checkout"
-    )
     assert result.exit_code == 0, result.output
     assert ctx.get_queries() == [
         dedent(
@@ -579,7 +627,7 @@ def test_deploy_streamlit_main_and_pages_files_experimental_no_stage(
             QUERY_WAREHOUSE = test_warehouse
             """
         ).strip(),
-        f"ALTER streamlit MockDatabase.MockSchema.{STREAMLIT_NAME} CHECKOUT",
+        post_create_command,
         _put_query("streamlit_app.py", root_path),
         _put_query("environment.yml", f"{root_path}"),
         _put_query("pages/*.py", f"{root_path}/pages"),