cleanup

Author: sfc-gh-bkogan

CHANGELOG.md

@@ -7,6 +7,7 @@
 #### New Features
 
 - Added support for the `DECFLOAT` data type that allows users to represent decimal numbers exactly with 38 digits of precision and a dynamic base-10 exponent.
+- Added support for the `DEFAULT_PYTHON_ARTIFACT_REPOSITORY` parameter that allows users to configure the default artifact repository at the account, database, and schema level.
 
 #### Bug Fixes
 

src/snowflake/snowpark/_internal/udf_utils.py

@@ -1227,13 +1227,16 @@ def resolve_imports_and_packages(
     Optional[str],
     bool,
 ]:
-    from snowflake.snowpark.session import ANACONDA_SHARED_REPOSITORY
+    from snowflake.snowpark.session import (
+        ANACONDA_SHARED_REPOSITORY,
+        DEFAULT_ARTIFACT_REPOSITORY,
+    )
 
     if artifact_repository is None:
         artifact_repository = (
             session._get_default_artifact_repository()
             if session
-            else ANACONDA_SHARED_REPOSITORY
+            else DEFAULT_ARTIFACT_REPOSITORY
         )
 
     existing_packages_dict = (

src/snowflake/snowpark/session.py

@@ -323,6 +323,8 @@
 
 # The fully qualified name of the Anaconda shared repository (conda channel).
 ANACONDA_SHARED_REPOSITORY = "snowflake.snowpark.anaconda_shared_repository"
+# In case of failures or the current default artifact repository is unset, we fallback to this
+DEFAULT_ARTIFACT_REPOSITORY = ANACONDA_SHARED_REPOSITORY
 
 
 def _get_active_session() -> "Session":
@@ -608,8 +610,8 @@ def __init__(
         ] = defaultdict(dict)
         # Single-entry cache for the default artifact repository value.
         # Stores a tuple of ((database, schema), cached_value).  Only one entry is
-        # kept at a time – switching to a different database/schema evicts the old
-        # value and triggers a fresh query on the next call.
+        # kept at a time – switching to a different database/schema will evict the old
+        # value and trigger a fresh query on the next call.
         self._default_artifact_repository_cache: Optional[
             Tuple[Tuple[Optional[str], Optional[str]], str]
         ] = None
@@ -1641,7 +1643,8 @@ def add_packages(
                 for this argument. If a ``module`` object is provided, the package will be
                 installed with the version in the local environment.
             artifact_repository: When set this parameter specifies the artifact repository that packages will be added from. Only functions
-                using that repository will use the packages. (Default None)
+                using that repository will use the packages. (Default None). Otherwise, uses the default artifact repository configured in the
+                current context.
 
         Example::
 
@@ -1701,7 +1704,8 @@ def remove_package(
         Args:
             package: The package name.
             artifact_repository: When set this parameter specifies that the package should be removed
-                from the default packages for a specific artifact repository.
+                from the default packages for a specific artifact repository. Otherwise, uses the default
+                artifact repository configured in the current context.
 
         Examples::
 
@@ -1758,7 +1762,8 @@ def add_requirements(
         Args:
             file_path: The path of a local requirement file.
             artifact_repository: When set this parameter specifies the artifact repository that packages will be added from. Only functions
-                using that repository will use the packages. (Default None)
+                using that repository will use the packages. (Default None). Otherwise, uses the default artifact repository configured in
+                the current context.
 
         Example::
 
@@ -2402,7 +2407,7 @@ def _get_default_artifact_repository(self) -> str:
         fallback needs to be updated here.
         """
         if isinstance(self._conn, MockServerConnection):
-            return ANACONDA_SHARED_REPOSITORY
+            return DEFAULT_ARTIFACT_REPOSITORY
 
         cache_key = (self.get_current_database(), self.get_current_schema())
 
@@ -2418,12 +2423,12 @@ def _get_default_artifact_repository(self) -> str:
                 f"SELECT SYSTEM$GET_DEFAULT_PYTHON_ARTIFACT_REPOSITORY('{python_version}')"
             )
             value = result[0][0] if result else None
-            resolved = value or ANACONDA_SHARED_REPOSITORY
+            resolved = value or DEFAULT_ARTIFACT_REPOSITORY
         except Exception as e:
             _logger.warning(
                 f"Error getting default artifact repository: {e}. Using fallback."
             )
-            resolved = ANACONDA_SHARED_REPOSITORY
+            resolved = DEFAULT_ARTIFACT_REPOSITORY
 
         with self._package_lock:
             self._default_artifact_repository_cache = (cache_key, resolved)

src/snowflake/snowpark/stored_procedure.py

@@ -941,12 +941,12 @@ def _do_register_sp(
 
         effective_artifact_repository = artifact_repository
         if effective_artifact_repository is None:
-            from snowflake.snowpark.session import ANACONDA_SHARED_REPOSITORY
+            from snowflake.snowpark.session import DEFAULT_ARTIFACT_REPOSITORY
 
             effective_artifact_repository = (
                 self._session._get_default_artifact_repository()
                 if self._session
-                else ANACONDA_SHARED_REPOSITORY
+                else DEFAULT_ARTIFACT_REPOSITORY
             )
 
         # Add in snowflake-snowpark-python if it is not already in the package list.