sqlframe 3.28.0__py3-none-any.whl → 3.28.2__py3-none-any.whl

sqlframe/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.28.0'
-__version_tuple__ = version_tuple = (3, 28, 0)
+__version__ = version = '3.28.2'
+__version_tuple__ = version_tuple = (3, 28, 2)

sqlframe/base/dataframe.py

@@ -80,8 +80,6 @@ JOIN_HINTS = {
 }
 
 JOIN_TYPE_MAPPING = {
-    "inner": "inner",
-    "cross": "cross",
     "outer": "full_outer",
     "full": "full_outer",
     "fullouter": "full_outer",
@@ -91,10 +89,8 @@ JOIN_TYPE_MAPPING = {
     "rightouter": "right_outer",
     "semi": "left_semi",
     "leftsemi": "left_semi",
-    "left_semi": "left_semi",
     "anti": "left_anti",
     "leftanti": "left_anti",
-    "left_anti": "left_anti",
 }
 
 DF = t.TypeVar("DF", bound="BaseDataFrame")
@@ -910,6 +906,8 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
 
     @operation(Operation.GROUP_BY)
     def groupBy(self, *cols, **kwargs) -> GROUP_DATA:
+        if cols and isinstance(cols[0], list):
+            cols = cols[0]  # type: ignore
         columns = self._ensure_and_normalize_cols(cols)
         return self._group_data(self, columns, self.last_op)
 
@@ -1026,7 +1024,7 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
     @operation(Operation.FROM)
     def join(
         self,
-        other_df: Self,
+        other: Self,
         on: t.Optional[t.Union[str, t.List[str], Column, t.List[Column]]] = None,
         how: str = "inner",
         **kwargs,
@@ -1042,7 +1040,7 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
             logger.warning("Got cross join with an 'on' value. This will result in an inner join.")
             how = "inner"
 
-        other_df = other_df._convert_leaf_to_cte()
+        other_df = other._convert_leaf_to_cte()
         join_expression = self._add_ctes_to_expression(self.expression, other_df.expression.ctes)
         # We will determine actual "join on" expression later so we don't provide it at first
         join_type = JOIN_TYPE_MAPPING.get(how, how).replace("_", " ")

sqlframe/base/group.py

@@ -47,7 +47,10 @@ class _BaseGroupedData(t.Generic[DF]):
         from sqlframe.base.column import Column
 
         columns = (
-            [Column(f"{agg_func}({column_name})") for column_name, agg_func in exprs[0].items()]
+            [
+                self._get_function_applied_columns(agg_func, (column_name,))[0]
+                for column_name, agg_func in exprs[0].items()
+            ]
             if isinstance(exprs[0], dict)
             else exprs
         )
@@ -55,7 +58,8 @@ class _BaseGroupedData(t.Generic[DF]):
 
         if not self.group_by_cols or not isinstance(self.group_by_cols[0], (list, tuple, set)):
             expression = self._df.expression.group_by(
-                *[x.expression for x in self.group_by_cols]  # type: ignore
+                # User column_expression for group by to avoid alias in group by
+                *[x.column_expression for x in self.group_by_cols]  # type: ignore
             ).select(*[x.expression for x in self.group_by_cols + cols], append=False)  # type: ignore
             group_by_cols = self.group_by_cols
         else:
@@ -66,7 +70,7 @@ class _BaseGroupedData(t.Generic[DF]):
             group_by_cols = []
             for grouping_set in self.group_by_cols:
                 all_grouping_sets.append(
-                    exp.Tuple(expressions=[x.expression for x in grouping_set])  # type: ignore
+                    exp.Tuple(expressions=[x.column_expression for x in grouping_set])  # type: ignore
                 )
                 group_by_cols.extend(grouping_set)  # type: ignore
             group_by_cols = list(dict.fromkeys(group_by_cols))

{sqlframe-3.28.0.dist-info → sqlframe-3.28.2.dist-info}/METADATA

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

{sqlframe-3.28.0.dist-info → sqlframe-3.28.2.dist-info}/RECORD

@@ -1,16 +1,16 @@
 sqlframe/__init__.py,sha256=SB80yLTITBXHI2GCDS6n6bN5ObHqgPjfpRPAUwxaots,3403
-sqlframe/_version.py,sha256=_J_DERLPc6ww1BpIbhe4eqp-2HZyB6Eu2nUzF3Tm5Tw,513
+sqlframe/_version.py,sha256=9o0IPCovPUOxBDHRN7R9Zcb381abgRZxXFEyPESsRhg,513
 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
 sqlframe/base/catalog.py,sha256=ZuU_qmt4yjSoTYgecSGnOhitOdh3rJbGCUjnUBp5mlc,38564
 sqlframe/base/column.py,sha256=AG9Z_6RNhVxLhLU29kRCgzMgDNSm-_GFg96xLqk1-bs,19838
-sqlframe/base/dataframe.py,sha256=6Ab1TWuh3yfUvvZc8xl5cj93y16r5zjnmvCvVUPtZSo,84048
+sqlframe/base/dataframe.py,sha256=DEdpFEUbbz9daxC_d-_tbeyctdF7upJezfhZ9bNbfp4,84028
 sqlframe/base/decorators.py,sha256=IhE5xNQDkwJHacCvulq5WpUKyKmXm7dL2A3o5WuKGP4,2131
 sqlframe/base/exceptions.py,sha256=9Uwvqn2eAkDpqm4BrRgbL61qM-GMCbJEMAW8otxO46s,370
 sqlframe/base/function_alternatives.py,sha256=Bs1bwl25fN3Yy9rb4GnUWBGunQ1C_yelkb2yV9DSZIY,53918
 sqlframe/base/functions.py,sha256=Rc9GfD3tIDg73FPqBAgqIDlrxH-A1c-ZWO76bcViX3w,224169
-sqlframe/base/group.py,sha256=4R9sOZm4ZRlTfShq2j3_HQOiL_Tj1bYkouenYsgnlII,4115
+sqlframe/base/group.py,sha256=OY4w1WRsCqLgW-Pi7DjF63zbbxSLISCF3qjAbzI2CQ4,4283
 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
@@ -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.28.0.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
-sqlframe-3.28.0.dist-info/METADATA,sha256=Kle_ZGbM79d854xzQ0Tl5gEGVDWg4WGz6Gg-MosiLKU,8971
-sqlframe-3.28.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sqlframe-3.28.0.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
-sqlframe-3.28.0.dist-info/RECORD,,
+sqlframe-3.28.2.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
+sqlframe-3.28.2.dist-info/METADATA,sha256=oAw2UR3arflqdajH11cfP0uG0uI9PL2-Emy9nMiExVQ,8971
+sqlframe-3.28.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sqlframe-3.28.2.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
+sqlframe-3.28.2.dist-info/RECORD,,