sqlframe 1.7.1__py3-none-any.whl → 1.9.0__py3-none-any.whl

sqlframe/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.1'
-__version_tuple__ = version_tuple = (1, 7, 1)
+__version__ = version = '1.9.0'
+__version_tuple__ = version_tuple = (1, 9, 0)

sqlframe/base/column.py

@@ -229,7 +229,7 @@ class Column:
         return Column(op)
 
     def unary_op(self, klass: t.Callable, **kwargs) -> Column:
-        return Column(klass(this=self.column_expression, **kwargs))
+        return Column(klass(this=exp.Paren(this=self.column_expression), **kwargs))
 
     @property
     def is_alias(self):

sqlframe/base/functions.py

@@ -1682,6 +1682,98 @@ def stack(*cols: ColumnOrName) -> Column:
     )
 
 
+@meta(unsupported_engines="*")
+def make_interval(
+    years: t.Optional[ColumnOrName] = None,
+    months: t.Optional[ColumnOrName] = None,
+    weeks: t.Optional[ColumnOrName] = None,
+    days: t.Optional[ColumnOrName] = None,
+    hours: t.Optional[ColumnOrName] = None,
+    mins: t.Optional[ColumnOrName] = None,
+    secs: t.Optional[ColumnOrName] = None,
+) -> Column:
+    columns = _ensure_column_of_optionals([years, months, weeks, days, hours, mins, secs])
+    if not columns:
+        raise ValueError("At least one value must be provided")
+    return Column.invoke_anonymous_function(columns[0], "MAKE_INTERVAL", *columns[1:])
+
+
+@meta(unsupported_engines="*")
+def try_add(left: ColumnOrName, right: ColumnOrName) -> Column:
+    return Column.invoke_anonymous_function(left, "TRY_ADD", right)
+
+
+@meta(unsupported_engines="*")
+def try_avg(col: ColumnOrName) -> Column:
+    return Column.invoke_anonymous_function(col, "TRY_AVG")
+
+
+@meta(unsupported_engines="*")
+def try_divide(left: ColumnOrName, right: ColumnOrName) -> Column:
+    return Column.invoke_anonymous_function(left, "TRY_DIVIDE", right)
+
+
+@meta(unsupported_engines="*")
+def try_multiply(left: ColumnOrName, right: ColumnOrName) -> Column:
+    return Column.invoke_anonymous_function(left, "TRY_MULTIPLY", right)
+
+
+@meta(unsupported_engines="*")
+def try_subtract(left: ColumnOrName, right: ColumnOrName) -> Column:
+    return Column.invoke_anonymous_function(left, "TRY_SUBTRACT", right)
+
+
+@meta(unsupported_engines="*")
+def try_sum(col: ColumnOrName) -> Column:
+    return Column.invoke_anonymous_function(col, "TRY_SUM")
+
+
+@meta(unsupported_engines="*")
+def try_to_binary(col: ColumnOrName, format: t.Optional[ColumnOrName] = None) -> Column:
+    if format is not None:
+        return Column.invoke_anonymous_function(col, "TRY_TO_BINARY", format)
+    return Column.invoke_anonymous_function(col, "TRY_TO_BINARY")
+
+
+@meta(unsupported_engines="*")
+def try_to_number(col: ColumnOrName, format: t.Optional[ColumnOrName] = None) -> Column:
+    if format is not None:
+        return Column.invoke_anonymous_function(col, "TRY_TO_NUMBER", format)
+    return Column.invoke_anonymous_function(col, "TRY_TO_NUMBER")
+
+
+@meta(unsupported_engines="*")
+def aes_decrypt(
+    input: ColumnOrName,
+    key: ColumnOrName,
+    mode: t.Optional[ColumnOrName] = None,
+    padding: t.Optional[ColumnOrName] = None,
+    aad: t.Optional[ColumnOrName] = None,
+) -> Column:
+    columns = _ensure_column_of_optionals([key, mode, padding, aad])
+    return Column.invoke_anonymous_function(input, "AES_DECRYPT", *columns)
+
+
+@meta(unsupported_engines="*")
+def aes_encrypt(
+    input: ColumnOrName,
+    key: ColumnOrName,
+    mode: t.Optional[ColumnOrName] = None,
+    padding: t.Optional[ColumnOrName] = None,
+    iv: t.Optional[ColumnOrName] = None,
+    aad: t.Optional[ColumnOrName] = None,
+) -> Column:
+    columns = _ensure_column_of_optionals([key, mode, padding, iv, aad])
+    return Column.invoke_anonymous_function(input, "AES_ENCRYPT", *columns)
+
+
+@meta(unsupported_engines="*")
+def to_binary(col: ColumnOrName, format: t.Optional[ColumnOrName] = None) -> Column:
+    if format is not None:
+        return Column.invoke_anonymous_function(col, "TO_BINARY", format)
+    return Column.invoke_anonymous_function(col, "TO_BINARY")
+
+
 @meta()
 def _lambda_quoted(value: str) -> t.Optional[bool]:
     return False if value == "_" else None
@@ -1697,3 +1789,11 @@ def _get_lambda_from_func(lambda_expression: t.Callable):
         this=lambda_expression(*[Column(x) for x in variables]).expression,
         expressions=variables,
     )
+
+
+def _ensure_column_of_optionals(optionals: t.List[t.Optional[ColumnOrName]]) -> t.List[Column]:
+    for value in reversed(optionals.copy()):
+        if value is not None:
+            break
+        optionals = optionals[:-1]
+    return [Column.ensure_col(x) if x is not None else lit(None) for x in optionals]

sqlframe/spark/catalog.py

@@ -519,7 +519,10 @@ class SparkCatalog(
                 )
                 for col in df.columns
             ]
-        return [Column(*x) for x in self._spark_catalog.listColumns(tableName, dbName)]
+        return [
+            Column(**{name: x._asdict()[name] for name in Column._fields})
+            for x in self._spark_catalog.listColumns(tableName, dbName)
+        ]
 
     def listFunctions(
         self, dbName: t.Optional[str] = None, pattern: t.Optional[str] = None

sqlframe/spark/functions.pyi

@@ -7,6 +7,8 @@ from sqlframe.base.functions import (
     abs as abs,
     acos as acos,
     acosh as acosh,
+    aes_encrypt as aes_encrypt,
+    aes_decrypt as aes_decrypt,
     aggregate as aggregate,
     approxCountDistinct as approxCountDistinct,
     approx_count_distinct as approx_count_distinct,
@@ -132,6 +134,7 @@ from sqlframe.base.functions import (
     lpad as lpad,
     ltrim as ltrim,
     make_date as make_date,
+    make_interval as make_interval,
     map_concat as map_concat,
     map_entries as map_entries,
     map_filter as map_filter,
@@ -217,6 +220,7 @@ from sqlframe.base.functions import (
     timestamp_seconds as timestamp_seconds,
     toDegrees as toDegrees,
     toRadians as toRadians,
+    to_binary as to_binary,
     to_csv as to_csv,
     to_date as to_date,
     to_json as to_json,
@@ -228,6 +232,14 @@ from sqlframe.base.functions import (
     translate as translate,
     trim as trim,
     trunc as trunc,
+    try_add as try_add,
+    try_avg as try_avg,
+    try_divide as try_divide,
+    try_multiply as try_multiply,
+    try_subtract as try_subtract,
+    try_sum as try_sum,
+    try_to_binary as try_to_binary,
+    try_to_number as try_to_number,
     typeof as typeof,
     unbase64 as unbase64,
     unhex as unhex,

{sqlframe-1.7.1.dist-info → sqlframe-1.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 1.7.1
+Version: 1.9.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.0)
-Requires-Dist: sqlglot (<25.1,>=24.0.0)
+Requires-Dist: sqlglot (<25.4,>=24.0.0)
 Requires-Dist: typing-extensions (<5,>=4.8)
 Provides-Extra: bigquery
 Requires-Dist: google-cloud-bigquery-storage (<3,>=2) ; extra == 'bigquery'
@@ -26,7 +26,7 @@ Requires-Dist: google-cloud-bigquery[pandas] (<4,>=3) ; extra == 'bigquery'
 Provides-Extra: dev
 Requires-Dist: duckdb (<1.1,>=0.9) ; extra == 'dev'
 Requires-Dist: mypy (<1.11,>=1.10.0) ; extra == 'dev'
-Requires-Dist: openai (<1.34,>=1.30) ; extra == 'dev'
+Requires-Dist: openai (<1.36,>=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'
@@ -49,7 +49,7 @@ Provides-Extra: duckdb
 Requires-Dist: duckdb (<1.1,>=0.9) ; extra == 'duckdb'
 Requires-Dist: pandas (<3,>=2) ; extra == 'duckdb'
 Provides-Extra: openai
-Requires-Dist: openai (<1.34,>=1.30) ; extra == 'openai'
+Requires-Dist: openai (<1.36,>=1.30) ; extra == 'openai'
 Provides-Extra: pandas
 Requires-Dist: pandas (<3,>=2) ; extra == 'pandas'
 Provides-Extra: postgres
@@ -57,7 +57,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.11,>=3.10.0) ; extra == 'snowflake'
+Requires-Dist: snowflake-connector-python[secure-local-storage] (<3.12,>=3.10.0) ; extra == 'snowflake'
 Provides-Extra: spark
 Requires-Dist: pyspark (<3.6,>=2) ; extra == 'spark'
 

{sqlframe-1.7.1.dist-info → sqlframe-1.9.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 sqlframe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sqlframe/_version.py,sha256=kn-QYzzAhfbnfKK6EpE9gJz8TDZkEk52evaid1DHkG4,411
+sqlframe/_version.py,sha256=Wi1Vgg8ccNVK7oIZNO8kmGhwjztIUyuzlku2tkT7820,411
 sqlframe/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlframe/base/_typing.py,sha256=DuTay8-o9W-pw3RPZCgLunKNJLS9PkaV11G_pxXp9NY,1256
 sqlframe/base/catalog.py,sha256=ATDGirouUjal05P4ymL-wIi8rgjg_8w4PoACamiO64A,37245
-sqlframe/base/column.py,sha256=0WgIRBfF8Fkbx_OtiaUB1-BsX3qCd4W5IL534Q2BkCA,16137
+sqlframe/base/column.py,sha256=5bfJWj9dnStHUxLSrWMD-gwiC4-aHKC8lhoC62nhM1k,16153
 sqlframe/base/dataframe.py,sha256=uL4neDTMy1a9XJH46YLQryzdDci4iDxNXBtiJOzfHfs,67718
 sqlframe/base/decorators.py,sha256=I5osMgx9BuCgbtp4jVM2DNwYJVLzCv-OtTedhQEik0g,1882
 sqlframe/base/exceptions.py,sha256=pCB9hXX4jxZWzNg3JN1i38cv3BmpUlee5NoLYx3YXIQ,208
 sqlframe/base/function_alternatives.py,sha256=NDXs2igY7PBsStzTSRZvJcCshBOJkPQl2GbhpVFU6To,42931
-sqlframe/base/functions.py,sha256=i4XvQ9KOW55SX2gs1CAk3U1t6-TRLiIZG_RJj_Zn5cI,54852
+sqlframe/base/functions.py,sha256=FZczLQzADcXQWuKUbv67LHnK1yQU4nVzJGnNJQEHkrY,58438
 sqlframe/base/group.py,sha256=TES9CleVmH3x-0X-tqmuUKfCKSWjH5vg1aU3R6dDmFc,4059
 sqlframe/base/normalize.py,sha256=nXAJ5CwxVf4DV0GsH-q1w0p8gmjSMlv96k_ez1eVul8,3880
 sqlframe/base/operations.py,sha256=-AhNuEzcV7ZExoP1oY3blaKip-joQyJeQVvfBTs_2g4,3456
@@ -77,11 +77,11 @@ sqlframe/snowflake/session.py,sha256=bDOlnuIiQ9j_zfF7F5H1gTLmpHUjruIxr2CfXcS_7YU
 sqlframe/snowflake/types.py,sha256=KwNyuXIo-2xVVd4bZED3YrQOobKCtemlxGrJL7DrTC8,34
 sqlframe/snowflake/window.py,sha256=6GKPzuxeSapJakBaKBeT9VpED1ACdjggDv9JRILDyV0,35
 sqlframe/spark/__init__.py,sha256=WhYQAZMJN1EMNAVGUH7BEinxNdYtXOrrr-6HUniJOyI,649
-sqlframe/spark/catalog.py,sha256=YeWBCUlkkhf2jDcmaFo-JvG4DQ6Daqyy1zEnVBx5gMo,32526
+sqlframe/spark/catalog.py,sha256=rIX5DtPnINbcPZRUe4Z1bOpkJoNRlrO9qWkUeTQClNc,32612
 sqlframe/spark/column.py,sha256=E1tUa62Y5HajkhgFuebU9zohrGyieudcHzTT8gfalio,40
 sqlframe/spark/dataframe.py,sha256=V3z5Bx9snLgYh4bDwJfJb5mj1P7UsZF8DMlLwZXopBg,1309
 sqlframe/spark/functions.py,sha256=PkK4MBpVADhnDbrgFDii5zFaNrhi4y-OYX3Lcu-SW0k,530
-sqlframe/spark/functions.pyi,sha256=eiAAXKW57HOJNfqLndkyijxlpIt-5WfojLWTk2gN6_Y,6479
+sqlframe/spark/functions.pyi,sha256=0gyD8H7qYqiG-u_dpZB9wBuPni6GB5wa8YXUICoZMwU,6849
 sqlframe/spark/group.py,sha256=MrvV_v-YkBc6T1zz882WrEqtWjlooWIyHBCmTQg3fCA,379
 sqlframe/spark/readwriter.py,sha256=w68EImTcGJv64X7pc1tk5tDjDxb1nAnn-MiIaaN9Dc8,812
 sqlframe/spark/session.py,sha256=ztIS7VCFxjR3B7i4JXaXo0evTUhUjOsIAZb7Ssqt2cU,4254
@@ -97,8 +97,8 @@ sqlframe/standalone/readwriter.py,sha256=EZNyDJ4ID6sGNog3uP4-e9RvchX4biJJDNtc5hk
 sqlframe/standalone/session.py,sha256=wQmdu2sv6KMTAv0LRFk7TY7yzlh3xvmsyqilEtRecbY,1191
 sqlframe/standalone/types.py,sha256=KwNyuXIo-2xVVd4bZED3YrQOobKCtemlxGrJL7DrTC8,34
 sqlframe/standalone/window.py,sha256=6GKPzuxeSapJakBaKBeT9VpED1ACdjggDv9JRILDyV0,35
-sqlframe-1.7.1.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
-sqlframe-1.7.1.dist-info/METADATA,sha256=K-7c9prIXrECo4scNvY_F2mHYwNEWjCefXJDpe_ahlc,7496
-sqlframe-1.7.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-sqlframe-1.7.1.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
-sqlframe-1.7.1.dist-info/RECORD,,
+sqlframe-1.9.0.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
+sqlframe-1.9.0.dist-info/METADATA,sha256=ZqMpC8SchKLMSu0-H36KkmMLQcv13IKaK-AKumtcIYA,7496
+sqlframe-1.9.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+sqlframe-1.9.0.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
+sqlframe-1.9.0.dist-info/RECORD,,