private

Author: sfc-gh-bkogan

src/snowflake/snowpark/_internal/udf_utils.py

@@ -1228,22 +1228,22 @@ def resolve_imports_and_packages(
     bool,
 ]:
     from snowflake.snowpark.session import (
-        ANACONDA_SHARED_REPOSITORY,
-        DEFAULT_ARTIFACT_REPOSITORY,
+        _ANACONDA_SHARED_REPOSITORY,
+        _DEFAULT_ARTIFACT_REPOSITORY,
     )
 
     if artifact_repository is None:
         artifact_repository = (
             session._get_default_artifact_repository()
             if session
-            else DEFAULT_ARTIFACT_REPOSITORY
+            else _DEFAULT_ARTIFACT_REPOSITORY
         )
 
     existing_packages_dict = (
         session._artifact_repository_packages[artifact_repository] if session else {}
     )
 
-    if artifact_repository != ANACONDA_SHARED_REPOSITORY:
+    if artifact_repository != _ANACONDA_SHARED_REPOSITORY:
         # Non-conda artifact repository - skip conda-based package resolution
         resolved_packages = []
         if not packages and session:

src/snowflake/snowpark/session.py

@@ -322,9 +322,9 @@
 WRITE_ARROW_CHUNK_SIZE: int = 100000 if is_in_stored_procedure() else None
 
 # The fully qualified name of the Anaconda shared repository (conda channel).
-ANACONDA_SHARED_REPOSITORY = "snowflake.snowpark.anaconda_shared_repository"
+_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
+_DEFAULT_ARTIFACT_REPOSITORY = _ANACONDA_SHARED_REPOSITORY
 
 
 def _get_active_session() -> "Session":
@@ -2144,7 +2144,7 @@ def _resolve_packages(
         package_dict = self._parse_packages(packages)
         if (
             isinstance(self._conn, MockServerConnection)
-            or artifact_repository != ANACONDA_SHARED_REPOSITORY
+            or artifact_repository != _ANACONDA_SHARED_REPOSITORY
         ):
             # in local testing or non-conda, we don't resolve the packages, we just return what is added
             errors = []
@@ -2405,7 +2405,7 @@ def _get_default_artifact_repository(self) -> str:
         """
         with self._package_lock:
             if isinstance(self._conn, MockServerConnection):
-                return DEFAULT_ARTIFACT_REPOSITORY
+                return _DEFAULT_ARTIFACT_REPOSITORY
 
             cache_key = (self.get_current_database(), self.get_current_schema())
 
@@ -2421,12 +2421,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 DEFAULT_ARTIFACT_REPOSITORY
+                resolved = value or _DEFAULT_ARTIFACT_REPOSITORY
             except Exception as e:
                 _logger.warning(
-                    f"Error getting default artifact repository: {e}. Using fallback: {DEFAULT_ARTIFACT_REPOSITORY}."
+                    f"Error getting default artifact repository: {e}. Using fallback: {_DEFAULT_ARTIFACT_REPOSITORY}."
                 )
-                resolved = DEFAULT_ARTIFACT_REPOSITORY
+                resolved = _DEFAULT_ARTIFACT_REPOSITORY
 
             self._default_artifact_repository_cache = (cache_key, resolved)
             return 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 DEFAULT_ARTIFACT_REPOSITORY
+            from snowflake.snowpark.session import _DEFAULT_ARTIFACT_REPOSITORY
 
             effective_artifact_repository = (
                 self._session._get_default_artifact_repository()
                 if self._session
-                else DEFAULT_ARTIFACT_REPOSITORY
+                else _DEFAULT_ARTIFACT_REPOSITORY
             )
 
         # Add in snowflake-snowpark-python if it is not already in the package list.

tests/integ/test_packaging.py

@@ -20,7 +20,7 @@
     get_signature,
 )
 from snowflake.snowpark.functions import call_udf, col, count_distinct, sproc, udf
-from snowflake.snowpark.session import ANACONDA_SHARED_REPOSITORY
+from snowflake.snowpark.session import _ANACONDA_SHARED_REPOSITORY
 from snowflake.snowpark.types import DateType, StringType
 from tests.utils import IS_IN_STORED_PROC, TempObjectType, TestFiles, Utils
 
@@ -271,7 +271,7 @@ def extract_major_minor_patch(version_string):
 
     resolved_packages = session._resolve_packages(
         [numpy, pandas, dateutil],
-        ANACONDA_SHARED_REPOSITORY,
+        _ANACONDA_SHARED_REPOSITORY,
         {},
         validate_package=False,
     )
@@ -1208,13 +1208,13 @@ def test_replicate_local_environment(session):
         [
             package.startswith("cloudpickle")
             for package in session._artifact_repository_packages[
-                ANACONDA_SHARED_REPOSITORY
+                _ANACONDA_SHARED_REPOSITORY
             ]
         ]
     )
 
     def naive_add_packages(self, packages):
-        self._artifact_repository_packages[ANACONDA_SHARED_REPOSITORY] = packages
+        self._artifact_repository_packages[_ANACONDA_SHARED_REPOSITORY] = packages
 
     with patch.object(session, "_is_anaconda_terms_acknowledged", lambda: True):
         with patch.object(Session, "add_packages", new=naive_add_packages):
@@ -1232,7 +1232,7 @@ def naive_add_packages(self, packages):
         [
             package.startswith("cloudpickle==")
             for package in session._artifact_repository_packages[
-                ANACONDA_SHARED_REPOSITORY
+                _ANACONDA_SHARED_REPOSITORY
             ]
         ]
     )
@@ -1241,7 +1241,7 @@ def naive_add_packages(self, packages):
             [
                 package.startswith(default_package)
                 for package in session._artifact_repository_packages[
-                    ANACONDA_SHARED_REPOSITORY
+                    _ANACONDA_SHARED_REPOSITORY
                 ]
             ]
         )
@@ -1266,7 +1266,7 @@ def naive_add_packages(self, packages):
         [
             package == "cloudpickle"
             for package in session._artifact_repository_packages[
-                ANACONDA_SHARED_REPOSITORY
+                _ANACONDA_SHARED_REPOSITORY
             ]
         ]
     )
@@ -1275,7 +1275,7 @@ def naive_add_packages(self, packages):
             [
                 package.startswith(default_package)
                 for package in session._artifact_repository_packages[
-                    ANACONDA_SHARED_REPOSITORY
+                    _ANACONDA_SHARED_REPOSITORY
                 ]
             ]
         )
@@ -1284,7 +1284,7 @@ def naive_add_packages(self, packages):
             [
                 package.startswith(ignored_package)
                 for package in session._artifact_repository_packages[
-                    ANACONDA_SHARED_REPOSITORY
+                    _ANACONDA_SHARED_REPOSITORY
                 ]
             ]
         )

tests/unit/test_session.py

@@ -30,7 +30,7 @@
 )
 from snowflake.snowpark.session import (
     _PYTHON_SNOWPARK_USE_SCOPED_TEMP_OBJECTS_STRING,
-    ANACONDA_SHARED_REPOSITORY,
+    _ANACONDA_SHARED_REPOSITORY,
 )
 from snowflake.snowpark.types import StructField, StructType
 
@@ -215,7 +215,7 @@ def mock_get_information_schema_packages(table_name: str, _emit_ast: bool = True
 
     session._resolve_packages(
         ["random_package_name"],
-        ANACONDA_SHARED_REPOSITORY,
+        _ANACONDA_SHARED_REPOSITORY,
         {},
         validate_package=True,
         include_pandas=False,
@@ -250,7 +250,7 @@ def run_query(sql: str):
     ):
         session._resolve_packages(
             ["random_package_name"],
-            ANACONDA_SHARED_REPOSITORY,
+            _ANACONDA_SHARED_REPOSITORY,
             {},
             validate_package=True,
             include_pandas=False,
@@ -275,7 +275,7 @@ def mock_get_information_schema_packages(table_name: str, _emit_ast: bool = True
 
     resolved_packages = session._resolve_packages(
         ["random_package_name"],
-        ANACONDA_SHARED_REPOSITORY,
+        _ANACONDA_SHARED_REPOSITORY,
         existing_packages,
         validate_package=True,
         include_pandas=False,
@@ -307,7 +307,7 @@ def mock_get_information_schema_packages(table_name: str, _emit_ast: bool = True
     ):
         session._resolve_packages(
             ["snowflake-snowpark-python"],
-            ANACONDA_SHARED_REPOSITORY,
+            _ANACONDA_SHARED_REPOSITORY,
             {},
             validate_package=True,
             include_pandas=False,
@@ -752,7 +752,7 @@ def test_get_default_artifact_repository():
         session, "get_current_schema", return_value="SCHEMA2"
     ):
         result = session._get_default_artifact_repository()
-        assert result == ANACONDA_SHARED_REPOSITORY
+        assert result == _ANACONDA_SHARED_REPOSITORY
 
         assert mocked_run_query.call_count == 1
 
@@ -764,6 +764,6 @@ def test_get_default_artifact_repository():
         session, "get_current_schema", return_value="SCHEMA1"
     ):
         result = session._get_default_artifact_repository()
-        assert result == ANACONDA_SHARED_REPOSITORY
+        assert result == _ANACONDA_SHARED_REPOSITORY
 
         assert mocked_run_query.call_count == 1

tests/unit/test_udf_utils.py

@@ -26,7 +26,7 @@
     resolve_packages_in_client_side_sandbox,
 )
 from snowflake.snowpark._internal.utils import TempObjectType
-from snowflake.snowpark.session import ANACONDA_SHARED_REPOSITORY
+from snowflake.snowpark.session import _ANACONDA_SHARED_REPOSITORY
 from snowflake.snowpark.types import StringType
 from snowflake.snowpark.version import VERSION
 
@@ -227,7 +227,7 @@ def test_resolve_imports_and_packages_imports_as_str(tmp_path_factory):
 def test_add_snowpark_package_to_sproc_packages_add_package(packages):
     old_packages_length = len(packages) if packages else 0
     result = add_snowpark_package_to_sproc_packages(
-        session=None, packages=packages, artifact_repository=ANACONDA_SHARED_REPOSITORY
+        session=None, packages=packages, artifact_repository=_ANACONDA_SHARED_REPOSITORY
     )
 
     major, minor, patch = VERSION
@@ -245,7 +245,7 @@ def test_add_snowpark_package_to_sproc_packages_does_not_replace_package():
         "snowflake-snowpark-python==1.12.0",
     ]
     result = add_snowpark_package_to_sproc_packages(
-        session=None, packages=packages, artifact_repository=ANACONDA_SHARED_REPOSITORY
+        session=None, packages=packages, artifact_repository=_ANACONDA_SHARED_REPOSITORY
     )
 
     assert len(result) == len(packages)
@@ -255,15 +255,15 @@ def test_add_snowpark_package_to_sproc_packages_does_not_replace_package():
 def test_add_snowpark_package_to_sproc_packages_to_session():
     fake_session = mock.create_autospec(Session)
     fake_session._artifact_repository_packages = defaultdict(dict)
-    fake_session._artifact_repository_packages[ANACONDA_SHARED_REPOSITORY] = {
+    fake_session._artifact_repository_packages[_ANACONDA_SHARED_REPOSITORY] = {
         "random_package_one": "random_package_one",
         "random_package_two": "random_package_two",
     }
     fake_session._package_lock = threading.RLock()
     result = add_snowpark_package_to_sproc_packages(
         session=fake_session,
         packages=None,
-        artifact_repository=ANACONDA_SHARED_REPOSITORY,
+        artifact_repository=_ANACONDA_SHARED_REPOSITORY,
     )
 
     major, minor, patch = VERSION
@@ -272,13 +272,13 @@ def test_add_snowpark_package_to_sproc_packages_to_session():
     assert len(result) == 3
     assert final_name in result
 
-    fake_session._artifact_repository_packages[ANACONDA_SHARED_REPOSITORY][
+    fake_session._artifact_repository_packages[_ANACONDA_SHARED_REPOSITORY][
         "snowflake-snowpark-python"
     ] = "snowflake-snowpark-python==1.12.0"
     result = add_snowpark_package_to_sproc_packages(
         session=fake_session,
         packages=None,
-        artifact_repository=ANACONDA_SHARED_REPOSITORY,
+        artifact_repository=_ANACONDA_SHARED_REPOSITORY,
     )
     assert result is None