diff --git a/altair/vegalite/v5/schema/_typing.py b/altair/vegalite/v5/schema/_typing.py index f4c0eaff0..fd6383ad7 100644 --- a/altair/vegalite/v5/schema/_typing.py +++ b/altair/vegalite/v5/schema/_typing.py @@ -57,8 +57,6 @@ "Interpolate_T", "LayoutAlign_T", "LegendOrient_T", - "LocalMultiTimeUnit_T", - "LocalSingleTimeUnit_T", "Map", "MarkInvalidDataMode_T", "MarkType_T", @@ -80,7 +78,6 @@ "SelectionType_T", "SingleDefUnitChannel_T", "SingleTimeUnit_T", - "SortByChannelDesc_T", "SortByChannel_T", "SortOrder_T", "StackOffset_T", @@ -97,8 +94,6 @@ "TitleOrient_T", "TypeForShape_T", "Type_T", - "UtcMultiTimeUnit_T", - "UtcSingleTimeUnit_T", "Value", "VegaThemes", "WindowOnlyOp_T", @@ -886,50 +881,6 @@ class PaddingKwds(TypedDict, total=False): "bottom-left", "bottom-right", ] -LocalMultiTimeUnit_T: TypeAlias = Literal[ - "yearquarter", - "yearquartermonth", - "yearmonth", - "yearmonthdate", - "yearmonthdatehours", - "yearmonthdatehoursminutes", - "yearmonthdatehoursminutesseconds", - "yearweek", - "yearweekday", - "yearweekdayhours", - "yearweekdayhoursminutes", - "yearweekdayhoursminutesseconds", - "yeardayofyear", - "quartermonth", - "monthdate", - "monthdatehours", - "monthdatehoursminutes", - "monthdatehoursminutesseconds", - "weekday", - "weekdayhours", - "weekdayhoursminutes", - "weekdayhoursminutesseconds", - "dayhours", - "dayhoursminutes", - "dayhoursminutesseconds", - "hoursminutes", - "hoursminutesseconds", - "minutesseconds", - "secondsmilliseconds", -] -LocalSingleTimeUnit_T: TypeAlias = Literal[ - "year", - "quarter", - "month", - "week", - "day", - "dayofyear", - "date", - "hours", - "minutes", - "seconds", - "milliseconds", -] MarkInvalidDataMode_T: TypeAlias = Literal[ "filter", "break-paths-filter-domains", @@ -1155,20 +1106,6 @@ class PaddingKwds(TypedDict, total=False): "utcseconds", "utcmilliseconds", ] -SortByChannelDesc_T: TypeAlias = Literal[ - "-x", - "-y", - "-color", - "-fill", - "-stroke", - "-strokeWidth", - "-size", - "-shape", - "-fillOpacity", - "-strokeOpacity", - "-opacity", - "-text", -] SortByChannel_T: TypeAlias = Literal[ "x", "y", @@ -1201,50 +1138,6 @@ class PaddingKwds(TypedDict, total=False): TitleOrient_T: TypeAlias = Literal["none", "left", "right", "top", "bottom"] TypeForShape_T: TypeAlias = Literal["nominal", "ordinal", "geojson"] Type_T: TypeAlias = Literal["quantitative", "ordinal", "temporal", "nominal", "geojson"] -UtcMultiTimeUnit_T: TypeAlias = Literal[ - "utcyearquarter", - "utcyearquartermonth", - "utcyearmonth", - "utcyearmonthdate", - "utcyearmonthdatehours", - "utcyearmonthdatehoursminutes", - "utcyearmonthdatehoursminutesseconds", - "utcyearweek", - "utcyearweekday", - "utcyearweekdayhours", - "utcyearweekdayhoursminutes", - "utcyearweekdayhoursminutesseconds", - "utcyeardayofyear", - "utcquartermonth", - "utcmonthdate", - "utcmonthdatehours", - "utcmonthdatehoursminutes", - "utcmonthdatehoursminutesseconds", - "utcweekday", - "utcweekdayhours", - "utcweekdayhoursminutes", - "utcweekdayhoursminutesseconds", - "utcdayhours", - "utcdayhoursminutes", - "utcdayhoursminutesseconds", - "utchoursminutes", - "utchoursminutesseconds", - "utcminutesseconds", - "utcsecondsmilliseconds", -] -UtcSingleTimeUnit_T: TypeAlias = Literal[ - "utcyear", - "utcquarter", - "utcmonth", - "utcweek", - "utcday", - "utcdayofyear", - "utcdate", - "utchours", - "utcminutes", - "utcseconds", - "utcmilliseconds", -] WindowOnlyOp_T: TypeAlias = Literal[ "row_number", "rank", diff --git a/altair/vegalite/v5/schema/channels.py b/altair/vegalite/v5/schema/channels.py index 011dbe6f6..3562bc83e 100644 --- a/altair/vegalite/v5/schema/channels.py +++ b/altair/vegalite/v5/schema/channels.py @@ -32,7 +32,17 @@ from altair import Parameter, SchemaBase from altair.typing import Optional - from altair.vegalite.v5.api import IntoCondition + from altair.vegalite.v5.api import Bin, Impute, IntoCondition + from altair.vegalite.v5.schema.core import ( + Axis, + DateTime, + EncodingSortField, + Header, + Legend, + RepeatRef, + Scale, + TimeUnitParams, + ) if sys.version_info >= (3, 11): from typing import Self @@ -481,27 +491,19 @@ class Angle(FieldChannelMixin, core.FieldOrDatumDefWithConditionMarkPropFieldDef _encoding_name = "angle" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Angle: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Angle: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Angle: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Angle: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Angle: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Angle: ... @overload - def bandPosition(self, _: float, **kwds) -> Angle: ... - + def bandPosition(self, _: float, /) -> Angle: ... @overload - def bin(self, _: bool, **kwds) -> Angle: ... - + def bin(self, _: bool | Bin | None, /) -> Angle: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -512,47 +514,38 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Angle: ... - - @overload - def bin(self, _: None, **kwds) -> Angle: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Angle: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Angle: ... - @overload - def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds - ) -> Angle: ... - + def condition(self, _: list[core.ConditionalValueDefnumberExprRef], /) -> Angle: ... @overload - def field(self, _: str, **kwds) -> Angle: ... - + def field(self, _: str | RepeatRef, /) -> Angle: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Angle: ... - + @overload + def legend(self, _: Legend | None, /) -> Angle: ... @overload def legend( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, clipHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, columnPadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, @@ -655,15 +648,13 @@ def legend( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> Angle: ... - @overload - def legend(self, _: None, **kwds) -> Angle: ... - + def scale(self, _: Scale | None, /) -> Angle: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -709,131 +700,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Angle: ... - - @overload - def scale(self, _: None, **kwds) -> Angle: ... - - @overload - def sort(self, _: list[float], **kwds) -> Angle: ... - - @overload - def sort(self, _: list[str], **kwds) -> Angle: ... - - @overload - def sort(self, _: list[bool], **kwds) -> Angle: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Angle: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Angle: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> Angle: ... - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> Angle: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> Angle: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Angle: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> Angle: ... - - @overload - def sort(self, _: None, **kwds) -> Angle: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Angle: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Angle: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Angle: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Angle: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Angle: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Angle: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Angle: ... - - @overload - def title(self, _: str, **kwds) -> Angle: ... - - @overload - def title(self, _: list[str], **kwds) -> Angle: ... - @overload - def title(self, _: None, **kwds) -> Angle: ... - + def title(self, _: str | Sequence[str] | None, /) -> Angle: ... @overload - def type(self, _: StandardType_T, **kwds) -> Angle: ... + def type(self, _: StandardType_T, /) -> Angle: ... def __init__( self, @@ -991,41 +904,30 @@ class AngleDatum(DatumChannelMixin, core.FieldOrDatumDefWithConditionDatumDefnum _encoding_name = "angle" @overload - def bandPosition(self, _: float, **kwds) -> AngleDatum: ... - + def bandPosition(self, _: float, /) -> AngleDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> AngleDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> AngleDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> AngleDatum: ... - - @overload - def title(self, _: str, **kwds) -> AngleDatum: ... - @overload - def title(self, _: list[str], **kwds) -> AngleDatum: ... - - @overload - def title(self, _: None, **kwds) -> AngleDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> AngleDatum: ... @overload - def type(self, _: Type_T, **kwds) -> AngleDatum: ... + def type(self, _: Type_T, /) -> AngleDatum: ... def __init__( self, @@ -1069,6 +971,7 @@ class AngleValue( @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -1091,12 +994,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> AngleValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -1106,12 +1008,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> AngleValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -1135,12 +1036,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> AngleValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -1151,29 +1051,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> AngleValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> AngleValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> AngleValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> AngleValue: ... def __init__( @@ -1413,27 +1309,19 @@ class Color( _encoding_name = "color" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Color: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Color: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Color: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Color: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Color: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Color: ... @overload - def bandPosition(self, _: float, **kwds) -> Color: ... - + def bandPosition(self, _: float, /) -> Color: ... @overload - def bin(self, _: bool, **kwds) -> Color: ... - + def bin(self, _: bool | Bin | None, /) -> Color: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -1444,47 +1332,40 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Color: ... - - @overload - def bin(self, _: None, **kwds) -> Color: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> Color: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> Color: ... - @overload def condition( - self, _: list[core.ConditionalValueDefGradientstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefGradientstringnullExprRef], / ) -> Color: ... - @overload - def field(self, _: str, **kwds) -> Color: ... - + def field(self, _: str | RepeatRef, /) -> Color: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Color: ... - + @overload + def legend(self, _: Legend | None, /) -> Color: ... @overload def legend( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, clipHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, columnPadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, @@ -1587,15 +1468,13 @@ def legend( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> Color: ... - @overload - def legend(self, _: None, **kwds) -> Color: ... - + def scale(self, _: Scale | None, /) -> Color: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -1641,131 +1520,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Color: ... - - @overload - def scale(self, _: None, **kwds) -> Color: ... - @overload - def sort(self, _: list[float], **kwds) -> Color: ... - - @overload - def sort(self, _: list[str], **kwds) -> Color: ... - - @overload - def sort(self, _: list[bool], **kwds) -> Color: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Color: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Color: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> Color: ... - - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> Color: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> Color: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Color: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> Color: ... - - @overload - def sort(self, _: None, **kwds) -> Color: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Color: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Color: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Color: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Color: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Color: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Color: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Color: ... - @overload - def title(self, _: str, **kwds) -> Color: ... - - @overload - def title(self, _: list[str], **kwds) -> Color: ... - - @overload - def title(self, _: None, **kwds) -> Color: ... - + def title(self, _: str | Sequence[str] | None, /) -> Color: ... @overload - def type(self, _: StandardType_T, **kwds) -> Color: ... + def type(self, _: StandardType_T, /) -> Color: ... def __init__( self, @@ -1925,41 +1726,30 @@ class ColorDatum( _encoding_name = "color" @overload - def bandPosition(self, _: float, **kwds) -> ColorDatum: ... - + def bandPosition(self, _: float, /) -> ColorDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> ColorDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> ColorDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefGradientstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefGradientstringnullExprRef], / ) -> ColorDatum: ... - - @overload - def title(self, _: str, **kwds) -> ColorDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> ColorDatum: ... - @overload - def title(self, _: None, **kwds) -> ColorDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> ColorDatum: ... @overload - def type(self, _: Type_T, **kwds) -> ColorDatum: ... + def type(self, _: Type_T, /) -> ColorDatum: ... def __init__( self, @@ -2004,6 +1794,7 @@ class ColorValue( @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -2026,12 +1817,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> ColorValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -2041,12 +1831,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> ColorValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -2070,12 +1859,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> ColorValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -2086,29 +1874,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> ColorValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> ColorValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> ColorValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefGradientstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefGradientstringnullExprRef], / ) -> ColorValue: ... def __init__( @@ -2330,30 +2114,25 @@ class Column(FieldChannelMixin, core.RowColumnEncodingFieldDef): _encoding_name = "column" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Column: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Column: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Column: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Column: ... - @overload - def align(self, _: LayoutAlign_T, **kwds) -> Column: ... - + def align(self, _: LayoutAlign_T, /) -> Column: ... @overload - def bandPosition(self, _: float, **kwds) -> Column: ... - + def bandPosition(self, _: float, /) -> Column: ... @overload - def bin(self, _: bool, **kwds) -> Column: ... - + def bin(self, _: bool | Bin | None, /) -> Column: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -2364,28 +2143,23 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Column: ... - @overload - def bin(self, _: None, **kwds) -> Column: ... - - @overload - def center(self, _: bool, **kwds) -> Column: ... - + def center(self, _: bool, /) -> Column: ... @overload - def field(self, _: str, **kwds) -> Column: ... - + def field(self, _: str | RepeatRef, /) -> Column: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Column: ... - + @overload + def header(self, _: Header | None, /) -> Column: ... @overload def header( self, + *, format: Optional[str | SchemaBase | Map] = Undefined, formatType: Optional[str] = Undefined, labelAlign: Optional[Parameter | SchemaBase | Map | Align_T] = Undefined, @@ -2430,120 +2204,49 @@ def header( titleLineHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, titleOrient: Optional[SchemaBase | Orient_T] = Undefined, titlePadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Column: ... - - @overload - def header(self, _: None, **kwds) -> Column: ... - - @overload - def sort(self, _: list[float], **kwds) -> Column: ... - - @overload - def sort(self, _: list[str], **kwds) -> Column: ... - - @overload - def sort(self, _: list[bool], **kwds) -> Column: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Column: ... - @overload - def sort(self, _: SortOrder_T, **kwds) -> Column: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | EncodingSortField + | Sequence[DateTime | Temporal] + | SortOrder_T + | None, + /, + ) -> Column: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Column: ... - - @overload - def sort(self, _: None, **kwds) -> Column: ... - - @overload - def spacing(self, _: float, **kwds) -> Column: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Column: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Column: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Column: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Column: ... - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Column: ... - + def spacing(self, _: float, /) -> Column: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Column: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Column: ... - - @overload - def title(self, _: str, **kwds) -> Column: ... - @overload - def title(self, _: list[str], **kwds) -> Column: ... - - @overload - def title(self, _: None, **kwds) -> Column: ... - + def title(self, _: str | Sequence[str] | None, /) -> Column: ... @overload - def type(self, _: StandardType_T, **kwds) -> Column: ... + def type(self, _: StandardType_T, /) -> Column: ... def __init__( self, @@ -2788,27 +2491,23 @@ class Description(FieldChannelMixin, core.StringFieldDefWithCondition): _encoding_name = "description" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Description: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Description: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Description: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Description: ... - @overload - def bandPosition(self, _: float, **kwds) -> Description: ... - + def bandPosition(self, _: float, /) -> Description: ... @overload - def bin(self, _: bool, **kwds) -> Description: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> Description: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -2819,134 +2518,60 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Description: ... - - @overload - def bin(self, _: Literal["binned"], **kwds) -> Description: ... - - @overload - def bin(self, _: None, **kwds) -> Description: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Description: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Description: ... - @overload def condition( - self, _: list[core.ConditionalValueDefstringExprRef], **kwds + self, _: list[core.ConditionalValueDefstringExprRef], / ) -> Description: ... - @overload - def field(self, _: str, **kwds) -> Description: ... - + def field(self, _: str | RepeatRef, /) -> Description: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Description: ... - - @overload - def format(self, _: str, **kwds) -> Description: ... - - @overload - def format(self, _: Map, **kwds) -> Description: ... - @overload - def formatType(self, _: str, **kwds) -> Description: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Description: ... - + def format(self, _: str, /) -> Description: ... @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Description: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Description: ... - + def format(self, _: Map, /) -> Description: ... @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Description: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Description: ... - + def formatType(self, _: str, /) -> Description: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Description: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Description: ... - @overload - def title(self, _: str, **kwds) -> Description: ... - - @overload - def title(self, _: list[str], **kwds) -> Description: ... - - @overload - def title(self, _: None, **kwds) -> Description: ... - + def title(self, _: str | Sequence[str] | None, /) -> Description: ... @overload - def type(self, _: StandardType_T, **kwds) -> Description: ... + def type(self, _: StandardType_T, /) -> Description: ... def __init__( self, @@ -3002,6 +2627,7 @@ class DescriptionValue(ValueChannelMixin, core.StringValueDefWithCondition): @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -3024,12 +2650,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> DescriptionValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -3039,12 +2664,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> DescriptionValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -3068,12 +2692,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> DescriptionValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -3084,29 +2707,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> DescriptionValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> DescriptionValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> DescriptionValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefstringnullExprRef], / ) -> DescriptionValue: ... def __init__( @@ -3278,27 +2897,23 @@ class Detail(FieldChannelMixin, core.FieldDefWithoutScale): _encoding_name = "detail" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Detail: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Detail: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Detail: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Detail: ... - @overload - def bandPosition(self, _: float, **kwds) -> Detail: ... - + def bandPosition(self, _: float, /) -> Detail: ... @overload - def bin(self, _: bool, **kwds) -> Detail: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> Detail: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -3309,103 +2924,35 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Detail: ... - @overload - def bin(self, _: Literal["binned"], **kwds) -> Detail: ... - - @overload - def bin(self, _: None, **kwds) -> Detail: ... - - @overload - def field(self, _: str, **kwds) -> Detail: ... - + def field(self, _: str | RepeatRef, /) -> Detail: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Detail: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Detail: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Detail: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Detail: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Detail: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Detail: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Detail: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Detail: ... - - @overload - def title(self, _: str, **kwds) -> Detail: ... - @overload - def title(self, _: list[str], **kwds) -> Detail: ... - - @overload - def title(self, _: None, **kwds) -> Detail: ... - + def title(self, _: str | Sequence[str] | None, /) -> Detail: ... @overload - def type(self, _: StandardType_T, **kwds) -> Detail: ... + def type(self, _: StandardType_T, /) -> Detail: ... def __init__( self, @@ -3680,38 +3227,28 @@ class Facet(FieldChannelMixin, core.FacetEncodingFieldDef): _encoding_name = "facet" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Facet: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Facet: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Facet: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Facet: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Facet: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Facet: ... @overload - def align(self, _: LayoutAlign_T, **kwds) -> Facet: ... - + def align(self, _: RowColKwds[LayoutAlign_T] | LayoutAlign_T, /) -> Facet: ... @overload def align( self, + *, column: Optional[SchemaBase | LayoutAlign_T] = Undefined, row: Optional[SchemaBase | LayoutAlign_T] = Undefined, - **kwds, ) -> Facet: ... - @overload - def bandPosition(self, _: float, **kwds) -> Facet: ... - + def bandPosition(self, _: float, /) -> Facet: ... @overload - def bin(self, _: bool, **kwds) -> Facet: ... - + def bin(self, _: bool | Bin | None, /) -> Facet: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -3722,42 +3259,31 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Facet: ... - @overload - def bin(self, _: None, **kwds) -> Facet: ... - + def bounds(self, _: Literal["full", "flush"], /) -> Facet: ... @overload - def bounds(self, _: Literal["full", "flush"], **kwds) -> Facet: ... - - @overload - def center(self, _: bool, **kwds) -> Facet: ... - + def center(self, _: bool | RowColKwds[bool], /) -> Facet: ... @overload def center( - self, - column: Optional[bool] = Undefined, - row: Optional[bool] = Undefined, - **kwds, + self, *, column: Optional[bool] = Undefined, row: Optional[bool] = Undefined ) -> Facet: ... - @overload - def columns(self, _: float, **kwds) -> Facet: ... - + def columns(self, _: float, /) -> Facet: ... @overload - def field(self, _: str, **kwds) -> Facet: ... - + def field(self, _: str | RepeatRef, /) -> Facet: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Facet: ... - + @overload + def header(self, _: Header | None, /) -> Facet: ... @overload def header( self, + *, format: Optional[str | SchemaBase | Map] = Undefined, formatType: Optional[str] = Undefined, labelAlign: Optional[Parameter | SchemaBase | Map | Align_T] = Undefined, @@ -3802,128 +3328,53 @@ def header( titleLineHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, titleOrient: Optional[SchemaBase | Orient_T] = Undefined, titlePadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Facet: ... - - @overload - def header(self, _: None, **kwds) -> Facet: ... - - @overload - def sort(self, _: list[float], **kwds) -> Facet: ... - - @overload - def sort(self, _: list[str], **kwds) -> Facet: ... - - @overload - def sort(self, _: list[bool], **kwds) -> Facet: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Facet: ... - @overload - def sort(self, _: SortOrder_T, **kwds) -> Facet: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | EncodingSortField + | Sequence[DateTime | Temporal] + | SortOrder_T + | None, + /, + ) -> Facet: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Facet: ... - @overload - def sort(self, _: None, **kwds) -> Facet: ... - - @overload - def spacing(self, _: float, **kwds) -> Facet: ... - + def spacing(self, _: float | RowColKwds[float], /) -> Facet: ... @overload def spacing( - self, - column: Optional[float] = Undefined, - row: Optional[float] = Undefined, - **kwds, + self, *, column: Optional[float] = Undefined, row: Optional[float] = Undefined ) -> Facet: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Facet: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Facet: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Facet: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Facet: ... - @overload def timeUnit( self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Facet: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, - ) -> Facet: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Facet: ... - @overload - def title(self, _: str, **kwds) -> Facet: ... - + def title(self, _: str | Sequence[str] | None, /) -> Facet: ... @overload - def title(self, _: list[str], **kwds) -> Facet: ... - - @overload - def title(self, _: None, **kwds) -> Facet: ... - - @overload - def type(self, _: StandardType_T, **kwds) -> Facet: ... + def type(self, _: StandardType_T, /) -> Facet: ... def __init__( self, @@ -4203,27 +3654,19 @@ class Fill( _encoding_name = "fill" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Fill: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Fill: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Fill: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Fill: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Fill: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Fill: ... @overload - def bandPosition(self, _: float, **kwds) -> Fill: ... - + def bandPosition(self, _: float, /) -> Fill: ... @overload - def bin(self, _: bool, **kwds) -> Fill: ... - + def bin(self, _: bool | Bin | None, /) -> Fill: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -4234,47 +3677,40 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Fill: ... - - @overload - def bin(self, _: None, **kwds) -> Fill: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> Fill: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> Fill: ... - @overload def condition( - self, _: list[core.ConditionalValueDefGradientstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefGradientstringnullExprRef], / ) -> Fill: ... - @overload - def field(self, _: str, **kwds) -> Fill: ... - + def field(self, _: str | RepeatRef, /) -> Fill: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Fill: ... - + @overload + def legend(self, _: Legend | None, /) -> Fill: ... @overload def legend( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, clipHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, columnPadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, @@ -4377,15 +3813,13 @@ def legend( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> Fill: ... - @overload - def legend(self, _: None, **kwds) -> Fill: ... - + def scale(self, _: Scale | None, /) -> Fill: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -4431,131 +3865,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Fill: ... - - @overload - def scale(self, _: None, **kwds) -> Fill: ... - @overload - def sort(self, _: list[float], **kwds) -> Fill: ... - - @overload - def sort(self, _: list[str], **kwds) -> Fill: ... - - @overload - def sort(self, _: list[bool], **kwds) -> Fill: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Fill: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Fill: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> Fill: ... - - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> Fill: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> Fill: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Fill: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> Fill: ... - - @overload - def sort(self, _: None, **kwds) -> Fill: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Fill: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Fill: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Fill: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Fill: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Fill: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Fill: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Fill: ... - @overload - def title(self, _: str, **kwds) -> Fill: ... - - @overload - def title(self, _: list[str], **kwds) -> Fill: ... - + def title(self, _: str | Sequence[str] | None, /) -> Fill: ... @overload - def title(self, _: None, **kwds) -> Fill: ... - - @overload - def type(self, _: StandardType_T, **kwds) -> Fill: ... + def type(self, _: StandardType_T, /) -> Fill: ... def __init__( self, @@ -4715,41 +4071,30 @@ class FillDatum( _encoding_name = "fill" @overload - def bandPosition(self, _: float, **kwds) -> FillDatum: ... - + def bandPosition(self, _: float, /) -> FillDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> FillDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> FillDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefGradientstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefGradientstringnullExprRef], / ) -> FillDatum: ... - @overload - def title(self, _: str, **kwds) -> FillDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> FillDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> FillDatum: ... @overload - def title(self, _: None, **kwds) -> FillDatum: ... - - @overload - def type(self, _: Type_T, **kwds) -> FillDatum: ... + def type(self, _: Type_T, /) -> FillDatum: ... def __init__( self, @@ -4794,6 +4139,7 @@ class FillValue( @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -4816,12 +4162,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> FillValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -4831,12 +4176,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> FillValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -4860,12 +4204,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> FillValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -4876,29 +4219,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> FillValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> FillValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> FillValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefGradientstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefGradientstringnullExprRef], / ) -> FillValue: ... def __init__( @@ -5137,27 +4476,23 @@ class FillOpacity( _encoding_name = "fillOpacity" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> FillOpacity: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> FillOpacity: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> FillOpacity: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> FillOpacity: ... - @overload - def bandPosition(self, _: float, **kwds) -> FillOpacity: ... - + def bandPosition(self, _: float, /) -> FillOpacity: ... @overload - def bin(self, _: bool, **kwds) -> FillOpacity: ... - + def bin(self, _: bool | Bin | None, /) -> FillOpacity: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -5168,47 +4503,40 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> FillOpacity: ... - - @overload - def bin(self, _: None, **kwds) -> FillOpacity: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> FillOpacity: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> FillOpacity: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> FillOpacity: ... - @overload - def field(self, _: str, **kwds) -> FillOpacity: ... - + def field(self, _: str | RepeatRef, /) -> FillOpacity: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> FillOpacity: ... - + @overload + def legend(self, _: Legend | None, /) -> FillOpacity: ... @overload def legend( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, clipHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, columnPadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, @@ -5311,15 +4639,13 @@ def legend( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> FillOpacity: ... - @overload - def legend(self, _: None, **kwds) -> FillOpacity: ... - + def scale(self, _: Scale | None, /) -> FillOpacity: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -5365,131 +4691,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> FillOpacity: ... - - @overload - def scale(self, _: None, **kwds) -> FillOpacity: ... - - @overload - def sort(self, _: list[float], **kwds) -> FillOpacity: ... - - @overload - def sort(self, _: list[str], **kwds) -> FillOpacity: ... - @overload - def sort(self, _: list[bool], **kwds) -> FillOpacity: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> FillOpacity: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> FillOpacity: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> FillOpacity: ... - - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> FillOpacity: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> FillOpacity: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> FillOpacity: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> FillOpacity: ... - - @overload - def sort(self, _: None, **kwds) -> FillOpacity: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> FillOpacity: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> FillOpacity: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> FillOpacity: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> FillOpacity: ... - @overload def timeUnit( self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> FillOpacity: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, - ) -> FillOpacity: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> FillOpacity: ... - @overload - def title(self, _: str, **kwds) -> FillOpacity: ... - + def title(self, _: str | Sequence[str] | None, /) -> FillOpacity: ... @overload - def title(self, _: list[str], **kwds) -> FillOpacity: ... - - @overload - def title(self, _: None, **kwds) -> FillOpacity: ... - - @overload - def type(self, _: StandardType_T, **kwds) -> FillOpacity: ... + def type(self, _: StandardType_T, /) -> FillOpacity: ... def __init__( self, @@ -5649,41 +4897,30 @@ class FillOpacityDatum( _encoding_name = "fillOpacity" @overload - def bandPosition(self, _: float, **kwds) -> FillOpacityDatum: ... - + def bandPosition(self, _: float, /) -> FillOpacityDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> FillOpacityDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> FillOpacityDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> FillOpacityDatum: ... - - @overload - def title(self, _: str, **kwds) -> FillOpacityDatum: ... - @overload - def title(self, _: list[str], **kwds) -> FillOpacityDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> FillOpacityDatum: ... @overload - def title(self, _: None, **kwds) -> FillOpacityDatum: ... - - @overload - def type(self, _: Type_T, **kwds) -> FillOpacityDatum: ... + def type(self, _: Type_T, /) -> FillOpacityDatum: ... def __init__( self, @@ -5727,6 +4964,7 @@ class FillOpacityValue( @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -5749,12 +4987,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> FillOpacityValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -5764,12 +5001,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> FillOpacityValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -5793,12 +5029,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> FillOpacityValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -5809,29 +5044,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> FillOpacityValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> FillOpacityValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> FillOpacityValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> FillOpacityValue: ... def __init__( @@ -6040,27 +5271,19 @@ class Href(FieldChannelMixin, core.StringFieldDefWithCondition): _encoding_name = "href" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Href: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Href: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Href: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Href: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Href: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Href: ... @overload - def bandPosition(self, _: float, **kwds) -> Href: ... - + def bandPosition(self, _: float, /) -> Href: ... @overload - def bin(self, _: bool, **kwds) -> Href: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> Href: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -6071,134 +5294,58 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Href: ... - - @overload - def bin(self, _: Literal["binned"], **kwds) -> Href: ... - - @overload - def bin(self, _: None, **kwds) -> Href: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Href: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Href: ... - @overload - def condition( - self, _: list[core.ConditionalValueDefstringExprRef], **kwds - ) -> Href: ... - + def condition(self, _: list[core.ConditionalValueDefstringExprRef], /) -> Href: ... @overload - def field(self, _: str, **kwds) -> Href: ... - + def field(self, _: str | RepeatRef, /) -> Href: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Href: ... - - @overload - def format(self, _: str, **kwds) -> Href: ... - - @overload - def format(self, _: Map, **kwds) -> Href: ... - @overload - def formatType(self, _: str, **kwds) -> Href: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Href: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Href: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Href: ... - + def format(self, _: str, /) -> Href: ... @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Href: ... - + def format(self, _: Map, /) -> Href: ... @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Href: ... - + def formatType(self, _: str, /) -> Href: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Href: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Href: ... - - @overload - def title(self, _: str, **kwds) -> Href: ... - - @overload - def title(self, _: list[str], **kwds) -> Href: ... - @overload - def title(self, _: None, **kwds) -> Href: ... - + def title(self, _: str | Sequence[str] | None, /) -> Href: ... @overload - def type(self, _: StandardType_T, **kwds) -> Href: ... + def type(self, _: StandardType_T, /) -> Href: ... def __init__( self, @@ -6254,6 +5401,7 @@ class HrefValue(ValueChannelMixin, core.StringValueDefWithCondition): @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -6276,12 +5424,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> HrefValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -6291,12 +5438,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> HrefValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -6320,12 +5466,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> HrefValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -6336,29 +5481,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> HrefValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> HrefValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> HrefValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefstringnullExprRef], / ) -> HrefValue: ... def __init__( @@ -6530,27 +5671,19 @@ class Key(FieldChannelMixin, core.FieldDefWithoutScale): _encoding_name = "key" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Key: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Key: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Key: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Key: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Key: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Key: ... @overload - def bandPosition(self, _: float, **kwds) -> Key: ... - + def bandPosition(self, _: float, /) -> Key: ... @overload - def bin(self, _: bool, **kwds) -> Key: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> Key: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -6561,103 +5694,35 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Key: ... - - @overload - def bin(self, _: Literal["binned"], **kwds) -> Key: ... - - @overload - def bin(self, _: None, **kwds) -> Key: ... - @overload - def field(self, _: str, **kwds) -> Key: ... - + def field(self, _: str | RepeatRef, /) -> Key: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> Key: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Key: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Key: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Key: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Key: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Key: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Key: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Key: ... - - @overload - def title(self, _: str, **kwds) -> Key: ... - @overload - def title(self, _: list[str], **kwds) -> Key: ... - - @overload - def title(self, _: None, **kwds) -> Key: ... - + def title(self, _: str | Sequence[str] | None, /) -> Key: ... @overload - def type(self, _: StandardType_T, **kwds) -> Key: ... + def type(self, _: StandardType_T, /) -> Key: ... def __init__( self, @@ -6844,112 +5909,47 @@ class Latitude(FieldChannelMixin, core.LatLongFieldDef): _encoding_name = "latitude" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Latitude: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Latitude: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Latitude: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Latitude: ... - @overload - def bandPosition(self, _: float, **kwds) -> Latitude: ... - + def bandPosition(self, _: float, /) -> Latitude: ... @overload - def bin(self, _: None, **kwds) -> Latitude: ... - + def bin(self, _: None, /) -> Latitude: ... @overload - def field(self, _: str, **kwds) -> Latitude: ... - + def field(self, _: str | RepeatRef, /) -> Latitude: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> Latitude: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Latitude: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Latitude: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Latitude: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Latitude: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Latitude: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Latitude: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Latitude: ... - - @overload - def title(self, _: str, **kwds) -> Latitude: ... - - @overload - def title(self, _: list[str], **kwds) -> Latitude: ... - @overload - def title(self, _: None, **kwds) -> Latitude: ... - + def title(self, _: str | Sequence[str] | None, /) -> Latitude: ... @overload - def type(self, _: Literal["quantitative"], **kwds) -> Latitude: ... + def type(self, _: Literal["quantitative"], /) -> Latitude: ... def __init__( self, @@ -7083,19 +6083,11 @@ class LatitudeDatum(DatumChannelMixin, core.DatumDef): _encoding_name = "latitude" @overload - def bandPosition(self, _: float, **kwds) -> LatitudeDatum: ... - - @overload - def title(self, _: str, **kwds) -> LatitudeDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> LatitudeDatum: ... - + def bandPosition(self, _: float, /) -> LatitudeDatum: ... @overload - def title(self, _: None, **kwds) -> LatitudeDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> LatitudeDatum: ... @overload - def type(self, _: Type_T, **kwds) -> LatitudeDatum: ... + def type(self, _: Type_T, /) -> LatitudeDatum: ... def __init__( self, @@ -7205,109 +6197,45 @@ class Latitude2(FieldChannelMixin, core.SecondaryFieldDef): _encoding_name = "latitude2" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Latitude2: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Latitude2: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Latitude2: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Latitude2: ... - @overload - def bandPosition(self, _: float, **kwds) -> Latitude2: ... - + def bandPosition(self, _: float, /) -> Latitude2: ... @overload - def bin(self, _: None, **kwds) -> Latitude2: ... - + def bin(self, _: None, /) -> Latitude2: ... @overload - def field(self, _: str, **kwds) -> Latitude2: ... - + def field(self, _: str | RepeatRef, /) -> Latitude2: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> Latitude2: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Latitude2: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Latitude2: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Latitude2: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Latitude2: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Latitude2: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Latitude2: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Latitude2: ... - - @overload - def title(self, _: str, **kwds) -> Latitude2: ... - @overload - def title(self, _: list[str], **kwds) -> Latitude2: ... - - @overload - def title(self, _: None, **kwds) -> Latitude2: ... + def title(self, _: str | Sequence[str] | None, /) -> Latitude2: ... def __init__( self, @@ -7439,19 +6367,11 @@ class Latitude2Datum(DatumChannelMixin, core.DatumDef): _encoding_name = "latitude2" @overload - def bandPosition(self, _: float, **kwds) -> Latitude2Datum: ... - - @overload - def title(self, _: str, **kwds) -> Latitude2Datum: ... - - @overload - def title(self, _: list[str], **kwds) -> Latitude2Datum: ... - + def bandPosition(self, _: float, /) -> Latitude2Datum: ... @overload - def title(self, _: None, **kwds) -> Latitude2Datum: ... - + def title(self, _: str | Sequence[str] | None, /) -> Latitude2Datum: ... @overload - def type(self, _: Type_T, **kwds) -> Latitude2Datum: ... + def type(self, _: Type_T, /) -> Latitude2Datum: ... def __init__( self, @@ -7647,112 +6567,47 @@ class Longitude(FieldChannelMixin, core.LatLongFieldDef): _encoding_name = "longitude" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Longitude: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Longitude: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Longitude: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Longitude: ... - @overload - def bandPosition(self, _: float, **kwds) -> Longitude: ... - + def bandPosition(self, _: float, /) -> Longitude: ... @overload - def bin(self, _: None, **kwds) -> Longitude: ... - + def bin(self, _: None, /) -> Longitude: ... @overload - def field(self, _: str, **kwds) -> Longitude: ... - + def field(self, _: str | RepeatRef, /) -> Longitude: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> Longitude: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Longitude: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Longitude: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Longitude: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Longitude: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Longitude: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Longitude: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Longitude: ... - - @overload - def title(self, _: str, **kwds) -> Longitude: ... - @overload - def title(self, _: list[str], **kwds) -> Longitude: ... - - @overload - def title(self, _: None, **kwds) -> Longitude: ... - + def title(self, _: str | Sequence[str] | None, /) -> Longitude: ... @overload - def type(self, _: Literal["quantitative"], **kwds) -> Longitude: ... + def type(self, _: Literal["quantitative"], /) -> Longitude: ... def __init__( self, @@ -7886,19 +6741,11 @@ class LongitudeDatum(DatumChannelMixin, core.DatumDef): _encoding_name = "longitude" @overload - def bandPosition(self, _: float, **kwds) -> LongitudeDatum: ... - - @overload - def title(self, _: str, **kwds) -> LongitudeDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> LongitudeDatum: ... - + def bandPosition(self, _: float, /) -> LongitudeDatum: ... @overload - def title(self, _: None, **kwds) -> LongitudeDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> LongitudeDatum: ... @overload - def type(self, _: Type_T, **kwds) -> LongitudeDatum: ... + def type(self, _: Type_T, /) -> LongitudeDatum: ... def __init__( self, @@ -8008,109 +6855,45 @@ class Longitude2(FieldChannelMixin, core.SecondaryFieldDef): _encoding_name = "longitude2" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Longitude2: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Longitude2: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Longitude2: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Longitude2: ... - @overload - def bandPosition(self, _: float, **kwds) -> Longitude2: ... - + def bandPosition(self, _: float, /) -> Longitude2: ... @overload - def bin(self, _: None, **kwds) -> Longitude2: ... - + def bin(self, _: None, /) -> Longitude2: ... @overload - def field(self, _: str, **kwds) -> Longitude2: ... - + def field(self, _: str | RepeatRef, /) -> Longitude2: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> Longitude2: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Longitude2: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Longitude2: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Longitude2: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Longitude2: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Longitude2: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Longitude2: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, - ) -> Longitude2: ... - - @overload - def title(self, _: str, **kwds) -> Longitude2: ... - - @overload - def title(self, _: list[str], **kwds) -> Longitude2: ... - + ) -> Longitude2: ... @overload - def title(self, _: None, **kwds) -> Longitude2: ... + def title(self, _: str | Sequence[str] | None, /) -> Longitude2: ... def __init__( self, @@ -8242,19 +7025,11 @@ class Longitude2Datum(DatumChannelMixin, core.DatumDef): _encoding_name = "longitude2" @overload - def bandPosition(self, _: float, **kwds) -> Longitude2Datum: ... - - @overload - def title(self, _: str, **kwds) -> Longitude2Datum: ... - - @overload - def title(self, _: list[str], **kwds) -> Longitude2Datum: ... - + def bandPosition(self, _: float, /) -> Longitude2Datum: ... @overload - def title(self, _: None, **kwds) -> Longitude2Datum: ... - + def title(self, _: str | Sequence[str] | None, /) -> Longitude2Datum: ... @overload - def type(self, _: Type_T, **kwds) -> Longitude2Datum: ... + def type(self, _: Type_T, /) -> Longitude2Datum: ... def __init__( self, @@ -8519,27 +7294,23 @@ class Opacity( _encoding_name = "opacity" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Opacity: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Opacity: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Opacity: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Opacity: ... - @overload - def bandPosition(self, _: float, **kwds) -> Opacity: ... - + def bandPosition(self, _: float, /) -> Opacity: ... @overload - def bin(self, _: bool, **kwds) -> Opacity: ... - + def bin(self, _: bool | Bin | None, /) -> Opacity: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -8550,47 +7321,40 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Opacity: ... - - @overload - def bin(self, _: None, **kwds) -> Opacity: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Opacity: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Opacity: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> Opacity: ... - @overload - def field(self, _: str, **kwds) -> Opacity: ... - + def field(self, _: str | RepeatRef, /) -> Opacity: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Opacity: ... - + @overload + def legend(self, _: Legend | None, /) -> Opacity: ... @overload def legend( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, clipHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, columnPadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, @@ -8693,15 +7457,13 @@ def legend( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> Opacity: ... - @overload - def legend(self, _: None, **kwds) -> Opacity: ... - + def scale(self, _: Scale | None, /) -> Opacity: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -8747,131 +7509,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Opacity: ... - - @overload - def scale(self, _: None, **kwds) -> Opacity: ... - @overload - def sort(self, _: list[float], **kwds) -> Opacity: ... - - @overload - def sort(self, _: list[str], **kwds) -> Opacity: ... - - @overload - def sort(self, _: list[bool], **kwds) -> Opacity: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Opacity: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Opacity: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> Opacity: ... - - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> Opacity: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> Opacity: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Opacity: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> Opacity: ... - - @overload - def sort(self, _: None, **kwds) -> Opacity: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Opacity: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Opacity: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Opacity: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Opacity: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Opacity: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Opacity: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Opacity: ... - @overload - def title(self, _: str, **kwds) -> Opacity: ... - - @overload - def title(self, _: list[str], **kwds) -> Opacity: ... - - @overload - def title(self, _: None, **kwds) -> Opacity: ... - + def title(self, _: str | Sequence[str] | None, /) -> Opacity: ... @overload - def type(self, _: StandardType_T, **kwds) -> Opacity: ... + def type(self, _: StandardType_T, /) -> Opacity: ... def __init__( self, @@ -9029,41 +7713,30 @@ class OpacityDatum(DatumChannelMixin, core.FieldOrDatumDefWithConditionDatumDefn _encoding_name = "opacity" @overload - def bandPosition(self, _: float, **kwds) -> OpacityDatum: ... - + def bandPosition(self, _: float, /) -> OpacityDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> OpacityDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> OpacityDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> OpacityDatum: ... - - @overload - def title(self, _: str, **kwds) -> OpacityDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> OpacityDatum: ... - @overload - def title(self, _: None, **kwds) -> OpacityDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> OpacityDatum: ... @overload - def type(self, _: Type_T, **kwds) -> OpacityDatum: ... + def type(self, _: Type_T, /) -> OpacityDatum: ... def __init__( self, @@ -9107,6 +7780,7 @@ class OpacityValue( @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -9129,12 +7803,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> OpacityValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -9144,12 +7817,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> OpacityValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -9173,12 +7845,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> OpacityValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -9189,29 +7860,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> OpacityValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> OpacityValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> OpacityValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> OpacityValue: ... def __init__( @@ -9383,27 +8050,19 @@ class Order(FieldChannelMixin, core.OrderFieldDef): _encoding_name = "order" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Order: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Order: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Order: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Order: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Order: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Order: ... @overload - def bandPosition(self, _: float, **kwds) -> Order: ... - + def bandPosition(self, _: float, /) -> Order: ... @overload - def bin(self, _: bool, **kwds) -> Order: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> Order: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -9414,106 +8073,37 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Order: ... - - @overload - def bin(self, _: Literal["binned"], **kwds) -> Order: ... - - @overload - def bin(self, _: None, **kwds) -> Order: ... - @overload - def field(self, _: str, **kwds) -> Order: ... - + def field(self, _: str | RepeatRef, /) -> Order: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Order: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Order: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Order: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Order: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Order: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Order: ... - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Order: ... - + def sort(self, _: SortOrder_T, /) -> Order: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Order: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Order: ... - - @overload - def title(self, _: str, **kwds) -> Order: ... - - @overload - def title(self, _: list[str], **kwds) -> Order: ... - @overload - def title(self, _: None, **kwds) -> Order: ... - + def title(self, _: str | Sequence[str] | None, /) -> Order: ... @overload - def type(self, _: StandardType_T, **kwds) -> Order: ... + def type(self, _: StandardType_T, /) -> Order: ... def __init__( self, @@ -9570,24 +8160,20 @@ class OrderValue(ValueChannelMixin, core.OrderValueDef): @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float] = Undefined, - **kwds, ) -> OrderValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float] = Undefined, - **kwds, ) -> OrderValue: ... - @overload - def condition( - self, _: list[core.ConditionalValueDefnumber], **kwds - ) -> OrderValue: ... + def condition(self, _: list[core.ConditionalValueDefnumber], /) -> OrderValue: ... def __init__( self, @@ -9837,27 +8423,23 @@ class Radius(FieldChannelMixin, core.PositionFieldDefBase): _encoding_name = "radius" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Radius: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Radius: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Radius: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Radius: ... - @overload - def bandPosition(self, _: float, **kwds) -> Radius: ... - + def bandPosition(self, _: float, /) -> Radius: ... @overload - def bin(self, _: bool, **kwds) -> Radius: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> Radius: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -9868,28 +8450,21 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Radius: ... - - @overload - def bin(self, _: Literal["binned"], **kwds) -> Radius: ... - - @overload - def bin(self, _: None, **kwds) -> Radius: ... - @overload - def field(self, _: str, **kwds) -> Radius: ... - + def field(self, _: str | RepeatRef, /) -> Radius: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Radius: ... - + @overload + def scale(self, _: Scale | None, /) -> Radius: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -9935,140 +8510,55 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Radius: ... - - @overload - def scale(self, _: None, **kwds) -> Radius: ... - - @overload - def sort(self, _: list[float], **kwds) -> Radius: ... - - @overload - def sort(self, _: list[str], **kwds) -> Radius: ... - - @overload - def sort(self, _: list[bool], **kwds) -> Radius: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Radius: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Radius: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> Radius: ... - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> Radius: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> Radius: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Radius: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Radius: ... - - @overload - def sort(self, _: None, **kwds) -> Radius: ... - - @overload - def stack(self, _: StackOffset_T, **kwds) -> Radius: ... - - @overload - def stack(self, _: None, **kwds) -> Radius: ... - - @overload - def stack(self, _: bool, **kwds) -> Radius: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Radius: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Radius: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Radius: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Radius: ... - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Radius: ... - + def stack(self, _: bool | StackOffset_T | None, /) -> Radius: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Radius: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Radius: ... - - @overload - def title(self, _: str, **kwds) -> Radius: ... - - @overload - def title(self, _: list[str], **kwds) -> Radius: ... - @overload - def title(self, _: None, **kwds) -> Radius: ... - + def title(self, _: str | Sequence[str] | None, /) -> Radius: ... @overload - def type(self, _: StandardType_T, **kwds) -> Radius: ... + def type(self, _: StandardType_T, /) -> Radius: ... def __init__( self, @@ -10260,11 +8750,13 @@ class RadiusDatum(DatumChannelMixin, core.PositionDatumDefBase): _encoding_name = "radius" @overload - def bandPosition(self, _: float, **kwds) -> RadiusDatum: ... - + def bandPosition(self, _: float, /) -> RadiusDatum: ... + @overload + def scale(self, _: Scale | None, /) -> RadiusDatum: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -10310,32 +8802,13 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> RadiusDatum: ... - - @overload - def scale(self, _: None, **kwds) -> RadiusDatum: ... - - @overload - def stack(self, _: StackOffset_T, **kwds) -> RadiusDatum: ... - - @overload - def stack(self, _: None, **kwds) -> RadiusDatum: ... - - @overload - def stack(self, _: bool, **kwds) -> RadiusDatum: ... - - @overload - def title(self, _: str, **kwds) -> RadiusDatum: ... - @overload - def title(self, _: list[str], **kwds) -> RadiusDatum: ... - + def stack(self, _: bool | StackOffset_T | None, /) -> RadiusDatum: ... @overload - def title(self, _: None, **kwds) -> RadiusDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> RadiusDatum: ... @overload - def type(self, _: Type_T, **kwds) -> RadiusDatum: ... + def type(self, _: Type_T, /) -> RadiusDatum: ... def __init__( self, @@ -10476,109 +8949,45 @@ class Radius2(FieldChannelMixin, core.SecondaryFieldDef): _encoding_name = "radius2" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Radius2: ... - - @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Radius2: ... - - @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Radius2: ... - - @overload - def bandPosition(self, _: float, **kwds) -> Radius2: ... - - @overload - def bin(self, _: None, **kwds) -> Radius2: ... - - @overload - def field(self, _: str, **kwds) -> Radius2: ... - - @overload - def field( - self, - repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> Radius2: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Radius2: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Radius2: ... @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Radius2: ... - + def aggregate( + self, *, argmax: Optional[str | SchemaBase] = Undefined + ) -> Radius2: ... @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Radius2: ... - + def aggregate( + self, *, argmin: Optional[str | SchemaBase] = Undefined + ) -> Radius2: ... @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Radius2: ... - + def bandPosition(self, _: float, /) -> Radius2: ... @overload - def timeUnit( + def bin(self, _: None, /) -> Radius2: ... + @overload + def field(self, _: str | RepeatRef, /) -> Radius2: ... + @overload + def field( self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, + *, + repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, ) -> Radius2: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Radius2: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Radius2: ... - - @overload - def title(self, _: str, **kwds) -> Radius2: ... - - @overload - def title(self, _: list[str], **kwds) -> Radius2: ... - @overload - def title(self, _: None, **kwds) -> Radius2: ... + def title(self, _: str | Sequence[str] | None, /) -> Radius2: ... def __init__( self, @@ -10710,19 +9119,11 @@ class Radius2Datum(DatumChannelMixin, core.DatumDef): _encoding_name = "radius2" @overload - def bandPosition(self, _: float, **kwds) -> Radius2Datum: ... - - @overload - def title(self, _: str, **kwds) -> Radius2Datum: ... - - @overload - def title(self, _: list[str], **kwds) -> Radius2Datum: ... - + def bandPosition(self, _: float, /) -> Radius2Datum: ... @overload - def title(self, _: None, **kwds) -> Radius2Datum: ... - + def title(self, _: str | Sequence[str] | None, /) -> Radius2Datum: ... @overload - def type(self, _: Type_T, **kwds) -> Radius2Datum: ... + def type(self, _: Type_T, /) -> Radius2Datum: ... def __init__( self, @@ -10970,30 +9371,21 @@ class Row(FieldChannelMixin, core.RowColumnEncodingFieldDef): _encoding_name = "row" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Row: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Row: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Row: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Row: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Row: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Row: ... @overload - def align(self, _: LayoutAlign_T, **kwds) -> Row: ... - + def align(self, _: LayoutAlign_T, /) -> Row: ... @overload - def bandPosition(self, _: float, **kwds) -> Row: ... - + def bandPosition(self, _: float, /) -> Row: ... @overload - def bin(self, _: bool, **kwds) -> Row: ... - + def bin(self, _: bool | Bin | None, /) -> Row: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -11004,28 +9396,23 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Row: ... - - @overload - def bin(self, _: None, **kwds) -> Row: ... - @overload - def center(self, _: bool, **kwds) -> Row: ... - + def center(self, _: bool, /) -> Row: ... @overload - def field(self, _: str, **kwds) -> Row: ... - + def field(self, _: str | RepeatRef, /) -> Row: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Row: ... - + @overload + def header(self, _: Header | None, /) -> Row: ... @overload def header( self, + *, format: Optional[str | SchemaBase | Map] = Undefined, formatType: Optional[str] = Undefined, labelAlign: Optional[Parameter | SchemaBase | Map | Align_T] = Undefined, @@ -11070,120 +9457,49 @@ def header( titleLineHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, titleOrient: Optional[SchemaBase | Orient_T] = Undefined, titlePadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Row: ... - - @overload - def header(self, _: None, **kwds) -> Row: ... - - @overload - def sort(self, _: list[float], **kwds) -> Row: ... - - @overload - def sort(self, _: list[str], **kwds) -> Row: ... - @overload - def sort(self, _: list[bool], **kwds) -> Row: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Row: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Row: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | EncodingSortField + | Sequence[DateTime | Temporal] + | SortOrder_T + | None, + /, + ) -> Row: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Row: ... - - @overload - def sort(self, _: None, **kwds) -> Row: ... - - @overload - def spacing(self, _: float, **kwds) -> Row: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Row: ... - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Row: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Row: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Row: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Row: ... - + def spacing(self, _: float, /) -> Row: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Row: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Row: ... - - @overload - def title(self, _: str, **kwds) -> Row: ... - - @overload - def title(self, _: list[str], **kwds) -> Row: ... - @overload - def title(self, _: None, **kwds) -> Row: ... - + def title(self, _: str | Sequence[str] | None, /) -> Row: ... @overload - def type(self, _: StandardType_T, **kwds) -> Row: ... + def type(self, _: StandardType_T, /) -> Row: ... def __init__( self, @@ -11459,27 +9775,19 @@ class Shape( _encoding_name = "shape" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Shape: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Shape: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Shape: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Shape: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Shape: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Shape: ... @overload - def bandPosition(self, _: float, **kwds) -> Shape: ... - + def bandPosition(self, _: float, /) -> Shape: ... @overload - def bin(self, _: bool, **kwds) -> Shape: ... - + def bin(self, _: bool | Bin | None, /) -> Shape: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -11490,47 +9798,40 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Shape: ... - - @overload - def bin(self, _: None, **kwds) -> Shape: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> Shape: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> Shape: ... - @overload def condition( - self, _: list[core.ConditionalValueDefstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefstringnullExprRef], / ) -> Shape: ... - @overload - def field(self, _: str, **kwds) -> Shape: ... - + def field(self, _: str | RepeatRef, /) -> Shape: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Shape: ... - + @overload + def legend(self, _: Legend | None, /) -> Shape: ... @overload def legend( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, clipHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, columnPadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, @@ -11633,15 +9934,13 @@ def legend( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> Shape: ... - @overload - def legend(self, _: None, **kwds) -> Shape: ... - + def scale(self, _: Scale | None, /) -> Shape: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -11687,131 +9986,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Shape: ... - - @overload - def scale(self, _: None, **kwds) -> Shape: ... - - @overload - def sort(self, _: list[float], **kwds) -> Shape: ... - - @overload - def sort(self, _: list[str], **kwds) -> Shape: ... - - @overload - def sort(self, _: list[bool], **kwds) -> Shape: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Shape: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Shape: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> Shape: ... - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> Shape: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> Shape: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Shape: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> Shape: ... - - @overload - def sort(self, _: None, **kwds) -> Shape: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Shape: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Shape: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Shape: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Shape: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Shape: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Shape: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Shape: ... - - @overload - def title(self, _: str, **kwds) -> Shape: ... - - @overload - def title(self, _: list[str], **kwds) -> Shape: ... - @overload - def title(self, _: None, **kwds) -> Shape: ... - + def title(self, _: str | Sequence[str] | None, /) -> Shape: ... @overload - def type(self, _: TypeForShape_T, **kwds) -> Shape: ... + def type(self, _: TypeForShape_T, /) -> Shape: ... def __init__( self, @@ -11971,41 +10192,30 @@ class ShapeDatum( _encoding_name = "shape" @overload - def bandPosition(self, _: float, **kwds) -> ShapeDatum: ... - + def bandPosition(self, _: float, /) -> ShapeDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> ShapeDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> ShapeDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefstringnullExprRef], / ) -> ShapeDatum: ... - - @overload - def title(self, _: str, **kwds) -> ShapeDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> ShapeDatum: ... - @overload - def title(self, _: None, **kwds) -> ShapeDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> ShapeDatum: ... @overload - def type(self, _: Type_T, **kwds) -> ShapeDatum: ... + def type(self, _: Type_T, /) -> ShapeDatum: ... def __init__( self, @@ -12050,6 +10260,7 @@ class ShapeValue( @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -12072,12 +10283,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | TypeForShape_T] = Undefined, - **kwds, ) -> ShapeValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -12087,12 +10297,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> ShapeValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -12116,12 +10325,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | TypeForShape_T] = Undefined, - **kwds, ) -> ShapeValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -12132,29 +10340,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> ShapeValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> ShapeValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> ShapeValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefstringnullExprRef], / ) -> ShapeValue: ... def __init__( @@ -12391,27 +10595,19 @@ class Size(FieldChannelMixin, core.FieldOrDatumDefWithConditionMarkPropFieldDefn _encoding_name = "size" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Size: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Size: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Size: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Size: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Size: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Size: ... @overload - def bandPosition(self, _: float, **kwds) -> Size: ... - + def bandPosition(self, _: float, /) -> Size: ... @overload - def bin(self, _: bool, **kwds) -> Size: ... - + def bin(self, _: bool | Bin | None, /) -> Size: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -12422,47 +10618,38 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Size: ... - - @overload - def bin(self, _: None, **kwds) -> Size: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Size: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Size: ... - @overload - def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds - ) -> Size: ... - + def condition(self, _: list[core.ConditionalValueDefnumberExprRef], /) -> Size: ... @overload - def field(self, _: str, **kwds) -> Size: ... - + def field(self, _: str | RepeatRef, /) -> Size: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Size: ... - + @overload + def legend(self, _: Legend | None, /) -> Size: ... @overload def legend( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, clipHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, columnPadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, @@ -12565,15 +10752,13 @@ def legend( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> Size: ... - @overload - def legend(self, _: None, **kwds) -> Size: ... - + def scale(self, _: Scale | None, /) -> Size: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -12619,131 +10804,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Size: ... - - @overload - def scale(self, _: None, **kwds) -> Size: ... - - @overload - def sort(self, _: list[float], **kwds) -> Size: ... - - @overload - def sort(self, _: list[str], **kwds) -> Size: ... - @overload - def sort(self, _: list[bool], **kwds) -> Size: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Size: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Size: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> Size: ... - - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> Size: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> Size: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Size: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> Size: ... - - @overload - def sort(self, _: None, **kwds) -> Size: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Size: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Size: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Size: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Size: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Size: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Size: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Size: ... - - @overload - def title(self, _: str, **kwds) -> Size: ... - - @overload - def title(self, _: list[str], **kwds) -> Size: ... - @overload - def title(self, _: None, **kwds) -> Size: ... - + def title(self, _: str | Sequence[str] | None, /) -> Size: ... @overload - def type(self, _: StandardType_T, **kwds) -> Size: ... + def type(self, _: StandardType_T, /) -> Size: ... def __init__( self, @@ -12901,41 +11008,30 @@ class SizeDatum(DatumChannelMixin, core.FieldOrDatumDefWithConditionDatumDefnumb _encoding_name = "size" @overload - def bandPosition(self, _: float, **kwds) -> SizeDatum: ... - + def bandPosition(self, _: float, /) -> SizeDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> SizeDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> SizeDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> SizeDatum: ... - - @overload - def title(self, _: str, **kwds) -> SizeDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> SizeDatum: ... - @overload - def title(self, _: None, **kwds) -> SizeDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> SizeDatum: ... @overload - def type(self, _: Type_T, **kwds) -> SizeDatum: ... + def type(self, _: Type_T, /) -> SizeDatum: ... def __init__( self, @@ -12979,6 +11075,7 @@ class SizeValue( @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -13001,12 +11098,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> SizeValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -13016,12 +11112,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> SizeValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -13045,12 +11140,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> SizeValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -13061,29 +11155,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> SizeValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> SizeValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> SizeValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> SizeValue: ... def __init__( @@ -13323,27 +11413,23 @@ class Stroke( _encoding_name = "stroke" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Stroke: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Stroke: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Stroke: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Stroke: ... - @overload - def bandPosition(self, _: float, **kwds) -> Stroke: ... - + def bandPosition(self, _: float, /) -> Stroke: ... @overload - def bin(self, _: bool, **kwds) -> Stroke: ... - + def bin(self, _: bool | Bin | None, /) -> Stroke: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -13354,47 +11440,40 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Stroke: ... - - @overload - def bin(self, _: None, **kwds) -> Stroke: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> Stroke: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> Stroke: ... - @overload def condition( - self, _: list[core.ConditionalValueDefGradientstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefGradientstringnullExprRef], / ) -> Stroke: ... - @overload - def field(self, _: str, **kwds) -> Stroke: ... - + def field(self, _: str | RepeatRef, /) -> Stroke: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Stroke: ... - + @overload + def legend(self, _: Legend | None, /) -> Stroke: ... @overload def legend( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, clipHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, columnPadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, @@ -13497,15 +11576,13 @@ def legend( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> Stroke: ... - @overload - def legend(self, _: None, **kwds) -> Stroke: ... - + def scale(self, _: Scale | None, /) -> Stroke: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -13551,131 +11628,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Stroke: ... - - @overload - def scale(self, _: None, **kwds) -> Stroke: ... - - @overload - def sort(self, _: list[float], **kwds) -> Stroke: ... - - @overload - def sort(self, _: list[str], **kwds) -> Stroke: ... - - @overload - def sort(self, _: list[bool], **kwds) -> Stroke: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Stroke: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Stroke: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> Stroke: ... - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> Stroke: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> Stroke: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Stroke: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> Stroke: ... - - @overload - def sort(self, _: None, **kwds) -> Stroke: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Stroke: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Stroke: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Stroke: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Stroke: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Stroke: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Stroke: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Stroke: ... - - @overload - def title(self, _: str, **kwds) -> Stroke: ... - - @overload - def title(self, _: list[str], **kwds) -> Stroke: ... - @overload - def title(self, _: None, **kwds) -> Stroke: ... - + def title(self, _: str | Sequence[str] | None, /) -> Stroke: ... @overload - def type(self, _: StandardType_T, **kwds) -> Stroke: ... + def type(self, _: StandardType_T, /) -> Stroke: ... def __init__( self, @@ -13835,41 +11834,30 @@ class StrokeDatum( _encoding_name = "stroke" @overload - def bandPosition(self, _: float, **kwds) -> StrokeDatum: ... - + def bandPosition(self, _: float, /) -> StrokeDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> StrokeDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> StrokeDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefGradientstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefGradientstringnullExprRef], / ) -> StrokeDatum: ... - - @overload - def title(self, _: str, **kwds) -> StrokeDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> StrokeDatum: ... - @overload - def title(self, _: None, **kwds) -> StrokeDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> StrokeDatum: ... @overload - def type(self, _: Type_T, **kwds) -> StrokeDatum: ... + def type(self, _: Type_T, /) -> StrokeDatum: ... def __init__( self, @@ -13914,6 +11902,7 @@ class StrokeValue( @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -13936,12 +11925,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> StrokeValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -13951,12 +11939,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> StrokeValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -13980,12 +11967,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> StrokeValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -13996,29 +11982,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> StrokeValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> StrokeValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> StrokeValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefGradientstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefGradientstringnullExprRef], / ) -> StrokeValue: ... def __init__( @@ -14257,27 +12239,23 @@ class StrokeDash( _encoding_name = "strokeDash" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> StrokeDash: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> StrokeDash: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> StrokeDash: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> StrokeDash: ... - @overload - def bandPosition(self, _: float, **kwds) -> StrokeDash: ... - + def bandPosition(self, _: float, /) -> StrokeDash: ... @overload - def bin(self, _: bool, **kwds) -> StrokeDash: ... - + def bin(self, _: bool | Bin | None, /) -> StrokeDash: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -14288,47 +12266,40 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> StrokeDash: ... - - @overload - def bin(self, _: None, **kwds) -> StrokeDash: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[Parameter | SchemaBase | Sequence[float] | Map] = Undefined, - **kwds, ) -> StrokeDash: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[Parameter | SchemaBase | Sequence[float] | Map] = Undefined, - **kwds, ) -> StrokeDash: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberArrayExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberArrayExprRef], / ) -> StrokeDash: ... - @overload - def field(self, _: str, **kwds) -> StrokeDash: ... - + def field(self, _: str | RepeatRef, /) -> StrokeDash: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> StrokeDash: ... - + @overload + def legend(self, _: Legend | None, /) -> StrokeDash: ... @overload def legend( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, clipHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, columnPadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, @@ -14431,15 +12402,13 @@ def legend( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> StrokeDash: ... - @overload - def legend(self, _: None, **kwds) -> StrokeDash: ... - + def scale(self, _: Scale | None, /) -> StrokeDash: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -14485,131 +12454,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeDash: ... - - @overload - def scale(self, _: None, **kwds) -> StrokeDash: ... - - @overload - def sort(self, _: list[float], **kwds) -> StrokeDash: ... - - @overload - def sort(self, _: list[str], **kwds) -> StrokeDash: ... - - @overload - def sort(self, _: list[bool], **kwds) -> StrokeDash: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> StrokeDash: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> StrokeDash: ... - @overload - def sort(self, _: SortByChannel_T, **kwds) -> StrokeDash: ... - - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> StrokeDash: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> StrokeDash: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> StrokeDash: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> StrokeDash: ... - - @overload - def sort(self, _: None, **kwds) -> StrokeDash: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> StrokeDash: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> StrokeDash: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> StrokeDash: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> StrokeDash: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> StrokeDash: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> StrokeDash: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> StrokeDash: ... - - @overload - def title(self, _: str, **kwds) -> StrokeDash: ... - @overload - def title(self, _: list[str], **kwds) -> StrokeDash: ... - - @overload - def title(self, _: None, **kwds) -> StrokeDash: ... - + def title(self, _: str | Sequence[str] | None, /) -> StrokeDash: ... @overload - def type(self, _: StandardType_T, **kwds) -> StrokeDash: ... + def type(self, _: StandardType_T, /) -> StrokeDash: ... def __init__( self, @@ -14769,41 +12660,30 @@ class StrokeDashDatum( _encoding_name = "strokeDash" @overload - def bandPosition(self, _: float, **kwds) -> StrokeDashDatum: ... - + def bandPosition(self, _: float, /) -> StrokeDashDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[Parameter | SchemaBase | Sequence[float] | Map] = Undefined, - **kwds, ) -> StrokeDashDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[Parameter | SchemaBase | Sequence[float] | Map] = Undefined, - **kwds, ) -> StrokeDashDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberArrayExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberArrayExprRef], / ) -> StrokeDashDatum: ... - - @overload - def title(self, _: str, **kwds) -> StrokeDashDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> StrokeDashDatum: ... - @overload - def title(self, _: None, **kwds) -> StrokeDashDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> StrokeDashDatum: ... @overload - def type(self, _: Type_T, **kwds) -> StrokeDashDatum: ... + def type(self, _: Type_T, /) -> StrokeDashDatum: ... def __init__( self, @@ -14847,6 +12727,7 @@ class StrokeDashValue( @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -14869,12 +12750,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> StrokeDashValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -14884,12 +12764,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> StrokeDashValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -14913,12 +12792,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> StrokeDashValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -14929,29 +12807,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> StrokeDashValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[Parameter | SchemaBase | Sequence[float] | Map] = Undefined, - **kwds, ) -> StrokeDashValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[Parameter | SchemaBase | Sequence[float] | Map] = Undefined, - **kwds, ) -> StrokeDashValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberArrayExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberArrayExprRef], / ) -> StrokeDashValue: ... def __init__( @@ -15190,27 +13064,23 @@ class StrokeOpacity( _encoding_name = "strokeOpacity" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> StrokeOpacity: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> StrokeOpacity: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> StrokeOpacity: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> StrokeOpacity: ... - @overload - def bandPosition(self, _: float, **kwds) -> StrokeOpacity: ... - + def bandPosition(self, _: float, /) -> StrokeOpacity: ... @overload - def bin(self, _: bool, **kwds) -> StrokeOpacity: ... - + def bin(self, _: bool | Bin | None, /) -> StrokeOpacity: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -15221,47 +13091,40 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> StrokeOpacity: ... - - @overload - def bin(self, _: None, **kwds) -> StrokeOpacity: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeOpacity: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeOpacity: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> StrokeOpacity: ... - @overload - def field(self, _: str, **kwds) -> StrokeOpacity: ... - + def field(self, _: str | RepeatRef, /) -> StrokeOpacity: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> StrokeOpacity: ... - + @overload + def legend(self, _: Legend | None, /) -> StrokeOpacity: ... @overload def legend( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, clipHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, columnPadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, @@ -15364,15 +13227,13 @@ def legend( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> StrokeOpacity: ... - @overload - def legend(self, _: None, **kwds) -> StrokeOpacity: ... - + def scale(self, _: Scale | None, /) -> StrokeOpacity: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -15418,131 +13279,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeOpacity: ... - - @overload - def scale(self, _: None, **kwds) -> StrokeOpacity: ... - - @overload - def sort(self, _: list[float], **kwds) -> StrokeOpacity: ... - - @overload - def sort(self, _: list[str], **kwds) -> StrokeOpacity: ... - - @overload - def sort(self, _: list[bool], **kwds) -> StrokeOpacity: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> StrokeOpacity: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> StrokeOpacity: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> StrokeOpacity: ... - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> StrokeOpacity: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> StrokeOpacity: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> StrokeOpacity: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> StrokeOpacity: ... - - @overload - def sort(self, _: None, **kwds) -> StrokeOpacity: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> StrokeOpacity: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> StrokeOpacity: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> StrokeOpacity: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> StrokeOpacity: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> StrokeOpacity: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> StrokeOpacity: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> StrokeOpacity: ... - - @overload - def title(self, _: str, **kwds) -> StrokeOpacity: ... - - @overload - def title(self, _: list[str], **kwds) -> StrokeOpacity: ... - @overload - def title(self, _: None, **kwds) -> StrokeOpacity: ... - + def title(self, _: str | Sequence[str] | None, /) -> StrokeOpacity: ... @overload - def type(self, _: StandardType_T, **kwds) -> StrokeOpacity: ... + def type(self, _: StandardType_T, /) -> StrokeOpacity: ... def __init__( self, @@ -15702,41 +13485,30 @@ class StrokeOpacityDatum( _encoding_name = "strokeOpacity" @overload - def bandPosition(self, _: float, **kwds) -> StrokeOpacityDatum: ... - + def bandPosition(self, _: float, /) -> StrokeOpacityDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeOpacityDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeOpacityDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> StrokeOpacityDatum: ... - - @overload - def title(self, _: str, **kwds) -> StrokeOpacityDatum: ... - @overload - def title(self, _: list[str], **kwds) -> StrokeOpacityDatum: ... - - @overload - def title(self, _: None, **kwds) -> StrokeOpacityDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> StrokeOpacityDatum: ... @overload - def type(self, _: Type_T, **kwds) -> StrokeOpacityDatum: ... + def type(self, _: Type_T, /) -> StrokeOpacityDatum: ... def __init__( self, @@ -15780,6 +13552,7 @@ class StrokeOpacityValue( @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -15802,12 +13575,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> StrokeOpacityValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -15817,12 +13589,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> StrokeOpacityValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -15846,12 +13617,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> StrokeOpacityValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -15862,29 +13632,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> StrokeOpacityValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeOpacityValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeOpacityValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> StrokeOpacityValue: ... def __init__( @@ -16123,27 +13889,23 @@ class StrokeWidth( _encoding_name = "strokeWidth" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> StrokeWidth: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> StrokeWidth: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> StrokeWidth: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> StrokeWidth: ... - @overload - def bandPosition(self, _: float, **kwds) -> StrokeWidth: ... - + def bandPosition(self, _: float, /) -> StrokeWidth: ... @overload - def bin(self, _: bool, **kwds) -> StrokeWidth: ... - + def bin(self, _: bool | Bin | None, /) -> StrokeWidth: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -16154,47 +13916,40 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> StrokeWidth: ... - - @overload - def bin(self, _: None, **kwds) -> StrokeWidth: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeWidth: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeWidth: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> StrokeWidth: ... - @overload - def field(self, _: str, **kwds) -> StrokeWidth: ... - + def field(self, _: str | RepeatRef, /) -> StrokeWidth: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> StrokeWidth: ... - + @overload + def legend(self, _: Legend | None, /) -> StrokeWidth: ... @overload def legend( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, clipHeight: Optional[float | Parameter | SchemaBase | Map] = Undefined, columnPadding: Optional[float | Parameter | SchemaBase | Map] = Undefined, @@ -16297,15 +14052,13 @@ def legend( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> StrokeWidth: ... - @overload - def legend(self, _: None, **kwds) -> StrokeWidth: ... - + def scale(self, _: Scale | None, /) -> StrokeWidth: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -16351,131 +14104,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeWidth: ... - - @overload - def scale(self, _: None, **kwds) -> StrokeWidth: ... - @overload - def sort(self, _: list[float], **kwds) -> StrokeWidth: ... - - @overload - def sort(self, _: list[str], **kwds) -> StrokeWidth: ... - - @overload - def sort(self, _: list[bool], **kwds) -> StrokeWidth: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> StrokeWidth: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> StrokeWidth: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> StrokeWidth: ... - - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> StrokeWidth: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> StrokeWidth: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> StrokeWidth: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> StrokeWidth: ... - - @overload - def sort(self, _: None, **kwds) -> StrokeWidth: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> StrokeWidth: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> StrokeWidth: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> StrokeWidth: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> StrokeWidth: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> StrokeWidth: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> StrokeWidth: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> StrokeWidth: ... - @overload - def title(self, _: str, **kwds) -> StrokeWidth: ... - - @overload - def title(self, _: list[str], **kwds) -> StrokeWidth: ... - - @overload - def title(self, _: None, **kwds) -> StrokeWidth: ... - + def title(self, _: str | Sequence[str] | None, /) -> StrokeWidth: ... @overload - def type(self, _: StandardType_T, **kwds) -> StrokeWidth: ... + def type(self, _: StandardType_T, /) -> StrokeWidth: ... def __init__( self, @@ -16635,41 +14310,30 @@ class StrokeWidthDatum( _encoding_name = "strokeWidth" @overload - def bandPosition(self, _: float, **kwds) -> StrokeWidthDatum: ... - + def bandPosition(self, _: float, /) -> StrokeWidthDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeWidthDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeWidthDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> StrokeWidthDatum: ... - - @overload - def title(self, _: str, **kwds) -> StrokeWidthDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> StrokeWidthDatum: ... - @overload - def title(self, _: None, **kwds) -> StrokeWidthDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> StrokeWidthDatum: ... @overload - def type(self, _: Type_T, **kwds) -> StrokeWidthDatum: ... + def type(self, _: Type_T, /) -> StrokeWidthDatum: ... def __init__( self, @@ -16713,6 +14377,7 @@ class StrokeWidthValue( @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -16735,12 +14400,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> StrokeWidthValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -16750,12 +14414,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> StrokeWidthValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -16779,12 +14442,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> StrokeWidthValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -16795,29 +14457,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> StrokeWidthValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeWidthValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[float | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> StrokeWidthValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefnumberExprRef], **kwds + self, _: list[core.ConditionalValueDefnumberExprRef], / ) -> StrokeWidthValue: ... def __init__( @@ -17026,27 +14684,19 @@ class Text(FieldChannelMixin, core.FieldOrDatumDefWithConditionStringFieldDefTex _encoding_name = "text" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Text: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Text: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Text: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Text: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Text: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Text: ... @overload - def bandPosition(self, _: float, **kwds) -> Text: ... - + def bandPosition(self, _: float, /) -> Text: ... @overload - def bin(self, _: bool, **kwds) -> Text: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> Text: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -17057,134 +14707,58 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Text: ... - - @overload - def bin(self, _: Literal["binned"], **kwds) -> Text: ... - - @overload - def bin(self, _: None, **kwds) -> Text: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Sequence[str] | Map] = Undefined, - **kwds, ) -> Text: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Sequence[str] | Map] = Undefined, - **kwds, ) -> Text: ... - @overload - def condition( - self, _: list[core.ConditionalValueDefTextExprRef], **kwds - ) -> Text: ... - + def condition(self, _: list[core.ConditionalValueDefTextExprRef], /) -> Text: ... @overload - def field(self, _: str, **kwds) -> Text: ... - + def field(self, _: str | RepeatRef, /) -> Text: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Text: ... - - @overload - def format(self, _: str, **kwds) -> Text: ... - - @overload - def format(self, _: Map, **kwds) -> Text: ... - - @overload - def formatType(self, _: str, **kwds) -> Text: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Text: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Text: ... - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Text: ... - + def format(self, _: str, /) -> Text: ... @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Text: ... - + def format(self, _: Map, /) -> Text: ... @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Text: ... - + def formatType(self, _: str, /) -> Text: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Text: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Text: ... - - @overload - def title(self, _: str, **kwds) -> Text: ... - @overload - def title(self, _: list[str], **kwds) -> Text: ... - - @overload - def title(self, _: None, **kwds) -> Text: ... - + def title(self, _: str | Sequence[str] | None, /) -> Text: ... @overload - def type(self, _: StandardType_T, **kwds) -> Text: ... + def type(self, _: StandardType_T, /) -> Text: ... def __init__( self, @@ -17363,50 +14937,36 @@ class TextDatum(DatumChannelMixin, core.FieldOrDatumDefWithConditionStringDatumD _encoding_name = "text" @overload - def bandPosition(self, _: float, **kwds) -> TextDatum: ... - + def bandPosition(self, _: float, /) -> TextDatum: ... @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Sequence[str] | Map] = Undefined, - **kwds, ) -> TextDatum: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Sequence[str] | Map] = Undefined, - **kwds, ) -> TextDatum: ... - @overload def condition( - self, _: list[core.ConditionalValueDefTextExprRef], **kwds + self, _: list[core.ConditionalValueDefTextExprRef], / ) -> TextDatum: ... - - @overload - def format(self, _: str, **kwds) -> TextDatum: ... - - @overload - def format(self, _: Map, **kwds) -> TextDatum: ... - @overload - def formatType(self, _: str, **kwds) -> TextDatum: ... - + def format(self, _: str, /) -> TextDatum: ... @overload - def title(self, _: str, **kwds) -> TextDatum: ... - + def format(self, _: Map, /) -> TextDatum: ... @overload - def title(self, _: list[str], **kwds) -> TextDatum: ... - + def formatType(self, _: str, /) -> TextDatum: ... @overload - def title(self, _: None, **kwds) -> TextDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> TextDatum: ... @overload - def type(self, _: Type_T, **kwds) -> TextDatum: ... + def type(self, _: Type_T, /) -> TextDatum: ... def __init__( self, @@ -17452,6 +15012,7 @@ class TextValue(ValueChannelMixin, core.ValueDefWithConditionStringFieldDefText) @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Literal["binned"] | Map | None] = Undefined, @@ -17464,12 +15025,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> TextValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Literal["binned"] | Map | None] = Undefined, @@ -17483,29 +15043,25 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> TextValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Sequence[str] | Map] = Undefined, - **kwds, ) -> TextValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Sequence[str] | Map] = Undefined, - **kwds, ) -> TextValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefTextExprRef], **kwds + self, _: list[core.ConditionalValueDefTextExprRef], / ) -> TextValue: ... def __init__( @@ -17756,27 +15312,19 @@ class Theta(FieldChannelMixin, core.PositionFieldDefBase): _encoding_name = "theta" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Theta: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Theta: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Theta: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Theta: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Theta: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Theta: ... @overload - def bandPosition(self, _: float, **kwds) -> Theta: ... - + def bandPosition(self, _: float, /) -> Theta: ... @overload - def bin(self, _: bool, **kwds) -> Theta: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> Theta: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -17787,28 +15335,21 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Theta: ... - @overload - def bin(self, _: Literal["binned"], **kwds) -> Theta: ... - - @overload - def bin(self, _: None, **kwds) -> Theta: ... - - @overload - def field(self, _: str, **kwds) -> Theta: ... - + def field(self, _: str | RepeatRef, /) -> Theta: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Theta: ... - + @overload + def scale(self, _: Scale | None, /) -> Theta: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -17854,140 +15395,55 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Theta: ... - - @overload - def scale(self, _: None, **kwds) -> Theta: ... - - @overload - def sort(self, _: list[float], **kwds) -> Theta: ... - - @overload - def sort(self, _: list[str], **kwds) -> Theta: ... - - @overload - def sort(self, _: list[bool], **kwds) -> Theta: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Theta: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Theta: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> Theta: ... - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> Theta: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> Theta: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Theta: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Theta: ... - - @overload - def sort(self, _: None, **kwds) -> Theta: ... - - @overload - def stack(self, _: StackOffset_T, **kwds) -> Theta: ... - - @overload - def stack(self, _: None, **kwds) -> Theta: ... - - @overload - def stack(self, _: bool, **kwds) -> Theta: ... - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Theta: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Theta: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Theta: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Theta: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Theta: ... - + def stack(self, _: bool | StackOffset_T | None, /) -> Theta: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Theta: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Theta: ... - - @overload - def title(self, _: str, **kwds) -> Theta: ... - - @overload - def title(self, _: list[str], **kwds) -> Theta: ... - @overload - def title(self, _: None, **kwds) -> Theta: ... - + def title(self, _: str | Sequence[str] | None, /) -> Theta: ... @overload - def type(self, _: StandardType_T, **kwds) -> Theta: ... + def type(self, _: StandardType_T, /) -> Theta: ... def __init__( self, @@ -18179,11 +15635,13 @@ class ThetaDatum(DatumChannelMixin, core.PositionDatumDefBase): _encoding_name = "theta" @overload - def bandPosition(self, _: float, **kwds) -> ThetaDatum: ... - + def bandPosition(self, _: float, /) -> ThetaDatum: ... + @overload + def scale(self, _: Scale | None, /) -> ThetaDatum: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -18229,32 +15687,13 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> ThetaDatum: ... - - @overload - def scale(self, _: None, **kwds) -> ThetaDatum: ... - - @overload - def stack(self, _: StackOffset_T, **kwds) -> ThetaDatum: ... - - @overload - def stack(self, _: None, **kwds) -> ThetaDatum: ... - @overload - def stack(self, _: bool, **kwds) -> ThetaDatum: ... - - @overload - def title(self, _: str, **kwds) -> ThetaDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> ThetaDatum: ... - + def stack(self, _: bool | StackOffset_T | None, /) -> ThetaDatum: ... @overload - def title(self, _: None, **kwds) -> ThetaDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> ThetaDatum: ... @overload - def type(self, _: Type_T, **kwds) -> ThetaDatum: ... + def type(self, _: Type_T, /) -> ThetaDatum: ... def __init__( self, @@ -18395,109 +15834,45 @@ class Theta2(FieldChannelMixin, core.SecondaryFieldDef): _encoding_name = "theta2" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Theta2: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Theta2: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Theta2: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Theta2: ... - @overload - def bandPosition(self, _: float, **kwds) -> Theta2: ... - + def bandPosition(self, _: float, /) -> Theta2: ... @overload - def bin(self, _: None, **kwds) -> Theta2: ... - + def bin(self, _: None, /) -> Theta2: ... @overload - def field(self, _: str, **kwds) -> Theta2: ... - + def field(self, _: str | RepeatRef, /) -> Theta2: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> Theta2: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Theta2: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Theta2: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Theta2: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Theta2: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Theta2: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Theta2: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Theta2: ... - @overload - def title(self, _: str, **kwds) -> Theta2: ... - - @overload - def title(self, _: list[str], **kwds) -> Theta2: ... - - @overload - def title(self, _: None, **kwds) -> Theta2: ... + def title(self, _: str | Sequence[str] | None, /) -> Theta2: ... def __init__( self, @@ -18629,19 +16004,11 @@ class Theta2Datum(DatumChannelMixin, core.DatumDef): _encoding_name = "theta2" @overload - def bandPosition(self, _: float, **kwds) -> Theta2Datum: ... - - @overload - def title(self, _: str, **kwds) -> Theta2Datum: ... - - @overload - def title(self, _: list[str], **kwds) -> Theta2Datum: ... - + def bandPosition(self, _: float, /) -> Theta2Datum: ... @overload - def title(self, _: None, **kwds) -> Theta2Datum: ... - + def title(self, _: str | Sequence[str] | None, /) -> Theta2Datum: ... @overload - def type(self, _: Type_T, **kwds) -> Theta2Datum: ... + def type(self, _: Type_T, /) -> Theta2Datum: ... def __init__( self, @@ -18876,27 +16243,23 @@ class Tooltip(FieldChannelMixin, core.StringFieldDefWithCondition): _encoding_name = "tooltip" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Tooltip: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Tooltip: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> Tooltip: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> Tooltip: ... - @overload - def bandPosition(self, _: float, **kwds) -> Tooltip: ... - + def bandPosition(self, _: float, /) -> Tooltip: ... @overload - def bin(self, _: bool, **kwds) -> Tooltip: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> Tooltip: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -18907,134 +16270,60 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Tooltip: ... - - @overload - def bin(self, _: Literal["binned"], **kwds) -> Tooltip: ... - - @overload - def bin(self, _: None, **kwds) -> Tooltip: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Tooltip: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Tooltip: ... - @overload def condition( - self, _: list[core.ConditionalValueDefstringExprRef], **kwds + self, _: list[core.ConditionalValueDefstringExprRef], / ) -> Tooltip: ... - @overload - def field(self, _: str, **kwds) -> Tooltip: ... - + def field(self, _: str | RepeatRef, /) -> Tooltip: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Tooltip: ... - - @overload - def format(self, _: str, **kwds) -> Tooltip: ... - - @overload - def format(self, _: Map, **kwds) -> Tooltip: ... - - @overload - def formatType(self, _: str, **kwds) -> Tooltip: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Tooltip: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Tooltip: ... - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Tooltip: ... - + def format(self, _: str, /) -> Tooltip: ... @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Tooltip: ... - + def format(self, _: Map, /) -> Tooltip: ... @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Tooltip: ... - + def formatType(self, _: str, /) -> Tooltip: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Tooltip: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Tooltip: ... - - @overload - def title(self, _: str, **kwds) -> Tooltip: ... - @overload - def title(self, _: list[str], **kwds) -> Tooltip: ... - - @overload - def title(self, _: None, **kwds) -> Tooltip: ... - + def title(self, _: str | Sequence[str] | None, /) -> Tooltip: ... @overload - def type(self, _: StandardType_T, **kwds) -> Tooltip: ... + def type(self, _: StandardType_T, /) -> Tooltip: ... def __init__( self, @@ -19090,6 +16379,7 @@ class TooltipValue(ValueChannelMixin, core.StringValueDefWithCondition): @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -19112,12 +16402,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> TooltipValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -19127,12 +16416,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> TooltipValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -19156,12 +16444,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> TooltipValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -19172,29 +16459,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> TooltipValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> TooltipValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> TooltipValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefstringnullExprRef], / ) -> TooltipValue: ... def __init__( @@ -19403,27 +16686,19 @@ class Url(FieldChannelMixin, core.StringFieldDefWithCondition): _encoding_name = "url" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Url: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Url: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Url: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Url: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Url: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Url: ... @overload - def bandPosition(self, _: float, **kwds) -> Url: ... - + def bandPosition(self, _: float, /) -> Url: ... @overload - def bin(self, _: bool, **kwds) -> Url: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> Url: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -19434,134 +16709,58 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Url: ... - - @overload - def bin(self, _: Literal["binned"], **kwds) -> Url: ... - - @overload - def bin(self, _: None, **kwds) -> Url: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Url: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Url: ... - @overload - def condition( - self, _: list[core.ConditionalValueDefstringExprRef], **kwds - ) -> Url: ... - + def condition(self, _: list[core.ConditionalValueDefstringExprRef], /) -> Url: ... @overload - def field(self, _: str, **kwds) -> Url: ... - + def field(self, _: str | RepeatRef, /) -> Url: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Url: ... - - @overload - def format(self, _: str, **kwds) -> Url: ... - - @overload - def format(self, _: Map, **kwds) -> Url: ... - @overload - def formatType(self, _: str, **kwds) -> Url: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Url: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Url: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Url: ... - + def format(self, _: str, /) -> Url: ... @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Url: ... - + def format(self, _: Map, /) -> Url: ... @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Url: ... - + def formatType(self, _: str, /) -> Url: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Url: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Url: ... - - @overload - def title(self, _: str, **kwds) -> Url: ... - - @overload - def title(self, _: list[str], **kwds) -> Url: ... - @overload - def title(self, _: None, **kwds) -> Url: ... - + def title(self, _: str | Sequence[str] | None, /) -> Url: ... @overload - def type(self, _: StandardType_T, **kwds) -> Url: ... + def type(self, _: StandardType_T, /) -> Url: ... def __init__( self, @@ -19617,6 +16816,7 @@ class UrlValue(ValueChannelMixin, core.StringValueDefWithCondition): @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -19639,12 +16839,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> UrlValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -19654,12 +16853,11 @@ def condition( test: Optional[str | SchemaBase | Map] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> UrlValue: ... - @overload def condition( self, + *, aggregate: Optional[SchemaBase | Map | NonArgAggregateOp_T] = Undefined, bandPosition: Optional[float] = Undefined, bin: Optional[bool | SchemaBase | Map | None] = Undefined, @@ -19683,12 +16881,11 @@ def condition( ] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | StandardType_T] = Undefined, - **kwds, ) -> UrlValue: ... - @overload def condition( self, + *, bandPosition: Optional[float] = Undefined, datum: Optional[ Temporal | Parameter | SchemaBase | Map | PrimitiveValue_T @@ -19699,29 +16896,25 @@ def condition( scale: Optional[SchemaBase | Map | None] = Undefined, title: Optional[str | SchemaBase | Sequence[str] | None] = Undefined, type: Optional[SchemaBase | Type_T] = Undefined, - **kwds, ) -> UrlValue: ... - @overload def condition( self, + *, test: Optional[str | SchemaBase | Map] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> UrlValue: ... - @overload def condition( self, + *, empty: Optional[bool] = Undefined, param: Optional[str | SchemaBase] = Undefined, value: Optional[str | Parameter | SchemaBase | Map | None] = Undefined, - **kwds, ) -> UrlValue: ... - @overload def condition( - self, _: list[core.ConditionalValueDefstringnullExprRef], **kwds + self, _: list[core.ConditionalValueDefstringnullExprRef], / ) -> UrlValue: ... def __init__( @@ -19989,21 +17182,17 @@ class X(FieldChannelMixin, core.PositionFieldDef): _encoding_name = "x" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> X: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> X: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> X: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> X: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> X: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> X: ... + @overload + def axis(self, _: Axis | None, /) -> X: ... @overload def axis( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, bandPosition: Optional[float | Parameter | SchemaBase | Map] = Undefined, description: Optional[str | Parameter | SchemaBase | Map] = Undefined, @@ -20116,21 +17305,15 @@ def axis( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> X: ... - @overload - def axis(self, _: None, **kwds) -> X: ... - - @overload - def bandPosition(self, _: float, **kwds) -> X: ... - + def bandPosition(self, _: float, /) -> X: ... @overload - def bin(self, _: bool, **kwds) -> X: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> X: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -20141,41 +17324,32 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> X: ... - - @overload - def bin(self, _: Literal["binned"], **kwds) -> X: ... - @overload - def bin(self, _: None, **kwds) -> X: ... - - @overload - def field(self, _: str, **kwds) -> X: ... - + def field(self, _: str | RepeatRef, /) -> X: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> X: ... - + @overload + def impute(self, _: Impute | None, /) -> X: ... @overload def impute( self, + *, frame: Optional[Sequence[float | None]] = Undefined, keyvals: Optional[SchemaBase | Sequence[Any] | Map] = Undefined, method: Optional[SchemaBase | ImputeMethod_T] = Undefined, value: Optional[Any] = Undefined, - **kwds, ) -> X: ... - @overload - def impute(self, _: None, **kwds) -> X: ... - + def scale(self, _: Scale | None, /) -> X: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -20219,142 +17393,57 @@ def scale( reverse: Optional[bool | Parameter | SchemaBase | Map] = Undefined, round: Optional[bool | Parameter | SchemaBase | Map] = Undefined, scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, - type: Optional[SchemaBase | ScaleType_T] = Undefined, - zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, - ) -> X: ... - - @overload - def scale(self, _: None, **kwds) -> X: ... - - @overload - def sort(self, _: list[float], **kwds) -> X: ... - - @overload - def sort(self, _: list[str], **kwds) -> X: ... - - @overload - def sort(self, _: list[bool], **kwds) -> X: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> X: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> X: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> X: ... - + type: Optional[SchemaBase | ScaleType_T] = Undefined, + zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, + ) -> X: ... @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> X: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> X: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> X: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> X: ... - - @overload - def sort(self, _: None, **kwds) -> X: ... - - @overload - def stack(self, _: StackOffset_T, **kwds) -> X: ... - - @overload - def stack(self, _: None, **kwds) -> X: ... - - @overload - def stack(self, _: bool, **kwds) -> X: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> X: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> X: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> X: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> X: ... - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> X: ... - + def stack(self, _: bool | StackOffset_T | None, /) -> X: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> X: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> X: ... - - @overload - def title(self, _: str, **kwds) -> X: ... - - @overload - def title(self, _: list[str], **kwds) -> X: ... - @overload - def title(self, _: None, **kwds) -> X: ... - + def title(self, _: str | Sequence[str] | None, /) -> X: ... @overload - def type(self, _: StandardType_T, **kwds) -> X: ... + def type(self, _: StandardType_T, /) -> X: ... def __init__( self, @@ -20566,9 +17655,12 @@ class XDatum(DatumChannelMixin, core.PositionDatumDef): _class_is_valid_at_instantiation = False _encoding_name = "x" + @overload + def axis(self, _: Axis | None, /) -> XDatum: ... @overload def axis( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, bandPosition: Optional[float | Parameter | SchemaBase | Map] = Undefined, description: Optional[str | Parameter | SchemaBase | Map] = Undefined, @@ -20681,31 +17773,26 @@ def axis( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> XDatum: ... - @overload - def axis(self, _: None, **kwds) -> XDatum: ... - + def bandPosition(self, _: float, /) -> XDatum: ... @overload - def bandPosition(self, _: float, **kwds) -> XDatum: ... - + def impute(self, _: Impute | None, /) -> XDatum: ... @overload def impute( self, + *, frame: Optional[Sequence[float | None]] = Undefined, keyvals: Optional[SchemaBase | Sequence[Any] | Map] = Undefined, method: Optional[SchemaBase | ImputeMethod_T] = Undefined, value: Optional[Any] = Undefined, - **kwds, ) -> XDatum: ... - @overload - def impute(self, _: None, **kwds) -> XDatum: ... - + def scale(self, _: Scale | None, /) -> XDatum: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -20751,32 +17838,13 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> XDatum: ... - - @overload - def scale(self, _: None, **kwds) -> XDatum: ... - - @overload - def stack(self, _: StackOffset_T, **kwds) -> XDatum: ... - - @overload - def stack(self, _: None, **kwds) -> XDatum: ... - - @overload - def stack(self, _: bool, **kwds) -> XDatum: ... - - @overload - def title(self, _: str, **kwds) -> XDatum: ... - @overload - def title(self, _: list[str], **kwds) -> XDatum: ... - + def stack(self, _: bool | StackOffset_T | None, /) -> XDatum: ... @overload - def title(self, _: None, **kwds) -> XDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> XDatum: ... @overload - def type(self, _: Type_T, **kwds) -> XDatum: ... + def type(self, _: Type_T, /) -> XDatum: ... def __init__( self, @@ -20921,109 +17989,41 @@ class X2(FieldChannelMixin, core.SecondaryFieldDef): _encoding_name = "x2" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> X2: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> X2: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> X2: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> X2: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> X2: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> X2: ... @overload - def bandPosition(self, _: float, **kwds) -> X2: ... - + def bandPosition(self, _: float, /) -> X2: ... @overload - def bin(self, _: None, **kwds) -> X2: ... - + def bin(self, _: None, /) -> X2: ... @overload - def field(self, _: str, **kwds) -> X2: ... - + def field(self, _: str | RepeatRef, /) -> X2: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> X2: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> X2: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> X2: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> X2: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> X2: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> X2: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> X2: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> X2: ... - - @overload - def title(self, _: str, **kwds) -> X2: ... - - @overload - def title(self, _: list[str], **kwds) -> X2: ... - @overload - def title(self, _: None, **kwds) -> X2: ... + def title(self, _: str | Sequence[str] | None, /) -> X2: ... def __init__( self, @@ -21155,19 +18155,11 @@ class X2Datum(DatumChannelMixin, core.DatumDef): _encoding_name = "x2" @overload - def bandPosition(self, _: float, **kwds) -> X2Datum: ... - - @overload - def title(self, _: str, **kwds) -> X2Datum: ... - - @overload - def title(self, _: list[str], **kwds) -> X2Datum: ... - + def bandPosition(self, _: float, /) -> X2Datum: ... @overload - def title(self, _: None, **kwds) -> X2Datum: ... - + def title(self, _: str | Sequence[str] | None, /) -> X2Datum: ... @overload - def type(self, _: Type_T, **kwds) -> X2Datum: ... + def type(self, _: Type_T, /) -> X2Datum: ... def __init__( self, @@ -21300,109 +18292,45 @@ class XError(FieldChannelMixin, core.SecondaryFieldDef): _encoding_name = "xError" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> XError: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> XError: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> XError: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> XError: ... - @overload - def bandPosition(self, _: float, **kwds) -> XError: ... - + def bandPosition(self, _: float, /) -> XError: ... @overload - def bin(self, _: None, **kwds) -> XError: ... - + def bin(self, _: None, /) -> XError: ... @overload - def field(self, _: str, **kwds) -> XError: ... - + def field(self, _: str | RepeatRef, /) -> XError: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> XError: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> XError: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> XError: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> XError: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> XError: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> XError: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> XError: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> XError: ... - - @overload - def title(self, _: str, **kwds) -> XError: ... - - @overload - def title(self, _: list[str], **kwds) -> XError: ... - @overload - def title(self, _: None, **kwds) -> XError: ... + def title(self, _: str | Sequence[str] | None, /) -> XError: ... def __init__( self, @@ -21547,109 +18475,45 @@ class XError2(FieldChannelMixin, core.SecondaryFieldDef): _encoding_name = "xError2" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> XError2: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> XError2: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> XError2: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> XError2: ... - @overload - def bandPosition(self, _: float, **kwds) -> XError2: ... - + def bandPosition(self, _: float, /) -> XError2: ... @overload - def bin(self, _: None, **kwds) -> XError2: ... - + def bin(self, _: None, /) -> XError2: ... @overload - def field(self, _: str, **kwds) -> XError2: ... - + def field(self, _: str | RepeatRef, /) -> XError2: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> XError2: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> XError2: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> XError2: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> XError2: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> XError2: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> XError2: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> XError2: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> XError2: ... - - @overload - def title(self, _: str, **kwds) -> XError2: ... - - @overload - def title(self, _: list[str], **kwds) -> XError2: ... - @overload - def title(self, _: None, **kwds) -> XError2: ... + def title(self, _: str | Sequence[str] | None, /) -> XError2: ... def __init__( self, @@ -21908,27 +18772,23 @@ class XOffset(FieldChannelMixin, core.ScaleFieldDef): _encoding_name = "xOffset" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> XOffset: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> XOffset: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> XOffset: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> XOffset: ... - @overload - def bandPosition(self, _: float, **kwds) -> XOffset: ... - + def bandPosition(self, _: float, /) -> XOffset: ... @overload - def bin(self, _: bool, **kwds) -> XOffset: ... - + def bin(self, _: bool | Bin | None, /) -> XOffset: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -21939,25 +18799,21 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> XOffset: ... - - @overload - def bin(self, _: None, **kwds) -> XOffset: ... - @overload - def field(self, _: str, **kwds) -> XOffset: ... - + def field(self, _: str | RepeatRef, /) -> XOffset: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> XOffset: ... - + @overload + def scale(self, _: Scale | None, /) -> XOffset: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -22003,131 +18859,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> XOffset: ... - - @overload - def scale(self, _: None, **kwds) -> XOffset: ... - - @overload - def sort(self, _: list[float], **kwds) -> XOffset: ... - - @overload - def sort(self, _: list[str], **kwds) -> XOffset: ... - - @overload - def sort(self, _: list[bool], **kwds) -> XOffset: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> XOffset: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> XOffset: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> XOffset: ... - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> XOffset: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> XOffset: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> XOffset: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> XOffset: ... - - @overload - def sort(self, _: None, **kwds) -> XOffset: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> XOffset: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> XOffset: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> XOffset: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> XOffset: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> XOffset: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> XOffset: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> XOffset: ... - - @overload - def title(self, _: str, **kwds) -> XOffset: ... - - @overload - def title(self, _: list[str], **kwds) -> XOffset: ... - @overload - def title(self, _: None, **kwds) -> XOffset: ... - + def title(self, _: str | Sequence[str] | None, /) -> XOffset: ... @overload - def type(self, _: StandardType_T, **kwds) -> XOffset: ... + def type(self, _: StandardType_T, /) -> XOffset: ... def __init__( self, @@ -22287,11 +19065,13 @@ class XOffsetDatum(DatumChannelMixin, core.ScaleDatumDef): _encoding_name = "xOffset" @overload - def bandPosition(self, _: float, **kwds) -> XOffsetDatum: ... - + def bandPosition(self, _: float, /) -> XOffsetDatum: ... + @overload + def scale(self, _: Scale | None, /) -> XOffsetDatum: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -22337,23 +19117,11 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> XOffsetDatum: ... - - @overload - def scale(self, _: None, **kwds) -> XOffsetDatum: ... - - @overload - def title(self, _: str, **kwds) -> XOffsetDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> XOffsetDatum: ... - @overload - def title(self, _: None, **kwds) -> XOffsetDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> XOffsetDatum: ... @overload - def type(self, _: Type_T, **kwds) -> XOffsetDatum: ... + def type(self, _: Type_T, /) -> XOffsetDatum: ... def __init__( self, @@ -22653,21 +19421,17 @@ class Y(FieldChannelMixin, core.PositionFieldDef): _encoding_name = "y" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Y: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Y: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Y: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Y: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Y: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Y: ... + @overload + def axis(self, _: Axis | None, /) -> Y: ... @overload def axis( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, bandPosition: Optional[float | Parameter | SchemaBase | Map] = Undefined, description: Optional[str | Parameter | SchemaBase | Map] = Undefined, @@ -22780,21 +19544,15 @@ def axis( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> Y: ... - - @overload - def axis(self, _: None, **kwds) -> Y: ... - @overload - def bandPosition(self, _: float, **kwds) -> Y: ... - + def bandPosition(self, _: float, /) -> Y: ... @overload - def bin(self, _: bool, **kwds) -> Y: ... - + def bin(self, _: bool | Bin | Literal["binned"] | None, /) -> Y: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -22805,41 +19563,32 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> Y: ... - - @overload - def bin(self, _: Literal["binned"], **kwds) -> Y: ... - - @overload - def bin(self, _: None, **kwds) -> Y: ... - @overload - def field(self, _: str, **kwds) -> Y: ... - + def field(self, _: str | RepeatRef, /) -> Y: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> Y: ... - + @overload + def impute(self, _: Impute | None, /) -> Y: ... @overload def impute( self, + *, frame: Optional[Sequence[float | None]] = Undefined, keyvals: Optional[SchemaBase | Sequence[Any] | Map] = Undefined, method: Optional[SchemaBase | ImputeMethod_T] = Undefined, value: Optional[Any] = Undefined, - **kwds, ) -> Y: ... - @overload - def impute(self, _: None, **kwds) -> Y: ... - + def scale(self, _: Scale | None, /) -> Y: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -22885,140 +19634,55 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> Y: ... - - @overload - def scale(self, _: None, **kwds) -> Y: ... - - @overload - def sort(self, _: list[float], **kwds) -> Y: ... - - @overload - def sort(self, _: list[str], **kwds) -> Y: ... - - @overload - def sort(self, _: list[bool], **kwds) -> Y: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> Y: ... - - @overload - def sort(self, _: SortOrder_T, **kwds) -> Y: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> Y: ... - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> Y: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> Y: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Y: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> Y: ... - - @overload - def sort(self, _: None, **kwds) -> Y: ... - - @overload - def stack(self, _: StackOffset_T, **kwds) -> Y: ... - - @overload - def stack(self, _: None, **kwds) -> Y: ... - - @overload - def stack(self, _: bool, **kwds) -> Y: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Y: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Y: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Y: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Y: ... - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> Y: ... - + def stack(self, _: bool | StackOffset_T | None, /) -> Y: ... @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Y: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Y: ... - @overload - def title(self, _: str, **kwds) -> Y: ... - - @overload - def title(self, _: list[str], **kwds) -> Y: ... - - @overload - def title(self, _: None, **kwds) -> Y: ... - + def title(self, _: str | Sequence[str] | None, /) -> Y: ... @overload - def type(self, _: StandardType_T, **kwds) -> Y: ... + def type(self, _: StandardType_T, /) -> Y: ... def __init__( self, @@ -23230,9 +19894,12 @@ class YDatum(DatumChannelMixin, core.PositionDatumDef): _class_is_valid_at_instantiation = False _encoding_name = "y" + @overload + def axis(self, _: Axis | None, /) -> YDatum: ... @overload def axis( self, + *, aria: Optional[bool | Parameter | SchemaBase | Map] = Undefined, bandPosition: Optional[float | Parameter | SchemaBase | Map] = Undefined, description: Optional[str | Parameter | SchemaBase | Map] = Undefined, @@ -23345,31 +20012,26 @@ def axis( | Map ] = Undefined, zindex: Optional[float] = Undefined, - **kwds, ) -> YDatum: ... - @overload - def axis(self, _: None, **kwds) -> YDatum: ... - + def bandPosition(self, _: float, /) -> YDatum: ... @overload - def bandPosition(self, _: float, **kwds) -> YDatum: ... - + def impute(self, _: Impute | None, /) -> YDatum: ... @overload def impute( self, + *, frame: Optional[Sequence[float | None]] = Undefined, keyvals: Optional[SchemaBase | Sequence[Any] | Map] = Undefined, method: Optional[SchemaBase | ImputeMethod_T] = Undefined, value: Optional[Any] = Undefined, - **kwds, ) -> YDatum: ... - @overload - def impute(self, _: None, **kwds) -> YDatum: ... - + def scale(self, _: Scale | None, /) -> YDatum: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -23415,32 +20077,13 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> YDatum: ... - - @overload - def scale(self, _: None, **kwds) -> YDatum: ... - - @overload - def stack(self, _: StackOffset_T, **kwds) -> YDatum: ... - - @overload - def stack(self, _: None, **kwds) -> YDatum: ... - - @overload - def stack(self, _: bool, **kwds) -> YDatum: ... - - @overload - def title(self, _: str, **kwds) -> YDatum: ... - @overload - def title(self, _: list[str], **kwds) -> YDatum: ... - + def stack(self, _: bool | StackOffset_T | None, /) -> YDatum: ... @overload - def title(self, _: None, **kwds) -> YDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> YDatum: ... @overload - def type(self, _: Type_T, **kwds) -> YDatum: ... + def type(self, _: Type_T, /) -> YDatum: ... def __init__( self, @@ -23585,109 +20228,41 @@ class Y2(FieldChannelMixin, core.SecondaryFieldDef): _encoding_name = "y2" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> Y2: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> Y2: ... @overload - def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Y2: ... - + def aggregate(self, *, argmax: Optional[str | SchemaBase] = Undefined) -> Y2: ... @overload - def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds - ) -> Y2: ... - + def aggregate(self, *, argmin: Optional[str | SchemaBase] = Undefined) -> Y2: ... @overload - def bandPosition(self, _: float, **kwds) -> Y2: ... - + def bandPosition(self, _: float, /) -> Y2: ... @overload - def bin(self, _: None, **kwds) -> Y2: ... - + def bin(self, _: None, /) -> Y2: ... @overload - def field(self, _: str, **kwds) -> Y2: ... - + def field(self, _: str | RepeatRef, /) -> Y2: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> Y2: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> Y2: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> Y2: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> Y2: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> Y2: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> Y2: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> Y2: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> Y2: ... - - @overload - def title(self, _: str, **kwds) -> Y2: ... - - @overload - def title(self, _: list[str], **kwds) -> Y2: ... - @overload - def title(self, _: None, **kwds) -> Y2: ... + def title(self, _: str | Sequence[str] | None, /) -> Y2: ... def __init__( self, @@ -23819,19 +20394,11 @@ class Y2Datum(DatumChannelMixin, core.DatumDef): _encoding_name = "y2" @overload - def bandPosition(self, _: float, **kwds) -> Y2Datum: ... - - @overload - def title(self, _: str, **kwds) -> Y2Datum: ... - - @overload - def title(self, _: list[str], **kwds) -> Y2Datum: ... - + def bandPosition(self, _: float, /) -> Y2Datum: ... @overload - def title(self, _: None, **kwds) -> Y2Datum: ... - + def title(self, _: str | Sequence[str] | None, /) -> Y2Datum: ... @overload - def type(self, _: Type_T, **kwds) -> Y2Datum: ... + def type(self, _: Type_T, /) -> Y2Datum: ... def __init__( self, @@ -23964,109 +20531,45 @@ class YError(FieldChannelMixin, core.SecondaryFieldDef): _encoding_name = "yError" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> YError: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> YError: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> YError: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> YError: ... - @overload - def bandPosition(self, _: float, **kwds) -> YError: ... - + def bandPosition(self, _: float, /) -> YError: ... @overload - def bin(self, _: None, **kwds) -> YError: ... - + def bin(self, _: None, /) -> YError: ... @overload - def field(self, _: str, **kwds) -> YError: ... - + def field(self, _: str | RepeatRef, /) -> YError: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, - ) -> YError: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> YError: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> YError: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> YError: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> YError: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> YError: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> YError: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> YError: ... - - @overload - def title(self, _: str, **kwds) -> YError: ... - - @overload - def title(self, _: list[str], **kwds) -> YError: ... - @overload - def title(self, _: None, **kwds) -> YError: ... + def title(self, _: str | Sequence[str] | None, /) -> YError: ... def __init__( self, @@ -24211,109 +20714,45 @@ class YError2(FieldChannelMixin, core.SecondaryFieldDef): _encoding_name = "yError2" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> YError2: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> YError2: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> YError2: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> YError2: ... - @overload - def bandPosition(self, _: float, **kwds) -> YError2: ... - + def bandPosition(self, _: float, /) -> YError2: ... @overload - def bin(self, _: None, **kwds) -> YError2: ... - + def bin(self, _: None, /) -> YError2: ... @overload - def field(self, _: str, **kwds) -> YError2: ... - + def field(self, _: str | RepeatRef, /) -> YError2: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> YError2: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> YError2: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> YError2: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> YError2: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> YError2: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, - ) -> YError2: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> YError2: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> YError2: ... - - @overload - def title(self, _: str, **kwds) -> YError2: ... - - @overload - def title(self, _: list[str], **kwds) -> YError2: ... - @overload - def title(self, _: None, **kwds) -> YError2: ... + def title(self, _: str | Sequence[str] | None, /) -> YError2: ... def __init__( self, @@ -24572,27 +21011,23 @@ class YOffset(FieldChannelMixin, core.ScaleFieldDef): _encoding_name = "yOffset" @overload - def aggregate(self, _: NonArgAggregateOp_T, **kwds) -> YOffset: ... - + def aggregate(self, _: NonArgAggregateOp_T, /) -> YOffset: ... @overload def aggregate( - self, argmax: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmax: Optional[str | SchemaBase] = Undefined ) -> YOffset: ... - @overload def aggregate( - self, argmin: Optional[str | SchemaBase] = Undefined, **kwds + self, *, argmin: Optional[str | SchemaBase] = Undefined ) -> YOffset: ... - @overload - def bandPosition(self, _: float, **kwds) -> YOffset: ... - + def bandPosition(self, _: float, /) -> YOffset: ... @overload - def bin(self, _: bool, **kwds) -> YOffset: ... - + def bin(self, _: bool | Bin | None, /) -> YOffset: ... @overload def bin( self, + *, anchor: Optional[float] = Undefined, base: Optional[float] = Undefined, binned: Optional[bool] = Undefined, @@ -24603,25 +21038,21 @@ def bin( nice: Optional[bool] = Undefined, step: Optional[float] = Undefined, steps: Optional[Sequence[float]] = Undefined, - **kwds, ) -> YOffset: ... - - @overload - def bin(self, _: None, **kwds) -> YOffset: ... - @overload - def field(self, _: str, **kwds) -> YOffset: ... - + def field(self, _: str | RepeatRef, /) -> YOffset: ... @overload def field( self, + *, repeat: Optional[Literal["row", "column", "repeat", "layer"]] = Undefined, - **kwds, ) -> YOffset: ... - + @overload + def scale(self, _: Scale | None, /) -> YOffset: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -24667,131 +21098,53 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> YOffset: ... - - @overload - def scale(self, _: None, **kwds) -> YOffset: ... - - @overload - def sort(self, _: list[float], **kwds) -> YOffset: ... - - @overload - def sort(self, _: list[str], **kwds) -> YOffset: ... - - @overload - def sort(self, _: list[bool], **kwds) -> YOffset: ... - - @overload - def sort(self, _: list[core.DateTime], **kwds) -> YOffset: ... - @overload - def sort(self, _: SortOrder_T, **kwds) -> YOffset: ... - - @overload - def sort(self, _: SortByChannel_T, **kwds) -> YOffset: ... - - @overload - def sort(self, _: SortByChannelDesc_T, **kwds) -> YOffset: ... - + def sort( + self, + _: Sequence[str] + | Sequence[bool] + | Sequence[float] + | Sequence[DateTime | Temporal] + | AllSortString_T + | None, + /, + ) -> YOffset: ... @overload def sort( self, + *, field: Optional[str | SchemaBase | Map] = Undefined, op: Optional[SchemaBase | NonArgAggregateOp_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, ) -> YOffset: ... - @overload def sort( self, + *, encoding: Optional[SchemaBase | SortByChannel_T] = Undefined, order: Optional[SchemaBase | SortOrder_T | None] = Undefined, - **kwds, - ) -> YOffset: ... - - @overload - def sort(self, _: None, **kwds) -> YOffset: ... - - @overload - def timeUnit(self, _: LocalSingleTimeUnit_T, **kwds) -> YOffset: ... - - @overload - def timeUnit(self, _: UtcSingleTimeUnit_T, **kwds) -> YOffset: ... - - @overload - def timeUnit(self, _: LocalMultiTimeUnit_T, **kwds) -> YOffset: ... - - @overload - def timeUnit(self, _: UtcMultiTimeUnit_T, **kwds) -> YOffset: ... - - @overload - def timeUnit( - self, - _: Literal[ - "binnedyear", - "binnedyearquarter", - "binnedyearquartermonth", - "binnedyearmonth", - "binnedyearmonthdate", - "binnedyearmonthdatehours", - "binnedyearmonthdatehoursminutes", - "binnedyearmonthdatehoursminutesseconds", - "binnedyearweek", - "binnedyearweekday", - "binnedyearweekdayhours", - "binnedyearweekdayhoursminutes", - "binnedyearweekdayhoursminutesseconds", - "binnedyeardayofyear", - ], - **kwds, ) -> YOffset: ... - @overload def timeUnit( self, - _: Literal[ - "binnedutcyear", - "binnedutcyearquarter", - "binnedutcyearquartermonth", - "binnedutcyearmonth", - "binnedutcyearmonthdate", - "binnedutcyearmonthdatehours", - "binnedutcyearmonthdatehoursminutes", - "binnedutcyearmonthdatehoursminutesseconds", - "binnedutcyearweek", - "binnedutcyearweekday", - "binnedutcyearweekdayhours", - "binnedutcyearweekdayhoursminutes", - "binnedutcyearweekdayhoursminutesseconds", - "binnedutcyeardayofyear", - ], - **kwds, + _: TimeUnitParams | MultiTimeUnit_T | BinnedTimeUnit_T | SingleTimeUnit_T, + /, ) -> YOffset: ... - @overload def timeUnit( self, + *, binned: Optional[bool] = Undefined, maxbins: Optional[float] = Undefined, step: Optional[float] = Undefined, unit: Optional[SchemaBase | MultiTimeUnit_T | SingleTimeUnit_T] = Undefined, utc: Optional[bool] = Undefined, - **kwds, ) -> YOffset: ... - @overload - def title(self, _: str, **kwds) -> YOffset: ... - - @overload - def title(self, _: list[str], **kwds) -> YOffset: ... - - @overload - def title(self, _: None, **kwds) -> YOffset: ... - + def title(self, _: str | Sequence[str] | None, /) -> YOffset: ... @overload - def type(self, _: StandardType_T, **kwds) -> YOffset: ... + def type(self, _: StandardType_T, /) -> YOffset: ... def __init__( self, @@ -24951,11 +21304,13 @@ class YOffsetDatum(DatumChannelMixin, core.ScaleDatumDef): _encoding_name = "yOffset" @overload - def bandPosition(self, _: float, **kwds) -> YOffsetDatum: ... - + def bandPosition(self, _: float, /) -> YOffsetDatum: ... + @overload + def scale(self, _: Scale | None, /) -> YOffsetDatum: ... @overload def scale( self, + *, align: Optional[float | Parameter | SchemaBase | Map] = Undefined, base: Optional[float | Parameter | SchemaBase | Map] = Undefined, bins: Optional[SchemaBase | Sequence[float] | Map] = Undefined, @@ -25001,23 +21356,11 @@ def scale( scheme: Optional[Parameter | SchemaBase | Map | ColorScheme_T] = Undefined, type: Optional[SchemaBase | ScaleType_T] = Undefined, zero: Optional[bool | Parameter | SchemaBase | Map] = Undefined, - **kwds, ) -> YOffsetDatum: ... - - @overload - def scale(self, _: None, **kwds) -> YOffsetDatum: ... - - @overload - def title(self, _: str, **kwds) -> YOffsetDatum: ... - - @overload - def title(self, _: list[str], **kwds) -> YOffsetDatum: ... - @overload - def title(self, _: None, **kwds) -> YOffsetDatum: ... - + def title(self, _: str | Sequence[str] | None, /) -> YOffsetDatum: ... @overload - def type(self, _: Type_T, **kwds) -> YOffsetDatum: ... + def type(self, _: Type_T, /) -> YOffsetDatum: ... def __init__( self, diff --git a/tests/vegalite/v5/schema/__init__.py b/tests/vegalite/v5/schema/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/vegalite/v5/schema/test_channels.py b/tests/vegalite/v5/schema/test_channels.py new file mode 100644 index 000000000..1193fa739 --- /dev/null +++ b/tests/vegalite/v5/schema/test_channels.py @@ -0,0 +1,82 @@ +from __future__ import annotations + +import datetime as dt +from collections import deque +from typing import TYPE_CHECKING + +import pytest + +from altair.utils.schemapi import SchemaValidationError +from altair.vegalite.v5.schema import channels as alt +from altair.vegalite.v5.schema.core import DateTime + +if TYPE_CHECKING: + from collections.abc import Sequence + + from altair.vegalite.v5.schema._typing import Temporal + + +def test_channels_typing() -> None: + """ + Ensuring static typing aligns with `SchemaValidationError`(s). + + Important + --------- + Unless a comment says otherwise, **every** ``# (type|pyright): ignore`` **is intentional**. + + Notes + ----- + - *Non-exhaustive*, focusing on several repeated patterns. + - Not generated from the schema + - To avoid leaking logic defined during generation + """ + nums: list[int] = [1, 2, 3, 4, 5] + range_nums: range = range(5) + day: dt.date = dt.date(2024, 10, 27) + dates: tuple[dt.date, ...] = tuple(day.replace(day.year + n) for n in range_nums) + dates_mixed: Sequence[Temporal | DateTime] = ( + DateTime(year=2000), + *dates, + dt.datetime(2001, 1, 1), + ) + + angle = alt.Angle("field:Q") + assert angle.to_dict() + + assert angle.sort("ascending").to_dict() + assert angle.sort("-fillOpacity").to_dict() + assert angle.sort(None) + assert angle.sort(nums).to_dict() + assert angle.sort(range_nums).to_dict() + assert angle.sort(deque(nums)).to_dict() + assert angle.sort(dates).to_dict() + assert angle.sort(dates_mixed).to_dict() + + # NOTE: Triggering static and runtime errors + invariant_sequence = angle.sort([*nums, *dates]) # type: ignore[arg-type] # pyright: ignore[reportCallIssue] + with pytest.raises(SchemaValidationError): + invariant_sequence.to_dict() + + positional_as_keyword = angle.sort(_="ascending") # type: ignore[call-overload] + with pytest.raises( + SchemaValidationError, + match=r"'{'_': 'ascending'}' is an invalid value for `sort`", + ): + positional_as_keyword.to_dict() + + keyword_as_positional = angle.sort("field:Q", "min", "descending") # type: ignore[call-overload] + with pytest.raises(SchemaValidationError): + keyword_as_positional.to_dict() + angle.sort(field="field:Q", op="min", order="descending") + + # NOTE: Doesn't raise `SchemaValidationError` + # - `"ascending"` is silently ignored when positional + # - Caught as invalid statically, but not at runtime + bad = angle.sort("x", "ascending").to_dict() # type: ignore[call-overload] + good = angle.sort(encoding="x", order="ascending").to_dict() + assert isinstance(bad, dict) + assert isinstance(good, dict) + with pytest.raises( + AssertionError, match=r"'x' == {'encoding': 'x', 'order': 'ascending'}" + ): + assert bad["sort"] == good["sort"] diff --git a/tools/generate_schema_wrapper.py b/tools/generate_schema_wrapper.py index 8787508ca..e7307078a 100644 --- a/tools/generate_schema_wrapper.py +++ b/tools/generate_schema_wrapper.py @@ -24,6 +24,7 @@ from tools.markup import rst_syntax_for_class from tools.schemapi import CodeSnippet, SchemaInfo, arg_kwds, arg_required_kwds, codegen from tools.schemapi.utils import ( + RemapContext, SchemaProperties, TypeAliasTracer, finalize_type_reprs, @@ -256,6 +257,24 @@ class {name}(TypedDict{metaclass_kwds}):{comment} PADDING_KWDS: Literal["PaddingKwds"] = "PaddingKwds" ROW_COL_KWDS: Literal["RowColKwds"] = "RowColKwds" TEMPORAL: Literal["Temporal"] = "Temporal" + +# NOTE: `api.py` typing imports +BIN: Literal["Bin"] = "Bin" +IMPUTE: Literal["Impute"] = "Impute" +INTO_CONDITION: Literal["IntoCondition"] = "IntoCondition" + +# NOTE: `core.py` typing imports +DATETIME: Literal["DateTime"] = "DateTime" +BIN_PARAMS: Literal["BinParams"] = "BinParams" +IMPUTE_PARAMS: Literal["ImputeParams"] = "ImputeParams" +TIME_UNIT_PARAMS: Literal["TimeUnitParams"] = "TimeUnitParams" +SCALE: Literal["Scale"] = "Scale" +AXIS: Literal["Axis"] = "Axis" +LEGEND: Literal["Legend"] = "Legend" +REPEAT_REF: Literal["RepeatRef"] = "RepeatRef" +HEADER_COLUMN: Literal["Header"] = "Header" +ENCODING_SORT_FIELD: Literal["EncodingSortField"] = "EncodingSortField" + ENCODE_KWDS_SUMMARY: Final = ( "Encoding channels map properties of the data to visual properties of the chart." ) @@ -398,7 +417,6 @@ class PaddingKwds(TypedDict, total=False): ''' _ChannelType = Literal["field", "datum", "value"] -INTO_CONDITION: Literal["IntoCondition"] = "IntoCondition" class SchemaGenerator(codegen.SchemaGenerator): @@ -427,6 +445,7 @@ class {classname}(FieldChannelMixin, core.{basename}): {init_code} ''' ) + haspropsetters = True class ValueSchemaGenerator(SchemaGenerator): @@ -443,6 +462,7 @@ class {classname}(ValueChannelMixin, core.{basename}): {init_code} ''' ) + haspropsetters = True class DatumSchemaGenerator(SchemaGenerator): @@ -459,6 +479,7 @@ class {classname}(DatumChannelMixin, core.{basename}): {init_code} ''' ) + haspropsetters = True def schema_class(*args, **kwargs) -> str: @@ -752,7 +773,6 @@ def generate_vegalite_channel_wrappers(fp: Path, /) -> str: "schema": defschema, "rootschema": schema, "encodingname": prop, - "haspropsetters": True, } if encoding_spec == "field": gen = FieldSchemaGenerator(classname, nodefault=[], **kwds) @@ -791,6 +811,17 @@ def generate_vegalite_channel_wrappers(fp: Path, /) -> str: "from . import core", "from ._typing import * # noqa: F403", ] + TYPING_CORE = ( + DATETIME, + TIME_UNIT_PARAMS, + SCALE, + AXIS, + LEGEND, + REPEAT_REF, + HEADER_COLUMN, + ENCODING_SORT_FIELD, + ) + TYPING_API = INTO_CONDITION, BIN, IMPUTE contents = [ HEADER, CHANNEL_MYPY_IGNORE_STATEMENTS, @@ -799,7 +830,8 @@ def generate_vegalite_channel_wrappers(fp: Path, /) -> str: "from datetime import date, datetime", "from altair import Parameter, SchemaBase", "from altair.typing import Optional", - f"from altair.vegalite.v5.api import {INTO_CONDITION}", + f"from altair.vegalite.v5.schema.core import {', '.join(TYPING_CORE)}", + f"from altair.vegalite.v5.api import {', '.join(TYPING_API)}", textwrap.indent(import_typing_extensions((3, 11), "Self"), " "), ), "\n" f"__all__ = {sorted(all_)}\n", @@ -1045,7 +1077,10 @@ def vegalite_main(skip_download: bool = False) -> None: # Generate the channel wrappers fp_channels = schemapath / "channels.py" print(f"Generating\n {schemafile!s}\n ->{fp_channels!s}") - files[fp_channels] = generate_vegalite_channel_wrappers(schemafile) + with RemapContext( + {DATETIME: (TEMPORAL, DATETIME), BIN_PARAMS: (BIN,), IMPUTE_PARAMS: (IMPUTE,)} + ): + files[fp_channels] = generate_vegalite_channel_wrappers(schemafile) # generate the mark mixin markdefs = {k: f"{k}Def" for k in ["Mark", "BoxPlot", "ErrorBar", "ErrorBand"]} diff --git a/tools/schemapi/codegen.py b/tools/schemapi/codegen.py index 1a71d506f..47d96dcd7 100644 --- a/tools/schemapi/codegen.py +++ b/tools/schemapi/codegen.py @@ -7,19 +7,16 @@ import textwrap from collections.abc import Iterable, Iterator from dataclasses import dataclass -from itertools import chain +from itertools import chain, starmap from operator import attrgetter -from typing import Any, Callable, Final, TypeVar, Union +from typing import Any, Callable, ClassVar, Final, Literal, TypeVar, Union from .utils import ( + Grouped, SchemaInfo, - TypeAliasTracer, - flatten, indent_docstring, is_valid_identifier, - jsonschema_to_python_types, process_description, - spell_literal, ) if sys.version_info >= (3, 12): @@ -39,6 +36,11 @@ Spelled more generically to support future extension. """ +ANON: Literal["_"] = "_" +DOUBLESTAR_ARGS: Literal["**kwds"] = "**kwds" +POS_ONLY: Literal["/"] = "/" +KWD_ONLY: Literal["*"] = "*" + class CodeSnippet: """Object whose repr() is a string of code.""" @@ -208,6 +210,8 @@ def __init__({arglist}): """ ).lstrip() + haspropsetters: ClassVar[bool] = False + def __init__( self, classname: str, @@ -217,7 +221,6 @@ def __init__( schemarepr: object | None = None, rootschemarepr: object | None = None, nodefault: list[str] | None = None, - haspropsetters: bool = False, **kwargs, ) -> None: self.classname = classname @@ -227,7 +230,6 @@ def __init__( self.schemarepr = schemarepr self.rootschemarepr = rootschemarepr self.nodefault = nodefault or () - self.haspropsetters = haspropsetters self.kwargs = kwargs def subclasses(self) -> Iterator[str]: @@ -265,7 +267,9 @@ def schema_class(self) -> str: rootschema=rootschemarepr, docstring=self.docstring(indent=4), init_code=self.init_code(indent=4), - method_code=self.method_code(indent=4), + method_code=( + self.overload_code(indent=4) if type(self).haspropsetters else None + ), **self.kwargs, ) @@ -351,89 +355,84 @@ def init_args(self) -> tuple[list[str], list[str]]: ) if arg_info.additional: - args.append("**kwds") - super_args.append("**kwds") + args.append(DOUBLESTAR_ARGS) + super_args.append(DOUBLESTAR_ARGS) return args, super_args - def get_args(self, si: SchemaInfo) -> list[str]: - contents = ["self"] - prop_infos: dict[str, SchemaInfo] = {} - if si.is_anyOf(): - prop_infos = {} - for si_sub in si.anyOf: - prop_infos.update(si_sub.properties) - elif si.properties: - prop_infos = dict(si.properties.items()) - - if prop_infos: - contents.extend( - f"{p}: {info.to_type_repr(target='annotation', use_undefined=True)} = Undefined" - for p, info in prop_infos.items() - ) - elif isinstance(si.type, str): - py_type = jsonschema_to_python_types[si.type] - if py_type == "list": - # Try to get a type hint like "List[str]" which is more specific - # then just "list" - item_vl_type = si.items.get("type", None) - if item_vl_type is not None: - item_type = jsonschema_to_python_types[item_vl_type] - else: - item_si = SchemaInfo(si.items, self.rootschema) - assert item_si.is_reference() - altair_class_name = item_si.title - item_type = f"core.{altair_class_name}" - py_type = f"List[{item_type}]" - elif si.is_literal(): - # If it's an enum, we can type hint it as a Literal which tells - # a type checker that only the values in enum are acceptable - py_type = TypeAliasTracer.add_literal( - si, spell_literal(si.literal), replace=True + # TODO: Resolve 45x ``list[core.ConditionalValueDef...] annotations + def overload_signature( + self, prop: str, info: SchemaInfo | Iterable[SchemaInfo], / + ) -> Iterator[str]: + """Yields a single, fully annotated ``@overload``, signature.""" + TARGET: Literal["annotation"] = "annotation" + yield "@overload" + signature = "def {0}(self, {1}) -> {2}: ..." + if isinstance(info, SchemaInfo): + if info.properties: + it = ( + f"{name}: {p_info.to_type_repr(target=TARGET, use_undefined=True)} = Undefined" + for name, p_info in info.properties.items() ) - contents.append(f"_: {py_type}") - - contents.append("**kwds") - - return contents - - def get_signature( - self, attr: str, sub_si: SchemaInfo, indent: int, has_overload: bool = False - ) -> list[str]: - lines = [] - if has_overload: - lines.append("@overload") - args = ", ".join(self.get_args(sub_si)) - lines.extend( - (f"def {attr}({args}) -> '{self.classname}':", indent * " " + "...\n") - ) - return lines - - def setter_hint(self, attr: str, indent: int) -> list[str]: - si = SchemaInfo(self.schema, self.rootschema).properties[attr] - if si.is_anyOf(): - return self._get_signature_any_of(si, attr, indent) + content = f"{KWD_ONLY}, {', '.join(it)}" + elif isinstance(info.type, str): + if info.is_array() and (title := info.child(info.items).title): + tp = f"list[core.{title}]" + else: + tp = info.to_type_repr(target=TARGET, use_concrete=True) + content = f"{ANON}: {tp}, {POS_ONLY}" + else: + msg = f"Assumed unreachable\n{info!r}" + raise NotImplementedError(msg) + else: + tp = SchemaInfo.to_type_repr_batched(info, target=TARGET, use_concrete=True) + content = f"{ANON}: {tp}, {POS_ONLY}" + yield signature.format(prop, content, self.classname) + + def _overload_expand( + self, prop: str, info: SchemaInfo | Iterable[SchemaInfo], / + ) -> Iterator[str]: + children: Iterable[SchemaInfo] + if isinstance(info, SchemaInfo): + children = info.anyOf if info.is_anyOf() else (info,) else: - return self.get_signature(attr, si, indent, has_overload=True) - - def _get_signature_any_of( - self, si: SchemaInfo, attr: str, indent: int - ) -> list[str]: - signatures = [] - for sub_si in si.anyOf: - if sub_si.is_anyOf(): - # Recursively call method again to go a level deeper - signatures.extend(self._get_signature_any_of(sub_si, attr, indent)) + children = info + for child in children: + if child.is_anyOf() and not child.is_union_flattenable(): + yield from self._overload_expand(prop, child) else: - signatures.extend( - self.get_signature(attr, sub_si, indent, has_overload=True) - ) - return list(flatten(signatures)) - - def method_code(self, indent: int = 0) -> str | None: - """Return code to assist setter methods.""" - if not self.haspropsetters: - return None - args = self.init_kwds - type_hints = (hint for a in args for hint in self.setter_hint(a, indent)) + yield from self.overload_signature(prop, child) - return ("\n" + indent * " ").join(type_hints) + def overload_dispatch(self, prop: str, info: SchemaInfo, /) -> Iterator[str]: + """ + For a given property ``prop``, decide how to represent all valid signatures. + + In this context, dispatching between **3** kinds of ``@overload``: + - ``Union`` + 1. The subset of basic types form a single signature + - See `thread`_ for special case handling mixed ``@overload``. + 2. More complex types are recursed into, possibly expanding to multiple signatures + - Others + 3. Only one signature is required + + .. _thread: + https://github.com/vega/altair/pull/3659#discussion_r1818164457 + """ + if info.is_anyOf(): + grouped = Grouped(info.anyOf, SchemaInfo.is_flattenable) + if (expand := grouped.falsy) and len(expand) == 1 and expand[0].properties: + grouped.truthy.append(expand[0]) + if flatten := grouped.truthy: + yield from self.overload_signature(prop, flatten) + if expand := grouped.falsy: + yield from self._overload_expand(prop, expand) + else: + yield from self.overload_signature(prop, info) + + def overload_code(self, indent: int = 0) -> str: + """Return all ``@overload`` for property setter methods and as an indented code block.""" + indented = "\n" + indent * " " + it = starmap( + self.overload_dispatch, + self.arg_info.iter_args(arg_kwds, exclude=self.nodefault), + ) + return indented.join(chain.from_iterable(it)) diff --git a/tools/schemapi/utils.py b/tools/schemapi/utils.py index 8358a4f38..caf2cec2b 100644 --- a/tools/schemapi/utils.py +++ b/tools/schemapi/utils.py @@ -7,20 +7,26 @@ import sys import textwrap import urllib.parse -from collections.abc import Iterable, Iterator, Mapping, Sequence +from collections import deque +from collections.abc import Sequence +from contextlib import AbstractContextManager +from copy import deepcopy from itertools import chain from keyword import iskeyword from operator import itemgetter -from typing import TYPE_CHECKING, Any, ClassVar, Literal, TypeVar, Union, overload +from typing import TYPE_CHECKING, Generic, Literal, TypeVar, Union, overload from tools.codemod import ruff from tools.markup import RSTParseVegaLite, rst_syntax_for_class from tools.schemapi.schemapi import _resolve_references as resolve_references if TYPE_CHECKING: - from _collections_abc import KeysView + from collections.abc import Callable, Iterable, Iterator, KeysView, Mapping from pathlib import Path from re import Pattern + from typing import Any, ClassVar + + from _typeshed import SupportsKeysAndGetItem if sys.version_info >= (3, 12): @@ -536,6 +542,47 @@ def to_type_repr( # noqa: C901 else sort_type_reprs(tps) ) + @classmethod + def to_type_repr_batched( + cls, + infos: Iterable[SchemaInfo], + /, + *, + target: TargetType = "doc", + use_concrete: bool = False, + use_undefined: bool = False, + ) -> str: + """ + Return the python type representation of multiple ``SchemaInfo``. + + Intended to handle a subset of a ``Union``. + + Parameters + ---------- + infos + Schemas to collapse into a single representation. + target: {"annotation", "doc"} + Where the representation will be used. + use_concrete + Avoid base classes/wrappers that don't provide type info. + use_undefined + Wrap the result in ``altair.typing.Optional``. + + See Also + -------- + - ``SchemaInfo.to_type_repr`` + """ + it: Iterator[str] = chain.from_iterable( + info.to_type_repr( + as_str=False, + target=target, + use_concrete=use_concrete, + use_undefined=False, + ) + for info in infos + ) + return finalize_type_reprs(it, target=target, use_undefined=use_undefined) + def title_to_type_reprs(self, *, use_concrete: bool) -> set[str]: """ Possibly use ``self.title`` as a type, or provide alternative(s). @@ -693,6 +740,21 @@ def is_const(self) -> bool: return "const" in self.schema def is_literal(self) -> bool: + """ + Return True for `const`_ or `enum`_ values. + + JSON Schema distinguishes between singular/multiple values. + + But we annotate them both the same way: + + ConstInfo = Literal["single value"] + EnumInfo = Literal["value 1", "value 2", "value 3"] + + .. _const: + https://json-schema.org/understanding-json-schema/reference/const + .. _enum: + https://json-schema.org/understanding-json-schema/reference/enum + """ return not ({"enum", "const"}.isdisjoint(self.schema)) def is_empty(self) -> bool: @@ -759,6 +821,66 @@ def is_union_literal(self) -> bool: """ return self.is_union() and all(el.is_literal() for el in self.anyOf) + def is_primitive(self) -> bool: + """ + A basic JSON Schema `type`_ or an array of **only** basic types. + + .. _type: + https://json-schema.org/understanding-json-schema/reference/type + """ + TP = "type" + return (self.schema.keys() == {TP}) or ( + self.is_array() and self.child(self.items).is_primitive() + ) + + def is_flattenable(self) -> bool: + """ + Represents a range of cases we want to annotate in ``@overload``(s). + + Examples + -------- + The following are non-exhaustive examples, using ``python`` types. + + Base cases look like: + + Literal["left", "center", "right"] + float + Sequence[str] + + We also include compound cases, but only when **every** member meets these criteria: + + Literal["pad", "none", "fit"] | None + float | Sequence[float] + Sequence[str] | str | bool | float | None + """ + return self.is_literal() or self.is_primitive() or self.is_union_flattenable() + + def is_union_flattenable(self) -> bool: + """ + Represents a fully flattenable ``Union``. + + Used to prevent ``@overload`` explosion in ``channels.py`` + + Requires **every** member of the ``Union`` satisfies *at least* **one** the criteria. + + See Also + -------- + - ``SchemaInfo.is_literal`` + - ``SchemaInfo.is_array`` + - ``SchemaInfo.is_primitive`` + - ``SchemaInfo.is_flattenable`` + """ + if not self.is_union(): + return False + else: + fns = ( + SchemaInfo.is_literal, + SchemaInfo.is_array, + SchemaInfo.is_primitive, + SchemaInfo.is_union_flattenable, + ) + return all(any(fn(el) for fn in fns) for el in self.anyOf) + def is_format(self) -> bool: """ Represents a string format specifier. @@ -848,6 +970,71 @@ def is_datetime(self) -> bool: return self.refname == "DateTime" +class Grouped(Generic[T]): + """ + Simple group-by like utility. + + Intended for consuming an iterator in full, splitting into true/false cases. + + Parameters + ---------- + iterable + Elements to divide into two groups. + predicate + Function to classify each element. + + Attributes + ---------- + truthy: deque[T] + Elements which pass ``predicate``. + falsy: deque[T] + Elements which fail ``predicate``. + """ + + def __init__( + self, iterable: Iterable[T], /, predicate: Callable[[T], bool] + ) -> None: + truthy, falsy = deque[T](), deque[T]() + for el in iterable: + if predicate(el): + truthy.append(el) + else: + falsy.append(el) + self.truthy: deque[T] = truthy + self.falsy: deque[T] = falsy + + +class RemapContext(AbstractContextManager): + """ + Context Manager to temporarily apply substitution rules for ``SchemaInfo``. + + Upon exiting, the original rules will be in effect. + + Notes + ----- + The constructor accepts arguments exactly the same way as ``dict``. + """ + + def __init__( + self, + m: SupportsKeysAndGetItem[str, Sequence[str]] + | Iterable[tuple[str, Sequence[str]]] = (), + /, + **kwds: Sequence[str], + ) -> None: + self._mapping: Mapping[str, Sequence[str]] = dict(m, **kwds) + self._orig: Mapping[str, Sequence[str]] + + def __enter__(self) -> Any: + self._orig = deepcopy(SchemaInfo._remap_title) + SchemaInfo._remap_title.update(self._mapping) + return self + + def __exit__(self, *args) -> None: + SchemaInfo._remap_title = dict(**self._orig) + del self._orig + + def flatten(container: Iterable) -> Iterable: """ Flatten arbitrarily flattened list.