omnata-plugin-devkit 0.13.8a200__tar.gz → 0.13.9a204__tar.gz

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omnata-plugin-devkit
-Version: 0.13.8a200
+Version: 0.13.9a204
 Summary: 
 License-File: LICENSE
 Author: James Weakley
@@ -13,14 +13,14 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: behave (>=1.2,<2.0)
 Requires-Dist: behave_pandas (>=0.5.0,<0.6.0)
-Requires-Dist: omnata-plugin-runtime (==0.12.10a374)
+Requires-Dist: omnata-plugin-runtime (>=0.12.5)
 Requires-Dist: omnata_cli (>=0.2.3,<0.3.0)
 Requires-Dist: pyparsing (>=3.0)
 Requires-Dist: python-slugify (>=8,<9)
 Requires-Dist: requirements-parser (==0.13.0)
 Requires-Dist: snowflake-connector-python[pandas] (<=4.3.0)
 Requires-Dist: tabulate (>=0.9,<0.10)
-Requires-Dist: vcrpy (>=4,<5)
+Requires-Dist: vcrpy (>=7,<8)
 Description-Content-Type: text/markdown
 
 # omnata-plugin-devkit

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-devkit"
-version = "0.13.8a200"
+version = "0.13.9a204"
 description = ""
 authors = ["James Weakley <james.weakley@omnata.com>"]
 readme = "README.md"
@@ -10,9 +10,12 @@ packages = [{ include = "omnata_plugin_devkit", from = "src" }]
 # support 3.10 - 3.13
 python = ">=3.10, <=3.13"
 omnata_cli = "^0.2.3"
-omnata-plugin-runtime = "==0.12.10a374"
+omnata-plugin-runtime = ">=0.12.5"
+#pandas = "^2,<=2.3.3"
+#numpy = "<=2.3.5"
+#jinja2 = "^3,<=3.1.6"
 python-slugify = "^8"
-vcrpy = "^4"
+vcrpy = "^7"
 tabulate = "^0.9"
 behave = "^1.2"
 behave_pandas = "^0.5.0"

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/API_LIMITS.sql.jinja

@@ -6,8 +6,7 @@ create or replace procedure PLUGIN.API_LIMITS(
                                     OTHER_SECRETS_NAME VARCHAR)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/CONFIGURATION_FORM.sql.jinja

@@ -2,8 +2,7 @@ create or replace procedure PLUGIN.CONFIGURATION_FORM(
                                                 CONNECTION_FORM_REQUEST OBJECT)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/CONNECTION_FORM.sql.jinja

@@ -1,8 +1,7 @@
 create or replace procedure PLUGIN.CONNECTION_FORM(CONNECTIVITY_OPTION VARCHAR)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/CONNECTION_TEST.sql.jinja

@@ -7,8 +7,7 @@ create or replace procedure PLUGIN.CONNECTION_TEST(
                                     OTHER_SECRETS_NAME VARCHAR)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/CONSTRUCT_FORM_OPTION.sql.jinja

@@ -1,8 +1,7 @@
 create or replace procedure PLUGIN.CONSTRUCT_FORM_OPTION(FUNCTION_NAME VARCHAR,STORED_VALUES ARRAY)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/CREATE_BILLING_EVENTS.sql.jinja

@@ -1,8 +1,7 @@
 create or replace procedure PLUGIN.CREATE_BILLING_EVENTS(BILLING_EVENT_REQUEST OBJECT)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/CREATE_GENERIC_SECRET_OBJECT.sql.jinja

@@ -1,8 +1,7 @@
 create or replace procedure PLUGIN.CREATE_GENERIC_SECRET_OBJECT(SECRET_NAME VARCHAR, SECRET_CONTENTS VARCHAR)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 HANDLER = 'run'
 COMMENT = $$

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/GET_MISSING_APP_PRIVILEGES.sql.jinja

@@ -1,7 +1,7 @@
 create or replace procedure PLUGIN.GET_MISSING_APP_PRIVILEGES()
 returns object
 language python
-RUNTIME_VERSION = '3.12'
+RUNTIME_VERSION = '3.10'
 PACKAGES = ('snowflake-snowpark-python','snowflake-native-apps-permission')
 HANDLER = 'run'
 COMMENT = $$

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/INBOUND_LIST_STREAMS.sql.jinja

@@ -8,8 +8,7 @@ create or replace procedure PLUGIN.INBOUND_LIST_STREAMS(
                                                 SELECTED_STREAMS ARRAY)
 returns table(RESULT object)
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/LIST_STAGES.sql.jinja

@@ -1,8 +1,7 @@
 create or replace procedure PLUGIN.LIST_STAGES()
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/NETWORK_ADDRESSES.sql.jinja

@@ -5,8 +5,7 @@ create or replace procedure PLUGIN.NETWORK_ADDRESSES(
                                     )
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/NGROK_POST_TUNNEL_FIELDS.sql.jinja

@@ -6,8 +6,7 @@ create or replace procedure PLUGIN.NGROK_POST_TUNNEL_FIELDS(
                                                 FUNCTION_NAME VARCHAR)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/OUTBOUND_RECORD_VALIDATOR.sql.jinja

@@ -1,8 +1,7 @@
 create or replace function PLUGIN.OUTBOUND_RECORD_VALIDATOR(SYNC_PARAMETERS OBJECT,FIELD_MAPPINGS OBJECT,TRANSFORM_RECORD OBJECT,SOURCE_TYPES OBJECT)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/RETRIEVE_SECRETS.sql.jinja

@@ -1,8 +1,7 @@
 create or replace procedure PLUGIN.RETRIEVE_SECRETS(OAUTH_SECRET_NAME VARCHAR,OTHER_SECRETS_NAME VARCHAR)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/RETRIEVE_SECRETS_UDF.sql.jinja

@@ -1,7 +1,7 @@
 create or replace function PLUGIN.RETRIEVE_SECRETS_UDF(OAUTH_SECRET_NAME VARCHAR,OTHER_SECRETS_NAME VARCHAR)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
+RUNTIME_VERSION = '3.10'
 HANDLER = 'run'
 COMMENT = $$
 Allows this plugin to retrieve its own secrets during CONFIGURE_API calls.

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/SET_CONNECTION_OBJECTS.sql.jinja

@@ -1,8 +1,7 @@
 create or replace procedure PLUGIN.SET_CONNECTION_OBJECTS(PARAMETERS OBJECT)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/SYNC.sql.jinja

@@ -1,8 +1,7 @@
 create or replace procedure PLUGIN.SYNC(SYNC_REQUEST OBJECT)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/TUNNEL_TEST.sql.jinja

@@ -2,8 +2,7 @@ create or replace procedure PLUGIN.TUNNEL_TEST(TUNNEL_TYPE VARCHAR,
                                                 OTHER_SECRETS_NAME VARCHAR)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/jinja_templates/UPDATE_GENERIC_SECRET_OBJECT.sql.jinja

@@ -1,8 +1,7 @@
 create or replace procedure PLUGIN.UPDATE_GENERIC_SECRET_OBJECT(SECRET_NAME VARCHAR,SECRET_CONTENTS VARCHAR,MERGE_WITH_OTHER_SECRET VARCHAR)
 returns object
 language python
-RUNTIME_VERSION = '3.12'
-ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository
+RUNTIME_VERSION = '3.10'
 PACKAGES = ({{packages}})
 IMPORTS = ('/app.zip')
 HANDLER = 'run'

{omnata_plugin_devkit-0.13.8a200 → omnata_plugin_devkit-0.13.9a204}/src/omnata_plugin_devkit/plugin_uploader.py

@@ -14,6 +14,7 @@ import distutils.core
 import inspect
 import json
 import os
+import re
 import shutil
 import sys
 import typing
@@ -21,7 +22,7 @@ import zipfile
 import copy
 import uuid
 from pathlib import Path
-from typing import Any, Dict, List, Literal, Optional, cast
+from typing import Any, Dict, List, Literal, Optional
 
 from pathlib import Path
 
@@ -33,6 +34,8 @@ from omnata_plugin_runtime.omnata_plugin import (
     UDFDefinition, UDTFDefinition
 )
 from omnata_plugin_devkit.snowcli.cli.plugins.snowpark import package_utils
+from omnata_plugin_devkit.snowcli.cli.plugins.snowpark import snowpark_shared
+from omnata_plugin_devkit.snowcli.cli.plugins.snowpark.models import PypiOption
 from snowflake.snowpark import Session
 import importlib.metadata
 
@@ -64,7 +67,7 @@ class PluginUploader:
         manifest: PluginManifest,
         anaconda_packages: List[str],
         bundled_packages: List[str],
-        icon_source: Optional[str],
+        icon_source: str,
         plugin_class_name: str,
         has_custom_validator: bool,
         plugin_runtime_version: str,
@@ -121,7 +124,7 @@ class PluginUploader:
         version_comment: str = "",
         log_level: str = "INFO",
         udf_directory_override: Optional[str] = None,
-    ) -> Optional[str]:
+    ) -> str:
         """
         Creates a stage and uploads the latest plugin artifacts, Omnata runtime etc.
         If the schema name is not provided, the plugin_id from the manifest will be used.
@@ -177,10 +180,9 @@ class PluginUploader:
         else:
             tier_file = Path(os.path.join(plugin_directory, "tier.txt"))
             if tier_file.exists():
-                plugin_tier_raw = tier_file.read_text(encoding="utf-8").strip()
-                if plugin_tier_raw not in ["standard","premium","byo","free"]:
-                    raise ValueError(f"Invalid tier {plugin_tier_raw} in {tier_file}")
-                plugin_tier = cast(Literal["byo","free","standard","premium"], plugin_tier_raw)
+                plugin_tier = tier_file.read_text(encoding="utf-8").strip()
+                if plugin_tier not in ["standard","premium","byo","free"]:
+                    raise ValueError(f"Invalid tier {plugin_tier} in {tier_file}")
         print(f"Using plugin tier: {plugin_tier}")
         license_url_file = Path(os.path.join(plugin_directory, "license_url.txt"))
         license_url: Optional[str] = (
@@ -212,7 +214,7 @@ class PluginUploader:
         # do checks first
 
         icon_file_name = "icon.svg"
-        icon_source:Optional[str] = None
+        icon_source = None
         if os.path.exists(os.path.join(plugin_directory, icon_file_name)):
             print("Using icon from icon.svg")
             with open(
@@ -244,34 +246,75 @@ class PluginUploader:
         if os.path.exists("build.zip"):
             os.remove("build.zip")
 
-        print("Building app.zip from plugin source")
-        with zipfile.ZipFile('app.zip', 'w', zipfile.ZIP_DEFLATED) as zf:
-            for root, dirs, files in os.walk('.'):
-                dirs[:] = [d for d in dirs if not d.startswith('.') and d != '__pycache__' and d != 'udf_direct_imports']
-                for fname in files:
-                    if fname.startswith('.'):
-                        continue
-                    if fname.endswith('.so'):
-                        raise ValueError(f"Native library found in package: {os.path.join(root, fname)}")
-                    full = os.path.join(root, fname)
-                    zf.write(full, os.path.relpath(full, '.'))
+        print("Creating Snowpark package for Snowflake")
+        # we allow native libraries to be included in the package, but then check ourselves
+        snowpark_shared.snowpark_package(
+            source=Path('.'),
+            artifact_file=Path('build.zip'),
+            pypi_download=PypiOption.YES,
+            check_anaconda_for_pypi_deps=True,
+            package_native_libraries=PypiOption.YES,
+        )
+        with zipfile.ZipFile('build.zip', 'r') as zip_read:
+            with zipfile.ZipFile('app.zip', 'w') as zip_write:
+                # Copy each file, skipping those in the specified folder
+                # some packages are named inconsistently which makes them hard to remove from the artifact
+                # Track directories we've emitted so each is added exactly once.
+                # zipimport's namespace-package detection (_is_dir) checks for
+                # '<path>/' as a key in the zip's TOC. Without these directory
+                # entries, namespace packages bundled inside app.zip (e.g. the
+                # google.* tree shipped by plugins that vendor google-ads) are
+                # invisible to Snowpark's importer, even though every file is
+                # present, because zipfile.write() does not emit directory
+                # entries by default.
+                emitted_dirs = set()
+                for item in zip_read.infolist():
+                    if not item.filename.startswith('.packages') and \
+                        not item.filename.startswith('udf_direct_imports') and \
+                        not item.filename.startswith('pydantic_core'):
+                        if item.filename.endswith('.so'):
+                            raise ValueError(f"Native library found in package: {item.filename}")
+                        parts = item.filename.split('/')
+                        for i in range(1, len(parts)):
+                            dir_entry = '/'.join(parts[:i]) + '/'
+                            if dir_entry not in emitted_dirs:
+                                zip_write.writestr(dir_entry, b'')
+                                emitted_dirs.add(dir_entry)
+                        data = zip_read.read(item.filename)
+                        zip_write.writestr(item, data)
         self.session.sql(
             f"put file://app.zip @{database_name}.{schema_name}.{stage_name} AUTO_COMPRESS=FALSE OVERWRITE=TRUE"
         ).collect()
 
-        requirements_list = package_utils.parse_requirements("requirements.txt")
-        all_packages: List[str] = [r.line for r in requirements_list]
-
-        runtime_reqs = [r for r in requirements_list if r.name == "omnata-plugin-runtime"]
-        if len(runtime_reqs) != 1 or len(runtime_reqs[0].specs) == 0:
+        if not os.path.exists(".packages"):
+            raise ValueError(".packages directory not found after packaging")
+        subfolders = [
+            f.path
+            for f in os.scandir(".packages")
+            if f.is_dir() and os.path.join(".packages","omnata_plugin_runtime-") in f.path
+        ]
+        if len(subfolders) != 1:
             raise ValueError(
-                "requirements.txt must contain a pinned omnata-plugin-runtime entry (e.g. omnata-plugin-runtime==X.Y.Z)"
+                "Failed to find omnata-plugin-runtime in downloaded package metadata"
             )
-        op, omnata_plugin_runtime_version = runtime_reqs[0].specs[0]
-        if op != "==":
+        subfolder = subfolders[0]
+        regex_matches = re.search(
+            r"^\.packages.omnata_plugin_runtime-(.*)\.dist-info$", subfolder
+        )
+        if regex_matches is None:
             raise ValueError(
-                f"omnata-plugin-runtime must be pinned with '==' (got '{op}{omnata_plugin_runtime_version}')"
+                "Failed to parse version of omnata-plugin-runtime package from metadata"
             )
+        omnata_plugin_runtime_version = regex_matches.group(1)
+        anaconda_packages = package_utils.parse_requirements("requirements.snowflake.txt")
+        anaconda_package_names: List[str] = [
+            r.name
+            for r in anaconda_packages
+        ]
+        other_packages = package_utils.parse_requirements("requirements.other.txt")
+        other_package_names: List[str] = [
+            r.name for r in other_packages
+        ]
         os.chdir(original_wd)
         # icon_file_name_full = os.path.abspath(os.path.join(plugin_directory,icon_file_name))
         # print(f'Loading icon file {icon_file_name_full} into stage')
@@ -282,10 +325,37 @@ class PluginUploader:
         plugin_fqn: str = f"{manifest.developer_id}__{manifest.plugin_id}".upper()
 
         install_script = "setup_script.sql"
+        default_packages = ["dictdiffer", "jinja2", "requests", "pydantic","snowflake-telemetry-python"]
+        if len([w for w in anaconda_packages if "snowflake-snowpark-python" in w.name]) == 0:
+            # if not present at all, pin it to a specific version
+            anaconda_package_names = anaconda_package_names + ["snowflake-snowpark-python==1.22.1"]
+            print("snowflake-snowpark-python not present, adding to default packages")
+        else:
+            snowpark_package = [w for w in anaconda_packages if "snowflake-snowpark-python" in w.name][0]
+            if len(snowpark_package.specs) == 0:
+                print("snowflake-snowpark-python found unpinned, replacing with pinned version")
+                anaconda_package_names = [
+                    w if w != "snowflake-snowpark-python" else "snowflake-snowpark-python==1.22.1"
+                    for w in anaconda_package_names
+                ]
+            else:
+                print(f"{snowpark_package.name} found already pinned ({snowpark_package.line}), leaving alone")
+                anaconda_package_names = [
+                    w.name if w.name != "snowflake-snowpark-python" else w.line
+                    for w in anaconda_packages
+                ]
+        # remove snowflake-connector-python if it's found its way into the other packages or the anaconda packages
+        other_package_names = [
+            w for w in other_package_names if "snowflake-connector-python" not in w
+        ]
+        anaconda_package_names = [
+            w for w in anaconda_package_names if "snowflake-connector-python" not in w
+        ]
         has_custom_validator = (
             plugin_class_instance.outbound_record_validator.__module__ != 'omnata_plugin_runtime.omnata_plugin'
         )
         print(f"Has custom validator: {has_custom_validator} ({plugin_class_instance.outbound_record_validator.__module__})")
+        all_packages = list(set(default_packages + anaconda_package_names))
         packages_to_include = [
             f"'{p}'" for p in all_packages
         ]
@@ -489,7 +559,7 @@ $${}$$;
                 print(f"Found {udf.language} UDF: {udf.name}, consumer facing: {udf.expose_to_consumer}")
                 if udf.language == "python":
                     udf.packages = all_packages
-                setup_script.write(_inject_artifact_repository(str(udf)))
+                setup_script.write(str(udf))
                 if udf.expose_to_consumer is True:
                     setup_script.write(
                         f"grant usage on function UDFS.{function_signature(input=udf,include_name=True,include_params='data_types_only',connection_parameter='leave')} to application role CONSUMER_FUNCTION_CALLER;\n"
@@ -515,7 +585,7 @@ $${}$$;
                 print(f"Found {udtf.language} UDTF: {udtf.name}, consumer facing: {udtf.expose_to_consumer}")
                 if udtf.language == "python":
                     udtf.packages = all_packages
-                setup_script.write(_inject_artifact_repository(str(udtf)))
+                setup_script.write(str(udtf))
                 if udtf.expose_to_consumer is True:
                     setup_script.write(
                         f"grant usage on function UDFS.{function_signature(input=udtf,include_name=True,include_params='data_types_only',connection_parameter='leave')} to application role CONSUMER_FUNCTION_CALLER;\n"
@@ -549,8 +619,8 @@ $${}$$;
             setup_script.write(
                 self.plugin_info_udf_definition(
                     manifest=manifest,
-                    anaconda_packages=all_packages,
-                    bundled_packages=[],
+                    anaconda_packages=anaconda_package_names,
+                    bundled_packages=other_package_names,
                     icon_source=icon_source,
                     plugin_class_name=plugin_class_name,
                     has_custom_validator=has_custom_validator,
@@ -683,8 +753,8 @@ GRANT USAGE ON FUNCTION PLUGIN.TOKEN() TO application role OMNATA_MANAGEMENT;
             self.session.sql(
                 self.plugin_info_udf_definition(
                     manifest=manifest,
-                    anaconda_packages=all_packages,
-                    bundled_packages=[],
+                    anaconda_packages=anaconda_package_names,
+                    bundled_packages=other_package_names,
                     icon_source=icon_source,
                     plugin_class_name=plugin_class_name,
                     has_custom_validator=has_custom_validator,
@@ -700,14 +770,6 @@ GRANT USAGE ON FUNCTION PLUGIN.TOKEN() TO application role OMNATA_MANAGEMENT;
         return schema_name
 
 
-def _inject_artifact_repository(udf_sql: str) -> str:
-    return udf_sql.replace(
-        "PACKAGES = (",
-        "ARTIFACT_REPOSITORY = snowflake.snowpark.pypi_shared_repository\nPACKAGES = (",
-        1,
-    )
-
-
 def prepare_version_comment(version_comment:str):
     """
     The manifest file takes a comment, but since it's in YAML you have to do a bunch of silly work to make it valid and multiline.