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

snowflake/cli/{plugins → _plugins}/nativeapp/codegen/compiler.py

@@ -16,22 +16,22 @@ from __future__ import annotations
 
 from typing import Dict, Optional
 
-from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.project.schemas.native_app.path_mapping import (
-    ProcessorMapping,
-)
-from snowflake.cli.plugins.nativeapp.codegen.artifact_processor import (
+from snowflake.cli._plugins.nativeapp.bundle_context import BundleContext
+from snowflake.cli._plugins.nativeapp.codegen.artifact_processor import (
     ArtifactProcessor,
     UnsupportedArtifactProcessorError,
 )
-from snowflake.cli.plugins.nativeapp.codegen.setup.native_app_setup_processor import (
+from snowflake.cli._plugins.nativeapp.codegen.setup.native_app_setup_processor import (
     NativeAppSetupProcessor,
 )
-from snowflake.cli.plugins.nativeapp.codegen.snowpark.python_processor import (
+from snowflake.cli._plugins.nativeapp.codegen.snowpark.python_processor import (
     SnowparkAnnotationProcessor,
 )
-from snowflake.cli.plugins.nativeapp.feature_flags import FeatureFlag
-from snowflake.cli.plugins.nativeapp.project_model import NativeAppProjectModel
+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 (
+    ProcessorMapping,
+)
 
 SNOWPARK_PROCESSOR = "snowpark"
 NA_SETUP_PROCESSOR = "native-app-setup"
@@ -53,9 +53,9 @@ class NativeAppCompiler:
 
     def __init__(
         self,
-        na_project: NativeAppProjectModel,
+        bundle_ctx: BundleContext,
     ):
-        self._na_project = na_project
+        self._bundle_ctx = bundle_ctx
         # dictionary of all processors created and shared between different artifact objects.
         self.cached_processors: Dict[str, ArtifactProcessor] = {}
 
@@ -69,12 +69,12 @@ class NativeAppCompiler:
             return
 
         with cc.phase("Invoking artifact processors"):
-            if self._na_project.generated_root.exists():
+            if self._bundle_ctx.generated_root.exists():
                 raise ClickException(
-                    f"Path {self._na_project.generated_root} already exists. Please choose a different name for your generated directory in the project definition file."
+                    f"Path {self._bundle_ctx.generated_root} already exists. Please choose a different name for your generated directory in the project definition file."
                 )
 
-            for artifact in self._na_project.artifacts:
+            for artifact in self._bundle_ctx.artifacts:
                 for processor in artifact.processors:
                     if self._is_enabled(processor):
                         artifact_processor = self._try_create_processor(
@@ -110,15 +110,13 @@ class NativeAppCompiler:
             # No registered processor with the specified name
             return None
 
-        current_processor = processor_factory(
-            na_project=self._na_project,
-        )
+        current_processor = processor_factory(self._bundle_ctx)
         self.cached_processors[processor_name] = current_processor
 
         return current_processor
 
     def _should_invoke_processors(self):
-        for artifact in self._na_project.artifacts:
+        for artifact in self._bundle_ctx.artifacts:
             for processor in artifact.processors:
                 if self._is_enabled(processor):
                     return True

snowflake/cli/{plugins → _plugins}/nativeapp/codegen/setup/native_app_setup_processor.py

@@ -20,34 +20,30 @@ from pathlib import Path
 from typing import List, Optional
 
 from click import ClickException
-from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.project.schemas.native_app.path_mapping import (
-    PathMapping,
-    ProcessorMapping,
-)
-from snowflake.cli.plugins.nativeapp.artifacts import BundleMap, find_setup_script_file
-from snowflake.cli.plugins.nativeapp.codegen.artifact_processor import (
+from snowflake.cli._plugins.nativeapp.artifacts import BundleMap, find_setup_script_file
+from snowflake.cli._plugins.nativeapp.codegen.artifact_processor import (
     ArtifactProcessor,
     is_python_file_artifact,
 )
-from snowflake.cli.plugins.nativeapp.codegen.sandbox import (
+from snowflake.cli._plugins.nativeapp.codegen.sandbox import (
     ExecutionEnvironmentType,
     SandboxEnvBuilder,
     execute_script_in_sandbox,
 )
-from snowflake.cli.plugins.nativeapp.project_model import NativeAppProjectModel
-from snowflake.cli.plugins.stage.diff import to_stage_path
+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 (
+    PathMapping,
+    ProcessorMapping,
+)
 
 DEFAULT_TIMEOUT = 30
 DRIVER_PATH = Path(__file__).parent / "setup_driver.py.source"
 
 
 class NativeAppSetupProcessor(ArtifactProcessor):
-    def __init__(
-        self,
-        na_project: NativeAppProjectModel,
-    ):
-        super().__init__(na_project=na_project)
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
     def process(
         self,
@@ -59,8 +55,8 @@ class NativeAppSetupProcessor(ArtifactProcessor):
         Processes a Python setup script and generates the corresponding SQL commands.
         """
         bundle_map = BundleMap(
-            project_root=self._na_project.project_root,
-            deploy_root=self._na_project.deploy_root,
+            project_root=self._bundle_ctx.project_root,
+            deploy_root=self._bundle_ctx.deploy_root,
         )
         bundle_map.add(artifact_to_process)
 
@@ -73,7 +69,7 @@ class NativeAppSetupProcessor(ArtifactProcessor):
             absolute=True, expand_directories=True, predicate=is_python_file_artifact
         ):
             cc.message(
-                f"Found Python setup file: {src_file.relative_to(self._na_project.project_root)}"
+                f"Found Python setup file: {src_file.relative_to(self._bundle_ctx.project_root)}"
             )
             files_to_process.append(src_file)
 
@@ -85,9 +81,9 @@ class NativeAppSetupProcessor(ArtifactProcessor):
         cc.step(f"Processing {file_count} setup file{'s' if file_count > 1 else ''}")
 
         env_vars = {
-            "_SNOWFLAKE_CLI_PROJECT_PATH": str(self._na_project.project_root),
+            "_SNOWFLAKE_CLI_PROJECT_PATH": str(self._bundle_ctx.project_root),
             "_SNOWFLAKE_CLI_SETUP_FILES": os.pathsep.join(map(str, py_files)),
-            "_SNOWFLAKE_CLI_APP_NAME": str(self._na_project.package_name),
+            "_SNOWFLAKE_CLI_APP_NAME": str(self._bundle_ctx.package_name),
             "_SNOWFLAKE_CLI_SQL_DEST_DIR": str(self.generated_root),
         }
 
@@ -95,7 +91,7 @@ class NativeAppSetupProcessor(ArtifactProcessor):
             result = execute_script_in_sandbox(
                 script_source=DRIVER_PATH.read_text(),
                 env_type=ExecutionEnvironmentType.VENV,
-                cwd=self._na_project.bundle_root,
+                cwd=self._bundle_ctx.bundle_root,
                 timeout=DEFAULT_TIMEOUT,
                 path=self.sandbox_root,
                 env_vars=env_vars,
@@ -123,7 +119,7 @@ class NativeAppSetupProcessor(ArtifactProcessor):
 
         cc.step("Patching setup script")
         setup_file_path = find_setup_script_file(
-            deploy_root=self._na_project.deploy_root
+            deploy_root=self._bundle_ctx.deploy_root
         )
         with self.edit_file(setup_file_path) as f:
             new_contents = [f.contents]
@@ -132,30 +128,30 @@ class NativeAppSetupProcessor(ArtifactProcessor):
                 schemas_file = generated_root / sql_file_mappings["schemas"]
                 new_contents.insert(
                     0,
-                    f"EXECUTE IMMEDIATE FROM '/{to_stage_path(schemas_file.relative_to(self._na_project.deploy_root))}';",
+                    f"EXECUTE IMMEDIATE FROM '/{to_stage_path(schemas_file.relative_to(self._bundle_ctx.deploy_root))}';",
                 )
 
             if sql_file_mappings["compute_pools"]:
                 compute_pools_file = generated_root / sql_file_mappings["compute_pools"]
                 new_contents.append(
-                    f"EXECUTE IMMEDIATE FROM '/{to_stage_path(compute_pools_file.relative_to(self._na_project.deploy_root))}';"
+                    f"EXECUTE IMMEDIATE FROM '/{to_stage_path(compute_pools_file.relative_to(self._bundle_ctx.deploy_root))}';"
                 )
 
             if sql_file_mappings["services"]:
                 services_file = generated_root / sql_file_mappings["services"]
                 new_contents.append(
-                    f"EXECUTE IMMEDIATE FROM '/{to_stage_path(services_file.relative_to(self._na_project.deploy_root))}';"
+                    f"EXECUTE IMMEDIATE FROM '/{to_stage_path(services_file.relative_to(self._bundle_ctx.deploy_root))}';"
                 )
 
             f.edited_contents = "\n".join(new_contents)
 
     @property
     def sandbox_root(self):
-        return self._na_project.bundle_root / "setup_py_venv"
+        return self._bundle_ctx.bundle_root / "setup_py_venv"
 
     @property
     def generated_root(self):
-        return self._na_project.generated_root / "setup_py"
+        return self._bundle_ctx.generated_root / "setup_py"
 
     def _create_or_update_sandbox(self):
         sandbox_root = self.sandbox_root
@@ -164,7 +160,7 @@ class NativeAppSetupProcessor(ArtifactProcessor):
             cc.step("Virtual environment found")
         else:
             cc.step(
-                f"Creating virtual environment in {sandbox_root.relative_to(self._na_project.project_root)}"
+                f"Creating virtual environment in {sandbox_root.relative_to(self._bundle_ctx.project_root)}"
             )
         env_builder.ensure_created()
 

snowflake/cli/{plugins → _plugins}/nativeapp/codegen/snowpark/extension_function_utils.py

@@ -23,6 +23,10 @@ from typing import (
 )
 
 from click.exceptions import ClickException
+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.util import (
     is_valid_identifier,
@@ -30,10 +34,6 @@ from snowflake.cli.api.project.util import (
     to_identifier,
     to_string_literal,
 )
-from snowflake.cli.plugins.nativeapp.codegen.snowpark.models import (
-    ExtensionFunctionTypeEnum,
-    NativeAppExtensionFunction,
-)
 
 ASTDefNode = Union[ast.FunctionDef, ast.ClassDef]
 

snowflake/cli/{plugins → _plugins}/nativeapp/codegen/snowpark/python_processor.py

@@ -21,26 +21,20 @@ from textwrap import dedent
 from typing import Any, Dict, List, Optional, Set
 
 from pydantic import ValidationError
-from snowflake.cli.api.console import cli_console as cc
-from snowflake.cli.api.project.schemas.native_app.path_mapping import (
-    PathMapping,
-    ProcessorMapping,
-)
-from snowflake.cli.api.rendering.jinja import jinja_render_from_file
-from snowflake.cli.plugins.nativeapp.artifacts import (
+from snowflake.cli._plugins.nativeapp.artifacts import (
     BundleMap,
     find_setup_script_file,
 )
-from snowflake.cli.plugins.nativeapp.codegen.artifact_processor import (
+from snowflake.cli._plugins.nativeapp.codegen.artifact_processor import (
     ArtifactProcessor,
     is_python_file_artifact,
 )
-from snowflake.cli.plugins.nativeapp.codegen.sandbox import (
+from snowflake.cli._plugins.nativeapp.codegen.sandbox import (
     ExecutionEnvironmentType,
     SandboxExecutionError,
     execute_script_in_sandbox,
 )
-from snowflake.cli.plugins.nativeapp.codegen.snowpark.extension_function_utils import (
+from snowflake.cli._plugins.nativeapp.codegen.snowpark.extension_function_utils import (
     deannotate_module_source,
     ensure_all_string_literals,
     ensure_string_literal,
@@ -49,12 +43,17 @@ from snowflake.cli.plugins.nativeapp.codegen.snowpark.extension_function_utils i
     get_sql_argument_signature,
     get_sql_object_type,
 )
-from snowflake.cli.plugins.nativeapp.codegen.snowpark.models import (
+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
+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 (
+    PathMapping,
+    ProcessorMapping,
+)
+from snowflake.cli.api.rendering.jinja import jinja_render_from_file
 
 DEFAULT_TIMEOUT = 30
 TEMPLATE_PATH = Path(__file__).parent / "callback_source.py.jinja"
@@ -163,11 +162,8 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
     and generate SQL code for creation of extension functions based on those discovered objects.
     """
 
-    def __init__(
-        self,
-        na_project: NativeAppProjectModel,
-    ):
-        super().__init__(na_project=na_project)
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
     def process(
         self,
@@ -181,8 +177,8 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
         """
 
         bundle_map = BundleMap(
-            project_root=self._na_project.project_root,
-            deploy_root=self._na_project.deploy_root,
+            project_root=self._bundle_ctx.project_root,
+            deploy_root=self._bundle_ctx.deploy_root,
         )
         bundle_map.add(artifact_to_process)
 
@@ -235,7 +231,7 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
 
     @property
     def _generated_root(self):
-        return self._na_project.generated_root / "snowpark"
+        return self._bundle_ctx.generated_root / "snowpark"
 
     def _normalize_imports(
         self,
@@ -315,7 +311,7 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
         self, bundle_map: BundleMap, processor_mapping: Optional[ProcessorMapping]
     ) -> Dict[Path, List[NativeAppExtensionFunction]]:
         kwargs = (
-            _determine_virtual_env(self._na_project.project_root, processor_mapping)
+            _determine_virtual_env(self._bundle_ctx.project_root, processor_mapping)
             if processor_mapping is not None
             else {}
         )
@@ -338,7 +334,7 @@ class SnowparkAnnotationProcessor(ArtifactProcessor):
             )
             collected_extension_function_json = _execute_in_sandbox(
                 py_file=str(dest_file.resolve()),
-                deploy_root=self._na_project.deploy_root,
+                deploy_root=self._bundle_ctx.deploy_root,
                 kwargs=kwargs,
             )
 
@@ -369,7 +365,7 @@ 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._na_project.deploy_root)
+        relative_py_file = py_file.relative_to(self._bundle_ctx.deploy_root)
         sql_file = Path(self._generated_root, relative_py_file.with_suffix(".sql"))
         if sql_file.exists():
             cc.warning(

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

@@ -14,60 +14,63 @@
 
 from __future__ import annotations
 
+import itertools
 import logging
+from enum import Enum
 from pathlib import Path
 from textwrap import dedent
-from typing import List, Optional
+from typing import Generator, Iterable, List, Optional, cast
 
 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,
-)
-from snowflake.cli.api.commands.snow_typer import SnowTyperFactory
-from snowflake.cli.api.output.formats import OutputFormat
-from snowflake.cli.api.output.types import (
-    CollectionResult,
-    CommandResult,
-    MessageResult,
-    ObjectResult,
-    StreamResult,
-)
-from snowflake.cli.api.project.project_verification import assert_project_type
-from snowflake.cli.api.secure_path import SecurePath
-from snowflake.cli.plugins.nativeapp.common_flags import (
+from snowflake.cli._plugins.nativeapp.common_flags import (
     ForceOption,
     InteractiveOption,
     ValidateOption,
 )
-from snowflake.cli.plugins.nativeapp.init import (
+from snowflake.cli._plugins.nativeapp.init import (
     OFFICIAL_TEMPLATES_GITHUB_URL,
     nativeapp_init,
 )
-from snowflake.cli.plugins.nativeapp.manager import NativeAppManager
-from snowflake.cli.plugins.nativeapp.policy import (
+from snowflake.cli._plugins.nativeapp.manager import NativeAppManager
+from snowflake.cli._plugins.nativeapp.policy import (
     AllowAlwaysPolicy,
     AskAlwaysPolicy,
     DenyAlwaysPolicy,
 )
-from snowflake.cli.plugins.nativeapp.run_processor import NativeAppRunProcessor
-from snowflake.cli.plugins.nativeapp.teardown_processor import (
+from snowflake.cli._plugins.nativeapp.run_processor import NativeAppRunProcessor
+from snowflake.cli._plugins.nativeapp.teardown_processor import (
     NativeAppTeardownProcessor,
 )
-from snowflake.cli.plugins.nativeapp.utils import (
+from snowflake.cli._plugins.nativeapp.utils import (
     get_first_paragraph_from_markdown_file,
     shallow_git_clone,
 )
-from snowflake.cli.plugins.nativeapp.v2_conversions.v2_to_v1_decorator import (
+from snowflake.cli._plugins.nativeapp.v2_conversions.v2_to_v1_decorator import (
     nativeapp_definition_v2_to_v1,
 )
-from snowflake.cli.plugins.nativeapp.version.commands import app as versions_app
-from snowflake.cli.plugins.stage.diff import (
+from snowflake.cli._plugins.nativeapp.version.commands import app as versions_app
+from snowflake.cli._plugins.stage.diff import (
     DiffResult,
     compute_stage_diff,
-    print_diff_to_console,
 )
+from snowflake.cli._plugins.stage.utils import print_diff_to_console
+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.exceptions import IncompatibleParametersError
+from snowflake.cli.api.output.formats import OutputFormat
+from snowflake.cli.api.output.types import (
+    CollectionResult,
+    CommandResult,
+    MessageResult,
+    ObjectResult,
+    StreamResult,
+)
+from snowflake.cli.api.project.project_verification import assert_project_type
+from snowflake.cli.api.secure_path import SecurePath
+from typing_extensions import Annotated
 
 app = SnowTyperFactory(
     name="app",
@@ -83,6 +86,7 @@ def app_init(
     path: str = typer.Argument(
         ...,
         help=f"""Directory to be initialized with the Snowflake Native App project. This directory must not already exist.""",
+        show_default=False,
     ),
     name: str = typer.Option(
         None,
@@ -166,6 +170,7 @@ def app_bundle(
 
     assert_project_type("native_app")
 
+    cli_context = get_cli_context()
     manager = NativeAppManager(
         project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
@@ -185,6 +190,7 @@ def app_diff(
     """
     assert_project_type("native_app")
 
+    cli_context = get_cli_context()
     manager = NativeAppManager(
         project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
@@ -243,6 +249,7 @@ def app_run(
     else:
         policy = DenyAlwaysPolicy()
 
+    cli_context = get_cli_context()
     processor = NativeAppRunProcessor(
         project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
@@ -276,6 +283,7 @@ def app_open(
 
     assert_project_type("native_app")
 
+    cli_context = get_cli_context()
     manager = NativeAppManager(
         project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
@@ -308,6 +316,7 @@ def app_teardown(
 
     assert_project_type("native_app")
 
+    cli_context = get_cli_context()
     processor = NativeAppTeardownProcessor(
         project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
@@ -362,8 +371,9 @@ def app_deploy(
             recursive = False
 
     if has_paths and prune:
-        raise ClickException("--prune cannot be used when paths are also specified")
+        raise IncompatibleParametersError(["paths", "--prune"])
 
+    cli_context = get_cli_context()
     manager = NativeAppManager(
         project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
@@ -393,6 +403,7 @@ def app_validate(**options):
 
     assert_project_type("native_app")
 
+    cli_context = get_cli_context()
     manager = NativeAppManager(
         project_definition=cli_context.project_definition.native_app,
         project_root=cli_context.project_root,
@@ -404,26 +415,144 @@ def app_validate(**options):
     return MessageResult("Snowflake Native App validation succeeded.")
 
 
-@app.command("events", hidden=True, requires_connection=True)
+class RecordType(Enum):
+    LOG = "log"
+    SPAN = "span"
+    SPAN_EVENT = "span_event"
+
+
+# The default number of lines to print before streaming when running
+# snow app events --follow
+DEFAULT_EVENT_FOLLOW_LAST = 20
+
+
+@app.command("events", requires_connection=True)
 @with_project_definition()
 @nativeapp_definition_v2_to_v1
-def app_events(**options):
-    """Fetches events for this app from the event table configured in Snowflake."""
+def app_events(
+    since: str = typer.Option(
+        default="",
+        help="Fetch events that are newer than this time ago, in Snowflake interval syntax.",
+    ),
+    until: str = typer.Option(
+        default="",
+        help="Fetch events that are older than this time ago, in Snowflake interval syntax.",
+    ),
+    record_types: Annotated[
+        list[RecordType], typer.Option(case_sensitive=False)
+    ] = typer.Option(
+        [],
+        "--type",
+        help="Restrict results to specific record type. Can be specified multiple times.",
+    ),
+    scopes: Annotated[list[str], typer.Option()] = typer.Option(
+        [],
+        "--scope",
+        help="Restrict results to a specific scope name. Can be specified multiple times.",
+    ),
+    consumer_org: str = typer.Option(
+        default="", help="The name of the consumer organization."
+    ),
+    consumer_account: str = typer.Option(
+        default="",
+        help="The name of the consumer account in the organization.",
+    ),
+    consumer_app_hash: str = typer.Option(
+        default="",
+        help="The SHA-1 hash of the consumer application name",
+    ),
+    first: int = typer.Option(
+        default=-1,
+        show_default=False,
+        help="Fetch only the first N events. Cannot be used with --last.",
+    ),
+    last: int = typer.Option(
+        default=-1,
+        show_default=False,
+        help="Fetch only the last N events. Cannot be used with --first.",
+    ),
+    follow: bool = typer.Option(
+        False,
+        "--follow",
+        "-f",
+        help=(
+            f"Continue polling for events. Implies --last {DEFAULT_EVENT_FOLLOW_LAST} "
+            f"unless overridden or the --since flag is used."
+        ),
+    ),
+    follow_interval: int = typer.Option(
+        10,
+        help=f"Polling interval in seconds when using the --follow flag.",
+    ),
+    **options,
+):
+    """Fetches events for this app from the event table configured in Snowflake.
+
+    By default, this command will fetch events generated by an app installed in the
+    current connection's account. To fetch events generated by an app installed
+    in a consumer account, use the --consumer-org and --consumer-account options.
+    This requires event sharing to be set up to route events to the provider account:
+    https://docs.snowflake.com/en/developer-guide/native-apps/setting-up-logging-and-events
+    """
+    if first >= 0 and last >= 0:
+        raise IncompatibleParametersError(["--first", "--last"])
+
+    if (consumer_org and not consumer_account) or (
+        consumer_account and not consumer_org
+    ):
+        raise IncompatibleParametersError(["--consumer-org", "--consumer-account"])
+
+    if follow:
+        if until:
+            raise IncompatibleParametersError(["--follow", "--until"])
+        if first >= 0:
+            raise IncompatibleParametersError(["--follow", "--first"])
+
     assert_project_type("native_app")
 
+    record_type_names = [r.name for r in record_types]
     manager = NativeAppManager(
-        project_definition=cli_context.project_definition.native_app,
-        project_root=cli_context.project_root,
+        project_definition=get_cli_context().project_definition.native_app,
+        project_root=get_cli_context().project_root,
     )
-    events = manager.get_events()
-    if not events:
-        return MessageResult("No events found.")
-
-    def g():
-        for event in events:
-            yield EventResult(event)
+    if follow:
+        if last == -1 and not since:
+            # If we don't have a value for --last or --since, assume a value
+            # for --last so we at least print something before starting the stream
+            last = DEFAULT_EVENT_FOLLOW_LAST
+        stream: Iterable[CommandResult] = (
+            EventResult(event)
+            for event in manager.stream_events(
+                since=since,
+                last=last,
+                interval_seconds=follow_interval,
+                record_types=record_type_names,
+                scopes=scopes,
+                consumer_org=consumer_org,
+                consumer_account=consumer_account,
+                consumer_app_hash=consumer_app_hash,
+            )
+        )
+        # Append a newline at the end to make the CLI output clean when we hit Ctrl-C
+        stream = itertools.chain(stream, [MessageResult("")])
+    else:
+        stream = (
+            EventResult(event)
+            for event in manager.get_events(
+                since=since,
+                until=until,
+                record_types=record_type_names,
+                scopes=scopes,
+                first=first,
+                last=last,
+                consumer_org=consumer_org,
+                consumer_account=consumer_account,
+                consumer_app_hash=consumer_app_hash,
+            )
+        )
 
-    return StreamResult(g())
+    # Cast the stream to a Generator since that's what StreamResult wants
+    return StreamResult(cast(Generator[CommandResult, None, None], stream))
 
 
 class EventResult(ObjectResult, MessageResult):

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

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import typer
-from snowflake.cli.plugins.nativeapp.utils import is_tty_interactive
+from snowflake.cli._plugins.nativeapp.utils import is_tty_interactive
 
 
 def interactive_callback(val):