snowflake-cli-labs 2.5.0rc0__py3-none-any.whl → 2.5.0rc2__py3-none-any.whl

snowflake/cli/__about__.py

@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "2.5.0rc0"
+VERSION = "2.5.0rc2"

snowflake/cli/api/utils/definition_rendering.py

@@ -18,11 +18,12 @@ import copy
 import os
 from typing import Any, Optional
 
-from jinja2 import Environment, UndefinedError, nodes
+from jinja2 import Environment, nodes
 from packaging.version import Version
 from snowflake.cli.api.exceptions import CycleDetectedError, InvalidTemplate
-from snowflake.cli.api.utils.dict_utils import deep_merge_dicts, traverse
+from snowflake.cli.api.utils.dict_utils import traverse
 from snowflake.cli.api.utils.graph import Graph, Node
+from snowflake.cli.api.utils.models import EnvironWithDefinedDictFallback
 from snowflake.cli.api.utils.rendering import CONTEXT_KEY, get_snowflake_cli_jinja_env
 from snowflake.cli.api.utils.types import Context, Definition
 
@@ -146,7 +147,7 @@ class TemplateVar:
 
         Returns the value in that location.
 
-        Raise UndefinedError if the variable is None or not found.
+        Raise InvalidTemplate if the variable is None or not found.
         """
         current_dict_level = context
         for key in self._vars_chain:
@@ -154,12 +155,12 @@ class TemplateVar:
                 not isinstance(current_dict_level, dict)
                 or key not in current_dict_level
             ):
-                raise UndefinedError(f"Could not find template variable {self.key}")
+                raise InvalidTemplate(f"Could not find template variable {self.key}")
             current_dict_level = current_dict_level[key]
 
         value = current_dict_level
         if value is None or isinstance(value, (dict, list)):
-            raise UndefinedError(
+            raise InvalidTemplate(
                 f"Template variable {self.key} does not contain a valid value"
             )
 
@@ -263,6 +264,8 @@ def render_definition_template(original_definition: Definition) -> Definition:
         definition,
         update_action=lambda val: template_env.render(val, final_context),
     )
-    deep_merge_dicts(definition, {"env": dict(os.environ)})
+
+    current_env = definition.setdefault("env", {})
+    definition["env"] = EnvironWithDefinedDictFallback(current_env)
 
     return definition

snowflake/cli/api/utils/models.py

@@ -17,8 +17,26 @@ from __future__ import annotations
 import os
 from typing import Any, Dict
 
+from snowflake.cli.api.exceptions import InvalidTemplate
+
+
+def _validate_env(current_env: dict):
+    if not isinstance(current_env, dict):
+        raise InvalidTemplate(
+            "env section in project definition file should be a mapping"
+        )
+    for variable, value in current_env.items():
+        if value is None or isinstance(value, (dict, list)):
+            raise InvalidTemplate(
+                f"Variable {variable} in env section or project definition file should be a scalar"
+            )
+
 
 class EnvironWithDefinedDictFallback(Dict):
+    def __init__(self, dict_input: dict):
+        _validate_env(dict_input)
+        super().__init__(dict_input)
+
     def __getattr__(self, item):
         try:
             return self[item]

snowflake/cli/plugins/nativeapp/artifacts.py

@@ -541,7 +541,7 @@ def symlink_or_copy(src: Path, dst: Path, deploy_root: Path) -> None:
             relative_root = Path(root).relative_to(absolute_src)
             absolute_root_in_deploy = Path(dst, relative_root)
             absolute_root_in_deploy.mkdir(parents=True, exist_ok=True)
-            for file in files:
+            for file in sorted(files):
                 absolute_file_in_project = Path(absolute_src, relative_root, file)
                 absolute_file_in_deploy = Path(absolute_root_in_deploy, file)
                 symlink_or_copy(

snowflake/cli/plugins/nativeapp/codegen/snowpark/callback_source.py.jinja

@@ -169,7 +169,7 @@ try:
     import importlib
     with contextlib.redirect_stdout(None):
         with contextlib.redirect_stderr(None):
-            __snowflake_internal_spec = importlib.util.spec_from_file_location("<string>", "{{py_file}}")
+            __snowflake_internal_spec = importlib.util.spec_from_file_location("<string>", r"{{py_file}}")
             __snowflake_internal_module = importlib.util.module_from_spec(__snowflake_internal_spec)
             __snowflake_internal_spec.loader.exec_module(__snowflake_internal_module)
 except Exception as exc:  # Catch any error

{snowflake_cli_labs-2.5.0rc0.dist-info → snowflake_cli_labs-2.5.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snowflake-cli-labs
-Version: 2.5.0rc0
+Version: 2.5.0rc2
 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.5.0rc0.dist-info → snowflake_cli_labs-2.5.0rc2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-snowflake/cli/__about__.py,sha256=PxIn_pgJHpyo6LbCtBRM71tfk7laZ-QcBSjIbB38NGQ,636
+snowflake/cli/__about__.py,sha256=9s_AeTZSPyjs8hb8BWhppIxqSlppSykJpB9s_qoRQ1A,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=_rGbRUonigVH09w-HnlSiIioZtPk5pe7goeuFMIqENo,10424
@@ -50,11 +50,11 @@ snowflake/cli/api/project/schemas/streamlit/__init__.py,sha256=uGA_QRGW3iGwaegpF
 snowflake/cli/api/project/schemas/streamlit/streamlit.py,sha256=9rf6Ose7cS1PfZoNvVyzTC_8AiRD4udGFBHpB3tu2M4,1725
 snowflake/cli/api/utils/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
 snowflake/cli/api/utils/cursor.py,sha256=JlyUG5b4EXii71Dm7qiTdptjwIsOOmEv2QmZA1cY8NQ,1222
-snowflake/cli/api/utils/definition_rendering.py,sha256=gIHHc5OnoWcCcAiVHOdWHBWxb_19_9Iix2VEp7eSplA,10160
+snowflake/cli/api/utils/definition_rendering.py,sha256=dC-K8EPDu_ZZS0tmedQXEhGaMnlyaVedwgjZPxnGnME,10263
 snowflake/cli/api/utils/dict_utils.py,sha256=8vb9EyiT8gNHCtPNfE1S-0WcWdP6G_kiwJ-aizu3Pzs,2799
 snowflake/cli/api/utils/error_handling.py,sha256=etIGdS8kd9APgyeUecnY2XMivDORSRV8q-WuBtpriZY,708
 snowflake/cli/api/utils/graph.py,sha256=XZgcTySyS1je9ARdPWqJyrfzuqFBNt9SSLnGeE2na8M,3045
-snowflake/cli/api/utils/models.py,sha256=p7fNKvsGAhwqG1f-GieQAuO71CADXobg7MEq-spRw0s,1192
+snowflake/cli/api/utils/models.py,sha256=iRTr_wOOCqXSD6ml6fxPrdAKC1650S4qluD43cT6NGg,1818
 snowflake/cli/api/utils/naming_utils.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
 snowflake/cli/api/utils/path_utils.py,sha256=ru0jgw6Ur5zhqpHhj_eAqcaJdrgEgr3bC7Z02FnQV18,1218
 snowflake/cli/api/utils/rendering.py,sha256=6AcxuC7BkweXtMOjQ3ghVjMl2V-u9KDK2zhUp0JkFRU,4358
@@ -101,7 +101,7 @@ snowflake/cli/plugins/git/commands.py,sha256=iD-8smP3BqHPgx9vx3WlM0MtrJQ2Fmv5FGD
 snowflake/cli/plugins/git/manager.py,sha256=1viE-Zq13okQDtOIqAIrzo0ZSgJ77V8DQAhjo9cecQA,2856
 snowflake/cli/plugins/git/plugin_spec.py,sha256=RgGZ744MYXfBMnR1-f11c9_n5XoH7GaIsPocrazq52A,991
 snowflake/cli/plugins/nativeapp/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
-snowflake/cli/plugins/nativeapp/artifacts.py,sha256=tbBHIzcqUBs2Kc8AZv_opZzjxi1Oyp5D1ZJ5XVARX_M,26942
+snowflake/cli/plugins/nativeapp/artifacts.py,sha256=KntAir6StSLHoADAiYwnO7UfrwyCaVCXa2ZNdhDnsWg,26950
 snowflake/cli/plugins/nativeapp/commands.py,sha256=OWZ1ABDtRB1Cl5KM5gyZCQNC1dU7w5OskoNt0N_viKg,12561
 snowflake/cli/plugins/nativeapp/common_flags.py,sha256=7OUXprC2n3B0a9gGTj4AezHaJyt8-C7vgRI5q9l-UXE,1610
 snowflake/cli/plugins/nativeapp/constants.py,sha256=u7eB8gjVZ_HZjPIZ7hux76wS8F76S4J0ze5D7K28zTc,1168
@@ -117,7 +117,7 @@ snowflake/cli/plugins/nativeapp/codegen/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgO
 snowflake/cli/plugins/nativeapp/codegen/artifact_processor.py,sha256=OLYD01rZAMC_PwBeibLK3OU6S5xFVNWpDDs9y1iaLDY,1868
 snowflake/cli/plugins/nativeapp/codegen/compiler.py,sha256=MLoacXP1IRwvTzjkxc6e8JIoFLDHkP_Cj8qne0EQOBU,4878
 snowflake/cli/plugins/nativeapp/codegen/sandbox.py,sha256=oxHNiDD9Vp2vFstb8tZwgIhoIoOj3Qlv_fLVOn9fNII,8243
-snowflake/cli/plugins/nativeapp/codegen/snowpark/callback_source.py.jinja,sha256=3LVzDX8SVrx7jUYwMyB6ogLj_7tp_Hiq7k0mKVc1xVw,7530
+snowflake/cli/plugins/nativeapp/codegen/snowpark/callback_source.py.jinja,sha256=JiMs2NKhtFFvKotQFU61wpKBAqPAfBthGsdT1aZgY-c,7531
 snowflake/cli/plugins/nativeapp/codegen/snowpark/extension_function_utils.py,sha256=E2bQFVmiC7MdRCWBtWo3BjzcBUr-9BBzwKduWmZdXdw,7626
 snowflake/cli/plugins/nativeapp/codegen/snowpark/models.py,sha256=xPC7Igbyo_A6Su4xWeXNYV421uefMqHpQbwFGG8AprI,2225
 snowflake/cli/plugins/nativeapp/codegen/snowpark/python_processor.py,sha256=33Vc6InyEM59nXxeMIB4KPOVZjIRQsrFdSUgihFK7nk,20374
@@ -199,8 +199,8 @@ snowflake/cli/templates/default_streamlit/snowflake.yml,sha256=yWFU-vqJ7Z17K3loU
 snowflake/cli/templates/default_streamlit/streamlit_app.py,sha256=BtWuwdkgcMiYt21ghyi6Y1b_ITcIunN13ulUknvQbgI,688
 snowflake/cli/templates/default_streamlit/common/hello.py,sha256=3kZSJggAWSYgi06NuI_5USV06mcCOBEzzz2DYeNGpc0,617
 snowflake/cli/templates/default_streamlit/pages/my_page.py,sha256=wj2nMJmpAH_e9hOHoAUxyG4q17vyeVdnBtaXv_5KG24,628
-snowflake_cli_labs-2.5.0rc0.dist-info/METADATA,sha256=SZGEa-xXbsCdoxr5EHx0zf-BT2BbHdwlS2JI7sJXRt4,17543
-snowflake_cli_labs-2.5.0rc0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-snowflake_cli_labs-2.5.0rc0.dist-info/entry_points.txt,sha256=_qdnT44fYFbH78kb6Em5jr2_26amIg3UIAvSdmqT6TY,57
-snowflake_cli_labs-2.5.0rc0.dist-info/licenses/LICENSE,sha256=mJMA3Uz2AbjU_kVggo1CAx01XhBsI7BSi2H7ggUg_-c,11344
-snowflake_cli_labs-2.5.0rc0.dist-info/RECORD,,
+snowflake_cli_labs-2.5.0rc2.dist-info/METADATA,sha256=cFJ5avP9eVi3CYn4VB2OkJ17l6okOrgkIdBrhPR_My4,17543
+snowflake_cli_labs-2.5.0rc2.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+snowflake_cli_labs-2.5.0rc2.dist-info/entry_points.txt,sha256=_qdnT44fYFbH78kb6Em5jr2_26amIg3UIAvSdmqT6TY,57
+snowflake_cli_labs-2.5.0rc2.dist-info/licenses/LICENSE,sha256=mJMA3Uz2AbjU_kVggo1CAx01XhBsI7BSi2H7ggUg_-c,11344
+snowflake_cli_labs-2.5.0rc2.dist-info/RECORD,,