snowflake-cli 3.0.1__py3-none-any.whl → 3.0.2__py3-none-any.whl

snowflake/cli/__about__.py

@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "3.0.1"
+VERSION = "3.0.2"

snowflake/cli/_plugins/snowpark/commands.py

@@ -345,8 +345,6 @@ def build(
                 skip_version_check=skip_version_check,
                 pip_index_url=index_url,
             )
-            if not download_result.succeeded:
-                raise ClickException(download_result.error_message)
 
             log.info("Checking to see if packages have shared (.so/.dll) libraries...")
             if package_utils.detect_and_log_shared_libraries(

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

@@ -147,8 +147,6 @@ def package_create(
             skip_version_check=skip_version_check,
             pip_index_url=index_url,
         )
-        if not download_result.succeeded:
-            raise ClickException(download_result.error_message)
 
         # check if package was detected as available
         package_available_in_conda = any(

snowflake/cli/_plugins/snowpark/package_utils.py

@@ -21,7 +21,6 @@ import os
 import re
 import subprocess
 from pathlib import Path
-from textwrap import dedent
 from typing import Dict, List, Optional
 
 from click import ClickException
@@ -97,6 +96,7 @@ def get_package_name_from_pip_wheel(package: str, index_url: str | None = None)
             download_dir=tmp_dir.path,
             index_url=index_url,
             dependencies=False,
+            raise_on_error=False,
         )
         file_list = [
             f.path.name for f in tmp_dir.iterdir() if f.path.name.endswith(".whl")
@@ -117,7 +117,6 @@ def _write_requirements_file(file_path: SecurePath, requirements: List[Requireme
 
 @dataclasses.dataclass
 class DownloadUnavailablePackagesResult:
-    succeeded: bool
     error_message: str | None = None
     anaconda_packages: List[Requirement] = dataclasses.field(default_factory=list)
     downloaded_packages_details: List[RequirementWithFiles] = dataclasses.field(
@@ -151,8 +150,7 @@ def download_unavailable_packages(
     if not requirements:
         # all packages are available in Snowflake
         return DownloadUnavailablePackagesResult(
-            succeeded=True,
-            anaconda_packages=packages_in_snowflake,
+            anaconda_packages=packages_in_snowflake
         )
 
     # download all packages with their dependencies
@@ -160,19 +158,14 @@ def download_unavailable_packages(
         # This is a Windows workaround where use TemporaryDirectory instead of NamedTemporaryFile
         requirements_file = downloads_dir / "requirements.txt"
         _write_requirements_file(requirements_file, requirements)  # type: ignore
-        pip_wheel_result = pip_wheel(
+        pip_wheel(
             package_name=None,
             requirements_file=requirements_file.path,  # type: ignore
             download_dir=downloads_dir.path,
             index_url=pip_index_url,
             dependencies=True,
+            raise_on_error=True,
         )
-        if pip_wheel_result != 0:
-            log.info(_pip_failed_log_msg(pip_wheel_result))
-            return DownloadUnavailablePackagesResult(
-                succeeded=False,
-                error_message=_pip_failed_log_msg(pip_wheel_result),
-            )
 
         # scan all downloaded packages and filter out ones available on Anaconda
         dependencies = split_downloaded_dependencies(
@@ -196,7 +189,6 @@ def download_unavailable_packages(
         for package in dependencies.unavailable_dependencies_wheels:
             package.extract_files(target_dir.path)
         return DownloadUnavailablePackagesResult(
-            succeeded=True,
             anaconda_packages=packages_in_snowflake,
             downloaded_packages_details=[
                 RequirementWithFiles(requirement=dep.requirement, files=dep.namelist())
@@ -211,7 +203,8 @@ def pip_wheel(
     download_dir: Path,
     index_url: Optional[str],
     dependencies: bool = True,
-):
+    raise_on_error: bool = True,
+) -> int:
     command = ["-m", "pip", "wheel", "-w", str(download_dir)]
     if package_name:
         command.append(package_name)
@@ -222,23 +215,30 @@ def pip_wheel(
     if not dependencies:
         command.append("--no-deps")
 
-    try:
+    log.info(
+        "Running pip wheel with command: %s",
+        " ".join([str(com) for com in command]),
+    )
+    result = subprocess.run(
+        ["python", *command],
+        capture_output=True,
+        text=True,
+        encoding=locale.getpreferredencoding(),
+    )
+    if result.returncode != 0:
         log.info(
-            "Running pip wheel with command: %s",
-            " ".join([str(com) for com in command]),
-        )
-        process = subprocess.run(
-            ["python", *command],
-            capture_output=True,
-            text=True,
-            encoding=locale.getpreferredencoding(),
+            "pip wheel finished with error code %d. Details: %s",
+            result.returncode,
+            result.stdout + result.stderr,
         )
-    except subprocess.CalledProcessError as e:
-        log.error("Encountered error %s", e.stderr)
-        raise ClickException(f"Encountered error while running pip wheel.")
+        if raise_on_error:
+            raise ClickException(
+                f"pip wheel finished with error code {result.returncode}. Please re-run with --verbose or --debug for more details."
+            )
+    else:
+        log.info("pip wheel command executed successfully")
 
-    log.info("Pip wheel command executed successfully")
-    return process.returncode
+    return result.returncode
 
 
 @dataclasses.dataclass
@@ -341,14 +341,3 @@ def _log_dependencies_found_in_conda(available_dependencies: List[Requirement])
         )
     else:
         log.info("None of the package dependencies were found on Anaconda")
-
-
-def _pip_failed_log_msg(return_code: int) -> str:
-    return dedent(
-        f"""
-        pip failed with return code {return_code}. Most likely reasons:
-         * incorrect package name or version
-         * package isn't compatible with host architecture (most probably due to .so libraries)
-         * pip is not installed correctly
-        """
-    )

snowflake/cli/_plugins/snowpark/snowpark_entity_model.py

@@ -147,8 +147,11 @@ class UdfSprocIdentifier:
             self._arg_names, self._arg_types, self._arg_defaults
         ):
             s = f"{name} {_type}"
-            if _default:
-                if self._is_signature_type_a_string(_type):
+            if _default is not None:
+                if (
+                    self._is_signature_type_a_string(_type)
+                    and _default.lower() != "null"
+                ):
                     _default = f"'{_default}'"
                 s += f" default {_default}"
             sig.append(s)

{snowflake_cli-3.0.1.dist-info → snowflake_cli-3.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: snowflake-cli
-Version: 3.0.1
+Version: 3.0.2
 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-3.0.1.dist-info → snowflake_cli-3.0.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-snowflake/cli/__about__.py,sha256=nWr_fpmx2fCHU6Ao54JxjHG6igdmGVJl0mVCRPSvj9k,633
+snowflake/cli/__about__.py,sha256=ykMwEnoJjghYCkU7YdCimhcQz_PMJ7Y93C1W_210oUU,633
 snowflake/cli/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
 snowflake/cli/_app/__init__.py,sha256=CR_uTgoqHnU1XdyRhm5iQsS86yWXGVx5Ht7aGSDNFmc,765
 snowflake/cli/_app/__main__.py,sha256=mHaHr0OsE2H_kUzNE3pu1znAr_stjXTZ4LAp7Hi2_po,834
@@ -101,19 +101,19 @@ snowflake/cli/_plugins/object/common.py,sha256=x1V8fiVnh7ohHHq0_NaGFtUvTz0soVRSG
 snowflake/cli/_plugins/object/manager.py,sha256=6PTd9GYVnF25WqdiOK7RiweouH9q4Hcf8t-x41PZ0CE,4870
 snowflake/cli/_plugins/object/plugin_spec.py,sha256=O8k6hSD48w4Uhkho0KpcTDkZ2iNjiU5jCPvEVitDzeo,995
 snowflake/cli/_plugins/snowpark/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
-snowflake/cli/_plugins/snowpark/commands.py,sha256=UTV7dz2x-lnjc3gj9d-vrLD9YTqow2LkIn9anffPrXc,16584
+snowflake/cli/_plugins/snowpark/commands.py,sha256=fmr4mp7-d9Mfp_Y2pAYlQxHL_vG9Z-6hR9qIXkGBE5I,16470
 snowflake/cli/_plugins/snowpark/common.py,sha256=vpJNXPE8pnZiyu-2aPpZJY8sLtZhJERkbq1cuFq1CDA,9245
 snowflake/cli/_plugins/snowpark/models.py,sha256=Bd69O3krCS5HvQdHhjQsbhFi0wtYOD_Y9sj6lBMR7KU,4766
-snowflake/cli/_plugins/snowpark/package_utils.py,sha256=D7XhCa2XpFfYBdBDW5qA29ediATjus1w711r8rQgGJ4,12287
+snowflake/cli/_plugins/snowpark/package_utils.py,sha256=GwCKgLTorCsO50UCPcuXy5voVjRSwmLxNFrONVrdtCs,11844
 snowflake/cli/_plugins/snowpark/plugin_spec.py,sha256=2fzlWnGL57oCLWfmkfo6USxvJpy7K9KPE3-ZqwILQcg,997
 snowflake/cli/_plugins/snowpark/snowpark_entity.py,sha256=Ly7tRfCB63eGEz9H7w-YoTuPMNS34JbMef0rQ8FC708,506
-snowflake/cli/_plugins/snowpark/snowpark_entity_model.py,sha256=M2QA6YtyA_XCk3s-KKO1vVBXQbdp4lPcE7NkMgNwUCw,6204
+snowflake/cli/_plugins/snowpark/snowpark_entity_model.py,sha256=aaZqn5eKI6JfCZHTmQ2I9U2exnVIg2GsGf3fVMbp5_k,6307
 snowflake/cli/_plugins/snowpark/snowpark_project_paths.py,sha256=eGbnZVmI3uKO-OJQN4u2Gdk8nwoX3iDENwo-Nkk1U8M,3635
 snowflake/cli/_plugins/snowpark/snowpark_shared.py,sha256=bvKQa0FkB0UCoqIkxAJAYyymaXUuaiQ5hAe5m1GTXXk,1723
 snowflake/cli/_plugins/snowpark/zipper.py,sha256=us4MEtn0L8lWJvSiBVeA1xB_iLxGVG-c-31vutcGYqo,2430
 snowflake/cli/_plugins/snowpark/package/__init__.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh9ou8J439uU,578
 snowflake/cli/_plugins/snowpark/package/anaconda_packages.py,sha256=KTgVTZCWSMtnTw3Mut9aL1_fj9XP0YTW_wNO7csb8XI,7808
-snowflake/cli/_plugins/snowpark/package/commands.py,sha256=i0kTEbXTfhI8PBP36u8lOuFBo_ThbRTbfJoI1aMKGmY,7096
+snowflake/cli/_plugins/snowpark/package/commands.py,sha256=USqZE-5PAVpVO5NkwCXALF5oXLadaoc9b6O4guLdjCs,6990
 snowflake/cli/_plugins/snowpark/package/manager.py,sha256=sd-SQplvq7Y4mh3AKBGRCnndKn4ZEm6VVyZJllGJ9ro,1631
 snowflake/cli/_plugins/snowpark/package/utils.py,sha256=NEvKsK_kxKt_38GVOoiq8Mq4Aq6A67rrdf1tGdP6mK8,1012
 snowflake/cli/_plugins/spcs/__init__.py,sha256=WtfeiPqu_hLaMnc7twQRTs9Uy-207T8UpHWhEoJfRLY,1292
@@ -235,8 +235,8 @@ snowflake/cli/api/utils/naming_utils.py,sha256=uGA_QRGW3iGwaegpFsLgOhup0zBliBSXh
 snowflake/cli/api/utils/path_utils.py,sha256=ru0jgw6Ur5zhqpHhj_eAqcaJdrgEgr3bC7Z02FnQV18,1218
 snowflake/cli/api/utils/templating_functions.py,sha256=DlmpGAEY6OBArtIap6kN1aaILPwx2ynqKflPwjj7BbU,4935
 snowflake/cli/api/utils/types.py,sha256=fVKuls8axKSsBzPqWwrkwkwoXXmedqxNJKqfXrrGyBM,1190
-snowflake_cli-3.0.1.dist-info/METADATA,sha256=4bhhkbbocVu04yv5TB-dV1Y2aJzS3hLGWA6Fc0Hzd5I,17990
-snowflake_cli-3.0.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-snowflake_cli-3.0.1.dist-info/entry_points.txt,sha256=6QmSI0wUX6p7f-dGvrPdswlQyVAVGi1AtOUbE8X6bho,58
-snowflake_cli-3.0.1.dist-info/licenses/LICENSE,sha256=mJMA3Uz2AbjU_kVggo1CAx01XhBsI7BSi2H7ggUg_-c,11344
-snowflake_cli-3.0.1.dist-info/RECORD,,
+snowflake_cli-3.0.2.dist-info/METADATA,sha256=MYu_m_lWFiclD56oQacWMDR4jLEx_U_YzV5e9cJzBtQ,17990
+snowflake_cli-3.0.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+snowflake_cli-3.0.2.dist-info/entry_points.txt,sha256=6QmSI0wUX6p7f-dGvrPdswlQyVAVGi1AtOUbE8X6bho,58
+snowflake_cli-3.0.2.dist-info/licenses/LICENSE,sha256=mJMA3Uz2AbjU_kVggo1CAx01XhBsI7BSi2H7ggUg_-c,11344
+snowflake_cli-3.0.2.dist-info/RECORD,,