sqlframe 3.33.0__tar.gz → 3.33.1__tar.gz

{sqlframe-3.33.0 → sqlframe-3.33.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 3.33.0
+Version: 3.33.1
 Summary: Turning PySpark Into a Universal DataFrame API
 Home-page: https://github.com/eakmanrq/sqlframe
 Author: Ryan Eakman

{sqlframe-3.33.0 → sqlframe-3.33.1}/docs/bigquery.md

@@ -516,6 +516,7 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [trim](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.trim.html)
 * [trunc](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.trunc.html)
     * Shorthand expressions not supported. Ex: Use `month` instead of `mon`
+* [try_divide](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.try_divide.html)
 * [try_to_timestamp](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.try_to_timestamp.html)
 * [typeof](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.typeof.html)
 * [ucase](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.ucase.html)

{sqlframe-3.33.0 → sqlframe-3.33.1}/docs/duckdb.md

@@ -478,6 +478,7 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [translate](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.translate.html)
 * [trim](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.trim.html)
 * [trunc](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.trunc.html)
+* [try_divide](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.try_divide.html)
 * [try_element_at](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.try_element_at.html)
 * [try_to_timestamp](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.try_to_timestamp.html)
 * [typeof](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.typeof.html)

{sqlframe-3.33.0 → sqlframe-3.33.1}/docs/postgres.md

@@ -464,6 +464,7 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [translate](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.translate.html)
 * [trim](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.trim.html)
 * [trunc](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.trunc.html)
+* [try_divide](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.try_divide.html)
 * [try_element_at](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.try_element_at.html)
   * Negative index returns null and cannot lookup elements in maps
 * [try_to_timestamp](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.try_to_timestamp.html)

{sqlframe-3.33.0 → sqlframe-3.33.1}/docs/snowflake.md

@@ -516,6 +516,7 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [translate](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.translate.html)
 * [trim](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.trim.html)
 * [trunc](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.trunc.html)
+* [try_divide](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.try_divide.html)
 * [try_to_timestamp](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.try_to_timestamp.html)
 * [typeof](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.typeof.html)
 * [ucase](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.ucase.html)

{sqlframe-3.33.0 → sqlframe-3.33.1}/setup.py

@@ -20,7 +20,7 @@ setup(
     python_requires=">=3.9",
     install_requires=[
         "prettytable<4",
-        "sqlglot>=24.0.0,<26.18",
+        "sqlglot>=24.0.0,<26.20",
         "typing_extensions",
     ],
     extras_require={
@@ -29,7 +29,7 @@ setup(
             "google-cloud-bigquery-storage>=2,<3",
         ],
         "dev": [
-            "duckdb>=1.2,<1.3",
+            "duckdb>=1.2,<1.4",
             "findspark>=2,<3",
             "mypy>=1.10.0,<1.16",
             "openai>=1.30,<2",
@@ -54,7 +54,7 @@ setup(
             "pymdown-extensions",
         ],
         "duckdb": [
-            "duckdb>=1.2,<1.3",
+            "duckdb>=1.2,<1.4",
             "pandas>=2,<3",
         ],
         "openai": [

{sqlframe-3.33.0 → sqlframe-3.33.1}/sqlframe/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.33.0'
-__version_tuple__ = version_tuple = (3, 33, 0)
+__version__ = version = '3.33.1'
+__version_tuple__ = version_tuple = (3, 33, 1)

{sqlframe-3.33.0 → sqlframe-3.33.1}/sqlframe/base/functions.py

@@ -2801,9 +2801,11 @@ def try_avg(col: ColumnOrName) -> Column:
     return Column.invoke_anonymous_function(col, "TRY_AVG")
 
 
-@meta(unsupported_engines="*")
+@meta()
 def try_divide(left: ColumnOrName, right: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(left, "TRY_DIVIDE", right)
+    return Column.invoke_expression_over_column(
+        left, expression.SafeDivide, expression=Column.ensure_col(right).column_expression
+    )
 
 
 @meta(unsupported_engines="*")

{sqlframe-3.33.0 → sqlframe-3.33.1}/sqlframe.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 3.33.0
+Version: 3.33.1
 Summary: Turning PySpark Into a Universal DataFrame API
 Home-page: https://github.com/eakmanrq/sqlframe
 Author: Ryan Eakman

{sqlframe-3.33.0 → sqlframe-3.33.1}/sqlframe.egg-info/requires.txt

@@ -1,5 +1,5 @@
 prettytable<4
-sqlglot<26.18,>=24.0.0
+sqlglot<26.20,>=24.0.0
 typing_extensions
 
 [bigquery]
@@ -10,7 +10,7 @@ google-cloud-bigquery[pandas]<4,>=3
 databricks-sql-connector[pyarrow]<5,>=3.6
 
 [dev]
-duckdb<1.3,>=1.2
+duckdb<1.4,>=1.2
 findspark<3,>=2
 mypy<1.16,>=1.10.0
 openai<2,>=1.30
@@ -35,7 +35,7 @@ mkdocs==1.4.2
 pymdown-extensions
 
 [duckdb]
-duckdb<1.3,>=1.2
+duckdb<1.4,>=1.2
 pandas<3,>=2
 
 [openai]

{sqlframe-3.33.0 → sqlframe-3.33.1}/tests/integration/engines/test_int_functions.py

@@ -1610,8 +1610,8 @@ def test_hash(get_session_and_func):
     session, hash = get_session_and_func("hash")
     df = session.createDataFrame([("ABC", "DEF")], ["c1", "c2"])
     if isinstance(session, DuckDBSession):
-        assert df.select(hash("c1").alias("hash")).first()[0] == 1241521928161919141
-        assert df.select(hash("c1", "c2").alias("hash")).first()[0] == 7524280102280623017
+        assert df.select(hash("c1").alias("hash")).first()[0] == 14760980515311954005
+        assert df.select(hash("c1", "c2").alias("hash")).first()[0] == 3670181680252885023
     # Bigquery only supports hashing a single column
     elif isinstance(session, BigQuerySession):
         assert df.select(hash("c1").alias("hash")).first()[0] == 228873345217803866
@@ -3112,10 +3112,11 @@ def test_try_divide(get_session_and_func, get_func):
     session, try_divide = get_session_and_func("try_divide")
     make_interval = get_func("make_interval", session)
     lit = get_func("lit", session)
-    df = session.createDataFrame([(6000, 15), (1990, 2)], ["a", "b"])
+    df = session.createDataFrame([(6000, 15), (1990, 2), (100, 0)], ["a", "b"])
     assert df.select(try_divide(df.a, df.b).alias("r")).collect() == [
         Row(r=400.0),
         Row(r=995.0),
+        Row(r=None),
     ]
     df = session.createDataFrame([(1, 2)], ["year", "month"])
     assert (
@@ -4217,10 +4218,12 @@ def test_median(get_session_and_func, get_func):
         ],
         schema=("course", "year", "earnings"),
     )
-    assert df.groupby("course").agg(median("earnings")).collect() == [
-        Row(value1="Java", value2=22000.0),
-        Row(value1="dotNET", value2=10000.0),
-    ]
+    assert sorted(df.groupby("course").agg(median("earnings")).collect()) == sorted(
+        [
+            Row(value1="Java", value2=22000.0),
+            Row(value1="dotNET", value2=10000.0),
+        ]
+    )
 
 
 def test_mode(get_session_and_func, get_func):

{sqlframe-3.33.0 → sqlframe-3.33.1}/tests/unit/standalone/test_functions.py

@@ -3012,8 +3012,11 @@ def test_try_avg(expression, expected):
 @pytest.mark.parametrize(
     "expression, expected",
     [
-        (SF.try_divide("cola", "colb"), "TRY_DIVIDE(cola, colb)"),
-        (SF.try_divide(SF.col("cola"), SF.col("colb")), "TRY_DIVIDE(cola, colb)"),
+        (SF.try_divide("cola", "colb"), "IF(colb <> 0, cola / colb, NULL)"),
+        (
+            SF.try_divide(SF.col("cola"), SF.col("colb")),
+            "IF(colb <> 0, cola / colb, NULL)",
+        ),
     ],
 )
 def test_try_divide(expression, expected):