snowflake-cli-labs 2.8.0rc0__py3-none-any.whl → 3.0.0rc0__py3-none-any.whl

snowflake/cli/{plugins → _plugins}/nativeapp/project_model.py

@@ -18,24 +18,27 @@ from functools import cached_property
 from pathlib import Path
 from typing import List, Optional
 
-from snowflake.cli.api.cli_global_context import cli_context
+from snowflake.cli._plugins.nativeapp.artifacts import resolve_without_follow
+from snowflake.cli._plugins.nativeapp.bundle_context import BundleContext
+from snowflake.cli.api.cli_global_context import get_cli_context
 from snowflake.cli.api.project.definition import (
     default_app_package,
     default_application,
     default_role,
 )
-from snowflake.cli.api.project.schemas.native_app.application import (
-    PostDeployHook,
-)
+from snowflake.cli.api.project.schemas.entities.common import PostDeployHook
 from snowflake.cli.api.project.schemas.native_app.native_app import NativeApp
 from snowflake.cli.api.project.schemas.native_app.path_mapping import PathMapping
-from snowflake.cli.api.project.util import extract_schema, to_identifier
-from snowflake.cli.plugins.nativeapp.artifacts import resolve_without_follow
+from snowflake.cli.api.project.util import (
+    append_test_resource_suffix,
+    extract_schema,
+    to_identifier,
+)
 from snowflake.connector import DictCursor
 
 
 def current_role() -> str:
-    conn = cli_context.connection
+    conn = get_cli_context().connection
     *_, cursor = conn.execute_string("select current_role()", cursor_class=DictCursor)
     role_result = cursor.fetchone()
     return role_result["CURRENT_ROLE()"]
@@ -107,6 +110,7 @@ class NativeAppProjectModel:
         if self.definition.package and self.definition.package.warehouse:
             return to_identifier(self.definition.package.warehouse)
         else:
+            cli_context = get_cli_context()
             if cli_context.connection.warehouse:
                 return to_identifier(cli_context.connection.warehouse)
             return None
@@ -116,6 +120,7 @@ class NativeAppProjectModel:
         if self.definition.application and self.definition.application.warehouse:
             return to_identifier(self.definition.application.warehouse)
         else:
+            cli_context = get_cli_context()
             if cli_context.connection.warehouse:
                 return to_identifier(cli_context.connection.warehouse)
             return None
@@ -126,12 +131,16 @@ class NativeAppProjectModel:
         # sometimes strip out double quotes, so we try to get them back here.
         return to_identifier(self.definition.name)
 
-    @cached_property
+    @property
     def package_name(self) -> str:
         if self.definition.package and self.definition.package.name:
             return to_identifier(self.definition.package.name)
         else:
-            return to_identifier(default_app_package(self.project_identifier))
+            # V1.0 PDF doesn't support templating, so if the identifier isn't
+            # explicitly specified, the default is generated here,
+            # so we have to append the test resource suffix here
+            name = default_app_package(self.project_identifier)
+            return to_identifier(append_test_resource_suffix(name))
 
     @cached_property
     def package_role(self) -> str:
@@ -147,12 +156,16 @@ class NativeAppProjectModel:
         else:
             return "internal"
 
-    @cached_property
+    @property
     def app_name(self) -> str:
         if self.definition.application and self.definition.application.name:
             return to_identifier(self.definition.application.name)
         else:
-            return to_identifier(default_application(self.project_identifier))
+            # V1.0 PDF doesn't support templating, so if the identifier isn't
+            # explicitly specified, the default is generated here,
+            # so we have to append the test resource suffix here
+            name = default_application(self.project_identifier)
+            return to_identifier(append_test_resource_suffix(name))
 
     @cached_property
     def app_role(self) -> str:
@@ -193,3 +206,13 @@ class NativeAppProjectModel:
         if self.definition.application:
             return self.definition.application.debug
         return None
+
+    def get_bundle_context(self) -> BundleContext:
+        return BundleContext(
+            package_name=self.package_name,
+            artifacts=self.artifacts,
+            project_root=self.project_root,
+            bundle_root=self.bundle_root,
+            deploy_root=self.deploy_root,
+            generated_root=self.generated_root,
+        )

snowflake/cli/{plugins → _plugins}/nativeapp/run_processor.py

@@ -20,7 +20,32 @@ from typing import Optional
 
 import typer
 from click import UsageError
+from snowflake.cli._plugins.nativeapp.artifacts import BundleMap
+from snowflake.cli._plugins.nativeapp.constants import (
+    ALLOWED_SPECIAL_COMMENTS,
+    COMMENT_COL,
+    PATCH_COL,
+    SPECIAL_COMMENT,
+    VERSION_COL,
+)
+from snowflake.cli._plugins.nativeapp.exceptions import (
+    ApplicationCreatedExternallyError,
+    ApplicationPackageDoesNotExistError,
+)
+from snowflake.cli._plugins.nativeapp.manager import (
+    NativeAppCommandProcessor,
+    NativeAppManager,
+)
+from snowflake.cli._plugins.nativeapp.policy import PolicyBase
+from snowflake.cli._plugins.nativeapp.project_model import (
+    NativeAppProjectModel,
+)
+from snowflake.cli._plugins.stage.manager import StageManager
 from snowflake.cli.api.console import cli_console as cc
+from snowflake.cli.api.entities.utils import (
+    ensure_correct_owner,
+    generic_sql_error_handler,
+)
 from snowflake.cli.api.errno import (
     APPLICATION_NO_LONGER_AVAILABLE,
     APPLICATION_OWNS_EXTERNAL_OBJECTS,
@@ -36,29 +61,6 @@ from snowflake.cli.api.project.util import (
     unquote_identifier,
 )
 from snowflake.cli.api.utils.cursor import find_all_rows
-from snowflake.cli.plugins.nativeapp.artifacts import BundleMap
-from snowflake.cli.plugins.nativeapp.constants import (
-    ALLOWED_SPECIAL_COMMENTS,
-    COMMENT_COL,
-    PATCH_COL,
-    SPECIAL_COMMENT,
-    VERSION_COL,
-)
-from snowflake.cli.plugins.nativeapp.exceptions import (
-    ApplicationCreatedExternallyError,
-    ApplicationPackageDoesNotExistError,
-)
-from snowflake.cli.plugins.nativeapp.manager import (
-    NativeAppCommandProcessor,
-    NativeAppManager,
-    ensure_correct_owner,
-    generic_sql_error_handler,
-)
-from snowflake.cli.plugins.nativeapp.policy import PolicyBase
-from snowflake.cli.plugins.nativeapp.project_model import (
-    NativeAppProjectModel,
-)
-from snowflake.cli.plugins.stage.manager import StageManager
 from snowflake.connector import ProgrammingError
 from snowflake.connector.cursor import DictCursor, SnowflakeCursor
 

snowflake/cli/{plugins → _plugins}/nativeapp/teardown_processor.py

@@ -19,27 +19,27 @@ from textwrap import dedent
 from typing import Dict, Optional
 
 import typer
-from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.errno import APPLICATION_NO_LONGER_AVAILABLE
-from snowflake.cli.api.exceptions import SnowflakeSQLExecutionError
-from snowflake.cli.plugins.nativeapp.constants import (
+from snowflake.cli._plugins.nativeapp.constants import (
     ALLOWED_SPECIAL_COMMENTS,
     COMMENT_COL,
     EXTERNAL_DISTRIBUTION,
     INTERNAL_DISTRIBUTION,
     OWNER_COL,
 )
-from snowflake.cli.plugins.nativeapp.exceptions import (
+from snowflake.cli._plugins.nativeapp.exceptions import (
     CouldNotDropApplicationPackageWithVersions,
 )
-from snowflake.cli.plugins.nativeapp.manager import (
+from snowflake.cli._plugins.nativeapp.manager import (
     NativeAppCommandProcessor,
     NativeAppManager,
-    ensure_correct_owner,
 )
-from snowflake.cli.plugins.nativeapp.utils import (
+from snowflake.cli._plugins.nativeapp.utils import (
     needs_confirmation,
 )
+from snowflake.cli.api.console import cli_console as cc
+from snowflake.cli.api.entities.utils import ensure_correct_owner
+from snowflake.cli.api.errno import APPLICATION_NO_LONGER_AVAILABLE
+from snowflake.cli.api.exceptions import SnowflakeSQLExecutionError
 from snowflake.connector import ProgrammingError
 from snowflake.connector.cursor import DictCursor
 

snowflake/cli/{plugins → _plugins}/nativeapp/v2_conversions/v2_to_v1_decorator.py

@@ -15,16 +15,18 @@
 from __future__ import annotations
 
 from functools import wraps
-from pathlib import Path
 from typing import Any, Dict, Optional, Union
 
 from click import ClickException
-from snowflake.cli.api.cli_global_context import cli_context, cli_context_manager
-from snowflake.cli.api.project.schemas.entities.application_entity import (
-    ApplicationEntity,
+from snowflake.cli.api.cli_global_context import (
+    get_cli_context,
+    get_cli_context_manager,
 )
-from snowflake.cli.api.project.schemas.entities.application_package_entity import (
-    ApplicationPackageEntity,
+from snowflake.cli.api.project.schemas.entities.application_entity_model import (
+    ApplicationEntityModel,
+)
+from snowflake.cli.api.project.schemas.entities.application_package_entity_model import (
+    ApplicationPackageEntityModel,
 )
 from snowflake.cli.api.project.schemas.native_app.path_mapping import PathMapping
 from snowflake.cli.api.project.schemas.project_definition import (
@@ -35,7 +37,7 @@ from snowflake.cli.api.utils.definition_rendering import render_definition_templ
 
 
 def _convert_v2_artifact_to_v1_dict(
-    v2_artifact: Union[PathMapping, Path]
+    v2_artifact: Union[PathMapping, str]
 ) -> Union[Dict, str]:
     if isinstance(v2_artifact, PathMapping):
         return {
@@ -43,23 +45,23 @@ def _convert_v2_artifact_to_v1_dict(
             "dest": v2_artifact.dest,
             "processors": v2_artifact.processors,
         }
-    return str(v2_artifact)
+    return v2_artifact
 
 
 def _pdf_v2_to_v1(v2_definition: DefinitionV20) -> DefinitionV11:
     pdfv1: Dict[str, Any] = {"definition_version": "1.1", "native_app": {}}
 
-    app_package_definition: ApplicationPackageEntity = None
-    app_definition: Optional[ApplicationEntity] = None
+    app_package_definition: Optional[ApplicationPackageEntityModel] = None
+    app_definition: Optional[ApplicationEntityModel] = None
 
     for key, entity in v2_definition.entities.items():
-        if entity.get_type() == ApplicationPackageEntity.get_type():
+        if entity.get_type() == ApplicationPackageEntityModel.get_type():
             if app_package_definition:
                 raise ClickException(
                     "More than one application package entity exists in the project definition file."
                 )
             app_package_definition = entity
-        elif entity.get_type() == ApplicationEntity.get_type():
+        elif entity.get_type() == ApplicationEntityModel.get_type():
             if app_definition:
                 raise ClickException(
                     "More than one application entity exists in the project definition file."
@@ -71,21 +73,24 @@ def _pdf_v2_to_v1(v2_definition: DefinitionV20) -> DefinitionV11:
         )
 
     # NativeApp
-    if app_definition and app_definition.name:
-        pdfv1["native_app"]["name"] = app_definition.name
+    if app_definition and app_definition.fqn.identifier:
+        pdfv1["native_app"]["name"] = app_definition.fqn.identifier
     else:
-        pdfv1["native_app"]["name"] = app_package_definition.name.split("_pkg_")[0]
+        pdfv1["native_app"]["name"] = app_package_definition.fqn.identifier.split(
+            "_pkg_"
+        )[0]
     pdfv1["native_app"]["artifacts"] = [
         _convert_v2_artifact_to_v1_dict(a) for a in app_package_definition.artifacts
     ]
     pdfv1["native_app"]["source_stage"] = app_package_definition.stage
-    pdfv1["native_app"]["bundle_root"] = str(app_package_definition.bundle_root)
-    pdfv1["native_app"]["generated_root"] = str(app_package_definition.generated_root)
-    pdfv1["native_app"]["deploy_root"] = str(app_package_definition.deploy_root)
+    pdfv1["native_app"]["bundle_root"] = app_package_definition.bundle_root
+    pdfv1["native_app"]["generated_root"] = app_package_definition.generated_root
+    pdfv1["native_app"]["deploy_root"] = app_package_definition.deploy_root
+    pdfv1["native_app"]["scratch_stage"] = app_package_definition.scratch_stage
 
     # Package
     pdfv1["native_app"]["package"] = {}
-    pdfv1["native_app"]["package"]["name"] = app_package_definition.name
+    pdfv1["native_app"]["package"]["name"] = app_package_definition.fqn.identifier
     if app_package_definition.distribution:
         pdfv1["native_app"]["package"][
             "distribution"
@@ -94,17 +99,31 @@ def _pdf_v2_to_v1(v2_definition: DefinitionV20) -> DefinitionV11:
         pdfv1["native_app"]["package"][
             "post_deploy"
         ] = app_package_definition.meta.post_deploy
+    if app_package_definition.meta:
+        if app_package_definition.meta.role:
+            pdfv1["native_app"]["package"]["role"] = app_package_definition.meta.role
+        if app_package_definition.meta.warehouse:
+            pdfv1["native_app"]["package"][
+                "warehouse"
+            ] = app_package_definition.meta.warehouse
 
     # Application
     if app_definition:
         pdfv1["native_app"]["application"] = {}
-        pdfv1["native_app"]["application"]["name"] = app_definition.name
-        if app_definition.meta and app_definition.meta.role:
-            pdfv1["native_app"]["application"]["role"] = app_definition.meta.role
-        if app_definition.meta and app_definition.meta.post_deploy:
-            pdfv1["native_app"]["application"][
-                "post_deploy"
-            ] = app_definition.meta.post_deploy
+        pdfv1["native_app"]["application"]["name"] = app_definition.fqn.identifier
+        if app_definition.debug:
+            pdfv1["native_app"]["application"]["debug"] = app_definition.debug
+        if app_definition.meta:
+            if app_definition.meta.role:
+                pdfv1["native_app"]["application"]["role"] = app_definition.meta.role
+            if app_definition.meta.warehouse:
+                pdfv1["native_app"]["application"][
+                    "warehouse"
+                ] = app_definition.meta.warehouse
+            if app_definition.meta.post_deploy:
+                pdfv1["native_app"]["application"][
+                    "post_deploy"
+                ] = app_definition.meta.post_deploy
 
     result = render_definition_template(pdfv1, {})
     # Override the definition object in global context
@@ -122,14 +141,14 @@ def nativeapp_definition_v2_to_v1(func):
 
     @wraps(func)
     def wrapper(*args, **kwargs):
-        original_pdf: DefinitionV20 = cli_context.project_definition
+        original_pdf: DefinitionV20 = get_cli_context().project_definition
         if not original_pdf:
             raise ValueError(
                 "Project definition could not be found. The nativeapp_definition_v2_to_v1 command decorator assumes with_project_definition() was called before it."
             )
         if original_pdf.definition_version == "2":
             pdfv1 = _pdf_v2_to_v1(original_pdf)
-            cli_context_manager.set_project_definition(pdfv1)
+            get_cli_context_manager().set_project_definition(pdfv1)
         return func(*args, **kwargs)
 
     return wrapper

snowflake/cli/{plugins → _plugins}/nativeapp/version/commands.py

@@ -19,27 +19,27 @@ from typing import Optional
 
 import typer
 from click import MissingParameter
-from snowflake.cli.api.cli_global_context import cli_context
-from snowflake.cli.api.commands.decorators import (
-    with_project_definition,
-)
-from snowflake.cli.api.commands.snow_typer import SnowTyperFactory
-from snowflake.cli.api.output.types import CommandResult, MessageResult, QueryResult
-from snowflake.cli.api.project.project_verification import assert_project_type
-from snowflake.cli.plugins.nativeapp.common_flags import ForceOption, InteractiveOption
-from snowflake.cli.plugins.nativeapp.policy import (
+from snowflake.cli._plugins.nativeapp.common_flags import ForceOption, InteractiveOption
+from snowflake.cli._plugins.nativeapp.policy import (
     AllowAlwaysPolicy,
     AskAlwaysPolicy,
     DenyAlwaysPolicy,
 )
-from snowflake.cli.plugins.nativeapp.run_processor import NativeAppRunProcessor
-from snowflake.cli.plugins.nativeapp.v2_conversions.v2_to_v1_decorator import (
+from snowflake.cli._plugins.nativeapp.run_processor import NativeAppRunProcessor
+from snowflake.cli._plugins.nativeapp.v2_conversions.v2_to_v1_decorator import (
     nativeapp_definition_v2_to_v1,
 )
-from snowflake.cli.plugins.nativeapp.version.version_processor import (
+from snowflake.cli._plugins.nativeapp.version.version_processor import (
     NativeAppVersionCreateProcessor,
     NativeAppVersionDropProcessor,
 )
+from snowflake.cli.api.cli_global_context import get_cli_context
+from snowflake.cli.api.commands.decorators import (
+    with_project_definition,
+)
+from snowflake.cli.api.commands.snow_typer import SnowTyperFactory
+from snowflake.cli.api.output.types import CommandResult, MessageResult, QueryResult
+from snowflake.cli.api.project.project_verification import assert_project_type
 
 app = SnowTyperFactory(
     name="version",
@@ -96,6 +96,7 @@ def create(
     else:
         git_policy = AllowAlwaysPolicy()
 
+    cli_context = get_cli_context()
     processor = NativeAppVersionCreateProcessor(
         project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
@@ -126,6 +127,7 @@ def version_list(
 
     assert_project_type("native_app")
 
+    cli_context = get_cli_context()
     processor = NativeAppRunProcessor(
         project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
@@ -162,6 +164,7 @@ def drop(
     else:
         policy = DenyAlwaysPolicy()
 
+    cli_context = get_cli_context()
     processor = NativeAppVersionDropProcessor(
         project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,

snowflake/cli/{plugins → _plugins}/nativeapp/version/version_processor.py

@@ -20,30 +20,29 @@ from typing import Dict, List, Optional
 
 import typer
 from click import BadOptionUsage, ClickException
-from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.exceptions import SnowflakeSQLExecutionError
-from snowflake.cli.api.project.schemas.native_app.native_app import NativeApp
-from snowflake.cli.api.project.util import unquote_identifier
-from snowflake.cli.api.utils.cursor import (
-    find_all_rows,
-    find_first_row,
-)
-from snowflake.cli.plugins.nativeapp.artifacts import (
+from snowflake.cli._plugins.nativeapp.artifacts import (
     BundleMap,
     find_version_info_in_manifest_file,
 )
-from snowflake.cli.plugins.nativeapp.constants import VERSION_COL
-from snowflake.cli.plugins.nativeapp.exceptions import (
+from snowflake.cli._plugins.nativeapp.constants import VERSION_COL
+from snowflake.cli._plugins.nativeapp.exceptions import (
     ApplicationPackageAlreadyExistsError,
     ApplicationPackageDoesNotExistError,
 )
-from snowflake.cli.plugins.nativeapp.manager import (
+from snowflake.cli._plugins.nativeapp.manager import (
     NativeAppCommandProcessor,
     NativeAppManager,
-    ensure_correct_owner,
 )
-from snowflake.cli.plugins.nativeapp.policy import PolicyBase
-from snowflake.cli.plugins.nativeapp.run_processor import NativeAppRunProcessor
+from snowflake.cli._plugins.nativeapp.policy import PolicyBase
+from snowflake.cli._plugins.nativeapp.run_processor import NativeAppRunProcessor
+from snowflake.cli.api.console import cli_console as cc
+from snowflake.cli.api.entities.utils import ensure_correct_owner
+from snowflake.cli.api.exceptions import SnowflakeSQLExecutionError
+from snowflake.cli.api.project.schemas.native_app.native_app import NativeApp
+from snowflake.cli.api.project.util import to_identifier, unquote_identifier
+from snowflake.cli.api.utils.cursor import (
+    find_all_rows,
+)
 from snowflake.connector import ProgrammingError
 from snowflake.connector.cursor import DictCursor
 
@@ -121,6 +120,8 @@ class NativeAppVersionCreateProcessor(NativeAppRunProcessor):
         """
         Defines a new version in an existing application package.
         """
+        # Make the version a valid identifier, adding quotes if necessary
+        version = to_identifier(version)
         with self.use_role(self.package_role):
             cc.step(
                 f"Defining a new version {version} in application package {self.package_name}"
@@ -141,6 +142,8 @@ class NativeAppVersionCreateProcessor(NativeAppRunProcessor):
         """
         Add a new patch, optionally a custom one, to an existing version in an application package.
         """
+        # Make the version a valid identifier, adding quotes if necessary
+        version = to_identifier(version)
         with self.use_role(self.package_role):
             cc.step(
                 f"Adding new patch to version {version} defined in application package {self.package_name}"
@@ -156,11 +159,7 @@ class NativeAppVersionCreateProcessor(NativeAppRunProcessor):
                 add_version_query, cursor_class=DictCursor
             )
 
-            show_row = find_first_row(
-                result_cursor,
-                lambda row: row[VERSION_COL] == unquote_identifier(version),
-            )
-
+            show_row = result_cursor.fetchall()[0]
             new_patch = show_row["patch"]
             cc.message(
                 f"Patch {new_patch} created for version {version} defined in application package {self.package_name}."
@@ -328,6 +327,9 @@ class NativeAppVersionDropProcessor(NativeAppManager, NativeAppCommandProcessor)
                     "Manifest.yml file does not contain a value for the version field."
                 )
 
+        # Make the version a valid identifier, adding quotes if necessary
+        version = to_identifier(version)
+
         cc.step(
             dedent(
                 f"""\

snowflake/cli/{plugins → _plugins}/notebook/commands.py

@@ -15,11 +15,12 @@
 import logging
 
 import typer
+from snowflake.cli._plugins.notebook.manager import NotebookManager
+from snowflake.cli._plugins.notebook.types import NotebookStagePath
 from snowflake.cli.api.commands.flags import identifier_argument
 from snowflake.cli.api.commands.snow_typer import SnowTyperFactory
+from snowflake.cli.api.identifiers import FQN
 from snowflake.cli.api.output.types import MessageResult
-from snowflake.cli.plugins.notebook.manager import NotebookManager
-from snowflake.cli.plugins.notebook.types import NotebookName, NotebookStagePath
 from typing_extensions import Annotated
 
 app = SnowTyperFactory(
@@ -33,12 +34,13 @@ NotebookFile: NotebookStagePath = typer.Option(
     "--notebook-file",
     "-f",
     help="Stage path with notebook file. For example `@stage/path/to/notebook.ipynb`",
+    show_default=False,
 )
 
 
 @app.command(requires_connection=True)
 def execute(
-    identifier: str = NOTEBOOK_IDENTIFIER,
+    identifier: FQN = NOTEBOOK_IDENTIFIER,
     **options,
 ):
     """
@@ -51,7 +53,7 @@ def execute(
 
 @app.command(requires_connection=True)
 def get_url(
-    identifier: str = NOTEBOOK_IDENTIFIER,
+    identifier: FQN = NOTEBOOK_IDENTIFIER,
     **options,
 ):
     """Return a url to a notebook."""
@@ -61,7 +63,7 @@ def get_url(
 
 @app.command(name="open", requires_connection=True)
 def open_cmd(
-    identifier: str = NOTEBOOK_IDENTIFIER,
+    identifier: FQN = NOTEBOOK_IDENTIFIER,
     **options,
 ):
     """Opens a notebook in default browser"""
@@ -72,7 +74,7 @@ def open_cmd(
 
 @app.command(requires_connection=True)
 def create(
-    identifier: Annotated[NotebookName, NOTEBOOK_IDENTIFIER],
+    identifier: Annotated[FQN, NOTEBOOK_IDENTIFIER],
     notebook_file: Annotated[NotebookStagePath, NotebookFile],
     **options,
 ):

snowflake/cli/{plugins → _plugins}/notebook/manager.py

@@ -15,28 +15,28 @@
 from pathlib import Path
 from textwrap import dedent
 
-from snowflake.cli.api.cli_global_context import cli_context
+from snowflake.cli._plugins.connection.util import make_snowsight_url
+from snowflake.cli._plugins.notebook.exceptions import NotebookStagePathError
+from snowflake.cli._plugins.notebook.types import NotebookStagePath
+from snowflake.cli.api.cli_global_context import get_cli_context
 from snowflake.cli.api.identifiers import FQN
 from snowflake.cli.api.sql_execution import SqlExecutionMixin
-from snowflake.cli.plugins.connection.util import make_snowsight_url
-from snowflake.cli.plugins.notebook.exceptions import NotebookStagePathError
-from snowflake.cli.plugins.notebook.types import NotebookName, NotebookStagePath
 
 
 class NotebookManager(SqlExecutionMixin):
-    def execute(self, notebook_name: NotebookName):
-        query = f"EXECUTE NOTEBOOK {notebook_name}()"
+    def execute(self, notebook_name: FQN):
+        query = f"EXECUTE NOTEBOOK {notebook_name.sql_identifier}()"
         return self._execute_query(query=query)
 
-    def get_url(self, notebook_name: NotebookName):
-        fqn = FQN.from_string(notebook_name).using_connection(self._conn)
+    def get_url(self, notebook_name: FQN):
+        fqn = notebook_name.using_connection(self._conn)
         return make_snowsight_url(
             self._conn,
             f"/#/notebooks/{fqn.url_identifier}",
         )
 
     @staticmethod
-    def parse_stage_as_path(notebook_file: NotebookName) -> Path:
+    def parse_stage_as_path(notebook_file: str) -> Path:
         """Parses notebook file path to pathlib.Path."""
         if not notebook_file.endswith(".ipynb"):
             raise NotebookStagePathError(notebook_file)
@@ -48,19 +48,19 @@ class NotebookManager(SqlExecutionMixin):
 
     def create(
         self,
-        notebook_name: NotebookName,
+        notebook_name: FQN,
         notebook_file: NotebookStagePath,
     ) -> str:
-        notebook_fqn = FQN.from_string(notebook_name).using_connection(self._conn)
+        notebook_fqn = notebook_name.using_connection(self._conn)
         stage_path = self.parse_stage_as_path(notebook_file)
 
         queries = dedent(
             f"""
-            CREATE OR REPLACE NOTEBOOK {notebook_fqn.identifier}
+            CREATE OR REPLACE NOTEBOOK {notebook_fqn.sql_identifier}
             FROM '{stage_path.parent}'
-            QUERY_WAREHOUSE = '{cli_context.connection.warehouse}'
+            QUERY_WAREHOUSE = '{get_cli_context().connection.warehouse}'
             MAIN_FILE = '{stage_path.name}';
-
+            // Cannot use IDENTIFIER(...)
             ALTER NOTEBOOK {notebook_fqn.identifier} ADD LIVE VERSION FROM LAST;
             """
         )

snowflake/cli/{plugins → _plugins}/notebook/plugin_spec.py

@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from snowflake.cli._plugins.notebook import commands
 from snowflake.cli.api.plugins.command import (
     SNOWCLI_ROOT_COMMAND_PATH,
     CommandSpec,
     CommandType,
     plugin_hook_impl,
 )
-from snowflake.cli.plugins.notebook import commands
 
 
 @plugin_hook_impl

snowflake/cli/{plugins → _plugins}/notebook/types.py

@@ -12,5 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-NotebookName = str
 NotebookStagePath = str