sqlframe 3.11.0__tar.gz → 3.12.0__tar.gz

{sqlframe-3.11.0 → sqlframe-3.12.0}/PKG-INFO

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

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.11.0'
-__version_tuple__ = version_tuple = (3, 11, 0)
+__version__ = version = '3.12.0'
+__version_tuple__ = version_tuple = (3, 12, 0)

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/base/dataframe.py

@@ -80,7 +80,7 @@ JOIN_HINTS = {
 }
 
 
-DF = t.TypeVar("DF", bound="_BaseDataFrame")
+DF = t.TypeVar("DF", bound="BaseDataFrame")
 
 
 class OpenAIMode(enum.Enum):
@@ -198,7 +198,7 @@ class _BaseDataFrameStatFunctions(t.Generic[DF]):
 STAT = t.TypeVar("STAT", bound=_BaseDataFrameStatFunctions)
 
 
-class _BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
+class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
     _na: t.Type[NA]
     _stat: t.Type[STAT]
     _group_data: t.Type[GROUP_DATA]

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/base/decorators.py

@@ -43,7 +43,7 @@ def func_metadata(unsupported_engines: t.Optional[t.Union[str, t.List[str]]] = N
                         col_name = col_name.this
                 alias_name = f"{func.__name__}__{col_name or ''}__"
                 # BigQuery has restrictions on alias names so we constrain it to alphanumeric characters and underscores
-                return result.alias(re.sub("\W", "_", alias_name))
+                return result.alias(re.sub("\W", "_", alias_name))  # type: ignore
             return result
 
         wrapper.unsupported_engines = (  # type: ignore

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/base/mixins/dataframe_mixins.py

@@ -11,7 +11,7 @@ from sqlframe.base.dataframe import (
     SESSION,
     STAT,
     WRITER,
-    _BaseDataFrame,
+    BaseDataFrame,
 )
 
 if sys.version_info >= (3, 11):
@@ -23,7 +23,7 @@ else:
 logger = logging.getLogger(__name__)
 
 
-class NoCachePersistSupportMixin(_BaseDataFrame, t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
+class NoCachePersistSupportMixin(BaseDataFrame, t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
     def cache(self) -> Self:
         logger.warning("This engine does not support caching. Ignoring cache() call.")
         return self
@@ -34,7 +34,7 @@ class NoCachePersistSupportMixin(_BaseDataFrame, t.Generic[SESSION, WRITER, NA,
 
 
 class TypedColumnsFromTempViewMixin(
-    _BaseDataFrame, t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]
+    BaseDataFrame, t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]
 ):
     @property
     def _typed_columns(self) -> t.List[Column]:

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/base/operations.py

@@ -7,7 +7,7 @@ import typing as t
 from enum import IntEnum
 
 if t.TYPE_CHECKING:
-    from sqlframe.base.dataframe import _BaseDataFrame
+    from sqlframe.base.dataframe import BaseDataFrame
     from sqlframe.base.group import _BaseGroupedData
 
 
@@ -37,7 +37,7 @@ def operation(op: Operation) -> t.Callable[[t.Callable], t.Callable]:
 
     def decorator(func: t.Callable) -> t.Callable:
         @functools.wraps(func)
-        def wrapper(self: _BaseDataFrame, *args, **kwargs) -> _BaseDataFrame:
+        def wrapper(self: BaseDataFrame, *args, **kwargs) -> BaseDataFrame:
             if self.last_op == Operation.INIT:
                 self = self._convert_leaf_to_cte()
                 self.last_op = Operation.NO_OP
@@ -45,7 +45,7 @@ def operation(op: Operation) -> t.Callable[[t.Callable], t.Callable]:
             new_op = op if op != Operation.NO_OP else last_op
             if new_op < last_op or (last_op == new_op == Operation.SELECT):
                 self = self._convert_leaf_to_cte()
-            df: t.Union[_BaseDataFrame, _BaseGroupedData] = func(self, *args, **kwargs)
+            df: t.Union[BaseDataFrame, _BaseGroupedData] = func(self, *args, **kwargs)
             df.last_op = new_op  # type: ignore
             return df  # type: ignore
 
@@ -69,7 +69,7 @@ def group_operation(op: Operation) -> t.Callable[[t.Callable], t.Callable]:
 
     def decorator(func: t.Callable) -> t.Callable:
         @functools.wraps(func)
-        def wrapper(self: _BaseGroupedData, *args, **kwargs) -> _BaseDataFrame:
+        def wrapper(self: _BaseGroupedData, *args, **kwargs) -> BaseDataFrame:
             if self._df.last_op == Operation.INIT:
                 self._df = self._df._convert_leaf_to_cte()
                 self._df.last_op = Operation.NO_OP
@@ -77,7 +77,7 @@ def group_operation(op: Operation) -> t.Callable[[t.Callable], t.Callable]:
             new_op = op if op != Operation.NO_OP else last_op
             if new_op < last_op or (last_op == new_op == Operation.SELECT):
                 self._df = self._df._convert_leaf_to_cte()
-            df: _BaseDataFrame = func(self, *args, **kwargs)
+            df: BaseDataFrame = func(self, *args, **kwargs)
             df.last_op = new_op  # type: ignore
             return df
 

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/base/session.py

@@ -24,7 +24,7 @@ from sqlglot.optimizer.qualify_columns import (
 from sqlglot.schema import MappingSchema
 
 from sqlframe.base.catalog import _BaseCatalog
-from sqlframe.base.dataframe import _BaseDataFrame
+from sqlframe.base.dataframe import BaseDataFrame
 from sqlframe.base.normalize import normalize_dict
 from sqlframe.base.readerwriter import _BaseDataFrameReader, _BaseDataFrameWriter
 from sqlframe.base.udf import _BaseUDFRegistration
@@ -64,7 +64,7 @@ logger = logging.getLogger(__name__)
 CATALOG = t.TypeVar("CATALOG", bound=_BaseCatalog)
 READER = t.TypeVar("READER", bound=_BaseDataFrameReader)
 WRITER = t.TypeVar("WRITER", bound=_BaseDataFrameWriter)
-DF = t.TypeVar("DF", bound=_BaseDataFrame)
+DF = t.TypeVar("DF", bound=BaseDataFrame)
 UDF_REGISTRATION = t.TypeVar("UDF_REGISTRATION", bound=_BaseUDFRegistration)
 
 _MISSING = "MISSING"

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/bigquery/dataframe.py

@@ -5,7 +5,7 @@ import typing as t
 
 from sqlframe.base.catalog import Column as CatalogColumn
 from sqlframe.base.dataframe import (
-    _BaseDataFrame,
+    BaseDataFrame,
     _BaseDataFrameNaFunctions,
     _BaseDataFrameStatFunctions,
 )
@@ -30,7 +30,7 @@ class BigQueryDataFrameStatFunctions(_BaseDataFrameStatFunctions["BigQueryDataFr
 
 class BigQueryDataFrame(
     NoCachePersistSupportMixin,
-    _BaseDataFrame[
+    BaseDataFrame[
         "BigQuerySession",
         "BigQueryDataFrameWriter",
         "BigQueryDataFrameNaFunctions",

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/databricks/dataframe.py

@@ -5,7 +5,7 @@ import typing as t
 
 from sqlframe.base.catalog import Column as CatalogColumn
 from sqlframe.base.dataframe import (
-    _BaseDataFrame,
+    BaseDataFrame,
     _BaseDataFrameNaFunctions,
     _BaseDataFrameStatFunctions,
 )
@@ -31,7 +31,7 @@ class DatabricksDataFrameStatFunctions(_BaseDataFrameStatFunctions["DatabricksDa
 
 class DatabricksDataFrame(
     NoCachePersistSupportMixin,
-    _BaseDataFrame[
+    BaseDataFrame[
         "DatabricksSession",
         "DatabricksDataFrameWriter",
         "DatabricksDataFrameNaFunctions",

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/duckdb/dataframe.py

@@ -4,7 +4,7 @@ import logging
 import typing as t
 
 from sqlframe.base.dataframe import (
-    _BaseDataFrame,
+    BaseDataFrame,
     _BaseDataFrameNaFunctions,
     _BaseDataFrameStatFunctions,
 )
@@ -34,7 +34,7 @@ class DuckDBDataFrameStatFunctions(_BaseDataFrameStatFunctions["DuckDBDataFrame"
 class DuckDBDataFrame(
     NoCachePersistSupportMixin,
     TypedColumnsFromTempViewMixin,
-    _BaseDataFrame[
+    BaseDataFrame[
         "DuckDBSession",
         "DuckDBDataFrameWriter",
         "DuckDBDataFrameNaFunctions",

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/postgres/dataframe.py

@@ -5,7 +5,7 @@ import sys
 import typing as t
 
 from sqlframe.base.dataframe import (
-    _BaseDataFrame,
+    BaseDataFrame,
     _BaseDataFrameNaFunctions,
     _BaseDataFrameStatFunctions,
 )
@@ -39,7 +39,7 @@ class PostgresDataFrameStatFunctions(_BaseDataFrameStatFunctions["PostgresDataFr
 class PostgresDataFrame(
     NoCachePersistSupportMixin,
     TypedColumnsFromTempViewMixin,
-    _BaseDataFrame[
+    BaseDataFrame[
         "PostgresSession",
         "PostgresDataFrameWriter",
         "PostgresDataFrameNaFunctions",

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/redshift/dataframe.py

@@ -5,7 +5,7 @@ import sys
 import typing as t
 
 from sqlframe.base.dataframe import (
-    _BaseDataFrame,
+    BaseDataFrame,
     _BaseDataFrameNaFunctions,
     _BaseDataFrameStatFunctions,
 )
@@ -30,7 +30,7 @@ class RedshiftDataFrameStatFunctions(_BaseDataFrameStatFunctions["RedshiftDataFr
 
 class RedshiftDataFrame(
     NoCachePersistSupportMixin,
-    _BaseDataFrame[
+    BaseDataFrame[
         "RedshiftSession",
         "RedshiftDataFrameWriter",
         "RedshiftDataFrameNaFunctions",

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/snowflake/dataframe.py

@@ -6,7 +6,7 @@ import typing as t
 
 from sqlframe.base.catalog import Column as CatalogColumn
 from sqlframe.base.dataframe import (
-    _BaseDataFrame,
+    BaseDataFrame,
     _BaseDataFrameNaFunctions,
     _BaseDataFrameStatFunctions,
 )
@@ -32,7 +32,7 @@ class SnowflakeDataFrameStatFunctions(_BaseDataFrameStatFunctions["SnowflakeData
 
 class SnowflakeDataFrame(
     NoCachePersistSupportMixin,
-    _BaseDataFrame[
+    BaseDataFrame[
         "SnowflakeSession",
         "SnowflakeDataFrameWriter",
         "SnowflakeDataFrameNaFunctions",

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/spark/dataframe.py

@@ -7,7 +7,7 @@ from sqlglot import exp
 
 from sqlframe.base.catalog import Column
 from sqlframe.base.dataframe import (
-    _BaseDataFrame,
+    BaseDataFrame,
     _BaseDataFrameNaFunctions,
     _BaseDataFrameStatFunctions,
 )
@@ -31,7 +31,7 @@ class SparkDataFrameStatFunctions(_BaseDataFrameStatFunctions["SparkDataFrame"])
 
 class SparkDataFrame(
     NoCachePersistSupportMixin,
-    _BaseDataFrame[
+    BaseDataFrame[
         "SparkSession",
         "SparkDataFrameWriter",
         "SparkDataFrameNaFunctions",

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/standalone/dataframe.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import typing as t
 
 from sqlframe.base.dataframe import (
-    _BaseDataFrame,
+    BaseDataFrame,
     _BaseDataFrameNaFunctions,
     _BaseDataFrameStatFunctions,
 )
@@ -23,7 +23,7 @@ class StandaloneDataFrameStatFunctions(_BaseDataFrameStatFunctions["StandaloneDa
 
 
 class StandaloneDataFrame(
-    _BaseDataFrame[
+    BaseDataFrame[
         "StandaloneSession",
         "StandaloneDataFrameWriter",
         "StandaloneDataFrameNaFunctions",

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe/testing/utils.py

@@ -7,7 +7,7 @@ import typing as t
 from itertools import zip_longest
 
 from sqlframe.base import types
-from sqlframe.base.dataframe import _BaseDataFrame
+from sqlframe.base.dataframe import BaseDataFrame
 from sqlframe.base.exceptions import (
     DataFrameDiffError,
     SchemaDiffError,
@@ -64,8 +64,8 @@ def _context_diff(actual: t.List[str], expected: t.List[str], n: int = 3):
 
 # Source: https://github.com/apache/spark/blob/master/python/pyspark/testing/utils.py#L519
 def assertDataFrameEqual(
-    actual: t.Union[_BaseDataFrame, pd.DataFrame, t.List[types.Row]],
-    expected: t.Union[_BaseDataFrame, pd.DataFrame, t.List[types.Row]],
+    actual: t.Union[BaseDataFrame, pd.DataFrame, t.List[types.Row]],
+    expected: t.Union[BaseDataFrame, pd.DataFrame, t.List[types.Row]],
     checkRowOrder: bool = False,
     rtol: float = 1e-5,
     atol: float = 1e-8,

{sqlframe-3.11.0 → sqlframe-3.12.0}/sqlframe.egg-info/PKG-INFO

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

{sqlframe-3.11.0 → sqlframe-3.12.0}/tests/integration/engines/test_engine_dataframe.py

@@ -5,12 +5,12 @@ import typing as t
 from sqlframe.base.types import Row
 
 if t.TYPE_CHECKING:
-    from sqlframe.base.dataframe import _BaseDataFrame
+    from sqlframe.base.dataframe import BaseDataFrame
 
 pytest_plugins = ["tests.integration.fixtures"]
 
 
-def test_collect(get_engine_df: t.Callable[[str], _BaseDataFrame], get_func):
+def test_collect(get_engine_df: t.Callable[[str], BaseDataFrame], get_func):
     employee = get_engine_df("employee")
     col = get_func("col", employee.session)
     results = employee.select(col("fname"), col("lname")).collect()
@@ -24,7 +24,7 @@ def test_collect(get_engine_df: t.Callable[[str], _BaseDataFrame], get_func):
 
 
 def test_show(
-    get_engine_df: t.Callable[[str], _BaseDataFrame],
+    get_engine_df: t.Callable[[str], BaseDataFrame],
     get_func,
     capsys,
     caplog,
@@ -53,7 +53,7 @@ def test_show(
 
 
 def test_show_limit(
-    get_engine_df: t.Callable[[str], _BaseDataFrame], capsys, is_snowflake: t.Callable
+    get_engine_df: t.Callable[[str], BaseDataFrame], capsys, is_snowflake: t.Callable
 ):
     employee = get_engine_df("employee")
     employee.show(1)

{sqlframe-3.11.0 → sqlframe-3.12.0}/tests/integration/engines/test_engine_writer.py

@@ -10,15 +10,15 @@ from sqlframe.base.types import Row
 from sqlframe.duckdb.session import DuckDBSession
 
 if t.TYPE_CHECKING:
-    from sqlframe.base.dataframe import _BaseDataFrame
+    from sqlframe.base.dataframe import BaseDataFrame
 
 pytest_plugins = ["tests.integration.fixtures"]
 
 
 @pytest.fixture
 def cleanup_employee_df(
-    get_engine_df: t.Callable[[str], _BaseDataFrame],
-) -> t.Iterator[_BaseDataFrame]:
+    get_engine_df: t.Callable[[str], BaseDataFrame],
+) -> t.Iterator[BaseDataFrame]:
     df = get_engine_df("employee")
     df.session._execute("DROP TABLE IF EXISTS insert_into_employee")
     df.session._execute("DROP TABLE IF EXISTS save_as_table_employee")
@@ -27,7 +27,7 @@ def cleanup_employee_df(
     df.session._execute("DROP TABLE IF EXISTS save_as_table_employee")
 
 
-def test_write_json(get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_path: pathlib.Path):
+def test_write_json(get_engine_df: t.Callable[[str], BaseDataFrame], tmp_path: pathlib.Path):
     df_employee = get_engine_df("employee")
     temp_json = str(tmp_path / "employee.json")
     df_employee.write.json(temp_json)
@@ -50,9 +50,7 @@ def test_write_json_append(get_session: t.Callable[[], _BaseSession], tmp_path:
         assert df_result.collect() == [Row(_1=1), Row(_1=2)]
 
 
-def test_write_json_ignore(
-    get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_path: pathlib.Path
-):
+def test_write_json_ignore(get_engine_df: t.Callable[[str], BaseDataFrame], tmp_path: pathlib.Path):
     df_employee = get_engine_df("employee")
     temp_json = tmp_path / "employee.json"
     temp_json.touch()
@@ -62,7 +60,7 @@ def test_write_json_ignore(
 
 
 def test_write_json_error(
-    get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_path: pathlib.Path, caplog
+    get_engine_df: t.Callable[[str], BaseDataFrame], tmp_path: pathlib.Path, caplog
 ):
     df_employee = get_engine_df("employee")
     temp_json = tmp_path / "employee.json"
@@ -71,7 +69,7 @@ def test_write_json_error(
         df_employee.write.json(temp_json, mode="error")
 
 
-def test_write_parquet(get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_path: pathlib.Path):
+def test_write_parquet(get_engine_df: t.Callable[[str], BaseDataFrame], tmp_path: pathlib.Path):
     df_employee = get_engine_df("employee")
     temp_parquet = str(tmp_path / "employee.parquet")
     df_employee.write.parquet(temp_parquet)
@@ -80,7 +78,7 @@ def test_write_parquet(get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_pat
 
 
 def test_write_parquet_ignore(
-    get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_path: pathlib.Path
+    get_engine_df: t.Callable[[str], BaseDataFrame], tmp_path: pathlib.Path
 ):
     df_employee = get_engine_df("employee")
     temp_parquet = str(tmp_path / "employee.parquet")
@@ -95,7 +93,7 @@ def test_write_parquet_ignore(
 
 
 def test_write_parquet_error(
-    get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_path: pathlib.Path, caplog
+    get_engine_df: t.Callable[[str], BaseDataFrame], tmp_path: pathlib.Path, caplog
 ):
     df_employee = get_engine_df("employee")
     temp_parquet = tmp_path / "employee.parquet"
@@ -105,7 +103,7 @@ def test_write_parquet_error(
 
 
 def test_write_parquet_unsupported_modes(
-    get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_path: pathlib.Path
+    get_engine_df: t.Callable[[str], BaseDataFrame], tmp_path: pathlib.Path
 ):
     df_employee = get_engine_df("employee")
     temp_json = tmp_path / "employee.parquet"
@@ -113,7 +111,7 @@ def test_write_parquet_unsupported_modes(
         df_employee.write.parquet(str(temp_json), mode="append")
 
 
-def test_write_csv(get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_path: pathlib.Path):
+def test_write_csv(get_engine_df: t.Callable[[str], BaseDataFrame], tmp_path: pathlib.Path):
     df_employee = get_engine_df("employee")
     temp_csv = str(tmp_path / "employee.csv")
     df_employee.write.csv(temp_csv)
@@ -136,7 +134,7 @@ def test_write_csv_append(get_session: t.Callable[[], _BaseSession], tmp_path: p
         assert df_result.collect() == [Row(_1=1), Row(_1=2)]
 
 
-def test_write_csv_ignore(get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_path: pathlib.Path):
+def test_write_csv_ignore(get_engine_df: t.Callable[[str], BaseDataFrame], tmp_path: pathlib.Path):
     df_employee = get_engine_df("employee")
     temp_csv = str(tmp_path / "employee.csv")
     df1 = df_employee.session.createDataFrame([(1,)])
@@ -150,7 +148,7 @@ def test_write_csv_ignore(get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_
     assert df_result.collect() == df1.collect()
 
 
-def test_write_csv_error(get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_path: pathlib.Path):
+def test_write_csv_error(get_engine_df: t.Callable[[str], BaseDataFrame], tmp_path: pathlib.Path):
     df_employee = get_engine_df("employee")
     temp_csv = tmp_path / "employee.csv"
     temp_csv.touch()
@@ -158,14 +156,14 @@ def test_write_csv_error(get_engine_df: t.Callable[[str], _BaseDataFrame], tmp_p
         df_employee.write.json(temp_csv, mode="error")
 
 
-def test_save_as_table(cleanup_employee_df: _BaseDataFrame, caplog):
+def test_save_as_table(cleanup_employee_df: BaseDataFrame, caplog):
     df_employee = cleanup_employee_df
     df_employee.write.saveAsTable("save_as_table_employee")
     df2 = df_employee.session.read.table("save_as_table_employee")
     assert sorted(df2.collect()) == sorted(df_employee.collect())
 
 
-def test_insertInto(cleanup_employee_df: _BaseDataFrame, caplog):
+def test_insertInto(cleanup_employee_df: BaseDataFrame, caplog):
     df_employee = cleanup_employee_df
     df = df_employee.session.createDataFrame(
         [(9, "Sayid", "Jarrah", 40, 1)], ["id", "first_name", "last_name", "age", "store_id"]

{sqlframe-3.11.0 → sqlframe-3.12.0}/tests/integration/engines/test_int_functions.py

@@ -25,7 +25,7 @@ from sqlframe.snowflake import SnowflakeSession
 from sqlframe.spark.session import SparkSession
 
 if t.TYPE_CHECKING:
-    from sqlframe.base.dataframe import _BaseDataFrame
+    from sqlframe.base.dataframe import BaseDataFrame
 
 pytest_plugins = ["tests.integration.fixtures"]
 
@@ -33,7 +33,7 @@ pytest_plugins = ["tests.integration.fixtures"]
 class GetDfAndFuncCallable(t.Protocol):
     def __call__(
         self, name: str, limit: t.Optional[int] = None
-    ) -> t.Tuple[_BaseDataFrame, t.Callable]: ...
+    ) -> t.Tuple[BaseDataFrame, t.Callable]: ...
 
 
 def get_func_from_session(name: str, session: t.Union[PySparkSession, _BaseSession]) -> t.Callable:

{sqlframe-3.11.0 → sqlframe-3.12.0}/tests/integration/fixtures.py

@@ -46,7 +46,7 @@ from sqlframe.standalone.dataframe import StandaloneDataFrame
 from sqlframe.standalone.session import StandaloneSession
 
 if t.TYPE_CHECKING:
-    from sqlframe.base.dataframe import _BaseDataFrame
+    from sqlframe.base.dataframe import BaseDataFrame
     from sqlframe.base.session import _BaseSession
     from tests.types import DistrictData, EmployeeData, StoreData
 
@@ -650,14 +650,14 @@ def get_explain_plan() -> t.Callable:
 
 
 @pytest.fixture(params=ENGINE_PARAMETERS_NO_PYSPARK_STANDALONE)
-def get_engine_df(request: FixtureRequest) -> t.Callable[[str], _BaseDataFrame]:
+def get_engine_df(request: FixtureRequest) -> t.Callable[[str], BaseDataFrame]:
     mapping = {
         "employee": f"{request.param}_employee",
         "store": f"{request.param}_store",
         "district": f"{request.param}_district",
     }
 
-    def _get_engine_df(name: str) -> _BaseDataFrame:
+    def _get_engine_df(name: str) -> BaseDataFrame:
         return request.getfixturevalue(mapping[name])
 
     return _get_engine_df
@@ -672,14 +672,14 @@ def get_session(request: FixtureRequest) -> t.Callable[[], _BaseSession]:
 
 
 @pytest.fixture(params=ENGINE_PARAMETERS_NO_PYSPARK)
-def get_df(request: FixtureRequest) -> t.Callable[[str], _BaseDataFrame]:
+def get_df(request: FixtureRequest) -> t.Callable[[str], BaseDataFrame]:
     mapping = {
         "employee": f"{request.param}_employee",
         "store": f"{request.param}_store",
         "district": f"{request.param}_district",
     }
 
-    def _get_df(name: str) -> _BaseDataFrame:
+    def _get_df(name: str) -> BaseDataFrame:
         return request.getfixturevalue(mapping[name])
 
     return _get_df
@@ -698,14 +698,14 @@ def get_engine_session_and_spark(
 @pytest.fixture(params=ENGINE_PARAMETERS_NO_STANDALONE)
 def get_engine_df_and_pyspark(
     request: FixtureRequest,
-) -> t.Callable[[str], t.Union[_BaseDataFrame, PySparkDataFrame]]:
+) -> t.Callable[[str], t.Union[BaseDataFrame, PySparkDataFrame]]:
     mapping = {
         "employee": f"{request.param}_employee",
         "store": f"{request.param}_store",
         "district": f"{request.param}_district",
     }
 
-    def _get_engine_df_and_pyspark(name: str) -> t.Union[_BaseDataFrame, PySparkDataFrame]:
+    def _get_engine_df_and_pyspark(name: str) -> t.Union[BaseDataFrame, PySparkDataFrame]:
         return request.getfixturevalue(mapping[name])
 
     return _get_engine_df_and_pyspark