snowflake-cli-labs 3.0.0rc1__py3-none-any.whl → 3.0.0rc3__py3-none-any.whl

snowflake/cli/{api/project/schemas/entities → _plugins/nativeapp}/application_package_entity_model.py

@@ -19,14 +19,14 @@ from typing import List, Literal, Optional, Union
 from pydantic import Field, field_validator
 from snowflake.cli.api.project.schemas.entities.common import (
     EntityModelBase,
+    Identifier,
 )
-from snowflake.cli.api.project.schemas.identifier_model import Identifier
-from snowflake.cli.api.project.schemas.native_app.package import DistributionOptions
-from snowflake.cli.api.project.schemas.native_app.path_mapping import PathMapping
 from snowflake.cli.api.project.schemas.updatable_model import (
     DiscriminatorField,
     IdentifierField,
 )
+from snowflake.cli.api.project.schemas.v1.native_app.package import DistributionOptions
+from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import PathMapping
 from snowflake.cli.api.project.util import append_test_resource_suffix
 
 

snowflake/cli/_plugins/nativeapp/artifacts.py

@@ -22,7 +22,8 @@ from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Tupl
 
 from click.exceptions import ClickException
 from snowflake.cli.api.constants import DEFAULT_SIZE_LIMIT_MB
-from snowflake.cli.api.project.schemas.native_app.path_mapping import PathMapping
+from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import PathMapping
+from snowflake.cli.api.project.util import to_identifier
 from snowflake.cli.api.secure_path import SecurePath
 from yaml import safe_load
 
@@ -734,23 +735,23 @@ def find_setup_script_file(deploy_root: Path) -> Path:
 
 def find_version_info_in_manifest_file(
     deploy_root: Path,
-) -> Tuple[Optional[str], Optional[str]]:
+) -> Tuple[Optional[str], Optional[int]]:
     """
     Find version and patch, if available, in the manifest.yml file.
     """
-    version_field = "version"
     name_field = "name"
     patch_field = "patch"
 
     manifest_content = find_and_read_manifest_file(deploy_root=deploy_root)
 
     version_name: Optional[str] = None
-    patch_name: Optional[str] = None
+    patch_number: Optional[int] = None
 
-    if version_field in manifest_content:
-        version_info = manifest_content[version_field]
-        version_name = version_info[name_field]
+    version_info = manifest_content.get("version", None)
+    if version_info:
+        if name_field in version_info:
+            version_name = to_identifier(str(version_info[name_field]))
         if patch_field in version_info:
-            patch_name = version_info[patch_field]
+            patch_number = int(version_info[patch_field])
 
-    return version_name, patch_name
+    return version_name, patch_number

snowflake/cli/_plugins/nativeapp/bundle_context.py

@@ -18,7 +18,7 @@ from typing import (
     List,
 )
 
-from snowflake.cli.api.project.schemas.native_app.path_mapping import PathMapping
+from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import PathMapping
 
 
 @dataclass

snowflake/cli/_plugins/nativeapp/codegen/artifact_processor.py

@@ -20,7 +20,7 @@ from typing import Optional
 
 from click import ClickException
 from snowflake.cli._plugins.nativeapp.bundle_context import BundleContext
-from snowflake.cli.api.project.schemas.native_app.path_mapping import (
+from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import (
     PathMapping,
     ProcessorMapping,
 )

snowflake/cli/_plugins/nativeapp/codegen/compiler.py

@@ -35,7 +35,7 @@ from snowflake.cli._plugins.nativeapp.codegen.templates.templates_processor impo
 )
 from snowflake.cli._plugins.nativeapp.feature_flags import FeatureFlag
 from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.project.schemas.native_app.path_mapping import (
+from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import (
     ProcessorMapping,
 )
 

snowflake/cli/_plugins/nativeapp/codegen/setup/native_app_setup_processor.py

@@ -38,7 +38,7 @@ from snowflake.cli._plugins.nativeapp.codegen.sandbox import (
 )
 from snowflake.cli._plugins.stage.diff import to_stage_path
 from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.project.schemas.native_app.path_mapping import (
+from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import (
     PathMapping,
     ProcessorMapping,
 )

snowflake/cli/_plugins/nativeapp/codegen/snowpark/extension_function_utils.py

@@ -27,7 +27,7 @@ from snowflake.cli._plugins.nativeapp.codegen.snowpark.models import (
     ExtensionFunctionTypeEnum,
     NativeAppExtensionFunction,
 )
-from snowflake.cli.api.project.schemas.snowpark.argument import Argument
+from snowflake.cli.api.project.schemas.v1.snowpark.argument import Argument
 from snowflake.cli.api.project.util import (
     is_valid_identifier,
     is_valid_string_literal,

snowflake/cli/_plugins/nativeapp/codegen/snowpark/models.py

@@ -18,8 +18,8 @@ from enum import Enum
 from typing import List, Optional
 
 from pydantic import Field
-from snowflake.cli.api.project.schemas.snowpark.callable import _CallableBase
 from snowflake.cli.api.project.schemas.updatable_model import IdentifierField
+from snowflake.cli.api.project.schemas.v1.snowpark.callable import _CallableBase
 
 
 class ExtensionFunctionTypeEnum(str, Enum):

snowflake/cli/_plugins/nativeapp/codegen/snowpark/python_processor.py

@@ -49,7 +49,7 @@ from snowflake.cli._plugins.nativeapp.codegen.snowpark.models import (
 )
 from snowflake.cli._plugins.stage.diff import to_stage_path
 from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.project.schemas.native_app.path_mapping import (
+from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import (
     PathMapping,
     ProcessorMapping,
 )
@@ -323,11 +323,8 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
                 predicate=is_python_file_artifact,
             )
         ):
-            cc.step(
-                "Processing Snowpark annotations from {}".format(
-                    dest_file.relative_to(bundle_map.deploy_root())
-                )
-            )
+            src_file_name = src_file.relative_to(self._bundle_ctx.project_root)
+            cc.step(f"Processing Snowpark annotations from {src_file_name}")
             collected_extension_function_json = _execute_in_sandbox(
                 py_file=str(dest_file.resolve()),
                 deploy_root=self._bundle_ctx.deploy_root,

snowflake/cli/_plugins/nativeapp/codegen/templates/templates_processor.py

@@ -14,6 +14,7 @@
 
 from __future__ import annotations
 
+from pathlib import Path
 from typing import Optional
 
 import jinja2
@@ -24,33 +25,78 @@ from snowflake.cli._plugins.nativeapp.codegen.artifact_processor import (
 from snowflake.cli._plugins.nativeapp.exceptions import InvalidTemplateInFileError
 from snowflake.cli.api.cli_global_context import get_cli_context
 from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.project.schemas.native_app.path_mapping import (
+from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import (
     PathMapping,
     ProcessorMapping,
 )
 from snowflake.cli.api.rendering.project_definition_templates import (
     get_client_side_jinja_env,
+    has_client_side_templates,
 )
 from snowflake.cli.api.rendering.sql_templates import (
     choose_sql_jinja_env_based_on_template_syntax,
+    has_sql_templates,
 )
 
 
+def _is_sql_file(file: Path) -> bool:
+    return file.name.lower().endswith(".sql")
+
+
 class TemplatesProcessor(ArtifactProcessor):
     """
     Processor class to perform template expansion on all relevant artifacts (specified in the project definition file).
     """
 
+    def expand_templates_in_file(self, src: Path, dest: Path) -> None:
+        """
+        Expand templates in the file.
+        """
+        if src.is_dir():
+            return
+
+        with self.edit_file(dest) as file:
+            if not has_client_side_templates(file.contents) and not (
+                _is_sql_file(dest) and has_sql_templates(file.contents)
+            ):
+                return
+
+            src_file_name = src.relative_to(self._bundle_ctx.project_root)
+            cc.step(f"Expanding templates in {src_file_name}")
+            with cc.indented():
+                try:
+                    jinja_env = (
+                        choose_sql_jinja_env_based_on_template_syntax(
+                            file.contents, reference_name=src_file_name
+                        )
+                        if _is_sql_file(dest)
+                        else get_client_side_jinja_env()
+                    )
+                    expanded_template = jinja_env.from_string(file.contents).render(
+                        get_cli_context().template_context
+                    )
+
+                # For now, we are printing the source file path in the error message
+                # instead of the destination file path to make it easier for the user
+                # to identify the file that has the error, and edit the correct file.
+                except jinja2.TemplateSyntaxError as e:
+                    raise InvalidTemplateInFileError(src_file_name, e, e.lineno) from e
+
+                except jinja2.UndefinedError as e:
+                    raise InvalidTemplateInFileError(src_file_name, e) from e
+
+                if expanded_template != file.contents:
+                    file.edited_contents = expanded_template
+
     def process(
         self,
         artifact_to_process: PathMapping,
         processor_mapping: Optional[ProcessorMapping],
         **kwargs,
-    ):
+    ) -> None:
         """
         Process the artifact by executing the template expansion logic on it.
         """
-        cc.step(f"Processing artifact {artifact_to_process} with templates processor")
 
         bundle_map = BundleMap(
             project_root=self._bundle_ctx.project_root,
@@ -62,32 +108,4 @@ class TemplatesProcessor(ArtifactProcessor):
             absolute=True,
             expand_directories=True,
         ):
-            if src.is_dir():
-                continue
-            with self.edit_file(dest) as f:
-                file_name = src.relative_to(self._bundle_ctx.project_root)
-
-                jinja_env = (
-                    choose_sql_jinja_env_based_on_template_syntax(
-                        f.contents, reference_name=file_name
-                    )
-                    if dest.name.lower().endswith(".sql")
-                    else get_client_side_jinja_env()
-                )
-
-                try:
-                    expanded_template = jinja_env.from_string(f.contents).render(
-                        get_cli_context().template_context
-                    )
-
-                # For now, we are printing the source file path in the error message
-                # instead of the destination file path to make it easier for the user
-                # to identify the file that has the error, and edit the correct file.
-                except jinja2.TemplateSyntaxError as e:
-                    raise InvalidTemplateInFileError(file_name, e, e.lineno) from e
-
-                except jinja2.UndefinedError as e:
-                    raise InvalidTemplateInFileError(file_name, e) from e
-
-                if expanded_template != f.contents:
-                    f.edited_contents = expanded_template
+            self.expand_templates_in_file(src, dest)

snowflake/cli/_plugins/nativeapp/commands.py

@@ -22,6 +22,12 @@ from textwrap import dedent
 from typing import Generator, Iterable, List, Optional, cast
 
 import typer
+from snowflake.cli._plugins.nativeapp.application_entity_model import (
+    ApplicationEntityModel,
+)
+from snowflake.cli._plugins.nativeapp.application_package_entity_model import (
+    ApplicationPackageEntityModel,
+)
 from snowflake.cli._plugins.nativeapp.common_flags import (
     ForceOption,
     InteractiveOption,
@@ -46,6 +52,7 @@ from snowflake.cli._plugins.nativeapp.utils import (
     shallow_git_clone,
 )
 from snowflake.cli._plugins.nativeapp.v2_conversions.v2_to_v1_decorator import (
+    find_entity,
     nativeapp_definition_v2_to_v1,
 )
 from snowflake.cli._plugins.nativeapp.version.commands import app as versions_app
@@ -54,11 +61,13 @@ from snowflake.cli._plugins.stage.diff import (
     compute_stage_diff,
 )
 from snowflake.cli._plugins.stage.utils import print_diff_to_console
+from snowflake.cli._plugins.workspace.manager import WorkspaceManager
 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.entities.common import EntityActions
 from snowflake.cli.api.exceptions import IncompatibleParametersError
 from snowflake.cli.api.output.formats import OutputFormat
 from snowflake.cli.api.output.types import (
@@ -69,6 +78,7 @@ from snowflake.cli.api.output.types import (
     StreamResult,
 )
 from snowflake.cli.api.project.project_verification import assert_project_type
+from snowflake.cli.api.project.schemas.project_definition import ProjectDefinitionV1
 from snowflake.cli.api.secure_path import SecurePath
 from typing_extensions import Annotated
 
@@ -160,7 +170,7 @@ def app_list_templates(**options) -> CommandResult:
 
 @app.command("bundle")
 @with_project_definition()
-@nativeapp_definition_v2_to_v1
+@nativeapp_definition_v2_to_v1()
 def app_bundle(
     **options,
 ) -> CommandResult:
@@ -181,7 +191,7 @@ def app_bundle(
 
 @app.command("diff", requires_connection=True, hidden=True)
 @with_project_definition()
-@nativeapp_definition_v2_to_v1
+@nativeapp_definition_v2_to_v1()
 def app_diff(
     **options,
 ) -> CommandResult:
@@ -208,7 +218,7 @@ def app_diff(
 
 @app.command("run", requires_connection=True)
 @with_project_definition()
-@nativeapp_definition_v2_to_v1
+@nativeapp_definition_v2_to_v1(app_required=True)
 def app_run(
     version: Optional[str] = typer.Option(
         None,
@@ -272,7 +282,7 @@ def app_run(
 
 @app.command("open", requires_connection=True)
 @with_project_definition()
-@nativeapp_definition_v2_to_v1
+@nativeapp_definition_v2_to_v1(app_required=True)
 def app_open(
     **options,
 ) -> CommandResult:
@@ -299,7 +309,9 @@ def app_open(
 
 @app.command("teardown", requires_connection=True)
 @with_project_definition()
-@nativeapp_definition_v2_to_v1
+# This command doesn't use @nativeapp_definition_v2_to_v1 because it needs to
+# be aware of PDFv2 definitions that have multiple apps created from the same package,
+# which all need to be torn down.
 def app_teardown(
     force: Optional[bool] = ForceOption,
     cascade: Optional[bool] = typer.Option(
@@ -308,26 +320,70 @@ def app_teardown(
         show_default=False,
     ),
     interactive: bool = InteractiveOption,
+    # Same as the param auto-added by @nativeapp_definition_v2_to_v1
+    package_entity_id: Optional[str] = typer.Option(
+        default="",
+        help="The ID of the package entity on which to operate when definition_version is 2 or higher.",
+    ),
     **options,
 ) -> CommandResult:
     """
     Attempts to drop both the application object and application package as defined in the project definition file.
     """
+    cli_context = get_cli_context()
+    project = cli_context.project_definition
+    if isinstance(project, ProjectDefinitionV1):
+        # Old behaviour, not multi-app aware so we can use the old processor
+        processor = NativeAppTeardownProcessor(
+            project_definition=cli_context.project_definition.native_app,
+            project_root=cli_context.project_root,
+        )
+        processor.process(interactive, force, cascade)
+    else:
+        # New behaviour, multi-app aware so teardown all the apps created from the package
+
+        # Determine the package entity to drop, there must be one
+        app_package_entity = find_entity(
+            project,
+            ApplicationPackageEntityModel,
+            package_entity_id,
+            disambiguation_option="--package-entity-id",
+            required=True,
+        )
+        assert app_package_entity is not None  # satisfy mypy
 
-    assert_project_type("native_app")
+        # Same implementation as `snow ws drop`
+        ws = WorkspaceManager(
+            project_definition=cli_context.project_definition,
+            project_root=cli_context.project_root,
+        )
+        for app_entity in project.get_entities_by_type(
+            ApplicationEntityModel.get_type()
+        ).values():
+            # Drop each app
+            if app_entity.from_.target == app_package_entity.entity_id:
+                ws.perform_action(
+                    app_entity.entity_id,
+                    EntityActions.DROP,
+                    force_drop=force,
+                    interactive=interactive,
+                    cascade=cascade,
+                )
+        # Then drop the package
+        ws.perform_action(
+            app_package_entity.entity_id,
+            EntityActions.DROP,
+            force_drop=force,
+            interactive=interactive,
+            cascade=cascade,
+        )
 
-    cli_context = get_cli_context()
-    processor = NativeAppTeardownProcessor(
-        project_definition=cli_context.project_definition.native_app,
-        project_root=cli_context.project_root,
-    )
-    processor.process(interactive, force, cascade)
     return MessageResult(f"Teardown is now complete.")
 
 
 @app.command("deploy", requires_connection=True)
 @with_project_definition()
-@nativeapp_definition_v2_to_v1
+@nativeapp_definition_v2_to_v1()
 def app_deploy(
     prune: Optional[bool] = typer.Option(
         default=None,
@@ -350,6 +406,8 @@ def app_deploy(
             unspecified, the command syncs all local changes to the stage."""
         ).strip(),
     ),
+    interactive: bool = InteractiveOption,
+    force: Optional[bool] = ForceOption,
     validate: bool = ValidateOption,
     **options,
 ) -> CommandResult:
@@ -360,6 +418,13 @@ def app_deploy(
 
     assert_project_type("native_app")
 
+    if force:
+        policy = AllowAlwaysPolicy()
+    elif interactive:
+        policy = AskAlwaysPolicy()
+    else:
+        policy = DenyAlwaysPolicy()
+
     has_paths = paths is not None and len(paths) > 0
     if prune is None and recursive is None and not has_paths:
         prune = True
@@ -386,6 +451,7 @@ def app_deploy(
         recursive=recursive,
         local_paths_to_sync=paths,
         validate=validate,
+        policy=policy,
     )
 
     return MessageResult(
@@ -395,8 +461,10 @@ def app_deploy(
 
 @app.command("validate", requires_connection=True)
 @with_project_definition()
-@nativeapp_definition_v2_to_v1
-def app_validate(**options):
+@nativeapp_definition_v2_to_v1()
+def app_validate(
+    **options,
+):
     """
     Validates a deployed Snowflake Native App's setup script.
     """
@@ -428,7 +496,7 @@ DEFAULT_EVENT_FOLLOW_LAST = 20
 
 @app.command("events", requires_connection=True)
 @with_project_definition()
-@nativeapp_definition_v2_to_v1
+@nativeapp_definition_v2_to_v1(app_required=True)
 def app_events(
     since: str = typer.Option(
         default="",

snowflake/cli/_plugins/nativeapp/exceptions.py

@@ -48,15 +48,6 @@ class ApplicationCreatedExternallyError(ClickException):
         )
 
 
-class UnexpectedOwnerError(ClickException):
-    """An operation is blocked because an object is owned by an unexpected role."""
-
-    def __init__(self, item: str, expected_owner: str, actual_owner: str):
-        super().__init__(
-            f"Cannot operate on {item}: owned by {actual_owner} (expected {expected_owner})"
-        )
-
-
 class MissingScriptError(ClickException):
     """A referenced script was not found."""