sqlframe 3.43.3__tar.gz → 3.43.5__tar.gz

{sqlframe-3.43.3 → sqlframe-3.43.5}/PKG-INFO

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

{sqlframe-3.43.3 → sqlframe-3.43.5}/docs/postgres.md

@@ -424,6 +424,7 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [rand](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.rand.html)
 * [rank](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.rank.html)
 * [regexp](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.regexp.html)
+* [regexp_count](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.regexp_count.html)
 * [regexp_like](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.regexp_like.html)
 * [regexp_replace](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.regexp_replace.html)
 * [repeat](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.repeat.html)

{sqlframe-3.43.3 → sqlframe-3.43.5}/docs/snowflake.md

@@ -471,6 +471,7 @@ See something that you would like to see supported? [Open an issue](https://gith
 * [radians](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.radians.html)
 * [rand](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.rand.html)
 * [rank](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.rank.html)
+* [regexp_count](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.regexp_count.html)
 * [regexp_extract](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.regexp_extract.html)
 * [regexp_extract_all](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.regexp_extract_all.html)
 * [regexp_replace](https://spark.apache.org/docs/latest/api/python/reference/pyspark.sql/api/pyspark.sql.functions.regexp_replace.html)

{sqlframe-3.43.3 → sqlframe-3.43.5}/setup.py

@@ -20,7 +20,7 @@ setup(
     python_requires=">=3.9",
     install_requires=[
         "prettytable<4",
-        "sqlglot>=24.0.0,<27.20",
+        "sqlglot>=24.0.0,<27.26",
         "typing_extensions",
         "more-itertools",
     ],
@@ -33,7 +33,7 @@ setup(
             "duckdb>=1.2,<1.5",
             "findspark>=2,<3",
             "mypy>=1.10.0,<1.19",
-            "openai>=1.30,<2",
+            "openai>=1.30,<3",
             "pandas>=2,<3",
             "pandas-stubs>=2,<3",
             "psycopg>=3.1,<4",
@@ -45,7 +45,7 @@ setup(
             "pytest-rerunfailures",
             "pytest-xdist>=3.6,<3.9",
             "pre-commit>=3.7,<5",
-            "ruff>=0.4.4,<0.14",
+            "ruff>=0.4.4,<0.15",
             "types-psycopg2>=2.9,<3",
         ],
         "docs": [
@@ -60,7 +60,7 @@ setup(
             "pandas>=2,<3",
         ],
         "openai": [
-            "openai>=1.30,<2",
+            "openai>=1.30,<3",
         ],
         "pandas": [
             "pandas>=2,<3",
@@ -72,7 +72,7 @@ setup(
             "redshift_connector>=2.1.1,<2.2.0",
         ],
         "snowflake": [
-            "snowflake-connector-python[secure-local-storage]>=3.10.0,<3.18",
+            "snowflake-connector-python[secure-local-storage]>=3.10.0,<3.19",
         ],
         "spark": [
             "pyspark>=2,<3.6",

{sqlframe-3.43.3 → sqlframe-3.43.5}/sqlframe/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '3.43.3'
-__version_tuple__ = version_tuple = (3, 43, 3)
+__version__ = version = '3.43.5'
+__version_tuple__ = version_tuple = (3, 43, 5)
 
-__commit_id__ = commit_id = 'gb1808fda1'
+__commit_id__ = commit_id = 'ge9449259f'

{sqlframe-3.43.3 → sqlframe-3.43.5}/sqlframe/base/functions.py

@@ -241,12 +241,12 @@ ceiling = ceil
 
 @meta()
 def cos(col: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(col, "COS")
+    return Column.invoke_expression_over_column(col, expression.Cos)
 
 
-@meta(unsupported_engines="duckdb")
+@meta()
 def cosh(col: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(col, "COSH")
+    return Column.invoke_expression_over_column(col, expression.Cosh)
 
 
 @meta()
@@ -309,7 +309,7 @@ def factorial(col: ColumnOrName) -> Column:
     if session._is_bigquery:
         return factorial_from_case_statement(col)
 
-    return Column.invoke_anonymous_function(col, "FACTORIAL")
+    return Column.invoke_expression_over_column(col, expression.Factorial)
 
 
 @meta()
@@ -382,7 +382,7 @@ def sinh(col: ColumnOrName) -> Column:
 
 @meta()
 def tan(col: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(col, "TAN")
+    return Column.invoke_expression_over_column(col, expression.Tan)
 
 
 @meta(unsupported_engines="duckdb")
@@ -399,7 +399,7 @@ def degrees(col: ColumnOrName) -> Column:
     if session._is_bigquery:
         return degrees_bgutil(col)
 
-    return Column.invoke_anonymous_function(col, "DEGREES")
+    return Column.invoke_expression_over_column(col, expression.Degrees)
 
 
 toDegrees = degrees
@@ -5209,7 +5209,7 @@ def regexp(str: ColumnOrName, regexp: ColumnOrName) -> Column:
     return Column.invoke_anonymous_function(str, "regexp", regexp)
 
 
-@meta(unsupported_engines="*")
+@meta(unsupported_engines=["bigquery", "duckdb"])
 def regexp_count(str: ColumnOrName, regexp: ColumnOrName) -> Column:
     r"""Returns a count of the number of times that the Java regex pattern `regexp` is matched
     in the string `str`.
@@ -5238,7 +5238,7 @@ def regexp_count(str: ColumnOrName, regexp: ColumnOrName) -> Column:
     >>> df.select(regexp_count("str", col("regexp")).alias('d')).collect()
     [Row(d=3)]
     """
-    return Column.invoke_anonymous_function(str, "regexp_count", regexp)
+    return Column.invoke_expression_over_column(str, expression.RegexpCount, expression=regexp)
 
 
 @meta(unsupported_engines=["bigquery", "postgres"])

{sqlframe-3.43.3 → sqlframe-3.43.5}/sqlframe/duckdb/session.py

@@ -7,10 +7,7 @@ from sqlframe.base.session import _BaseSession
 from sqlframe.base.util import soundex
 from sqlframe.duckdb.catalog import DuckDBCatalog
 from sqlframe.duckdb.dataframe import DuckDBDataFrame
-from sqlframe.duckdb.readwriter import (
-    DuckDBDataFrameReader,
-    DuckDBDataFrameWriter,
-)
+from sqlframe.duckdb.readwriter import DuckDBDataFrameReader, DuckDBDataFrameWriter
 from sqlframe.duckdb.table import DuckDBTable
 from sqlframe.duckdb.udf import DuckDBUDFRegistration
 
@@ -42,7 +39,11 @@ class DuckDBSession(
     def __init__(self, conn: t.Optional[DuckDBPyConnection] = None, *args, **kwargs):
         import duckdb
         from duckdb import InvalidInputException
-        from duckdb.typing import VARCHAR
+
+        try:  # Available from duckdb 1.4.1
+            from duckdb.sqltypes import VARCHAR
+        except ImportError:
+            from duckdb.typing import VARCHAR
 
         if not hasattr(self, "_conn"):
             conn = conn or duckdb.connect()

{sqlframe-3.43.3 → sqlframe-3.43.5}/sqlframe.egg-info/PKG-INFO

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

{sqlframe-3.43.3 → sqlframe-3.43.5}/sqlframe.egg-info/requires.txt

@@ -1,6 +1,6 @@
 more-itertools
 prettytable<4
-sqlglot<27.20,>=24.0.0
+sqlglot<27.26,>=24.0.0
 typing_extensions
 
 [bigquery]
@@ -14,7 +14,7 @@ databricks-sql-connector[pyarrow]<5,>=3.6
 duckdb<1.5,>=1.2
 findspark<3,>=2
 mypy<1.19,>=1.10.0
-openai<2,>=1.30
+openai<3,>=1.30
 pandas-stubs<3,>=2
 pandas<3,>=2
 pre-commit<5,>=3.7
@@ -26,7 +26,7 @@ pytest-postgresql<8,>=6
 pytest-rerunfailures
 pytest-xdist<3.9,>=3.6
 pytest<8.5,>=8.2.0
-ruff<0.14,>=0.4.4
+ruff<0.15,>=0.4.4
 types-psycopg2<3,>=2.9
 
 [docs]
@@ -41,7 +41,7 @@ duckdb<1.5,>=1.2
 pandas<3,>=2
 
 [openai]
-openai<2,>=1.30
+openai<3,>=1.30
 
 [pandas]
 pandas<3,>=2
@@ -53,7 +53,7 @@ psycopg2<3,>=2.8
 redshift_connector<2.2.0,>=2.1.1
 
 [snowflake]
-snowflake-connector-python[secure-local-storage]<3.18,>=3.10.0
+snowflake-connector-python[secure-local-storage]<3.19,>=3.10.0
 
 [spark]
 pyspark<3.6,>=2