⚠ This page is served via a proxy. Original site: https://github.com
This service does not collect credentials or authentication data.
Skip to content

[SPARK-54990][PYTHON] Fix how classproperty is implemented in session.py #53772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gaogaotiantian wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[SPARK-54990][PYTHON] Fix how classproperty is implemented in session.py #53772

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72dc89b
Fix how classproperty is implemented in session.py
gaogaotiantian Jan 12, 2026
637c6bd
Remove type hint for cls
gaogaotiantian Jan 12, 2026
51034ba
Add ignore for cls
gaogaotiantian Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions python/pyspark/sql/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@
from types import TracebackType
from typing import (
Any,
Callable,
ClassVar,
Dict,
Iterable,
Generic,
List,
Optional,
Tuple,
Type,
TypeVar,
Union,
Set,
cast,
Expand Down Expand Up @@ -136,7 +139,10 @@ def toDF(self, schema=None, sampleRatio=None):
RDD.toDF = toDF # type: ignore[method-assign]


class classproperty(property):
T = TypeVar("T")


class classproperty(Generic[T]):
"""Same as Python's @property decorator, but for class attributes.

Examples
Expand All @@ -161,12 +167,13 @@ class classproperty(property):
True
"""

def __get__(self, instance: Any, owner: Any = None) -> "SparkSession.Builder":
# The "type: ignore" below silences the following error from mypy:
# error: Argument 1 to "classmethod" has incompatible
# type "Optional[Callable[[Any], Any]]";
# expected "Callable[..., Any]" [arg-type]
return classmethod(self.fget).__get__(None, owner)() # type: ignore
def __init__(self, fget: Callable[[type], T]) -> None:
self.fget = fget

def __get__(self, instance: Any, owner: Optional[type]) -> T:
if owner is None:
owner = type(instance)
return self.fget(owner)


class SparkSession(SparkConversionMixin):
Expand Down Expand Up @@ -603,12 +610,14 @@ def create(self) -> "SparkSession":

# SPARK-47544: Explicitly declaring this as an identifier instead of a method.
# If changing, make sure this bug is not reintroduced.
builder: Builder = classproperty(lambda cls: cls.Builder()) # type: ignore
"""Creates a :class:`Builder` for constructing a :class:`SparkSession`.
@classproperty
def builder(cls: Type["SparkSession"]) -> "Builder": # type: ignore[misc]
"""Creates a :class:`Builder` for constructing a :class:`SparkSession`.

.. versionchanged:: 3.4.0
Supports Spark Connect.
"""
.. versionchanged:: 3.4.0
Supports Spark Connect.
"""
return cls.Builder()

_instantiatedSession: ClassVar[Optional["SparkSession"]] = None
_activeSession: ClassVar[Optional["SparkSession"]] = None
Expand Down