kumoai 2.14.0.dev202512181731__cp312-cp312-macosx_11_0_arm64.whl → 2.14.0.dev202512301731__cp312-cp312-macosx_11_0_arm64.whl

kumoai/experimental/rfm/base/column.py

@@ -1,15 +1,89 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
-from typing import Any
+from typing import Any, Mapping, TypeAlias
 
 from kumoapi.typing import Dtype, Stype
+from typing_extensions import Self
+
+from kumoai.experimental.rfm.base import Expression
+from kumoai.mixin import CastMixin
+
+
+@dataclass(init=False)
+class ColumnSpec(CastMixin):
+    r"""A column specification for adding a column to a table.
+
+    A column specification can either refer to a physical column present in
+    the data source, or be defined logically via an expression.
+
+    Args:
+        name: The name of the column.
+        expr: A column expression to define logical columns.
+        dtype: The data type of the column.
+    """
+    def __init__(
+        self,
+        name: str,
+        expr: Expression | Mapping[str, str] | str | None = None,
+        dtype: Dtype | str | None = None,
+        stype: Stype | str | None = None,
+    ) -> None:
+
+        self.name = name
+        self.expr = Expression.coerce(expr)
+        self.dtype = Dtype(dtype) if dtype is not None else None
+        self.stype = Stype(dtype) if stype is not None else None
+
+    @classmethod
+    def coerce(cls, spec: ColumnSpec | Mapping[str, Any] | str) -> Self:
+        r"""Coerces a column specification into a :class:`ColumnSpec`."""
+        if isinstance(spec, cls):
+            return spec
+        if isinstance(spec, str):
+            return cls(name=spec)
+        if isinstance(spec, Mapping):
+            try:
+                return cls(**spec)
+            except TypeError:
+                pass
+        raise TypeError(f"Unable to coerce 'ColumnSpec' from '{spec}'")
+
+    @property
+    def is_source(self) -> bool:
+        r"""Whether the column specification refers to a phyiscal column
+        present in the data source.
+        """
+        return self.expr is None
+
+
+ColumnSpecType: TypeAlias = ColumnSpec | Mapping[str, Any] | str
 
 
 @dataclass(init=False, repr=False, eq=False)
 class Column:
+    r"""Column-level metadata information.
+
+    A column can either refer to a physical column present in the data source,
+    or be defined logically via an expression.
+
+    Args:
+        name: The name of the column.
+        expr: A column expression to define logical columns.
+        dtype: The data type of the column.
+        stype: The semantic type of the column.
+    """
     stype: Stype
 
-    def __init__(self, name: str, stype: Stype, dtype: Dtype) -> None:
+    def __init__(
+        self,
+        name: str,
+        expr: Expression | None,
+        dtype: Dtype,
+        stype: Stype,
+    ) -> None:
         self._name = name
+        self._expr = expr
         self._dtype = Dtype(dtype)
 
         self._is_primary_key = False
@@ -20,12 +94,26 @@ class Column:
 
     @property
     def name(self) -> str:
+        r"""The name of the column."""
         return self._name
 
+    @property
+    def expr(self) -> Expression | None:
+        r"""The expression of column (if logically)."""
+        return self._expr
+
     @property
     def dtype(self) -> Dtype:
+        r"""The data type of the column."""
         return self._dtype
 
+    @property
+    def is_source(self) -> bool:
+        r"""Whether the column refers to a phyiscal column present in the data
+        source.
+        """
+        return self.expr is None
+
     def __setattr__(self, key: str, val: Any) -> None:
         if key == 'stype':
             if isinstance(val, str):
@@ -48,7 +136,7 @@ class Column:
         super().__setattr__(key, val)
 
     def __hash__(self) -> int:
-        return hash((self.name, self.stype, self.dtype))
+        return hash((self.name, self.expr, self.dtype, self.stype))
 
     def __eq__(self, other: Any) -> bool:
         if not isinstance(other, Column):
@@ -56,5 +144,9 @@ class Column:
         return hash(self) == hash(other)
 
     def __repr__(self) -> str:
-        return (f'{self.__class__.__name__}(name={self.name}, '
-                f'stype={self.stype}, dtype={self.dtype})')
+        parts = [f'name={self.name}']
+        if self.expr is not None:
+            parts.append(f'expr={self.expr}')
+        parts.append(f'dtype={self.dtype}')
+        parts.append(f'stype={self.stype}')
+        return f"{self.__class__.__name__}({', '.join(parts)})"

kumoai/experimental/rfm/base/expression.py

@@ -0,0 +1,44 @@
+from __future__ import annotations
+
+from abc import ABC
+from dataclasses import dataclass
+from typing import Mapping
+
+
+class Expression(ABC):
+    """A base expression to define logical columns."""
+    @classmethod
+    def coerce(
+        cls,
+        spec: Expression | Mapping[str, str] | str | None,
+    ) -> Expression | None:
+        r"""Coerces an expression specification into an :class:`Expression`, if
+        possible.
+        """
+        if spec is None:
+            return None
+        if isinstance(spec, Expression):
+            return spec
+        if isinstance(spec, str):
+            return LocalExpression(spec)
+        if isinstance(spec, Mapping):
+            for sub_cls in (LocalExpression, ):
+                try:
+                    return sub_cls(**spec)
+                except TypeError:
+                    pass
+        raise TypeError(f"Unable to coerce 'Expression' from '{spec}'")
+
+
+@dataclass(frozen=True, repr=False)
+class LocalExpression(Expression):
+    r"""A local expression to define a row-level logical attribute based on
+    physical columns of the data source in the same row.
+
+    Args:
+        value: The value of the expression.
+    """
+    value: str
+
+    def __repr__(self) -> str:
+        return self.value

kumoai/experimental/rfm/base/sampler.py

@@ -13,7 +13,6 @@ from kumoapi.pquery.AST import Aggregation, ASTNode
 from kumoapi.rfm.context import EdgeLayout, Link, Subgraph, Table
 from kumoapi.typing import Stype
 
-from kumoai.experimental.rfm.base import SourceColumn
 from kumoai.utils import ProgressLogger
 
 if TYPE_CHECKING:
@@ -53,6 +52,7 @@ class Sampler(ABC):
         graph: 'Graph',
         verbose: bool | ProgressLogger = True,
     ) -> None:
+
         self._edge_types: list[tuple[str, str, str]] = []
         for edge in graph.edges:
             edge_type = (edge.src_table, edge.fkey, edge.dst_table)
@@ -88,10 +88,6 @@ class Sampler(ABC):
                     continue
                 self._table_stype_dict[table.name][column.name] = column.stype
 
-        self._source_table_dict: dict[str, dict[str, SourceColumn]] = {}
-        for table in graph.tables.values():
-            self._source_table_dict[table.name] = table._source_column_dict
-
         self._min_time_dict: dict[str, pd.Timestamp] = {}
         self._max_time_dict: dict[str, pd.Timestamp] = {}
 
@@ -119,16 +115,11 @@ class Sampler(ABC):
 
     @property
     def table_stype_dict(self) -> dict[str, dict[str, Stype]]:
-        r"""The registered semantic types for all columns in all tables in
-        the graph.
+        r"""The registered semantic types for all feature columns in all tables
+        in the graph.
         """
         return self._table_stype_dict
 
-    @property
-    def source_table_dict(self) -> dict[str, dict[str, SourceColumn]]:
-        r"""Source column information for all tables in the graph."""
-        return self._source_table_dict
-
     def get_min_time(
         self,
         table_names: list[str] | None = None,
@@ -189,7 +180,7 @@ class Sampler(ABC):
             exclude_cols_dict: The columns to exclude from the subgraph.
         """
         # Exclude all columns that leak target information:
-        table_stype_dict: dict[str, dict[str, Stype]] = self._table_stype_dict
+        table_stype_dict: dict[str, dict[str, Stype]] = self.table_stype_dict
         if exclude_cols_dict is not None:
             table_stype_dict = copy.deepcopy(table_stype_dict)
             for table_name, exclude_cols in exclude_cols_dict.items():
@@ -237,11 +228,8 @@ class Sampler(ABC):
                 # Set end time to NaT for all values greater than anchor time:
                 assert table_name not in out.inverse_dict
                 ser = df[end_time_column]
-                if ser.dtype != 'datetime64[ns]':
-                    ser = ser.astype('datetime64[ns]')
                 mask = ser.astype(int).to_numpy() > out.anchor_time[batch]
-                ser.iloc[mask] = pd.NaT
-                df[end_time_column] = ser
+                df.loc[mask, end_time_column] = pd.NaT
 
             stype_dict = table_stype_dict[table_name]
             for column_name, stype in stype_dict.items():

kumoai/experimental/rfm/base/source.py

@@ -6,7 +6,7 @@ from kumoapi.typing import Dtype
 @dataclass
 class SourceColumn:
     name: str
-    dtype: Dtype
+    dtype: Dtype | None
     is_primary_key: bool
     is_unique_key: bool
     is_nullable: bool

kumoai/experimental/rfm/base/sql_sampler.py

@@ -3,9 +3,15 @@ from typing import TYPE_CHECKING, Literal
 
 import numpy as np
 import pandas as pd
+from kumoapi.typing import Dtype
 
-from kumoai.experimental.rfm.base import Sampler, SamplerOutput, SQLTable
-from kumoai.utils import ProgressLogger
+from kumoai.experimental.rfm.base import (
+    LocalExpression,
+    Sampler,
+    SamplerOutput,
+    SourceColumn,
+)
+from kumoai.utils import ProgressLogger, quote_ident
 
 if TYPE_CHECKING:
     from kumoai.experimental.rfm import Graph
@@ -19,18 +25,71 @@ class SQLSampler(Sampler):
     ) -> None:
         super().__init__(graph=graph, verbose=verbose)
 
-        self._fqn_dict: dict[str, str] = {}
+        self._source_name_dict: dict[str, str] = {
+            table.name: table._quoted_source_name
+            for table in graph.tables.values()
+        }
+
+        self._source_table_dict: dict[str, dict[str, SourceColumn]] = {}
+        for table in graph.tables.values():
+            self._source_table_dict[table.name] = {}
+            for column in table.columns:
+                if not column.is_source:
+                    continue
+                src_column = table._source_column_dict[column.name]
+                self._source_table_dict[table.name][column.name] = src_column
+
+        self._table_dtype_dict: dict[str, dict[str, Dtype]] = {}
+        for table in graph.tables.values():
+            self._table_dtype_dict[table.name] = {}
+            for column in table.columns:
+                self._table_dtype_dict[table.name][column.name] = column.dtype
+
+        self._table_column_ref_dict: dict[str, dict[str, str]] = {}
+        self._table_column_proj_dict: dict[str, dict[str, str]] = {}
         for table in graph.tables.values():
-            assert isinstance(table, SQLTable)
-            self._connection = table._connection
-            self._fqn_dict[table.name] = table.fqn
+            column_ref_dict: dict[str, str] = {}
+            column_proj_dict: dict[str, str] = {}
+            for column in table.columns:
+                if column.expr is not None:
+                    assert isinstance(column.expr, LocalExpression)
+                    column_ref_dict[column.name] = column.expr.value
+                    column_proj_dict[column.name] = (
+                        f'{column.expr} AS {quote_ident(column.name)}')
+                else:
+                    column_ref_dict[column.name] = quote_ident(column.name)
+                    column_proj_dict[column.name] = quote_ident(column.name)
+            self._table_column_ref_dict[table.name] = column_ref_dict
+            self._table_column_proj_dict[table.name] = column_proj_dict
+
+    @property
+    def source_name_dict(self) -> dict[str, str]:
+        r"""The source table names for all tables in the graph."""
+        return self._source_name_dict
+
+    @property
+    def source_table_dict(self) -> dict[str, dict[str, SourceColumn]]:
+        r"""The source column information for all tables in the graph."""
+        return self._source_table_dict
+
+    @property
+    def table_dtype_dict(self) -> dict[str, dict[str, Dtype]]:
+        r"""The data types for all columns in all tables in the graph."""
+        return self._table_dtype_dict
+
+    @property
+    def table_column_ref_dict(self) -> dict[str, dict[str, str]]:
+        r"""The SQL reference expression for all columns in all tables in the
+        graph.
+        """
+        return self._table_column_ref_dict
 
     @property
-    def fqn_dict(self) -> dict[str, str]:
-        r"""The fully-qualified quoted source name for all table names in the
+    def table_column_proj_dict(self) -> dict[str, dict[str, str]]:
+        r"""The SQL projection expressions for all columns in all tables in the
         graph.
         """
-        return self._fqn_dict
+        return self._table_column_proj_dict
 
     def _sample_subgraph(
         self,