omnata-plugin-devkit 0.3.4__tar.gz → 0.3.6__tar.gz

{omnata_plugin_devkit-0.3.4 → omnata_plugin_devkit-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-devkit
-Version: 0.3.4
+Version: 0.3.6
 Summary: 
 Author: James Weakley
 Author-email: james.weakley@omnata.com

{omnata_plugin_devkit-0.3.4 → omnata_plugin_devkit-0.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-devkit"
-version = "0.3.4"
+version = "0.3.6"
 description = ""
 authors = ["James Weakley <james.weakley@omnata.com>"]
 readme = "README.md"

{omnata_plugin_devkit-0.3.4 → omnata_plugin_devkit-0.3.6}/src/omnata_plugin_devkit/plugin_uploader.py

@@ -20,11 +20,31 @@ import typing
 from pathlib import Path
 from typing import Any, List, Literal, Optional
 
+# quick bit of monkey-patching. We to this thanks to tzdata	having an invalid version number on conda (2023d)
+from packaging.version import parse,InvalidVersion
+from requirements.requirement import Requirement
+def check_if_package_is_avaiable_in_conda_patch(package: Requirement, packages: dict) -> bool:
+    package_name = package.name.lower()
+    if package_name not in packages:
+        return False
+    if package.specs:
+        try:
+            latest_ver = parse(packages[package_name]["version"])
+            return all([parse(spec[1]) <= latest_ver for spec in package.specs])
+        except InvalidVersion:
+            snowflake.cli.plugins.snowpark.package_utils.log.warning("Invalid version for package %s: %s, unable to verify anaconda version compatibility", package_name,packages[package_name]["version"])
+    return True
+
+import snowflake.cli.plugins.snowpark.package_utils
+snowflake.cli.plugins.snowpark.package_utils.check_if_package_is_avaiable_in_conda = check_if_package_is_avaiable_in_conda_patch
+
+
 import pydantic.json  # pylint:disable=no-name-in-module
 from jinja2 import Environment, FileSystemLoader
 from omnata_plugin_runtime.omnata_plugin import OmnataPlugin, PluginInfo, PluginManifest
 from snowflake.cli.plugins.snowpark import package_utils
 from snowflake.cli.plugins.snowpark import snowpark_shared
+from snowflake.cli.plugins.snowpark.models import PypiOption
 from snowflake.snowpark import Session
 import importlib.metadata
 
@@ -226,11 +246,11 @@ class PluginUploader:
 
         print("Creating Snowpark package for Snowflake")        
         snowpark_shared.snowpark_package(
-            source=os.path.abspath(plugin_directory),
+            source=Path(os.path.abspath(plugin_directory)),
             artifact_file=Path('app.zip'),
-            pypi_download="yes",
+            pypi_download=PypiOption.YES,
             check_anaconda_for_pypi_deps=True,
-            package_native_libraries="ask",
+            package_native_libraries=PypiOption.ASK,
         )
         self.session.sql(
             f"put file://app.zip @{database_name}.{schema_name}.{stage_name} AUTO_COMPRESS=FALSE OVERWRITE=TRUE"
@@ -458,9 +478,9 @@ class PluginUploader:
                 snowpark_shared.snowpark_package(
                     source=Path(function_handlers_path),
                     artifact_file=Path('udf_handlers.zip'),
-                    pypi_download="yes",
+                    pypi_download=PypiOption.YES,
                     check_anaconda_for_pypi_deps=True,
-                    package_native_libraries="yes",
+                    package_native_libraries=PypiOption.ASK,
                 )
                 print("Uploading handlers zip to stage")
                 for path in sorted(Path(".").rglob("udf_handlers.zip")):