sqlframe 3.3.1__py3-none-any.whl → 3.4.0__py3-none-any.whl

sqlframe/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.3.1'
-__version_tuple__ = version_tuple = (3, 3, 1)
+__version__ = version = '3.4.0'
+__version_tuple__ = version_tuple = (3, 4, 0)

sqlframe/base/functions.py

@@ -1129,11 +1129,15 @@ def overlay(
     pos: t.Union[ColumnOrName, int],
     len: t.Optional[t.Union[ColumnOrName, int]] = None,
 ) -> Column:
-    pos_value = lit(pos) if isinstance(pos, int) else pos
-    if len is not None:
-        len_value = lit(len) if isinstance(len, int) else len
-        return Column.invoke_anonymous_function(src, "OVERLAY", replace, pos_value, len_value)
-    return Column.invoke_anonymous_function(src, "OVERLAY", replace, pos_value)
+    return Column.invoke_expression_over_column(
+        src,
+        expression.Overlay,
+        **{
+            "expression": Column(replace).expression,
+            "from": lit(pos).expression,
+            "for": lit(len).expression if len is not None else None,
+        },
+    )
 
 
 @meta(unsupported_engines=["bigquery", "duckdb", "postgres", "snowflake"])
@@ -4834,7 +4838,7 @@ def str_to_map(
     )
 
 
-@meta(unsupported_engines="*")
+@meta(unsupported_engines="postgres")
 def substr(str: ColumnOrName, pos: ColumnOrName, len: t.Optional[ColumnOrName] = None) -> Column:
     """
     Returns the substring of `str` that starts at `pos` and is of length `len`,
@@ -4873,10 +4877,7 @@ def substr(str: ColumnOrName, pos: ColumnOrName, len: t.Optional[ColumnOrName] =
     |                   k SQL|
     +------------------------+
     """
-    if len is not None:
-        return Column.invoke_anonymous_function(str, "substr", pos, len)
-    else:
-        return Column.invoke_anonymous_function(str, "substr", pos)
+    return Column.invoke_expression_over_column(str, expression.Substring, start=pos, length=len)
 
 
 @meta(unsupported_engines="*")

sqlframe/bigquery/functions.pyi

@@ -251,6 +251,7 @@ from sqlframe.base.functions import stddev as stddev
 from sqlframe.base.functions import stddev_pop as stddev_pop
 from sqlframe.base.functions import stddev_samp as stddev_samp
 from sqlframe.base.functions import struct as struct
+from sqlframe.base.functions import substr as substr
 from sqlframe.base.functions import substring as substring
 from sqlframe.base.functions import sum as sum
 from sqlframe.base.functions import sum_distinct as sum_distinct

sqlframe/duckdb/functions.pyi

@@ -184,6 +184,7 @@ from sqlframe.base.functions import (
     stddev_samp as stddev_samp,
     struct as struct,
     substring as substring,
+    substr as substr,
     sum as sum,
     sumDistinct as sumDistinct,
     sum_distinct as sum_distinct,

sqlframe/duckdb/session.py

@@ -52,6 +52,10 @@ class DuckDBSession(
             super().__init__(conn, *args, **kwargs)
             self._last_result = None
 
+    @cached_property
+    def _cur(self) -> DuckDBPyConnection:  # type: ignore
+        return self._conn
+
     @classmethod
     def _try_get_map(cls, value: t.Any) -> t.Optional[t.Dict[str, t.Any]]:
         if value and isinstance(value, dict):

sqlframe/snowflake/functions.pyi

@@ -193,6 +193,7 @@ from sqlframe.base.functions import (
     stddev_pop as stddev_pop,
     stddev_samp as stddev_samp,
     substring as substring,
+    substr as substr,
     sum as sum,
     sumDistinct as sumDistinct,
     sum_distinct as sum_distinct,

sqlframe/spark/functions.py

@@ -18,4 +18,5 @@ from sqlframe.base.function_alternatives import (  # noqa
     add_months_by_multiplication as add_months,
     arrays_overlap_renamed as arrays_overlap,
     _is_string_using_typeof_string_lcase as _is_string,
+    try_element_at_zero_based as try_element_at,
 )

sqlframe/spark/functions.pyi

@@ -2,6 +2,7 @@ from sqlframe.base.function_alternatives import (  # noqa
     percentile_without_disc as percentile,
     add_months_by_multiplication as add_months,
     arrays_overlap_renamed as arrays_overlap,
+    try_element_at_zero_based as try_element_at,
 )
 from sqlframe.base.functions import (
     abs as abs,
@@ -372,7 +373,6 @@ from sqlframe.base.functions import (
     try_aes_decrypt as try_aes_decrypt,
     try_avg as try_avg,
     try_divide as try_divide,
-    try_element_at as try_element_at,
     try_multiply as try_multiply,
     try_subtract as try_subtract,
     try_sum as try_sum,

{sqlframe-3.3.1.dist-info → sqlframe-3.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 3.3.1
+Version: 3.4.0
 Summary: Turning PySpark Into a Universal DataFrame API
 Home-page: https://github.com/eakmanrq/sqlframe
 Author: Ryan Eakman
@@ -18,7 +18,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: prettytable (<3.11.1)
-Requires-Dist: sqlglot (<25.23,>=24.0.0)
+Requires-Dist: sqlglot (<25.25,>=24.0.0)
 Requires-Dist: typing-extensions (<5,>=4.8)
 Provides-Extra: bigquery
 Requires-Dist: google-cloud-bigquery-storage (<3,>=2) ; extra == 'bigquery'
@@ -27,7 +27,7 @@ Provides-Extra: dev
 Requires-Dist: duckdb (<1.2,>=0.9) ; extra == 'dev'
 Requires-Dist: findspark (<3,>=2) ; extra == 'dev'
 Requires-Dist: mypy (<1.12,>=1.10.0) ; extra == 'dev'
-Requires-Dist: openai (<1.48,>=1.30) ; extra == 'dev'
+Requires-Dist: openai (<1.52,>=1.30) ; extra == 'dev'
 Requires-Dist: pandas-stubs (<3,>=2) ; extra == 'dev'
 Requires-Dist: pandas (<3,>=2) ; extra == 'dev'
 Requires-Dist: psycopg (<4,>=3.1) ; extra == 'dev'
@@ -39,7 +39,7 @@ Requires-Dist: pytest (<8.4,>=8.2.0) ; extra == 'dev'
 Requires-Dist: ruff (<0.7,>=0.4.4) ; extra == 'dev'
 Requires-Dist: types-psycopg2 (<3,>=2.9) ; extra == 'dev'
 Requires-Dist: pre-commit (>=3.5) ; (python_version == "3.8") and extra == 'dev'
-Requires-Dist: pre-commit (<3.9,>=3.7) ; (python_version >= "3.9") and extra == 'dev'
+Requires-Dist: pre-commit (<4.1,>=3.7) ; (python_version >= "3.9") and extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: mkdocs-include-markdown-plugin (==6.0.6) ; extra == 'docs'
 Requires-Dist: mkdocs-material-extensions (==1.1.1) ; extra == 'docs'
@@ -50,7 +50,7 @@ Provides-Extra: duckdb
 Requires-Dist: duckdb (<1.2,>=0.9) ; extra == 'duckdb'
 Requires-Dist: pandas (<3,>=2) ; extra == 'duckdb'
 Provides-Extra: openai
-Requires-Dist: openai (<1.48,>=1.30) ; extra == 'openai'
+Requires-Dist: openai (<1.52,>=1.30) ; extra == 'openai'
 Provides-Extra: pandas
 Requires-Dist: pandas (<3,>=2) ; extra == 'pandas'
 Provides-Extra: postgres

{sqlframe-3.3.1.dist-info → sqlframe-3.4.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlframe/__init__.py,sha256=E3qCJ4PSEgKz6Hg3ves6LWt3JrQOV8c9HVLSIUOzKNc,3106
-sqlframe/_version.py,sha256=kgjiv6RGaxXEtlEXqn4D_sBXv_DSClZBtjMcTFwo908,411
+sqlframe/_version.py,sha256=YWGqQYvejjlymmjzg4jncyBgDC760jlRmyon_Rd-2uQ,411
 sqlframe/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlframe/base/_typing.py,sha256=b2clI5HI1zEZKB_3Msx3FeAJQyft44ubUifJwQRVXyQ,1298
 sqlframe/base/catalog.py,sha256=SzFQalTWdhWzxUY-4ut1f9TfOECp_JmJEgNPfrRKCe0,38457
@@ -8,7 +8,7 @@ sqlframe/base/dataframe.py,sha256=uTM46auSPniww-ZMtI5s0hrrCG1nOICMEhdZZ8E4cu8,71
 sqlframe/base/decorators.py,sha256=Jy4bf8MhZ-AJ6CWTj59bBJRqamtLbPC0USUMFrY6g0w,449
 sqlframe/base/exceptions.py,sha256=9Uwvqn2eAkDpqm4BrRgbL61qM-GMCbJEMAW8otxO46s,370
 sqlframe/base/function_alternatives.py,sha256=IxNBqplehkAEkpzA625Dif-9Xyi4Hrho81A9U262rV0,50714
-sqlframe/base/functions.py,sha256=p1aVgQ3htTLR5-mDzDtEh7W3iTcbt_XOOljLpza-dF8,189984
+sqlframe/base/functions.py,sha256=b6rjrBHHpTMzBU2N5ubdXMJACM40qw4WnbI_RqusWIU,189878
 sqlframe/base/group.py,sha256=fsyG5990_Pd7gFPjTFrH9IEoAquL_wEkVpIlBAIkZJU,4091
 sqlframe/base/normalize.py,sha256=nXAJ5CwxVf4DV0GsH-q1w0p8gmjSMlv96k_ez1eVul8,3880
 sqlframe/base/operations.py,sha256=-AhNuEzcV7ZExoP1oY3blaKip-joQyJeQVvfBTs_2g4,3456
@@ -28,7 +28,7 @@ sqlframe/bigquery/catalog.py,sha256=8d36IzT5GPWd1FdxJ9vEljOdbIDepHnFOBjwP0bX6FE,
 sqlframe/bigquery/column.py,sha256=E1tUa62Y5HajkhgFuebU9zohrGyieudcHzTT8gfalio,40
 sqlframe/bigquery/dataframe.py,sha256=Y2uy4FEYw0KxIHgnaA9uMwdIzxJzTlD_NSzIe7P7kxA,2405
 sqlframe/bigquery/functions.py,sha256=CxXiBzSLRf9h-9lAM8xSz1CFcVk2tVXU1eFPJ4d_L00,11140
-sqlframe/bigquery/functions.pyi,sha256=BCYqHpZzv4KWVtTuiC9wCSzXdxeHsz9gwkEvKzwHnoY,13583
+sqlframe/bigquery/functions.pyi,sha256=GJnEmsTV2PyEzVlowJxpAvOT_6JYY2pVwJ_cZ3lxvz0,13636
 sqlframe/bigquery/group.py,sha256=UVBNBRTo8OqS-_cS5YwvTeJYgYxeG-d6R3kfyHmlFqw,391
 sqlframe/bigquery/readwriter.py,sha256=WAD3ZMwkkjOpvPPoZXfaLLNM6tRTeUvdEj-hQZAzXeo,870
 sqlframe/bigquery/session.py,sha256=uSiEWWiDEryq3gIJJUmsu1DIalRGomNiymVulxt439c,2744
@@ -40,10 +40,10 @@ sqlframe/duckdb/catalog.py,sha256=YYYVmetLUaJOdObKw4AJ7L0P-msshkta4xHlcZQ9zEA,47
 sqlframe/duckdb/column.py,sha256=E1tUa62Y5HajkhgFuebU9zohrGyieudcHzTT8gfalio,40
 sqlframe/duckdb/dataframe.py,sha256=HZg_uMAz4RsubZJT4-MslUQS_0-InF0_P5Yq5HyJ3wE,1708
 sqlframe/duckdb/functions.py,sha256=Ee8o6YFtRdEiq0jNLXxgu5lcbc7Tsg0-lK6oRyxdcjo,1920
-sqlframe/duckdb/functions.pyi,sha256=Qn6j4zwwuBsh6q9341dR3Z5kpeRsgvM4u6Bb6FekKrI,5827
+sqlframe/duckdb/functions.pyi,sha256=mKr9hI4snRyXEeWWTYfRNpBJmWd5T2EujdQ0oJxpEjY,5849
 sqlframe/duckdb/group.py,sha256=IkhbW42Ng1U5YT3FkIdiB4zBqRkW4QyTb-1detY1e_4,383
 sqlframe/duckdb/readwriter.py,sha256=iY0Wsms35gymilETOhAQGQCHfH8LCj9_uY8aCdF77ds,4806
-sqlframe/duckdb/session.py,sha256=h0gr4hzGTLTSYN2OECAYjb8HHh2QvSshInxAIUjEEs8,2615
+sqlframe/duckdb/session.py,sha256=b5IrKbTkYUVNQGSG2EJPNV9MTdJw4onN-9aMrskjxck,2721
 sqlframe/duckdb/types.py,sha256=KwNyuXIo-2xVVd4bZED3YrQOobKCtemlxGrJL7DrTC8,34
 sqlframe/duckdb/udf.py,sha256=Du9LnOtT1lJvB90D4HSR2tB7MXy179jZngDR-EjVjQk,656
 sqlframe/duckdb/window.py,sha256=6GKPzuxeSapJakBaKBeT9VpED1ACdjggDv9JRILDyV0,35
@@ -75,7 +75,7 @@ sqlframe/snowflake/catalog.py,sha256=Tp_B9oMTInnqLTiZNsT0UNc-a-aKXu3zFThlCwLeKCA
 sqlframe/snowflake/column.py,sha256=E1tUa62Y5HajkhgFuebU9zohrGyieudcHzTT8gfalio,40
 sqlframe/snowflake/dataframe.py,sha256=ANDZ5Dpxz-WTlTtmKNcv-nJlzTeTsAOK0X0gR2euPqQ,2144
 sqlframe/snowflake/functions.py,sha256=iX67xU8Czy5k3HiNjNbN-x-via6yqGNaMPw1maV9HPs,2580
-sqlframe/snowflake/functions.pyi,sha256=wqUPXuZxjRY0rPY2BRAb7XXkWYP1DyuDzvlriRySdSw,6185
+sqlframe/snowflake/functions.pyi,sha256=DoRyF0zob8kV7qHkHonyyyPex-C_GIQvFDaSxf2lSa4,6207
 sqlframe/snowflake/group.py,sha256=pPP1l2RRo_LgkXrji8a87n2PKo-63ZRPT-WUtvVcBME,395
 sqlframe/snowflake/readwriter.py,sha256=yhRc2HcMq6PwV3ghZWC-q-qaE7LE4aEjZEXCip4OOlQ,884
 sqlframe/snowflake/session.py,sha256=fnFYrJ9JxoOf4ZKTrQcSKjwr6wNp6A85cMqKczOi3vA,3320
@@ -86,8 +86,8 @@ sqlframe/spark/__init__.py,sha256=QV0eNmY5fL4ulLvAJVVVx2OYFfQXN2KYV3R5cij7HTg,85
 sqlframe/spark/catalog.py,sha256=8ghHiKz9rBJ2ohm768XIftyi9Htbw-1cSkJUlXemwrI,39796
 sqlframe/spark/column.py,sha256=E1tUa62Y5HajkhgFuebU9zohrGyieudcHzTT8gfalio,40
 sqlframe/spark/dataframe.py,sha256=_TD-h7oz0-i80r90v17UoLDoIzcGNchU2SL13ujOOic,1779
-sqlframe/spark/functions.py,sha256=AQfqfvaojJzCuo9DyDklz0JYZPhn_3dzWvztsklBO0o,586
-sqlframe/spark/functions.pyi,sha256=bjz6s8E6OB0c4KfTTsls7rhb_R9mIYvkaeaXefMziqM,11617
+sqlframe/spark/functions.py,sha256=KY_597LO6UN0NQOK9Gk4ElRPACjS60ANTDF4KWKeyxc,635
+sqlframe/spark/functions.pyi,sha256=jiZr-EGGuXEodEeKq56MwibcXBk4Lpy4H3brFd0DDVA,11628
 sqlframe/spark/group.py,sha256=MrvV_v-YkBc6T1zz882WrEqtWjlooWIyHBCmTQg3fCA,379
 sqlframe/spark/readwriter.py,sha256=w68EImTcGJv64X7pc1tk5tDjDxb1nAnn-MiIaaN9Dc8,812
 sqlframe/spark/session.py,sha256=cjsRQZz1kW67aajvXQyAJkv9Uh-zmmk3C3O9QSBbEQQ,5265
@@ -107,8 +107,8 @@ sqlframe/standalone/udf.py,sha256=azmgtUjHNIPs0WMVNId05SHwiYn41MKVBhKXsQJ5dmY,27
 sqlframe/standalone/window.py,sha256=6GKPzuxeSapJakBaKBeT9VpED1ACdjggDv9JRILDyV0,35
 sqlframe/testing/__init__.py,sha256=VVCosQhitU74A3NnE52O4mNtGZONapuEXcc20QmSlnQ,132
 sqlframe/testing/utils.py,sha256=9DDYVuocO7tygee3RaajuJNZ24sJwf_LY556kKg7kTw,13011
-sqlframe-3.3.1.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
-sqlframe-3.3.1.dist-info/METADATA,sha256=SPW_z2bAjr0_jJPP-BNREOJAgwhMmecPt11oqPpcv4E,8639
-sqlframe-3.3.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-sqlframe-3.3.1.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
-sqlframe-3.3.1.dist-info/RECORD,,
+sqlframe-3.4.0.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
+sqlframe-3.4.0.dist-info/METADATA,sha256=IDBAwEcCrJfWwGuAaa8kfV3Jxlte38uOYO87zcFWJfY,8639
+sqlframe-3.4.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+sqlframe-3.4.0.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
+sqlframe-3.4.0.dist-info/RECORD,,