sqlframe 3.38.2__py3-none-any.whl → 3.39.1__py3-none-any.whl

sqlframe/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '3.38.2'
-__version_tuple__ = version_tuple = (3, 38, 2)
+__version__ = version = '3.39.1'
+__version_tuple__ = version_tuple = (3, 39, 1)
+
+__commit_id__ = commit_id = 'g0245f44bb'

sqlframe/base/functions.py

@@ -2572,7 +2572,7 @@ def shuffle(col: ColumnOrName) -> Column:
 
 @meta(unsupported_engines="snowflake")
 def reverse(col: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(col, "REVERSE")
+    return Column.invoke_expression_over_column(col, expression.Reverse)
 
 
 @meta(unsupported_engines=["bigquery", "postgres"])
@@ -3219,9 +3219,9 @@ def current_user() -> Column:
     return Column.invoke_expression_over_column(None, expression.CurrentUser)
 
 
-@meta(unsupported_engines="*")
+@meta()
 def date_from_unix_date(days: ColumnOrName) -> Column:
-    return Column.invoke_anonymous_function(days, "date_from_unix_date")
+    return Column.invoke_expression_over_column(days, expression.DateFromUnixDate)
 
 
 @meta(unsupported_engines="*")
@@ -6631,7 +6631,7 @@ def unix_micros(col: ColumnOrName) -> Column:
 
     col = to_timestamp(col)
 
-    return Column.invoke_anonymous_function(col, "unix_micros")
+    return Column.invoke_expression_over_column(col, expression.UnixMicros)
 
 
 @meta()
@@ -6651,15 +6651,10 @@ def unix_millis(col: ColumnOrName) -> Column:
     """
     from sqlframe.base.function_alternatives import unix_millis_multiply_epoch
 
-    if (
-        _get_session()._is_bigquery
-        or _get_session()._is_duckdb
-        or _get_session()._is_postgres
-        or _get_session()._is_snowflake
-    ):
+    if _get_session()._is_duckdb or _get_session()._is_postgres or _get_session()._is_snowflake:
         return unix_millis_multiply_epoch(col)
 
-    return Column.invoke_anonymous_function(col, "unix_millis")
+    return Column.invoke_expression_over_column(col, expression.UnixMillis)
 
 
 @meta()

sqlframe/base/session.py

@@ -12,7 +12,6 @@ from collections import defaultdict
 from functools import cached_property
 
 import sqlglot
-from dateutil.relativedelta import relativedelta
 from sqlglot import Dialect, exp
 from sqlglot.dialects.dialect import DialectType, NormalizationStrategy
 from sqlglot.expressions import parse_identifier
@@ -34,6 +33,7 @@ from sqlframe.base.table import _BaseTable
 from sqlframe.base.udf import _BaseUDFRegistration
 from sqlframe.base.util import (
     get_column_mapping_from_schema_input,
+    is_relativedelta_like,
     normalize_string,
     verify_pandas_installed,
 )
@@ -614,7 +614,7 @@ class _BaseSession(t.Generic[CATALOG, READER, WRITER, DF, TABLE, CONN, UDF_REGIS
             return [cls._to_value(x) for x in value]
         elif isinstance(value, datetime.datetime):
             return value.replace(tzinfo=None)
-        elif isinstance(value, relativedelta):
+        elif is_relativedelta_like(value):
             return datetime.timedelta(
                 days=value.days, hours=value.hours, minutes=value.minutes, seconds=value.seconds
             )

sqlframe/base/util.py

@@ -113,9 +113,13 @@ def get_tables_from_expression_with_join(expression: exp.Select) -> t.List[exp.T
 
 
 def to_csv(options: t.Dict[str, OptionalPrimitiveType], equality_char: str = "=") -> str:
-    return ", ".join(
-        [f"{k}{equality_char}{v}" for k, v in (options or {}).items() if v is not None]
-    )
+    results = []
+    for k, v in (options or {}).items():
+        if v is None:
+            continue
+        v = f"'{v}'" if isinstance(v, str) else v
+        results.append(f"{k}{equality_char}{v}")
+    return ", ".join(results)
 
 
 def ensure_column_mapping(schema: t.Union[str, StructType]) -> t.Dict:
@@ -524,3 +528,12 @@ def split_filepath(filepath: str) -> tuple[str, str]:
     if len(split_) == 2:  # noqa: PLR2004
         return split_[0] + "://", split_[1]
     return "", split_[0]
+
+
+def is_relativedelta_like(value: t.Any) -> bool:
+    return (
+        hasattr(value, "years")
+        and hasattr(value, "months")
+        and hasattr(value, "weeks")
+        and hasattr(value, "leapdays")
+    )

sqlframe/databricks/catalog.py

@@ -461,11 +461,7 @@ class DatabricksCatalog(
             exp.Property(this=sg.to_identifier(name=k), value=exp.convert(value=v))
             for k, v in (table_properties if isinstance(table_properties, dict) else {}).items()
         )
-
-        format_options: dict[str, t.Union[bool, float, int, str, None]] = {
-            key: f"'{val}'" for key, val in options.items() if val is not None
-        }
-        format_options_str = to_csv(format_options, " ")
+        format_options_str = to_csv(options, " ")  # type: ignore
 
         output_expression_container = exp.Create(
             this=exp.Schema(

sqlframe/databricks/readwriter.py

@@ -128,8 +128,6 @@ class DatabricksDataFrameReader(
                 format_options["schema"] = f"{schema}"
             if "inferSchema" in format_options:
                 format_options["inferColumnTypes"] = format_options.pop("inferSchema")
-
-            format_options = {key: f"'{val}'" for key, val in format_options.items()}
             format_options_str = to_csv(format_options, " => ")
 
             from_clause = f"read_files('{paths}', {format_options_str})"
@@ -338,10 +336,7 @@ class DatabricksDataFrameWriter(
         format_options_str = ""
         if format is not None:
             properties.append(exp.FileFormatProperty(this=exp.Var(this=format.upper())))
-            format_options: dict[str, OptionalPrimitiveType] = {
-                key: f"'{val}'" for key, val in options.items() if val is not None
-            }
-            format_options_str = to_csv(format_options, " ")
+            format_options_str = to_csv(options, " ")
 
         if path is not None and isinstance(path, str):
             properties.append(exp.LocationProperty(this=exp.convert(path)))

sqlframe/duckdb/readwriter.py

@@ -86,10 +86,7 @@ class DuckDBDataFrameReader(
                 select_column_mapping["filename"] = "VARCHAR"
             select_columns = [x.expression for x in self._to_casted_columns(select_column_mapping)]
             if format == "csv":
-                duckdb_columns = ", ".join(
-                    [f"'{column}': '{dtype}'" for column, dtype in column_mapping.items()]
-                )
-                merged_options["columns"] = "{" + duckdb_columns + "}"
+                merged_options["columns"] = column_mapping  # type: ignore
         else:
             select_columns = [exp.Star()]
         if format == "delta":

sqlframe/spark/readwriter.py

@@ -110,7 +110,6 @@ class SparkDataFrameReader(
             if schema:
                 format_options["schema"] = f"{schema}"
                 format_options.pop("inferSchema", None)
-            format_options = {key: f"'{val}'" for key, val in format_options.items()}
             format_options_str = to_csv(format_options, " ")
 
             tmp_view = f"CREATE OR REPLACE TEMPORARY VIEW {tmp_view_key} USING {format}" + (

{sqlframe-3.38.2.dist-info → sqlframe-3.39.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 3.38.2
+Version: 3.39.1
 Summary: Turning PySpark Into a Universal DataFrame API
 Home-page: https://github.com/eakmanrq/sqlframe
 Author: Ryan Eakman
@@ -17,7 +17,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: prettytable <4
-Requires-Dist: sqlglot <27.7,>=24.0.0
+Requires-Dist: sqlglot <27.8,>=24.0.0
 Requires-Dist: typing-extensions
 Provides-Extra: bigquery
 Requires-Dist: google-cloud-bigquery-storage <3,>=2 ; extra == 'bigquery'
@@ -60,7 +60,7 @@ Requires-Dist: psycopg2 <3,>=2.8 ; extra == 'postgres'
 Provides-Extra: redshift
 Requires-Dist: redshift-connector <2.2.0,>=2.1.1 ; extra == 'redshift'
 Provides-Extra: snowflake
-Requires-Dist: snowflake-connector-python[secure-local-storage] <3.17,>=3.10.0 ; extra == 'snowflake'
+Requires-Dist: snowflake-connector-python[secure-local-storage] <3.18,>=3.10.0 ; extra == 'snowflake'
 Provides-Extra: spark
 Requires-Dist: pyspark <3.6,>=2 ; extra == 'spark'
 

{sqlframe-3.38.2.dist-info → sqlframe-3.39.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlframe/__init__.py,sha256=SB80yLTITBXHI2GCDS6n6bN5ObHqgPjfpRPAUwxaots,3403
-sqlframe/_version.py,sha256=_jX_R7_H72gqRQJCQLfuj94JZgcTBOsYXYFp5ayxiUI,513
+sqlframe/_version.py,sha256=Magv3v4P13Mop8QdiPMhhrwCJ78Gp6qb0vlJrw80tno,714
 sqlframe/py.typed,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 sqlframe/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlframe/base/_typing.py,sha256=b2clI5HI1zEZKB_3Msx3FeAJQyft44ubUifJwQRVXyQ,1298
@@ -9,17 +9,17 @@ sqlframe/base/dataframe.py,sha256=0diYONDlet8iZt49LC3vcmfXHAAZ2MovPL2pTXYHj2U,85
 sqlframe/base/decorators.py,sha256=IhE5xNQDkwJHacCvulq5WpUKyKmXm7dL2A3o5WuKGP4,2131
 sqlframe/base/exceptions.py,sha256=9Uwvqn2eAkDpqm4BrRgbL61qM-GMCbJEMAW8otxO46s,370
 sqlframe/base/function_alternatives.py,sha256=aTu3nQhIAkZoxrI1IpjpaHEAMxBNms0AnhS0EMR-TwY,51727
-sqlframe/base/functions.py,sha256=eV0QjTvDKAArIKSMByXkGJalQtjzGVqO8-8vjQWtMvE,227677
+sqlframe/base/functions.py,sha256=Hd77xVVOBeD4wr08OeCwFJa89LHAZHsMjZXl3cg_RQs,227630
 sqlframe/base/group.py,sha256=fBm8EUve7W7xz11nybTXr09ih-yZxL_vvEiZVE1eb_0,12025
 sqlframe/base/normalize.py,sha256=nXAJ5CwxVf4DV0GsH-q1w0p8gmjSMlv96k_ez1eVul8,3880
 sqlframe/base/operations.py,sha256=g-YNcbvNKTOBbYm23GKfB3fmydlR7ZZDAuZUtXIHtzw,4438
 sqlframe/base/readerwriter.py,sha256=Nb2VJ_HBmLQp5mK8JhnFooZh2ydAaboCAFVPb-4MNX4,31241
-sqlframe/base/session.py,sha256=ExaGjY_lxkMi2WDwJ8wTd2uf7a2PjOOk9bx1ViEaAqA,27507
+sqlframe/base/session.py,sha256=8oaEgGbyctKKEaI0GW6k7Praku7nwx3YRYgAW3mZNk0,27481
 sqlframe/base/table.py,sha256=rCeh1W5SWbtEVfkLAUiexzrZwNgmZeptLEmLcM1ABkE,6961
 sqlframe/base/transforms.py,sha256=y0j3SGDz3XCmNGrvassk1S-owllUWfkHyMgZlY6SFO4,467
 sqlframe/base/types.py,sha256=OktuJ5f7tEogOW0oupI0RBlHfzZMmKh7zGLke9cwllo,12305
 sqlframe/base/udf.py,sha256=O6hMhBUy9NVv-mhJRtfFhXTIa_-Z8Y_FkmmuOHu0l90,1117
-sqlframe/base/util.py,sha256=gv_kRc3LxCuQy3t4dHFldV7elB8RU5PMqIN5-xSkWSo,19107
+sqlframe/base/util.py,sha256=D4HAhtu4DMz5mXyxlUHRP_GrsjLJACpBYlLriyGoT0g,19435
 sqlframe/base/window.py,sha256=7NaKDTlhun-95LEghukBCjFBwq0RHrPaajWQNCsLxok,4818
 sqlframe/base/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlframe/base/mixins/catalog_mixins.py,sha256=9fZGWToz9xMJSzUl1vsVtj6TH3TysP3fBCKJLnGUQzE,23353
@@ -40,13 +40,13 @@ sqlframe/bigquery/types.py,sha256=KwNyuXIo-2xVVd4bZED3YrQOobKCtemlxGrJL7DrTC8,34
 sqlframe/bigquery/udf.py,sha256=ZZ1-P1zWZhQqmhBqwAxfNeKl31nDkkZgkuz7Dn28P_0,264
 sqlframe/bigquery/window.py,sha256=6GKPzuxeSapJakBaKBeT9VpED1ACdjggDv9JRILDyV0,35
 sqlframe/databricks/__init__.py,sha256=BkB_eO1UYwcf8j6x7bi4BWmDCMkfn0CUMwossWgwaG4,993
-sqlframe/databricks/catalog.py,sha256=T_4NlQ7TD57_UTYFeRezYUu0t9NEx7cgJS60O4DKcBQ,18609
+sqlframe/databricks/catalog.py,sha256=QrleTG5_a8JOVUtVTBUu-c8fvxrS_J28QD85awqTBd4,18452
 sqlframe/databricks/column.py,sha256=E1tUa62Y5HajkhgFuebU9zohrGyieudcHzTT8gfalio,40
 sqlframe/databricks/dataframe.py,sha256=8kwT1kWU2TwGjR9zDrGdmkvabiBCivA_Mcg06r2XVX4,3111
 sqlframe/databricks/functions.py,sha256=La8rjAwO0hD4FBO0QxW5CtZtFAPvOrVc6lG4OtPGgbc,336
 sqlframe/databricks/functions.pyi,sha256=FzVBpzXCJzxIp73sIAo_R8Wx8uOJrix-W12HsgyeTcQ,23799
 sqlframe/databricks/group.py,sha256=dU3g0DVLRlfOSCamKchQFXRd1WTFbdxoXkpEX8tPD6Y,399
-sqlframe/databricks/readwriter.py,sha256=cuGRI1G627JEZgGNtirrT8LAwT6xQCdgkSAETmLKNXU,14777
+sqlframe/databricks/readwriter.py,sha256=u2-0j_gXB4JikMxLBzUWhJZhJ5tYbGJpIGTqnWuDKqk,14521
 sqlframe/databricks/session.py,sha256=i2CgrLIHJb53Cx1qu_rE1-cmmm19S-Sw1MhTISX1zYU,4013
 sqlframe/databricks/table.py,sha256=Q0Vnrl5aUqnqFTQpTwfWMRyQ9AQnagtpnSnXmP6IKRs,678
 sqlframe/databricks/types.py,sha256=KwNyuXIo-2xVVd4bZED3YrQOobKCtemlxGrJL7DrTC8,34
@@ -59,7 +59,7 @@ sqlframe/duckdb/dataframe.py,sha256=Z8_K69UQGZVeBfVGXVwIJP8OMuIvNBB3DPKTP3Lfu4w,
 sqlframe/duckdb/functions.py,sha256=ix2efGGD4HLaY1rtCtEd3IrsicGEVGiBAeKOo5OD8rA,424
 sqlframe/duckdb/functions.pyi,sha256=hDjpT-tGDO8LyElcno5YYRUnJg1dXXbGcRjJ69Zqk_U,12542
 sqlframe/duckdb/group.py,sha256=IkhbW42Ng1U5YT3FkIdiB4zBqRkW4QyTb-1detY1e_4,383
-sqlframe/duckdb/readwriter.py,sha256=WEfUSKI68BFwAt4xwQX-GO8ZSGuUQYgYKkmWE55DmJo,5171
+sqlframe/duckdb/readwriter.py,sha256=IA2nLGBfUVAUrSO3DyYL3LWQz-5pfbjQ1fROnnfw_r4,5022
 sqlframe/duckdb/session.py,sha256=FBU78oA9Lnj5A8ikVswQEDIlJcA3wc0Thn6KVso5iqM,2793
 sqlframe/duckdb/table.py,sha256=AmEKoH2TZo98loS5NbNaTuqv0eg76SY_OckVBMmQ6Co,410
 sqlframe/duckdb/types.py,sha256=KwNyuXIo-2xVVd4bZED3YrQOobKCtemlxGrJL7DrTC8,34
@@ -110,7 +110,7 @@ sqlframe/spark/dataframe.py,sha256=WyXHWsH8Ldu2cWTNmsLy5hEFrjJvQh_Aqv3JJcbDy6k,1
 sqlframe/spark/functions.py,sha256=MYCgHsjRQWylT-rezWRBuLV6BivcaVarbaQtP4T0toQ,331
 sqlframe/spark/functions.pyi,sha256=GyOdUzv2Z7Qt99JAKEPKgV2t2Rn274OuqwAfcoAXlN0,24259
 sqlframe/spark/group.py,sha256=MrvV_v-YkBc6T1zz882WrEqtWjlooWIyHBCmTQg3fCA,379
-sqlframe/spark/readwriter.py,sha256=VZHFWnhuFjlI-PMHclp1RmoIiISeT6IIp5O8lDn5TBY,6777
+sqlframe/spark/readwriter.py,sha256=mSrAnFXKyPyNb250Ho1c8CgxEoHovsgG209ys_x0aZs,6691
 sqlframe/spark/session.py,sha256=irlsTky06pKRKAyPLwVzUtLGe4O8mALSgxIqLvqJNF8,5675
 sqlframe/spark/table.py,sha256=puWV8h_CqA64zwpzq0ydY9LoygMAvprkODyxyzZeF9M,186
 sqlframe/spark/types.py,sha256=KwNyuXIo-2xVVd4bZED3YrQOobKCtemlxGrJL7DrTC8,34
@@ -130,8 +130,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=PFsGZpwNUE_4-g_f43_vstTqsK0AQ2lBneb5Eb6NkFo,13008
-sqlframe-3.38.2.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
-sqlframe-3.38.2.dist-info/METADATA,sha256=qHIvP28L4dPTMhTjSR150ZzGfGLxUZ7YZmStZUbasg8,9039
-sqlframe-3.38.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sqlframe-3.38.2.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
-sqlframe-3.38.2.dist-info/RECORD,,
+sqlframe-3.39.1.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
+sqlframe-3.39.1.dist-info/METADATA,sha256=1WWnSl5RkOZOCniSSzeNgHSUztaC4FbMmCjxakLC6E0,9039
+sqlframe-3.39.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sqlframe-3.39.1.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
+sqlframe-3.39.1.dist-info/RECORD,,