refactor of init in consequence of last commit:

- _ExpressionLike -> IntoExpr
- Expression | str -> IntoExprColumn

Author: OutSquareCapital

_duckdb-stubs/__init__.pyi

@@ -1,39 +1,19 @@
-import datetime
-import decimal
 import os
 import pathlib
 import typing
-import uuid
 from typing_extensions import Self
+from ._expression import Expression
 
 if typing.TYPE_CHECKING:
     import fsspec
     import numpy as np
     import polars
     import pandas
     import pyarrow.lib
-    from collections.abc import Callable, Iterable, Sequence, Mapping
+    from collections.abc import Callable, Iterable, Sequence
+    from ._typing import ParquetFieldIdsType, IntoExpr, IntoExprColumn
     from duckdb import sqltypes, func
 
-    # the field_ids argument to to_parquet and write_parquet has a recursive structure
-    ParquetFieldIdsType = Mapping[str, int | "ParquetFieldIdsType"]
-
-_ExpressionLike: typing.TypeAlias = (
-    "Expression"
-    | str
-    | int
-    | float
-    | bool
-    | bytes
-    | None
-    | datetime.date
-    | datetime.datetime
-    | datetime.time
-    | datetime.timedelta
-    | decimal.Decimal
-    | uuid.UUID
-)
-
 __all__: list[str] = [
     "BinderException",
     "CSVLineTerminator",
@@ -490,9 +470,7 @@ class DuckDBPyRelation:
     def __getattr__(self, name: str) -> DuckDBPyRelation: ...
     def __getitem__(self, name: str) -> DuckDBPyRelation: ...
     def __len__(self) -> int: ...
-    def aggregate(
-        self, aggr_expr: str | Iterable[_ExpressionLike], group_expr: _ExpressionLike = ""
-    ) -> DuckDBPyRelation: ...
+    def aggregate(self, aggr_expr: str | Iterable[IntoExpr], group_expr: IntoExpr = "") -> DuckDBPyRelation: ...
     def any_value(
         self, expression: str, groups: str = "", window_spec: str = "", projected_columns: str = ""
     ) -> DuckDBPyRelation: ...
@@ -577,7 +555,7 @@ class DuckDBPyRelation:
     def fetchmany(self, size: typing.SupportsInt = 1) -> list[tuple[typing.Any, ...]]: ...
     def fetchnumpy(self) -> dict[str, np.typing.NDArray[typing.Any] | pandas.Categorical]: ...
     def fetchone(self) -> tuple[typing.Any, ...] | None: ...
-    def filter(self, filter_expr: Expression | str) -> DuckDBPyRelation: ...
+    def filter(self, filter_expr: IntoExprColumn) -> DuckDBPyRelation: ...
     def first(self, expression: str, groups: str = "", projected_columns: str = "") -> DuckDBPyRelation: ...
     def first_value(self, expression: str, window_spec: str = "", projected_columns: str = "") -> DuckDBPyRelation: ...
     def fsum(
@@ -593,7 +571,7 @@ class DuckDBPyRelation:
     def join(
         self,
         other_rel: DuckDBPyRelation,
-        condition: Expression | str,
+        condition: IntoExprColumn,
         how: typing.Literal["inner", "left", "right", "outer", "semi", "anti"] = "inner",
     ) -> DuckDBPyRelation: ...
     def lag(
@@ -664,7 +642,7 @@ class DuckDBPyRelation:
     def product(
         self, expression: str, groups: str = "", window_spec: str = "", projected_columns: str = ""
     ) -> DuckDBPyRelation: ...
-    def project(self, *args: _ExpressionLike, groups: str = "") -> DuckDBPyRelation: ...
+    def project(self, *args: IntoExpr, groups: str = "") -> DuckDBPyRelation: ...
     def quantile(
         self,
         expression: str,
@@ -693,7 +671,7 @@ class DuckDBPyRelation:
     def rank(self, window_spec: str, projected_columns: str = "") -> DuckDBPyRelation: ...
     def rank_dense(self, window_spec: str, projected_columns: str = "") -> DuckDBPyRelation: ...
     def row_number(self, window_spec: str, projected_columns: str = "") -> DuckDBPyRelation: ...
-    def select(self, *args: _ExpressionLike, groups: str = "") -> DuckDBPyRelation: ...
+    def select(self, *args: IntoExpr, groups: str = "") -> DuckDBPyRelation: ...
     def select_dtypes(self, types: list[sqltypes.DuckDBPyType | str]) -> DuckDBPyRelation: ...
     def select_types(self, types: list[sqltypes.DuckDBPyType | str]) -> DuckDBPyRelation: ...
     def set_alias(self, alias: str) -> DuckDBPyRelation: ...
@@ -706,7 +684,7 @@ class DuckDBPyRelation:
         null_value: str | None = None,
         render_mode: RenderMode | None = None,
     ) -> None: ...
-    def sort(self, *args: _ExpressionLike) -> DuckDBPyRelation: ...
+    def sort(self, *args: IntoExpr) -> DuckDBPyRelation: ...
     def sql_query(self) -> str: ...
     def std(
         self, expression: str, groups: str = "", window_spec: str = "", projected_columns: str = ""
@@ -770,7 +748,7 @@ class DuckDBPyRelation:
     def torch(self) -> dict[str, typing.Any]: ...
     def union(self, union_rel: DuckDBPyRelation) -> DuckDBPyRelation: ...
     def unique(self, unique_aggr: str) -> DuckDBPyRelation: ...
-    def update(self, set: dict[str, _ExpressionLike], *, condition: _ExpressionLike | None = None) -> None: ...
+    def update(self, set: dict[str, IntoExpr], *, condition: IntoExpr = None) -> None: ...
     def value_counts(self, expression: str, groups: str = "") -> DuckDBPyRelation: ...
     def var(
         self, expression: str, groups: str = "", window_spec: str = "", projected_columns: str = ""
@@ -877,56 +855,6 @@ class ExplainType:
     @property
     def value(self) -> int: ...
 
-class Expression:
-    def __add__(self, other: _ExpressionLike) -> Expression: ...
-    def __and__(self, other: _ExpressionLike) -> Expression: ...
-    def __div__(self, other: _ExpressionLike) -> Expression: ...
-    def __eq__(self, other: _ExpressionLike) -> Expression: ...  # type: ignore[override]
-    def __floordiv__(self, other: _ExpressionLike) -> Expression: ...
-    def __ge__(self, other: _ExpressionLike) -> Expression: ...
-    def __gt__(self, other: _ExpressionLike) -> Expression: ...
-    @typing.overload
-    def __init__(self, arg0: str) -> None: ...
-    @typing.overload
-    def __init__(self, arg0: typing.Any) -> None: ...
-    def __invert__(self) -> Expression: ...
-    def __le__(self, other: _ExpressionLike) -> Expression: ...
-    def __lt__(self, other: _ExpressionLike) -> Expression: ...
-    def __mod__(self, other: _ExpressionLike) -> Expression: ...
-    def __mul__(self, other: _ExpressionLike) -> Expression: ...
-    def __ne__(self, other: _ExpressionLike) -> Expression: ...  # type: ignore[override]
-    def __neg__(self) -> Expression: ...
-    def __or__(self, other: _ExpressionLike) -> Expression: ...
-    def __pow__(self, other: _ExpressionLike) -> Expression: ...
-    def __radd__(self, other: _ExpressionLike) -> Expression: ...
-    def __rand__(self, other: _ExpressionLike) -> Expression: ...
-    def __rdiv__(self, other: _ExpressionLike) -> Expression: ...
-    def __rfloordiv__(self, other: _ExpressionLike) -> Expression: ...
-    def __rmod__(self, other: _ExpressionLike) -> Expression: ...
-    def __rmul__(self, other: _ExpressionLike) -> Expression: ...
-    def __ror__(self, other: _ExpressionLike) -> Expression: ...
-    def __rpow__(self, other: _ExpressionLike) -> Expression: ...
-    def __rsub__(self, other: _ExpressionLike) -> Expression: ...
-    def __rtruediv__(self, other: _ExpressionLike) -> Expression: ...
-    def __sub__(self, other: _ExpressionLike) -> Expression: ...
-    def __truediv__(self, other: _ExpressionLike) -> Expression: ...
-    def alias(self, name: str) -> Expression: ...
-    def asc(self) -> Expression: ...
-    def between(self, lower: _ExpressionLike, upper: _ExpressionLike) -> Expression: ...
-    def cast(self, type: sqltypes.DuckDBPyType) -> Expression: ...
-    def collate(self, collation: str) -> Expression: ...
-    def desc(self) -> Expression: ...
-    def get_name(self) -> str: ...
-    def isin(self, *args: _ExpressionLike) -> Expression: ...
-    def isnotin(self, *args: _ExpressionLike) -> Expression: ...
-    def isnotnull(self) -> Expression: ...
-    def isnull(self) -> Expression: ...
-    def nulls_first(self) -> Expression: ...
-    def nulls_last(self) -> Expression: ...
-    def otherwise(self, value: _ExpressionLike) -> Expression: ...
-    def show(self) -> None: ...
-    def when(self, condition: _ExpressionLike, value: _ExpressionLike) -> Expression: ...
-
 class FatalException(DatabaseError): ...
 
 class HTTPException(IOException):
@@ -1077,18 +1005,18 @@ class token_type:
     @property
     def value(self) -> int: ...
 
-def CaseExpression(condition: _ExpressionLike, value: _ExpressionLike) -> Expression: ...
-def CoalesceOperator(*args: _ExpressionLike) -> Expression: ...
+def CaseExpression(condition: IntoExpr, value: IntoExpr) -> Expression: ...
+def CoalesceOperator(*args: IntoExpr) -> Expression: ...
 def ColumnExpression(*args: str) -> Expression: ...
 def ConstantExpression(value: typing.Any) -> Expression: ...
 def DefaultExpression() -> Expression: ...
-def FunctionExpression(function_name: str, *args: _ExpressionLike) -> Expression: ...
-def LambdaExpression(lhs: typing.Any, rhs: _ExpressionLike) -> Expression: ...
+def FunctionExpression(function_name: str, *args: IntoExpr) -> Expression: ...
+def LambdaExpression(lhs: typing.Any, rhs: IntoExpr) -> Expression: ...
 def SQLExpression(expression: str) -> Expression: ...
 def StarExpression(*, exclude: Iterable[str | Expression] | None = None) -> Expression: ...
 def aggregate(
     df: pandas.DataFrame,
-    aggr_expr: str | Iterable[_ExpressionLike],
+    aggr_expr: str | Iterable[IntoExpr],
     group_expr: str = "",
     *,
     connection: DuckDBPyConnection | None = None,
@@ -1202,7 +1130,7 @@ def fetchone(*, connection: DuckDBPyConnection | None = None) -> tuple[typing.An
 def filesystem_is_registered(name: str, *, connection: DuckDBPyConnection | None = None) -> bool: ...
 def filter(
     df: pandas.DataFrame,
-    filter_expr: Expression | str,
+    filter_expr: IntoExprColumn,
     *,
     connection: DuckDBPyConnection | None = None,
 ) -> DuckDBPyRelation: ...
@@ -1346,7 +1274,7 @@ def pl(
     connection: DuckDBPyConnection | None = None,
 ) -> polars.DataFrame | polars.LazyFrame: ...
 def project(
-    df: pandas.DataFrame, *args: _ExpressionLike, groups: str = "", connection: DuckDBPyConnection | None = None
+    df: pandas.DataFrame, *args: IntoExpr, groups: str = "", connection: DuckDBPyConnection | None = None
 ) -> DuckDBPyRelation: ...
 def query(
     query: Statement | str,