Merge branch 'main' of github.com:snowflakedb/snowpark-python into bkogan-decfloat

Author: sfc-gh-bkogan

ci/snyk/requirements.txt

@@ -1,5 +1,5 @@
 setuptools>=40.6.0
 wheel
 cloudpickle>=1.6.0,<=3.1.1,!=2.1.0,!=2.2.0
-snowflake-connector-python>=3.17.0,<5.0.0
+snowflake-connector-python>=4.0.0,<5.0.0
 typing-extensions>=4.1.0,<5.0.0

tests/integ/test_stored_procedure.py

@@ -983,6 +983,9 @@ def return_all_datatypes(
     reason="session.sql not supported in local testing",
 )
 def test_register_sp_with_preserve_parameter_names(session, resources_path):
+    sp_pow_name = Utils.random_name_for_temp_object(TempObjectType.PROCEDURE)
+    mod5_name = Utils.random_name_for_temp_object(TempObjectType.PROCEDURE)
+
     def sp_pow(session_, x, y):
         return (
             session_.create_dataframe([[x, y]])
@@ -993,7 +996,7 @@ def sp_pow(session_, x, y):
 
     pow_sp = sproc(
         sp_pow,
-        name="sp_pow",
+        name=sp_pow_name,
         return_type=DoubleType(),
         input_types=[IntegerType(), IntegerType()],
         preserve_parameter_names=True,
@@ -1003,7 +1006,7 @@ def sp_pow(session_, x, y):
     mod5_sp = session.sproc.register_from_file(
         test_files.test_sp_py_file,
         "mod5",
-        name="mod5",
+        name=mod5_name,
         return_type=IntegerType(),
         input_types=[IntegerType()],
         preserve_parameter_names=True,
@@ -1012,8 +1015,8 @@ def sp_pow(session_, x, y):
     assert pow_sp(2, 10) == 1024
     assert mod5_sp(3) == 3
     # assert parameter names preserved by issuing a SQL CALL with named arguments
-    assert session.sql("call sp_pow(y=>3, x=>2)").collect()[0][0] == 8
-    assert session.sql("call mod5(x=>3)").collect()[0][0] == 3
+    assert session.sql(f"call {sp_pow_name}(y=>3, x=>2)").collect()[0][0] == 8
+    assert session.sql(f"call {mod5_name}(x=>3)").collect()[0][0] == 3
 
 
 @pytest.mark.xfail(

tests/integ/test_udaf.py

@@ -747,6 +747,9 @@ def finish(self):
 
 
 def test_register_udaf_with_preserve_parameter_names(session, resources_path):
+    sum_udaf_name = Utils.random_name_for_temp_object(TempObjectType.AGGREGATE_FUNCTION)
+    my_udaf_name = Utils.random_name_for_temp_object(TempObjectType.AGGREGATE_FUNCTION)
+
     class PythonSumUDAFHandler:
         def __init__(self) -> None:
             self._sum = 0
@@ -766,24 +769,26 @@ def finish(self):
 
     sum_udaf = udaf(
         PythonSumUDAFHandler,
-        name="sum_udaf",
+        name=sum_udaf_name,
         return_type=IntegerType(),
         input_types=[IntegerType(), IntegerType()],
         preserve_parameter_names=True,
     )
     df = session.create_dataframe([[1, 3], [1, 4], [2, 5], [2, 6]]).to_df("a", "b")
     Utils.check_answer(df.agg(sum_udaf("a", "b")), [Row(24)])
-    describe_udaf = session.sql("describe function sum_udaf(int, int)").collect()
+    describe_udaf = session.sql(
+        f"describe function {sum_udaf_name}(int, int)"
+    ).collect()
     assert describe_udaf[0][1] == "(INPUT_VALUE1 NUMBER, INPUT_VALUE2 NUMBER)"
 
     test_files = TestFiles(resources_path)
     session.udaf.register_from_file(
         test_files.test_udaf_py_file,
         "MyUDAFWithTypeHints",
-        name="my_udaf",
+        name=my_udaf_name,
         input_types=[IntegerType()],
         return_type=IntegerType(),
         preserve_parameter_names=True,
     )
-    describe_udaf = session.sql("describe function my_udaf(int)").collect()
+    describe_udaf = session.sql(f"describe function {my_udaf_name}(int)").collect()
     assert describe_udaf[0][1] == "(INPUT_VALUE NUMBER)"

tests/integ/test_udf.py

@@ -1218,9 +1218,13 @@ def return_all_datatypes(
     reason="session.sql not supported in local testing",
 )
 def test_register_udf_with_preserve_parameter_names(session, resources_path):
+    pow_udf_name = Utils.random_name_for_temp_object(TempObjectType.FUNCTION)
+    pow_udf_name2 = Utils.random_name_for_temp_object(TempObjectType.FUNCTION)
+    mod5_name = Utils.random_name_for_temp_object(TempObjectType.FUNCTION)
+
     pow_udf = udf(
         lambda x, y: x**y,
-        name="pow_udf",
+        name=pow_udf_name,
         return_type=DoubleType(),
         input_types=[IntegerType(), IntegerType()],
         preserve_parameter_names=True,
@@ -1232,7 +1236,7 @@ def test_register_udf_with_preserve_parameter_names(session, resources_path):
     mod5_udf = session.udf.register_from_file(
         test_files.test_udf_py_file,
         "mod5",
-        name="mod5",
+        name=mod5_name,
         return_type=IntegerType(),
         input_types=[IntegerType()],
         preserve_parameter_names=True,
@@ -1245,7 +1249,7 @@ def test_register_udf_with_preserve_parameter_names(session, resources_path):
             Row(0, 1),
         ],
     )
-    assert session.sql("select mod5(x=>2)").collect()[0][0] == 2
+    assert session.sql(f"select {mod5_name}(x=>2)").collect()[0][0] == 2
 
     Utils.check_answer(
         df.select(pow_udf(col("a"), "b"), "b"),
@@ -1254,16 +1258,16 @@ def test_register_udf_with_preserve_parameter_names(session, resources_path):
             Row(15625.0, 6),
         ],
     )
-    assert session.sql("select pow_udf(y=>3, x=>2)").collect()[0][0] == 8
+    assert session.sql(f"select {pow_udf_name}(y=>3, x=>2)").collect()[0][0] == 8
 
     # without preserve_parameter_names, it should use arg1 and arg2 as parameter names
     udf(
         lambda x, y: x**y,
-        name="pow_udf2",
+        name=pow_udf_name2,
         return_type=DoubleType(),
         input_types=[IntegerType(), IntegerType()],
     )
-    assert session.sql("select pow_udf2(arg2=>3, arg1=>2)").collect()[0][0] == 8
+    assert session.sql(f"select {pow_udf_name2}(arg2=>3, arg1=>2)").collect()[0][0] == 8
 
 
 @pytest.mark.xfail(

tests/integ/test_udtf.py

@@ -361,11 +361,16 @@ def process(
 
 
 def test_register_udtf_with_preserve_parameter_names(session, resources_path):
+    udtf_echo_name = Utils.random_name_for_temp_object(TempObjectType.TABLE_FUNCTION)
+    generator_udtf_name = Utils.random_name_for_temp_object(
+        TempObjectType.TABLE_FUNCTION
+    )
+
     @udtf(
         output_schema=["a", "b"],
         input_types=[IntegerType(), IntegerType()],
         preserve_parameter_names=True,
-        name="udtf_echo",
+        name=udtf_echo_name,
     )
     class UDTFEcho:
         def process(
@@ -380,14 +385,16 @@ def process(
         df,
         [Row(3, 4)],
     )
-    describe_udaf = session.sql("describe function udtf_echo(int, int)").collect()
+    describe_udaf = session.sql(
+        f"describe function {udtf_echo_name}(int, int)"
+    ).collect()
     assert describe_udaf[0][1] == "(A NUMBER, B NUMBER)"
 
     test_files = TestFiles(resources_path)
     my_udtf = session.udtf.register_from_file(
         test_files.test_udtf_py_file,
         "GeneratorUDTF",
-        name="generator_udtf",
+        name=generator_udtf_name,
         input_types=[IntegerType()],
         output_schema=StructType([StructField("number", IntegerType())]),
         preserve_parameter_names=True,
@@ -405,7 +412,9 @@ def process(
             Row(1),
         ],
     )
-    describe_udaf = session.sql("describe function generator_udtf(int)").collect()
+    describe_udaf = session.sql(
+        f"describe function {generator_udtf_name}(int)"
+    ).collect()
     assert describe_udaf[0][1] == "(N NUMBER)"