Merge branch 'main' into vmaleki-add-comment-support

pyproject.toml

@@ -29,12 +29,12 @@ dependencies = [
   "pluggy==1.5.0",
   "PyYAML==6.0.2",
   "packaging",
-  "rich==13.8.0",
+  "rich==13.8.1",
   "requests==2.32.3",
   "requirements-parser==0.11.0",
-  "setuptools==74.1.2",
-  'snowflake.core==0.8.0; python_version < "3.12"',
-  "snowflake-connector-python[secure-local-storage]==3.12.1",
+  "setuptools==75.1.0",
+  'snowflake.core==0.12.1; python_version < "3.12"',
+  "snowflake-connector-python[secure-local-storage]==3.12.2",
   'snowflake-snowpark-python>=1.15.0;python_version < "3.12"',
   "tomlkit==0.13.2",
   "typer==0.12.5",
@@ -59,7 +59,7 @@ classifiers = [
 development = [
   "coverage==7.6.1",
   "pre-commit>=3.5.0",
-  "pytest==8.3.2",
+  "pytest==8.3.3",
   "pytest-randomly==3.15.0",
   "syrupy==4.7.1",
 ]

snyk/requirements.txt

@@ -2,12 +2,12 @@ jinja2==3.1.4
 pluggy==1.5.0
 PyYAML==6.0.2
 packaging
-rich==13.8.0
+rich==13.8.1
 requests==2.32.3
 requirements-parser==0.11.0
-setuptools==74.1.2
-snowflake.core==0.8.0; python_version < "3.12"
-snowflake-connector-python[secure-local-storage]==3.12.1
+setuptools==75.1.0
+snowflake.core==0.12.1; python_version < "3.12"
+snowflake-connector-python[secure-local-storage]==3.12.2
 snowflake-snowpark-python>=1.15.0;python_version < "3.12"
 tomlkit==0.13.2
 typer==0.12.5
@@ -17,6 +17,6 @@ pip
 pydantic==2.9.1
 coverage==7.6.1
 pre-commit>=3.5.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-randomly==3.15.0
 syrupy==4.7.1

src/snowflake/cli/api/entities/application_entity.py → src/snowflake/cli/_plugins/nativeapp/application_entity.py

@@ -5,6 +5,15 @@
 
 import typer
 from click import ClickException, UsageError
+from snowflake.cli._plugins.nativeapp.application_entity_model import (
+    ApplicationEntityModel,
+)
+from snowflake.cli._plugins.nativeapp.application_package_entity import (
+    ApplicationPackageEntity,
+)
+from snowflake.cli._plugins.nativeapp.application_package_entity_model import (
+    ApplicationPackageEntityModel,
+)
 from snowflake.cli._plugins.nativeapp.common_flags import (
     ForceOption,
     InteractiveOption,
@@ -36,9 +45,6 @@
 )
 from snowflake.cli._plugins.workspace.action_context import ActionContext
 from snowflake.cli.api.console.abc import AbstractConsole
-from snowflake.cli.api.entities.application_package_entity import (
-    ApplicationPackageEntity,
-)
 from snowflake.cli.api.entities.common import EntityBase, get_sql_executor
 from snowflake.cli.api.entities.utils import (
     drop_generic_object,
@@ -55,12 +61,6 @@
     ONLY_SUPPORTED_ON_DEV_MODE_APPLICATIONS,
 )
 from snowflake.cli.api.exceptions import SnowflakeSQLExecutionError
-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.entities.common import PostDeployHook
 from snowflake.cli.api.project.util import (
     extract_schema,

src/snowflake/cli/api/project/schemas/entities/application_entity_model.py → src/snowflake/cli/_plugins/nativeapp/application_entity_model.py

@@ -17,14 +17,14 @@
 from typing import Literal, Optional
 
 from pydantic import Field, field_validator
-from snowflake.cli.api.project.schemas.entities.application_package_entity_model import (
+from snowflake.cli._plugins.nativeapp.application_package_entity_model import (
     ApplicationPackageEntityModel,
 )
 from snowflake.cli.api.project.schemas.entities.common import (
     EntityModelBase,
+    Identifier,
     TargetField,
 )
-from snowflake.cli.api.project.schemas.identifier_model import Identifier
 from snowflake.cli.api.project.schemas.updatable_model import (
     DiscriminatorField,
 )

src/snowflake/cli/api/entities/application_package_entity.py → src/snowflake/cli/_plugins/nativeapp/application_package_entity.py

@@ -6,6 +6,9 @@
 
 import typer
 from click import ClickException
+from snowflake.cli._plugins.nativeapp.application_package_entity_model import (
+    ApplicationPackageEntityModel,
+)
 from snowflake.cli._plugins.nativeapp.artifacts import build_bundle
 from snowflake.cli._plugins.nativeapp.bundle_context import BundleContext
 from snowflake.cli._plugins.nativeapp.codegen.compiler import NativeAppCompiler
@@ -45,11 +48,8 @@
     DOES_NOT_EXIST_OR_NOT_AUTHORIZED,
 )
 from snowflake.cli.api.exceptions import SnowflakeSQLExecutionError
-from snowflake.cli.api.project.schemas.entities.application_package_entity_model import (
-    ApplicationPackageEntityModel,
-)
 from snowflake.cli.api.project.schemas.entities.common import PostDeployHook
-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 extract_schema
 from snowflake.cli.api.rendering.jinja import (
     get_basic_jinja_env,

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

@@ -19,14 +19,14 @@
 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
 
 

src/snowflake/cli/_plugins/nativeapp/artifacts.py

@@ -22,7 +22,7 @@
 
 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.secure_path import SecurePath
 from yaml import safe_load
 

src/snowflake/cli/_plugins/nativeapp/bundle_context.py

@@ -18,7 +18,7 @@
     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

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

@@ -20,7 +20,7 @@
 
 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,
 )

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

@@ -35,7 +35,7 @@
 )
 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,
 )
 

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

@@ -38,7 +38,7 @@
 )
 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,
 )

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

@@ -27,7 +27,7 @@
     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,

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

@@ -18,8 +18,8 @@
 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):

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

@@ -49,7 +49,7 @@
 )
 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,
 )

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

@@ -25,7 +25,7 @@
 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,
 )

src/snowflake/cli/_plugins/nativeapp/manager.py

@@ -23,6 +23,13 @@
 from typing import Generator, List, Optional
 
 from snowflake.cli._plugins.connection.util import make_snowsight_url
+from snowflake.cli._plugins.nativeapp.application_entity import (
+    ApplicationEntity,
+    ApplicationOwnedObject,
+)
+from snowflake.cli._plugins.nativeapp.application_package_entity import (
+    ApplicationPackageEntity,
+)
 from snowflake.cli._plugins.nativeapp.artifacts import (
     BundleMap,
 )
@@ -36,21 +43,14 @@
     DiffResult,
 )
 from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.entities.application_entity import (
-    ApplicationEntity,
-    ApplicationOwnedObject,
-)
-from snowflake.cli.api.entities.application_package_entity import (
-    ApplicationPackageEntity,
-)
 from snowflake.cli.api.entities.utils import (
     execute_post_deploy_hooks,
     generic_sql_error_handler,
     sync_deploy_root_with_stage,
 )
 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.schemas.v1.native_app.native_app import NativeApp
+from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import PathMapping
 from snowflake.cli.api.project.util import (
     identifier_for_url,
     unquote_identifier,

src/snowflake/cli/_plugins/nativeapp/project_model.py

@@ -28,8 +28,8 @@
     default_role,
 )
 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.schemas.v1.native_app.native_app import NativeApp
+from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import PathMapping
 from snowflake.cli.api.project.util import (
     append_test_resource_suffix,
     extract_schema,

src/snowflake/cli/_plugins/nativeapp/run_processor.py

@@ -18,6 +18,12 @@
 from typing import Optional
 
 import typer
+from snowflake.cli._plugins.nativeapp.application_entity import (
+    ApplicationEntity,
+)
+from snowflake.cli._plugins.nativeapp.application_package_entity import (
+    ApplicationPackageEntity,
+)
 from snowflake.cli._plugins.nativeapp.artifacts import BundleMap
 from snowflake.cli._plugins.nativeapp.manager import (
     NativeAppCommandProcessor,
@@ -28,20 +34,14 @@
     SameAccountInstallMethod,
 )
 from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.entities.application_entity import (
-    ApplicationEntity,
-)
-from snowflake.cli.api.entities.application_package_entity import (
-    ApplicationPackageEntity,
-)
 from snowflake.cli.api.entities.utils import (
     generic_sql_error_handler,
 )
 from snowflake.cli.api.errno import (
     APPLICATION_NO_LONGER_AVAILABLE,
     APPLICATION_OWNS_EXTERNAL_OBJECTS,
 )
-from snowflake.cli.api.project.schemas.native_app.native_app import NativeApp
+from snowflake.cli.api.project.schemas.v1.native_app.native_app import NativeApp
 from snowflake.connector import ProgrammingError
 from snowflake.connector.cursor import SnowflakeCursor
 

src/snowflake/cli/_plugins/nativeapp/teardown_processor.py

@@ -17,17 +17,17 @@
 from pathlib import Path
 from typing import Dict, Optional
 
+from snowflake.cli._plugins.nativeapp.application_entity import (
+    ApplicationEntity,
+)
+from snowflake.cli._plugins.nativeapp.application_package_entity import (
+    ApplicationPackageEntity,
+)
 from snowflake.cli._plugins.nativeapp.manager import (
     NativeAppCommandProcessor,
     NativeAppManager,
 )
 from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.entities.application_entity import (
-    ApplicationEntity,
-)
-from snowflake.cli.api.entities.application_package_entity import (
-    ApplicationPackageEntity,
-)
 
 
 class NativeAppTeardownProcessor(NativeAppManager, NativeAppCommandProcessor):

src/snowflake/cli/_plugins/nativeapp/v2_conversions/v2_to_v1_decorator.py

@@ -20,22 +20,22 @@
 
 import typer
 from click import ClickException
+from snowflake.cli._plugins.nativeapp.application_entity_model import (
+    ApplicationEntityModel,
+)
+from snowflake.cli._plugins.nativeapp.application_package_entity_model import (
+    ApplicationPackageEntityModel,
+)
 from snowflake.cli.api.cli_global_context import (
     get_cli_context,
     get_cli_context_manager,
 )
 from snowflake.cli.api.commands.decorators import _options_decorator_factory
-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 (
     DefinitionV11,
     DefinitionV20,
 )
+from snowflake.cli.api.project.schemas.v1.native_app.path_mapping import PathMapping
 from snowflake.cli.api.utils.definition_rendering import render_definition_template
 
 

src/snowflake/cli/_plugins/nativeapp/version/version_processor.py

@@ -38,7 +38,7 @@
 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.schemas.v1.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,

src/snowflake/cli/_plugins/snowpark/commands.py

@@ -46,6 +46,10 @@
     AnacondaPackagesManager,
 )
 from snowflake.cli._plugins.snowpark.package.commands import app as package_app
+from snowflake.cli._plugins.snowpark.snowpark_entity_model import (
+    FunctionEntityModel,
+    ProcedureEntityModel,
+)
 from snowflake.cli._plugins.snowpark.snowpark_project_paths import (
     SnowparkProjectPaths,
 )
@@ -87,10 +91,6 @@
 from snowflake.cli.api.project.definition_conversion import (
     convert_project_definition_to_v2,
 )
-from snowflake.cli.api.project.schemas.entities.snowpark_entity import (
-    FunctionEntityModel,
-    ProcedureEntityModel,
-)
 from snowflake.cli.api.project.schemas.project_definition import (
     ProjectDefinition,
     ProjectDefinitionV2,