snowflake-cli-labs 2.5.0rc2__py3-none-any.whl → 2.6.0__py3-none-any.whl

snowflake/cli/app/loggers.py

@@ -25,6 +25,7 @@ from snowflake.cli.api.config import (
 )
 from snowflake.cli.api.exceptions import InvalidLogsConfiguration
 from snowflake.cli.api.secure_path import SecurePath
+from snowflake.connector.errors import ConfigSourceError
 
 _DEFAULT_LOG_FILENAME = "snowflake-cli.log"
 
@@ -82,6 +83,16 @@ class DefaultLoggingConfig:
     )
 
 
+@dataclass
+class InitialLoggingConfig(DefaultLoggingConfig):
+    loggers: Dict[str, Any] = field(
+        default_factory=lambda: {
+            "snowflake.cli": LoggerConfig(level=logging.INFO, handlers=["file"]),
+            "snowflake": LoggerConfig(),
+        }
+    )
+
+
 def _remove_underscore_prefixes_from_keys(d: Dict[str, Any]) -> None:
     for k, v in list(d.items()):
         if k.startswith("_"):
@@ -127,6 +138,16 @@ class FileLogsConfig:
         return self.path.path / _DEFAULT_LOG_FILENAME
 
 
+def create_initial_loggers():
+    config = InitialLoggingConfig()
+    try:
+        file_logs_config = FileLogsConfig(debug=False)
+        config.handlers["file"]["filename"] = file_logs_config.filename
+        _configurate_logging(config)
+    except ConfigSourceError:
+        pass
+
+
 def create_loggers(verbose: bool, debug: bool):
     """Creates a logger depending on the SnowCLI parameters and config file.
     verbose == True - print info and higher logs in default format
@@ -165,6 +186,10 @@ def create_loggers(verbose: bool, debug: bool):
     config.loggers["snowflake.cli"].level = global_log_level
     config.loggers["snowflake"].level = global_log_level
 
+    _configurate_logging(config)
+
+
+def _configurate_logging(config: DefaultLoggingConfig | InitialLoggingConfig) -> None:
     dict_config = asdict(config)
     _remove_underscore_prefixes_from_keys(dict_config)
     logging.config.dictConfig(dict_config)

snowflake/cli/app/printing.py

@@ -34,19 +34,24 @@ from snowflake.cli.api.output.types import (
     MessageResult,
     MultipleResults,
     ObjectResult,
-    QueryResult,
 )
+from snowflake.cli.api.sanitizers import sanitize_for_terminal
 
 NO_ITEMS_FOUND: str = "No data"
 
 # ensure we do not break URLs that wrap lines
 get_console().soft_wrap = True
 
+# Disable markup to avoid escaping errors
+get_console()._markup = False  # noqa: SLF001
+
 
 class CustomJSONEncoder(JSONEncoder):
     """Custom JSON encoder handling serialization of non-standard types"""
 
     def default(self, o):
+        if isinstance(o, str):
+            return sanitize_for_terminal(o)
         if isinstance(o, (ObjectResult, MessageResult)):
             return o.result
         if isinstance(o, (CollectionResult, MultipleResults)):
@@ -70,8 +75,6 @@ def _get_table():
 
 
 def _print_multiple_table_results(obj: CollectionResult):
-    if isinstance(obj, QueryResult):
-        rich_print(obj.query)
     items = obj.result
     try:
         first_item = next(items)
@@ -131,7 +134,7 @@ def print_unstructured(obj: CommandResult | None):
     elif not obj.result:
         rich_print("No data")
     elif isinstance(obj, MessageResult):
-        rich_print(obj.message)
+        rich_print(sanitize_for_terminal(obj.message))
     else:
         if isinstance(obj, ObjectResult):
             _print_single_table(obj)
@@ -146,7 +149,9 @@ def _print_single_table(obj):
     table.add_column("key", overflow="fold")
     table.add_column("value", overflow="fold")
     for key, value in obj.result.items():
-        table.add_row(str(key), str(value))
+        table.add_row(
+            sanitize_for_terminal(str(key)), sanitize_for_terminal(str(value))
+        )
     rich_print(table)
 
 

snowflake/cli/app/telemetry.py

@@ -51,6 +51,8 @@ class CLITelemetryField(Enum):
     EVENT = "event"
     ERROR_MSG = "error_msg"
     ERROR_TYPE = "error_type"
+    # Project context
+    PROJECT_DEFINITION_VERSION = "project_definition_version"
 
 
 class TelemetryEvent(Enum):
@@ -74,9 +76,18 @@ def _find_command_info() -> TelemetryDict:
         CLITelemetryField.COMMAND_OUTPUT_TYPE: ctx.params.get(
             "format", OutputFormat.TABLE
         ).value,
+        CLITelemetryField.PROJECT_DEFINITION_VERSION: str(_get_definition_version()),
     }
 
 
+def _get_definition_version() -> str | None:
+    from snowflake.cli.api.cli_global_context import cli_context
+
+    if cli_context.project_definition:
+        return cli_context.project_definition.definition_version
+    return None
+
+
 def command_info() -> str:
     info = _find_command_info()
     command = ".".join(info[CLITelemetryField.COMMAND])

snowflake/cli/plugins/nativeapp/artifacts.py

@@ -116,7 +116,7 @@ class _ArtifactPathMap:
         self.__src_dest_pairs: List[Tuple[Path, Path]] = []
         # built-in dict instances are ordered as of Python 3.7
         self.__src_to_dest: Dict[Path, List[Path]] = {}
-        self.__dest_to_src: Dict[Path, List[Path]] = {}
+        self.__dest_to_src: Dict[Path, Optional[Path]] = {}
 
         # This dictionary accumulates keys for each directory or file to be created in
         # the deploy root for any artifact mapping rule being processed. This includes
@@ -142,7 +142,7 @@ class _ArtifactPathMap:
 
         absolute_src = self._project_root / src
 
-        current_sources = self.__dest_to_src.get(dest, [])
+        current_source = self.__dest_to_src.get(dest)
         src_is_dir = absolute_src.is_dir()
         if dest_is_dir:
             assert src_is_dir  # file -> directory is not possible here given how rules are processed
@@ -156,7 +156,7 @@ class _ArtifactPathMap:
         else:
             # file -> file
             # Check that there is no previous mapping for the same file.
-            if current_sources and src not in current_sources:
+            if current_source is not None and current_source != src:
                 # There is already a different source mapping to this destination
                 raise TooManyFilesError(dest)
 
@@ -176,17 +176,16 @@ class _ArtifactPathMap:
         self._update_dest_is_dir(dest, dest_is_dir)
 
         dests = self.__src_to_dest.setdefault(src, [])
-        srcs = self.__dest_to_src.setdefault(dest, [])
         if dest not in dests:
             dests.append(dest)
-            srcs.append(src)
+            self.__dest_to_src[dest] = src
             self.__src_dest_pairs.append((src, dest))
 
-    def get_sources(self, dest: Path) -> Iterable[Path]:
+    def get_source(self, dest: Path) -> Optional[Path]:
         """
-        Returns all source paths associated with the provided destination path, in insertion order.
+        Returns the source path associated with the provided destination path, if any.
         """
-        return self.__dest_to_src.get(dest, [])
+        return self.__dest_to_src.get(dest)
 
     def get_destinations(self, src: Path) -> Iterable[Path]:
         """
@@ -194,6 +193,12 @@ class _ArtifactPathMap:
         """
         return self.__src_to_dest.get(src, [])
 
+    def all_sources(self) -> Iterable[Path]:
+        """
+        Returns all source paths associated with this map, in insertion order.
+        """
+        return self.__src_to_dest.keys()
+
     def __iter__(self) -> Iterator[Tuple[Path, Path]]:
         """
         Returns all (source, destination) pairs known to this map, in insertion order.
@@ -401,7 +406,14 @@ class BundleMap:
     def to_deploy_paths(self, src: Path) -> List[Path]:
         """
         Converts a source path to its corresponding deploy root path. If the input path is relative to the project root,
-        a path relative to the deploy root is returned. If the input path is absolute, an absolute path is returned.
+        paths relative to the deploy root are returned. If the input path is absolute, absolute paths are returned.
+
+        Note that the provided source path must be part of a mapping. If the source path is not part of any mapping,
+        an empty list is returned. For example, if `app/*` is specified as the source of a mapping,
+        `to_deploy_paths(Path("app"))` will not yield any result.
+
+        Arguments:
+            src {Path} -- the source path within the project root, in canonical or absolute form.
 
         Returns:
             The deploy root paths for the given source path, or an empty list if no such path exists.
@@ -419,11 +431,14 @@ class BundleMap:
 
         output_destinations: List[Path] = []
 
+        # 1. Check for exact rule matches for this path
         canonical_dests = self._artifact_map.get_destinations(canonical_src)
         if canonical_dests:
             for d in canonical_dests:
                 output_destinations.append(self._to_output_dest(d, is_absolute))
 
+        # 2. Check for any matches to parent directories for this path that would
+        # cause this path to be part of the recursive copy
         canonical_parent = canonical_src.parent
         canonical_parent_dests = self.to_deploy_paths(canonical_parent)
         if canonical_parent_dests:
@@ -435,6 +450,60 @@ class BundleMap:
 
         return output_destinations
 
+    def all_sources(self, absolute: bool = False) -> Iterator[Path]:
+        """
+        Yields each registered artifact source in the project.
+
+        Arguments:
+            self: this instance
+            absolute (bool): Specifies whether the yielded paths should be joined with the absolute project root.
+        Returns:
+          An iterator over all artifact mapping source paths.
+        """
+        for src in self._artifact_map.all_sources():
+            yield self._to_output_src(src, absolute)
+
+    def to_project_path(self, dest: Path) -> Optional[Path]:
+        """
+        Converts a deploy root path to its corresponding project source path. If the input path is relative to the
+        deploy root, a path relative to the project root is returned. If the input path is absolute, an absolute path is
+        returned.
+
+        Arguments:
+            dest {Path} -- the destination path within the deploy root, in canonical or absolute form.
+
+        Returns:
+            The project root path for the given deploy root path, or None if no such path exists.
+        """
+        is_absolute = dest.is_absolute()
+        try:
+            canonical_dest = self._canonical_dest(dest)
+        except NotInDeployRootError:
+            # No mapping possible for the dest path
+            return None
+
+        # 1. Look for an exact rule matching this path. If we find any, then
+        # stop searching. This is because each destination path can only originate
+        # from a single source (however, one source can be copied to multiple destinations).
+        canonical_src = self._artifact_map.get_source(canonical_dest)
+        if canonical_src is not None:
+            return self._to_output_src(canonical_src, is_absolute)
+
+        # 2. No exact match was found, look for a match for parent directories of this
+        # path, recursively. Stop when a match is found
+        canonical_parent = canonical_dest.parent
+        if canonical_parent == canonical_dest:
+            return None
+        canonical_parent_src = self.to_project_path(canonical_parent)
+        if canonical_parent_src is not None:
+            canonical_child = canonical_dest.relative_to(canonical_parent)
+            canonical_child_candidate = canonical_parent_src / canonical_child
+            if self._absolute_src(canonical_child_candidate).exists():
+                return self._to_output_src(canonical_child_candidate, is_absolute)
+
+        # No mapping for this destination path
+        return None
+
     def _absolute_src(self, src: Path) -> Path:
         if src.is_absolute():
             resolved_src = resolve_without_follow(src)

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

@@ -15,15 +15,14 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from pathlib import Path
 from typing import Optional
 
 from click import ClickException
-from snowflake.cli.api.project.schemas.native_app.native_app import NativeApp
 from snowflake.cli.api.project.schemas.native_app.path_mapping import (
     PathMapping,
     ProcessorMapping,
 )
+from snowflake.cli.plugins.nativeapp.project_model import NativeAppProjectModel
 
 
 class UnsupportedArtifactProcessorError(ClickException):
@@ -36,18 +35,11 @@ class UnsupportedArtifactProcessorError(ClickException):
 
 
 class ArtifactProcessor(ABC):
-    @abstractmethod
     def __init__(
         self,
-        project_definition: NativeApp,
-        project_root: Path,
-        deploy_root: Path,
-        generated_root: Path,
-        **kwargs,
+        na_project: NativeAppProjectModel,
     ) -> None:
-        assert project_root.is_absolute()
-        assert deploy_root.is_absolute()
-        assert generated_root.is_absolute()
+        self._na_project = na_project
 
     @abstractmethod
     def process(

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

@@ -14,16 +14,12 @@
 
 from __future__ import annotations
 
-from pathlib import Path
 from typing import Dict, Optional
 
 from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.project.schemas.native_app.native_app import NativeApp
 from snowflake.cli.api.project.schemas.native_app.path_mapping import (
-    PathMapping,
     ProcessorMapping,
 )
-from snowflake.cli.plugins.nativeapp.artifacts import resolve_without_follow
 from snowflake.cli.plugins.nativeapp.codegen.artifact_processor import (
     ArtifactProcessor,
     UnsupportedArtifactProcessorError,
@@ -31,6 +27,7 @@ from snowflake.cli.plugins.nativeapp.codegen.artifact_processor import (
 from snowflake.cli.plugins.nativeapp.codegen.snowpark.python_processor import (
     SnowparkAnnotationProcessor,
 )
+from snowflake.cli.plugins.nativeapp.project_model import NativeAppProjectModel
 
 SNOWPARK_PROCESSOR = "snowpark"
 
@@ -46,21 +43,9 @@ class NativeAppCompiler:
 
     def __init__(
         self,
-        project_definition: NativeApp,
-        project_root: Path,
-        deploy_root: Path,
-        generated_root: Path,
+        na_project: NativeAppProjectModel,
     ):
-        self.project_definition = project_definition
-        self.project_root = project_root
-        self.deploy_root = deploy_root
-        self.generated_root = generated_root
-
-        self.artifacts = [
-            artifact
-            for artifact in project_definition.artifacts
-            if isinstance(artifact, PathMapping)
-        ]
+        self._na_project = na_project
         # dictionary of all processors created and shared between different artifact objects.
         self.cached_processors: Dict[str, ArtifactProcessor] = {}
 
@@ -70,7 +55,7 @@ class NativeAppCompiler:
         May have side-effects on the filesystem by either directly editing source files or the deploy root.
         """
         should_proceed = False
-        for artifact in self.artifacts:
+        for artifact in self._na_project.artifacts:
             if artifact.processors:
                 should_proceed = True
                 break
@@ -78,7 +63,7 @@ class NativeAppCompiler:
             return
 
         with cc.phase("Invoking artifact processors"):
-            for artifact in self.artifacts:
+            for artifact in self._na_project.artifacts:
                 for processor in artifact.processors:
                     artifact_processor = self._try_create_processor(
                         processor_mapping=processor,
@@ -107,10 +92,7 @@ class NativeAppCompiler:
                 return curr_processor
             else:
                 curr_processor = SnowparkAnnotationProcessor(
-                    project_definition=self.project_definition,
-                    project_root=resolve_without_follow(self.project_root),
-                    deploy_root=resolve_without_follow(self.deploy_root),
-                    generated_root=resolve_without_follow(self.generated_root),
+                    na_project=self._na_project,
                 )
                 self.cached_processors[SNOWPARK_PROCESSOR] = curr_processor
                 return curr_processor

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

@@ -21,9 +21,8 @@ from textwrap import dedent
 from typing import Any, Dict, List, Optional, Set
 
 from click import ClickException
+from pydantic import ValidationError
 from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.project.errors import SchemaValidationError
-from snowflake.cli.api.project.schemas.native_app.native_app import NativeApp
 from snowflake.cli.api.project.schemas.native_app.path_mapping import (
     PathMapping,
     ProcessorMapping,
@@ -52,6 +51,7 @@ from snowflake.cli.plugins.nativeapp.codegen.snowpark.models import (
     ExtensionFunctionTypeEnum,
     NativeAppExtensionFunction,
 )
+from snowflake.cli.plugins.nativeapp.project_model import NativeAppProjectModel
 from snowflake.cli.plugins.stage.diff import to_stage_path
 
 DEFAULT_TIMEOUT = 30
@@ -163,25 +163,18 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
 
     def __init__(
         self,
-        project_definition: NativeApp,
-        project_root: Path,
-        deploy_root: Path,
-        generated_root: Path,
+        na_project: NativeAppProjectModel,
     ):
-        super().__init__(
-            project_definition=project_definition,
-            project_root=project_root,
-            deploy_root=deploy_root,
-            generated_root=generated_root,
-        )
-        self.project_definition = project_definition
-        self.project_root = project_root
-        self.deploy_root = deploy_root
-        self.generated_root = generated_root
+        super().__init__(na_project=na_project)
+
+        assert self._na_project.bundle_root.is_absolute()
+        assert self._na_project.deploy_root.is_absolute()
+        assert self._na_project.generated_root.is_absolute()
+        assert self._na_project.project_root.is_absolute()
 
-        if self.generated_root.exists():
+        if self._na_project.generated_root.exists():
             raise ClickException(
-                f"Path {self.generated_root} already exists. Please choose a different name for your generated directory in the project definition file."
+                f"Path {self._na_project.generated_root} already exists. Please choose a different name for your generated directory in the project definition file."
             )
 
     def process(
@@ -196,7 +189,8 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
         """
 
         bundle_map = BundleMap(
-            project_root=self.project_root, deploy_root=self.deploy_root
+            project_root=self._na_project.project_root,
+            deploy_root=self._na_project.deploy_root,
         )
         bundle_map.add(artifact_to_process)
 
@@ -242,7 +236,7 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
             edit_setup_script_with_exec_imm_sql(
                 collected_sql_files=collected_sql_files,
                 deploy_root=bundle_map.deploy_root(),
-                generated_root=self.generated_root,
+                generated_root=self._na_project.generated_root,
             )
 
     def _normalize_imports(
@@ -323,7 +317,7 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
         self, bundle_map: BundleMap, processor_mapping: Optional[ProcessorMapping]
     ) -> Dict[Path, List[NativeAppExtensionFunction]]:
         kwargs = (
-            _determine_virtual_env(self.project_root, processor_mapping)
+            _determine_virtual_env(self._na_project.project_root, processor_mapping)
             if processor_mapping is not None
             else {}
         )
@@ -342,7 +336,7 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
             )
             collected_extension_function_json = _execute_in_sandbox(
                 py_file=str(dest_file.resolve()),
-                deploy_root=self.deploy_root,
+                deploy_root=self._na_project.deploy_root,
                 kwargs=kwargs,
             )
 
@@ -359,7 +353,7 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
                         deploy_root=bundle_map.deploy_root(),
                     )
                     collected_extension_functions.append(extension_fn)
-                except SchemaValidationError:
+                except ValidationError:
                     cc.warning("Invalid extension function definition")
 
             if collected_extension_functions:
@@ -373,8 +367,10 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
         """
         Generates a SQL filename for the generated root from the python file, and creates its parent directories.
         """
-        relative_py_file = py_file.relative_to(self.deploy_root)
-        sql_file = Path(self.generated_root, relative_py_file.with_suffix(".sql"))
+        relative_py_file = py_file.relative_to(self._na_project.deploy_root)
+        sql_file = Path(
+            self._na_project.generated_root, relative_py_file.with_suffix(".sql")
+        )
         if sql_file.exists():
             cc.warning(
                 f"""\
@@ -510,7 +506,9 @@ def edit_setup_script_with_exec_imm_sql(
             sql_file_relative_path = sql_file.relative_to(
                 deploy_root
             )  # Path on stage, without the leading slash
-            file.write(f"EXECUTE IMMEDIATE FROM '/{sql_file_relative_path}';\n")
+            file.write(
+                f"EXECUTE IMMEDIATE FROM '/{to_stage_path(sql_file_relative_path)}';\n"
+            )
 
     # Find the setup script in the deploy root.
     setup_file_path = find_setup_script_file(deploy_root=deploy_root)
@@ -524,5 +522,7 @@ def edit_setup_script_with_exec_imm_sql(
     generated_file_relative_path = generated_file_path.relative_to(deploy_root)
     with open(setup_file_path, "w", encoding="utf-8") as file:
         file.write(code)
-        file.write(f"\nEXECUTE IMMEDIATE FROM '/{generated_file_relative_path}';")
+        file.write(
+            f"\nEXECUTE IMMEDIATE FROM '/{to_stage_path(generated_file_relative_path)}';"
+        )
         file.write(f"\n")

snowflake/cli/plugins/nativeapp/commands.py

@@ -16,9 +16,11 @@ from __future__ import annotations
 
 import logging
 from pathlib import Path
+from textwrap import dedent
 from typing import List, Optional
 
 import typer
+from click import ClickException
 from snowflake.cli.api.cli_global_context import cli_context
 from snowflake.cli.api.commands.decorators import (
     with_project_definition,
@@ -151,7 +153,7 @@ def app_bundle(
     Prepares a local folder with configured app artifacts.
     """
     manager = NativeAppManager(
-        project_definition=cli_context.project_definition,
+        project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
     )
     manager.build_bundle()
@@ -199,7 +201,7 @@ def app_run(
         policy = DenyAlwaysPolicy()
 
     processor = NativeAppRunProcessor(
-        project_definition=cli_context.project_definition,
+        project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
     )
     bundle_map = processor.build_bundle()
@@ -228,7 +230,7 @@ def app_open(
     once it has been installed in your account.
     """
     manager = NativeAppManager(
-        project_definition=cli_context.project_definition,
+        project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
     )
     if manager.get_existing_app_info():
@@ -256,7 +258,7 @@ def app_teardown(
     Attempts to drop both the application object and application package as defined in the project definition file.
     """
     processor = NativeAppTeardownProcessor(
-        project_definition=cli_context.project_definition,
+        project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
     )
     processor.process(interactive, force, cascade)
@@ -268,7 +270,7 @@ def app_teardown(
 def app_deploy(
     prune: Optional[bool] = typer.Option(
         default=None,
-        help=f"""Whether to delete specified files from the stage if they don't exist locally. If set, the command deletes files that exist in the stage, but not in the local filesystem.""",
+        help=f"""Whether to delete specified files from the stage if they don't exist locally. If set, the command deletes files that exist in the stage, but not in the local filesystem. This option cannot be used when paths are specified.""",
     ),
     recursive: Optional[bool] = typer.Option(
         None,
@@ -276,10 +278,16 @@ def app_deploy(
         "-r",
         help=f"""Whether to traverse and deploy files from subdirectories. If set, the command deploys all files and subdirectories; otherwise, only files in the current directory are deployed.""",
     ),
-    files: Optional[List[Path]] = typer.Argument(
+    paths: Optional[List[Path]] = typer.Argument(
         default=None,
         show_default=False,
-        help=f"""Paths, relative to the the project root, of files you want to upload to a stage. The paths must match one of the artifacts src pattern entries in snowflake.yml. If unspecified, the command syncs all local changes to the stage.""",
+        help=dedent(
+            f"""
+            Paths, relative to the the project root, of files or directories you want to upload to a stage. If a file is
+            specified, it must match one of the artifacts src pattern entries in snowflake.yml. If a directory is
+            specified, it will be searched for subfolders or files to deploy based on artifacts src pattern entries. If
+            unspecified, the command syncs all local changes to the stage."""
+        ).strip(),
     ),
     validate: bool = ValidateOption,
     **options,
@@ -288,8 +296,8 @@ def app_deploy(
     Creates an application package in your Snowflake account and syncs the local changes to the stage without creating or updating the application.
     Running this command with no arguments at all, as in `snow app deploy`, is a shorthand for `snow app deploy --prune --recursive`.
     """
-    has_files = files is not None and len(files) > 0
-    if prune is None and recursive is None and not has_files:
+    has_paths = paths is not None and len(paths) > 0
+    if prune is None and recursive is None and not has_paths:
         prune = True
         recursive = True
     else:
@@ -298,8 +306,11 @@ def app_deploy(
         if recursive is None:
             recursive = False
 
+    if has_paths and prune:
+        raise ClickException("--prune cannot be used when paths are also specified")
+
     manager = NativeAppManager(
-        project_definition=cli_context.project_definition,
+        project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
     )
 
@@ -308,7 +319,7 @@ def app_deploy(
         bundle_map=bundle_map,
         prune=prune,
         recursive=recursive,
-        local_paths_to_sync=files,
+        local_paths_to_sync=paths,
         validate=validate,
     )
 
@@ -324,7 +335,7 @@ def app_validate(**options):
     Validates a deployed Snowflake Native App's setup script.
     """
     manager = NativeAppManager(
-        project_definition=cli_context.project_definition,
+        project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
     )
     if cli_context.output_format == OutputFormat.JSON:

snowflake/cli/plugins/nativeapp/constants.py

@@ -29,3 +29,5 @@ EXTERNAL_DISTRIBUTION = "external"
 ERROR_MESSAGE_2003 = "does not exist or not authorized"
 ERROR_MESSAGE_2043 = "Object does not exist, or operation cannot be performed."
 ERROR_MESSAGE_606 = "No active warehouse selected in the current session."
+ERROR_MESSAGE_093079 = "Application is no longer available for use"
+ERROR_MESSAGE_093128 = "The application owns one or more objects within the account"

snowflake/cli/plugins/nativeapp/errno.py

@@ -0,0 +1,15 @@
+# Copyright (c) 2024 Snowflake Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+APPLICATION_NO_LONGER_AVAILABLE = 93079