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

snowflake/cli/__about__.py

@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "2.8.0rc0"
+VERSION = "2.8.0rc1"

snowflake/cli/api/project/errors.py

@@ -29,10 +29,25 @@ class SchemaValidationError(ClickException):
     def __init__(self, error: ValidationError):
         errors = error.errors()
         message = f"During evaluation of {error.title} in project definition following errors were encountered:\n"
+
+        def calculate_location(e):
+            if e["loc"] is None:
+                return None
+
+            # show numbers as list indexes and strings as dictionary keys. Example: key1[0].key2
+            result = "".join(
+                f"[{item}]" if isinstance(item, int) else f".{item}"
+                for item in e["loc"]
+            )
+
+            # remove leading dot from the string if any:
+            return result[1:] if result.startswith(".") else result
+
         message += "\n".join(
             [
                 self.message_templates.get(e["type"], self.generic_message).format(
-                    **e, location=".".join(e["loc"]) if e["loc"] is not None else None
+                    **e,
+                    location=calculate_location(e),
                 )
                 for e in errors
             ]

snowflake/cli/plugins/nativeapp/manager.py

@@ -45,6 +45,7 @@ from snowflake.cli.api.project.util import (
 from snowflake.cli.api.rendering.sql_templates import (
     get_sql_cli_jinja_env,
 )
+from snowflake.cli.api.secure_path import UNLIMITED, SecurePath
 from snowflake.cli.api.sql_execution import SqlExecutionMixin
 from snowflake.cli.plugins.connection.util import make_snowsight_url
 from snowflake.cli.plugins.nativeapp.artifacts import (
@@ -577,7 +578,10 @@ class NativeAppManager(SqlExecutionMixin):
             )
 
     def _expand_script_templates(
-        self, env: jinja2.Environment, jinja_context: dict[str, Any], scripts: List[str]
+        self,
+        env: jinja2.Environment,
+        jinja_context: dict[str, Any],
+        scripts: List[str],
     ) -> List[str]:
         """
         Input:
@@ -589,20 +593,22 @@ class NativeAppManager(SqlExecutionMixin):
         Size of the return list is the same as the size of the input scripts list.
         """
         scripts_contents = []
-        for relpath in scripts:
+        for script in scripts:
+            full_path = SecurePath(self.project_root) / script
             try:
-                template = env.get_template(relpath)
+                template_content = full_path.read_text(file_size_limit_mb=UNLIMITED)
+                template = env.from_string(template_content)
                 result = template.render(**jinja_context)
                 scripts_contents.append(result)
 
-            except jinja2.TemplateNotFound as e:
-                raise MissingScriptError(e.name) from e
+            except FileNotFoundError as e:
+                raise MissingScriptError(script) from e
 
             except jinja2.TemplateSyntaxError as e:
-                raise InvalidScriptError(e.name, e, e.lineno) from e
+                raise InvalidScriptError(script, e, e.lineno) from e
 
             except jinja2.UndefinedError as e:
-                raise InvalidScriptError(relpath, e) from e
+                raise InvalidScriptError(script, e) from e
 
         return scripts_contents
 
@@ -618,7 +624,7 @@ class NativeAppManager(SqlExecutionMixin):
             )
 
         env = jinja2.Environment(
-            loader=jinja2.loaders.FileSystemLoader(self.project_root),
+            loader=jinja2.BaseLoader(),
             keep_trailing_newline=True,
             undefined=jinja2.StrictUndefined,
         )
@@ -668,19 +674,17 @@ class NativeAppManager(SqlExecutionMixin):
         if not post_deploy_hooks:
             return
 
-        with cc.phase(f"Executing {deployed_object_type} post-deploy actions"):
+        with cc.phase(f"Executing {deployed_object_type} post_deploy actions"):
             sql_scripts_paths = []
             for hook in post_deploy_hooks:
                 if hook.sql_script:
                     sql_scripts_paths.append(hook.sql_script)
                 else:
                     raise ValueError(
-                        f"Unsupported {deployed_object_type} post-deploy hook type: {hook}"
+                        f"Unsupported {deployed_object_type} post_deploy hook type: {hook}"
                     )
 
-            env = get_sql_cli_jinja_env(
-                loader=jinja2.loaders.FileSystemLoader(self.project_root)
-            )
+            env = get_sql_cli_jinja_env()
             scripts_content_list = self._expand_script_templates(
                 env, cli_context.template_context, sql_scripts_paths
             )

{snowflake_cli_labs-2.8.0rc0.dist-info → snowflake_cli_labs-2.8.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snowflake-cli-labs
-Version: 2.8.0rc0
+Version: 2.8.0rc1
 Summary: Snowflake CLI
 Project-URL: Source code, https://github.com/snowflakedb/snowflake-cli
 Project-URL: Bug Tracker, https://github.com/snowflakedb/snowflake-cli/issues

{snowflake_cli_labs-2.8.0rc0.dist-info → snowflake_cli_labs-2.8.0rc1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-snowflake/cli/__about__.py,sha256=DXQdpxAQ2bEz1VwFbGeObG4Lm7jRX_ojFsaj5ClOhQg,636
+snowflake/cli/__about__.py,sha256=--zpRaqLpjNYGKlTH_ufSpk37KBoL5EjRpdoCanEWF4,636
 snowflake/cli/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
 snowflake/cli/api/__init__.py,sha256=kD6lYv5et7QJvW7vzvLN9p2ibfD7pjh9KRWsp2QoYqo,1330
 snowflake/cli/api/cli_global_context.py,sha256=gAs7snaqRi5ESaxU8HcC_QBR2q9y1PMdhi7kQCGkICs,11714
@@ -36,7 +36,7 @@ snowflake/cli/api/plugins/command/plugin_hook_specs.py,sha256=AHJGk6j3NRzalIe4ll
 snowflake/cli/api/project/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
 snowflake/cli/api/project/definition.py,sha256=12R3Z59bp0y0E1eQC2E1VFxRx3HwsFzk4p9nlkW0csk,2987
 snowflake/cli/api/project/definition_manager.py,sha256=h1ympKIZ9TB5a-WgEro4gm8BjqpHxAeCwXVppV26x0Y,4645
-snowflake/cli/api/project/errors.py,sha256=LJY_XkL6B6agD4jAxXxFbEe80j6Pak5SxSP67Ls4Fkc,1674
+snowflake/cli/api/project/errors.py,sha256=9TGN2ezqSCHmSGy1U7AByaJm5Xf47zN-7N3i6R6fyBg,2136
 snowflake/cli/api/project/project_verification.py,sha256=l3K6SMDJxpys9xhnwxBhd6BDyQVqqUItsf4FKAp8NtA,951
 snowflake/cli/api/project/util.py,sha256=wung3PYl3_32RO-R2Qu7SGFnYWpIxqE6bltJFyoWnfc,8678
 snowflake/cli/api/project/schemas/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
@@ -133,7 +133,7 @@ snowflake/cli/plugins/nativeapp/constants.py,sha256=j25fS9dS54GPPp41njUOZTDykhYq
 snowflake/cli/plugins/nativeapp/exceptions.py,sha256=Wh-qJlAG9UMdWB0lqAVafbBdA_hj_m7UnI4efLjOgUA,4360
 snowflake/cli/plugins/nativeapp/feature_flags.py,sha256=Y1peJF8ju_lybKjklOvXYsGQMN8VhFoLnoq-Z7oqO-E,829
 snowflake/cli/plugins/nativeapp/init.py,sha256=BX0rDIJem5bJn0-0s5Ha3BSJIX82ZWJLsDiJvuQSsAA,12124
-snowflake/cli/plugins/nativeapp/manager.py,sha256=z89L8Srwe2GQfosOEQumqYASWHghxjDR7Qtq8cjO_tE,30904
+snowflake/cli/plugins/nativeapp/manager.py,sha256=Xel0eAhs65FQBGWT-3eKI5Zi33qioXoAWKX3tu34j9s,31023
 snowflake/cli/plugins/nativeapp/plugin_spec.py,sha256=CWpkkQlCjY7kO-JLFdAx6UtUo4FZ2soJXcxjUAnUflM,997
 snowflake/cli/plugins/nativeapp/policy.py,sha256=yND6QTJUtbuREdT9I2fzFI4-XFd7zbNgWKlvoFICwko,1605
 snowflake/cli/plugins/nativeapp/project_model.py,sha256=uLVLEbefN_vV0TbsYJWTOQD-YO2_-scJzxS69aE1RHo,6774
@@ -233,8 +233,8 @@ snowflake/cli/templates/default_streamlit/snowflake.yml,sha256=yWFU-vqJ7Z17K3loU
 snowflake/cli/templates/default_streamlit/streamlit_app.py,sha256=hfYtJl4Rtm0n3J2gNeDwMT-leeGL5R-qJKwyJ0kUxAI,109
 snowflake/cli/templates/default_streamlit/common/hello.py,sha256=3Zt2LthAYDs6UGqOvRNCzYH-HISLHxdx_uAVhcCOtJM,37
 snowflake/cli/templates/default_streamlit/pages/my_page.py,sha256=f__P9j5XCo8J1c6du25wSvknIKvhTFWrXF_298YiQbw,49
-snowflake_cli_labs-2.8.0rc0.dist-info/METADATA,sha256=Ut5Ef7KOXi4RdpJrPljCB_QvLTVW6y9-lz1ZaSWxp0o,17804
-snowflake_cli_labs-2.8.0rc0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-snowflake_cli_labs-2.8.0rc0.dist-info/entry_points.txt,sha256=_qdnT44fYFbH78kb6Em5jr2_26amIg3UIAvSdmqT6TY,57
-snowflake_cli_labs-2.8.0rc0.dist-info/licenses/LICENSE,sha256=mJMA3Uz2AbjU_kVggo1CAx01XhBsI7BSi2H7ggUg_-c,11344
-snowflake_cli_labs-2.8.0rc0.dist-info/RECORD,,
+snowflake_cli_labs-2.8.0rc1.dist-info/METADATA,sha256=TuH8YQDJ4B7S4_Gmvfh0rCrGrcCPHWtizbEwCgJ0Ooc,17804
+snowflake_cli_labs-2.8.0rc1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+snowflake_cli_labs-2.8.0rc1.dist-info/entry_points.txt,sha256=_qdnT44fYFbH78kb6Em5jr2_26amIg3UIAvSdmqT6TY,57
+snowflake_cli_labs-2.8.0rc1.dist-info/licenses/LICENSE,sha256=mJMA3Uz2AbjU_kVggo1CAx01XhBsI7BSi2H7ggUg_-c,11344
+snowflake_cli_labs-2.8.0rc1.dist-info/RECORD,,