snowflake-cli 3.3.0__py3-none-any.whl → 3.4.1__py3-none-any.whl

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

@@ -23,7 +23,6 @@ from typing import List, Optional
 import yaml
 from click import ClickException
 from snowflake.cli._plugins.nativeapp.artifacts import (
-    BundleMap,
     find_manifest_file,
     find_setup_script_file,
 )
@@ -38,8 +37,9 @@ from snowflake.cli._plugins.nativeapp.codegen.sandbox import (
 )
 from snowflake.cli._plugins.nativeapp.feature_flags import FeatureFlag
 from snowflake.cli._plugins.stage.diff import to_stage_path
+from snowflake.cli.api.artifacts.bundle_map import BundleMap
 from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import (
+from snowflake.cli.api.project.schemas.entities.common import (
     PathMapping,
     ProcessorMapping,
 )

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

@@ -22,7 +22,6 @@ from typing import Any, Dict, List, Optional, Set
 
 from pydantic import ValidationError
 from snowflake.cli._plugins.nativeapp.artifacts import (
-    BundleMap,
     find_setup_script_file,
 )
 from snowflake.cli._plugins.nativeapp.codegen.artifact_processor import (
@@ -48,10 +47,11 @@ from snowflake.cli._plugins.nativeapp.codegen.snowpark.models import (
     NativeAppExtensionFunction,
 )
 from snowflake.cli._plugins.stage.diff import to_stage_path
+from snowflake.cli.api.artifacts.bundle_map import BundleMap
 from snowflake.cli.api.cli_global_context import get_cli_context, span
 from snowflake.cli.api.console import cli_console as cc
 from snowflake.cli.api.metrics import CLICounterField
-from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import (
+from snowflake.cli.api.project.schemas.entities.common import (
     PathMapping,
     ProcessorMapping,
 )

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

@@ -18,15 +18,15 @@ from pathlib import Path
 from typing import Any, Optional
 
 import jinja2
-from snowflake.cli._plugins.nativeapp.artifacts import BundleMap
 from snowflake.cli._plugins.nativeapp.codegen.artifact_processor import (
     ArtifactProcessor,
 )
 from snowflake.cli._plugins.nativeapp.exceptions import InvalidTemplateInFileError
+from snowflake.cli.api.artifacts.bundle_map import BundleMap
 from snowflake.cli.api.cli_global_context import get_cli_context, span
 from snowflake.cli.api.console import cli_console as cc
 from snowflake.cli.api.metrics import CLICounterField
-from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import (
+from snowflake.cli.api.project.schemas.entities.common import (
     PathMapping,
     ProcessorMapping,
 )

snowflake/cli/_plugins/nativeapp/commands.py

@@ -44,18 +44,13 @@ from snowflake.cli._plugins.nativeapp.v2_conversions.compat import (
     force_project_definition_v2,
 )
 from snowflake.cli._plugins.nativeapp.version.commands import app as versions_app
-from snowflake.cli._plugins.stage.diff import (
-    DiffResult,
-    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.entities.utils import EntityActions
 from snowflake.cli.api.exceptions import (
     IncompatibleParametersError,
     UnmetParametersError,
@@ -67,6 +62,7 @@ from snowflake.cli.api.output.types import (
     ObjectResult,
     StreamResult,
 )
+from snowflake.cli.api.project.util import same_identifiers
 from typing_extensions import Annotated
 
 app = SnowTyperFactory(
@@ -118,20 +114,15 @@ def app_diff(
         project_root=cli_context.project_root,
     )
     package_id = options["package_entity_id"]
-    package = cli_context.project_definition.entities[package_id]
-    bundle_map = ws.perform_action(
+    diff = ws.perform_action(
         package_id,
-        EntityActions.BUNDLE,
-    )
-    stage_fqn = f"{package.fqn.name}.{package.stage}"
-    diff: DiffResult = compute_stage_diff(
-        local_root=Path(package.deploy_root), stage_fqn=stage_fqn
+        EntityActions.DIFF,
+        print_to_console=cli_context.output_format != OutputFormat.JSON,
     )
     if cli_context.output_format == OutputFormat.JSON:
         return ObjectResult(diff.to_dict())
-    else:
-        print_diff_to_console(diff, bundle_map)
-        return None  # don't print any output
+
+    return None
 
 
 @app.command("run", requires_connection=True)
@@ -238,7 +229,7 @@ def app_teardown(
     # Same as the param auto-added by @force_project_definition_v2 if single_app_and_package were true
     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.",
+        help="The ID of the package entity on which to operate when the definition_version is 2 or higher.",
     ),
     **options,
 ) -> CommandResult:
@@ -263,11 +254,22 @@ def app_teardown(
         project_definition=cli_context.project_definition,
         project_root=cli_context.project_root,
     )
+
+    # TODO: get all apps created from this application package from snowflake, compare, confirm and drop.
+    # TODO: add messaging/confirmation here for extra apps found as part of above
+    all_packages_with_id = [
+        package_entity.entity_id
+        for package_entity in project.get_entities_by_type(
+            ApplicationPackageEntityModel.get_type()
+        ).values()
+        if same_identifiers(package_entity.fqn.name, app_package_entity.fqn.name)
+    ]
+
     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:
+        if app_entity.from_.target in all_packages_with_id:
             ws.perform_action(
                 app_entity.entity_id,
                 EntityActions.DROP,
@@ -306,7 +308,7 @@ def app_deploy(
         show_default=False,
         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
+            Paths, relative to 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."""

snowflake/cli/_plugins/nativeapp/entities/application.py

@@ -53,6 +53,7 @@ from snowflake.cli._plugins.nativeapp.sf_facade_exceptions import (
     UpgradeApplicationRestrictionError,
 )
 from snowflake.cli._plugins.nativeapp.utils import needs_confirmation
+from snowflake.cli._plugins.stage.manager import DefaultStagePathParts
 from snowflake.cli._plugins.workspace.context import ActionContext
 from snowflake.cli.api.cli_global_context import get_cli_context, span
 from snowflake.cli.api.console.abc import AbstractConsole
@@ -60,12 +61,12 @@ from snowflake.cli.api.constants import ObjectType
 from snowflake.cli.api.entities.common import (
     EntityBase,
     attach_spans_to_entity_actions,
-    get_sql_executor,
 )
 from snowflake.cli.api.entities.utils import (
     drop_generic_object,
     execute_post_deploy_hooks,
     generic_sql_error_handler,
+    get_sql_executor,
     print_messages,
 )
 from snowflake.cli.api.errno import (
@@ -83,7 +84,6 @@ from snowflake.cli.api.project.schemas.entities.common import (
 from snowflake.cli.api.project.schemas.updatable_model import DiscriminatorField
 from snowflake.cli.api.project.util import (
     append_test_resource_suffix,
-    extract_schema,
     identifier_for_url,
     to_identifier,
     unquote_identifier,
@@ -331,7 +331,6 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
         paths: List[Path],
         release_channel: Optional[str] = None,
         validate: bool = ValidateOption,
-        stage_fqn: Optional[str] = None,
         interactive: bool = InteractiveOption,
         version: Optional[str] = None,
         patch: Optional[int] = None,
@@ -346,7 +345,8 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
         package_entity: ApplicationPackageEntity = action_ctx.get_entity(
             self.package_entity_id
         )
-        stage_fqn = stage_fqn or package_entity.stage_fqn
+
+        stage_path = package_entity.stage_path
 
         if force:
             policy = AllowAlwaysPolicy()
@@ -363,7 +363,7 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
 
             self.create_or_upgrade_app(
                 package=package_entity,
-                stage_fqn=stage_fqn,
+                stage_path=stage_path,
                 install_method=SameAccountInstallMethod.release_directive(),
                 release_channel=release_channel,
                 policy=policy,
@@ -391,7 +391,7 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
 
             self.create_or_upgrade_app(
                 package=package_entity,
-                stage_fqn=stage_fqn,
+                stage_path=stage_path,
                 install_method=SameAccountInstallMethod.versioned_dev(version, patch),
                 policy=policy,
                 interactive=interactive,
@@ -405,13 +405,12 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
             recursive=True,
             paths=[],
             validate=validate,
-            stage_fqn=stage_fqn,
             interactive=interactive,
             force=force,
         )
         self.create_or_upgrade_app(
             package=package_entity,
-            stage_fqn=stage_fqn,
+            stage_path=stage_path,
             install_method=SameAccountInstallMethod.unversioned_dev(),
             policy=policy,
             interactive=interactive,
@@ -609,7 +608,7 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
 
     def _upgrade_app(
         self,
-        stage_fqn: str,
+        stage_path: DefaultStagePathParts,
         install_method: SameAccountInstallMethod,
         event_sharing: EventSharingHandler,
         policy: PolicyBase,
@@ -622,7 +621,7 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
             return get_snowflake_facade().upgrade_application(
                 name=self.name,
                 install_method=install_method,
-                stage_fqn=stage_fqn,
+                path_to_version_directory=stage_path.full_path,
                 debug_mode=self.debug,
                 should_authorize_event_sharing=event_sharing.should_authorize_event_sharing(),
                 release_channel=release_channel,
@@ -636,7 +635,7 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
 
     def _create_app(
         self,
-        stage_fqn: str,
+        stage_path: DefaultStagePathParts,
         install_method: SameAccountInstallMethod,
         event_sharing: EventSharingHandler,
         package: ApplicationPackageEntity,
@@ -653,7 +652,7 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
                 role_to_use=package.role,
             )
 
-            stage_schema = extract_schema(stage_fqn)
+            stage_schema = stage_path.schema
             get_snowflake_facade().grant_privileges_to_role(
                 privileges=["usage"],
                 object_type=ObjectType.SCHEMA,
@@ -665,7 +664,7 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
             get_snowflake_facade().grant_privileges_to_role(
                 privileges=["read"],
                 object_type=ObjectType.STAGE,
-                object_identifier=stage_fqn,
+                object_identifier=stage_path.stage,
                 role_to_grant=self.role,
                 role_to_use=package.role,
             )
@@ -674,7 +673,7 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
             name=self.name,
             package_name=package.name,
             install_method=install_method,
-            stage_fqn=stage_fqn,
+            path_to_version_directory=stage_path.full_path,
             debug_mode=self.debug,
             should_authorize_event_sharing=event_sharing.should_authorize_event_sharing(),
             role=self.role,
@@ -686,7 +685,7 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
     def create_or_upgrade_app(
         self,
         package: ApplicationPackageEntity,
-        stage_fqn: str,
+        stage_path: DefaultStagePathParts,
         install_method: SameAccountInstallMethod,
         policy: PolicyBase,
         interactive: bool,
@@ -704,13 +703,11 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
             self.name, self.role
         )
 
-        stage_fqn = stage_fqn or package.stage_fqn
-
         # 2. If existing application is found, try to upgrade the application object.
         create_or_upgrade_result = None
         if show_app_row:
             create_or_upgrade_result = self._upgrade_app(
-                stage_fqn=stage_fqn,
+                stage_path=stage_path,
                 install_method=install_method,
                 event_sharing=event_sharing,
                 policy=policy,
@@ -721,7 +718,7 @@ class ApplicationEntity(EntityBase[ApplicationEntityModel]):
         # 3. If no existing application found, or we performed a drop before the upgrade, we proceed to create
         if create_or_upgrade_result is None:
             create_or_upgrade_result = self._create_app(
-                stage_fqn=stage_fqn,
+                stage_path=stage_path,
                 install_method=install_method,
                 event_sharing=event_sharing,
                 package=package,