kumoai 2.13.0.dev202512081731__cp313-cp313-macosx_11_0_arm64.whl → 2.14.0.dev202512211732__cp313-cp313-macosx_11_0_arm64.whl

kumoai/experimental/rfm/rfm.py

@@ -2,25 +2,22 @@ import json
 import time
 import warnings
 from collections import defaultdict
-from collections.abc import Generator
+from collections.abc import Generator, Iterator
 from contextlib import contextmanager
 from dataclasses import dataclass, replace
-from typing import (
-    Any,
-    Dict,
-    Iterator,
-    List,
-    Literal,
-    Optional,
-    Tuple,
-    Union,
-    overload,
-)
+from typing import Any, Literal, overload
 
 import numpy as np
 import pandas as pd
 from kumoapi.model_plan import RunMode
 from kumoapi.pquery import QueryType, ValidatedPredictiveQuery
+from kumoapi.pquery.AST import (
+    Aggregation,
+    Column,
+    Condition,
+    Join,
+    LogicalOperation,
+)
 from kumoapi.rfm import Context
 from kumoapi.rfm import Explanation as ExplanationConfig
 from kumoapi.rfm import (
@@ -29,18 +26,15 @@ from kumoapi.rfm import (
     RFMPredictRequest,
 )
 from kumoapi.task import TaskType
+from kumoapi.typing import AggregationType, Stype
 
+from kumoai import in_notebook, in_snowflake_notebook
 from kumoai.client.rfm import RFMAPI
 from kumoai.exceptions import HTTPException
 from kumoai.experimental.rfm import Graph
-from kumoai.experimental.rfm.backend.local import LocalGraphStore
-from kumoai.experimental.rfm.local_graph_sampler import LocalGraphSampler
-from kumoai.experimental.rfm.local_pquery_driver import (
-    LocalPQueryDriver,
-    date_offset_to_seconds,
-)
+from kumoai.experimental.rfm.base import DataBackend, Sampler
 from kumoai.mixin import CastMixin
-from kumoai.utils import InteractiveProgressLogger, ProgressLogger
+from kumoai.utils import ProgressLogger
 
 _RANDOM_SEED = 42
 
@@ -95,24 +89,41 @@ class Explanation:
     def __getitem__(self, index: Literal[1]) -> str:
         pass
 
-    def __getitem__(self, index: int) -> Union[pd.DataFrame, str]:
+    def __getitem__(self, index: int) -> pd.DataFrame | str:
         if index == 0:
             return self.prediction
         if index == 1:
             return self.summary
         raise IndexError("Index out of range")
 
-    def __iter__(self) -> Iterator[Union[pd.DataFrame, str]]:
+    def __iter__(self) -> Iterator[pd.DataFrame | str]:
         return iter((self.prediction, self.summary))
 
     def __repr__(self) -> str:
         return str((self.prediction, self.summary))
 
-    def _ipython_display_(self) -> None:
-        from IPython.display import Markdown, display
+    def print(self) -> None:
+        r"""Prints the explanation."""
+        if in_snowflake_notebook():
+            import streamlit as st
+            st.dataframe(self.prediction, hide_index=True)
+            st.markdown(self.summary)
+        elif in_notebook():
+            from IPython.display import Markdown, display
+            try:
+                if hasattr(self.prediction.style, 'hide'):
+                    display(self.prediction.hide(axis='index'))  # pandas=2
+                else:
+                    display(self.prediction.hide_index())  # pandas <1.3
+            except ImportError:
+                print(self.prediction.to_string(index=False))  # missing jinja2
+            display(Markdown(self.summary))
+        else:
+            print(self.prediction.to_string(index=False))
+            print(self.summary)
 
-        display(self.prediction)
-        display(Markdown(self.summary))
+    def _ipython_display_(self) -> None:
+        self.print()
 
 
 class KumoRFM:
@@ -151,20 +162,35 @@ class KumoRFM:
     Args:
         graph: The graph.
         verbose: Whether to print verbose output.
+        optimize: If set to ``True``, will optimize the underlying data backend
+            for optimal querying. For example, for transactional database
+            backends, will create any missing indices. Requires write-access to
+            the data backend.
     """
     def __init__(
         self,
         graph: Graph,
-        verbose: Union[bool, ProgressLogger] = True,
+        verbose: bool | ProgressLogger = True,
+        optimize: bool = False,
     ) -> None:
         graph = graph.validate()
         self._graph_def = graph._to_api_graph_definition()
-        self._graph_store = LocalGraphStore(graph, verbose)
-        self._graph_sampler = LocalGraphSampler(self._graph_store)
 
-        self._client: Optional[RFMAPI] = None
+        if graph.backend == DataBackend.LOCAL:
+            from kumoai.experimental.rfm.backend.local import LocalSampler
+            self._sampler: Sampler = LocalSampler(graph, verbose)
+        elif graph.backend == DataBackend.SQLITE:
+            from kumoai.experimental.rfm.backend.sqlite import SQLiteSampler
+            self._sampler = SQLiteSampler(graph, verbose, optimize)
+        elif graph.backend == DataBackend.SNOWFLAKE:
+            from kumoai.experimental.rfm.backend.snow import SnowSampler
+            self._sampler = SnowSampler(graph, verbose)
+        else:
+            raise NotImplementedError
+
+        self._client: RFMAPI | None = None
 
-        self._batch_size: Optional[int | Literal['max']] = None
+        self._batch_size: int | Literal['max'] | None = None
         self.num_retries: int = 0
 
     @property
@@ -182,7 +208,7 @@ class KumoRFM:
     @contextmanager
     def batch_mode(
         self,
-        batch_size: Union[int, Literal['max']] = 'max',
+        batch_size: int | Literal['max'] = 'max',
         num_retries: int = 1,
     ) -> Generator[None, None, None]:
         """Context manager to predict in batches.
@@ -216,17 +242,17 @@ class KumoRFM:
     def predict(
         self,
         query: str,
-        indices: Union[List[str], List[float], List[int], None] = None,
+        indices: list[str] | list[float] | list[int] | None = None,
         *,
         explain: Literal[False] = False,
-        anchor_time: Union[pd.Timestamp, Literal['entity'], None] = None,
-        context_anchor_time: Union[pd.Timestamp, None] = None,
-        run_mode: Union[RunMode, str] = RunMode.FAST,
-        num_neighbors: Optional[List[int]] = None,
+        anchor_time: pd.Timestamp | Literal['entity'] | None = None,
+        context_anchor_time: pd.Timestamp | None = None,
+        run_mode: RunMode | str = RunMode.FAST,
+        num_neighbors: list[int] | None = None,
         num_hops: int = 2,
-        max_pq_iterations: int = 20,
-        random_seed: Optional[int] = _RANDOM_SEED,
-        verbose: Union[bool, ProgressLogger] = True,
+        max_pq_iterations: int = 10,
+        random_seed: int | None = _RANDOM_SEED,
+        verbose: bool | ProgressLogger = True,
         use_prediction_time: bool = False,
     ) -> pd.DataFrame:
         pass
@@ -235,17 +261,17 @@ class KumoRFM:
     def predict(
         self,
         query: str,
-        indices: Union[List[str], List[float], List[int], None] = None,
+        indices: list[str] | list[float] | list[int] | None = None,
         *,
-        explain: Union[Literal[True], ExplainConfig, Dict[str, Any]],
-        anchor_time: Union[pd.Timestamp, Literal['entity'], None] = None,
-        context_anchor_time: Union[pd.Timestamp, None] = None,
-        run_mode: Union[RunMode, str] = RunMode.FAST,
-        num_neighbors: Optional[List[int]] = None,
+        explain: Literal[True] | ExplainConfig | dict[str, Any],
+        anchor_time: pd.Timestamp | Literal['entity'] | None = None,
+        context_anchor_time: pd.Timestamp | None = None,
+        run_mode: RunMode | str = RunMode.FAST,
+        num_neighbors: list[int] | None = None,
         num_hops: int = 2,
-        max_pq_iterations: int = 20,
-        random_seed: Optional[int] = _RANDOM_SEED,
-        verbose: Union[bool, ProgressLogger] = True,
+        max_pq_iterations: int = 10,
+        random_seed: int | None = _RANDOM_SEED,
+        verbose: bool | ProgressLogger = True,
         use_prediction_time: bool = False,
     ) -> Explanation:
         pass
@@ -253,19 +279,19 @@ class KumoRFM:
     def predict(
         self,
         query: str,
-        indices: Union[List[str], List[float], List[int], None] = None,
+        indices: list[str] | list[float] | list[int] | None = None,
         *,
-        explain: Union[bool, ExplainConfig, Dict[str, Any]] = False,
-        anchor_time: Union[pd.Timestamp, Literal['entity'], None] = None,
-        context_anchor_time: Union[pd.Timestamp, None] = None,
-        run_mode: Union[RunMode, str] = RunMode.FAST,
-        num_neighbors: Optional[List[int]] = None,
+        explain: bool | ExplainConfig | dict[str, Any] = False,
+        anchor_time: pd.Timestamp | Literal['entity'] | None = None,
+        context_anchor_time: pd.Timestamp | None = None,
+        run_mode: RunMode | str = RunMode.FAST,
+        num_neighbors: list[int] | None = None,
         num_hops: int = 2,
-        max_pq_iterations: int = 20,
-        random_seed: Optional[int] = _RANDOM_SEED,
-        verbose: Union[bool, ProgressLogger] = True,
+        max_pq_iterations: int = 10,
+        random_seed: int | None = _RANDOM_SEED,
+        verbose: bool | ProgressLogger = True,
         use_prediction_time: bool = False,
-    ) -> Union[pd.DataFrame, Explanation]:
+    ) -> pd.DataFrame | Explanation:
         """Returns predictions for a predictive query.
 
         Args:
@@ -307,7 +333,7 @@ class KumoRFM:
             If ``explain`` is provided, returns an :class:`Explanation` object
             containing the prediction, summary, and details.
         """
-        explain_config: Optional[ExplainConfig] = None
+        explain_config: ExplainConfig | None = None
         if explain is True:
             explain_config = ExplainConfig()
         elif explain is not False:
@@ -351,15 +377,15 @@ class KumoRFM:
             msg = f'[bold]PREDICT[/bold] {query_repr}'
 
         if not isinstance(verbose, ProgressLogger):
-            verbose = InteractiveProgressLogger(msg, verbose=verbose)
+            verbose = ProgressLogger.default(msg=msg, verbose=verbose)
 
         with verbose as logger:
 
-            batch_size: Optional[int] = None
+            batch_size: int | None = None
             if self._batch_size == 'max':
-                task_type = LocalPQueryDriver.get_task_type(
-                    query_def,
-                    edge_types=self._graph_store.edge_types,
+                task_type = self._get_task_type(
+                    query=query_def,
+                    edge_types=self._sampler.edge_types,
                 )
                 batch_size = _MAX_PRED_SIZE[task_type]
             else:
@@ -375,9 +401,9 @@ class KumoRFM:
                 logger.log(f"Splitting {len(indices):,} entities into "
                            f"{len(batches):,} batches of size {batch_size:,}")
 
-            predictions: List[pd.DataFrame] = []
-            summary: Optional[str] = None
-            details: Optional[Explanation] = None
+            predictions: list[pd.DataFrame] = []
+            summary: str | None = None
+            details: Explanation | None = None
             for i, batch in enumerate(batches):
                 # TODO Re-use the context for subsequent predictions.
                 context = self._get_context(
@@ -411,8 +437,7 @@ class KumoRFM:
                     stats = Context.get_memory_stats(request_msg.context)
                     raise ValueError(_SIZE_LIMIT_MSG.format(stats=stats))
 
-                if (isinstance(verbose, InteractiveProgressLogger) and i == 0
-                        and len(batches) > 1):
+                if i == 0 and len(batches) > 1:
                     verbose.init_progress(
                         total=len(batches),
                         description='Predicting',
@@ -433,10 +458,10 @@ class KumoRFM:
 
                         # Cast 'ENTITY' to correct data type:
                         if 'ENTITY' in df:
-                            entity = query_def.entity_table
-                            pkey_map = self._graph_store.pkey_map_dict[entity]
-                            df['ENTITY'] = df['ENTITY'].astype(
-                                type(pkey_map.index[0]))
+                            table_dict = context.subgraph.table_dict
+                            table = table_dict[query_def.entity_table]
+                            ser = table.df[table.primary_key]
+                            df['ENTITY'] = df['ENTITY'].astype(ser.dtype)
 
                         # Cast 'ANCHOR_TIMESTAMP' to correct data type:
                         if 'ANCHOR_TIMESTAMP' in df:
@@ -451,8 +476,7 @@ class KumoRFM:
 
                         predictions.append(df)
 
-                        if (isinstance(verbose, InteractiveProgressLogger)
-                                and len(batches) > 1):
+                        if len(batches) > 1:
                             verbose.step()
 
                         break
@@ -490,9 +514,9 @@ class KumoRFM:
     def is_valid_entity(
         self,
         query: str,
-        indices: Union[List[str], List[float], List[int], None] = None,
+        indices: list[str] | list[float] | list[int] | None = None,
         *,
-        anchor_time: Union[pd.Timestamp, Literal['entity'], None] = None,
+        anchor_time: pd.Timestamp | Literal['entity'] | None = None,
     ) -> np.ndarray:
         r"""Returns a mask that denotes which entities are valid for the
         given predictive query, *i.e.*, which entities fulfill (temporal)
@@ -519,37 +543,32 @@ class KumoRFM:
             raise ValueError("At least one entity is required")
 
         if anchor_time is None:
-            anchor_time = self._graph_store.max_time
+            anchor_time = self._get_default_anchor_time(query_def)
 
         if isinstance(anchor_time, pd.Timestamp):
             self._validate_time(query_def, anchor_time, None, False)
         else:
             assert anchor_time == 'entity'
-            if (query_def.entity_table not in self._graph_store.time_dict):
+            if query_def.entity_table not in self._sampler.time_column_dict:
                 raise ValueError(f"Anchor time 'entity' requires the entity "
                                  f"table '{query_def.entity_table}' "
                                  f"to have a time column.")
 
-        node = self._graph_store.get_node_id(
-            table_name=query_def.entity_table,
-            pkey=pd.Series(indices),
-        )
-        query_driver = LocalPQueryDriver(self._graph_store, query_def)
-        return query_driver.is_valid(node, anchor_time)
+        raise NotImplementedError
 
     def evaluate(
         self,
         query: str,
         *,
-        metrics: Optional[List[str]] = None,
-        anchor_time: Union[pd.Timestamp, Literal['entity'], None] = None,
-        context_anchor_time: Union[pd.Timestamp, None] = None,
-        run_mode: Union[RunMode, str] = RunMode.FAST,
-        num_neighbors: Optional[List[int]] = None,
+        metrics: list[str] | None = None,
+        anchor_time: pd.Timestamp | Literal['entity'] | None = None,
+        context_anchor_time: pd.Timestamp | None = None,
+        run_mode: RunMode | str = RunMode.FAST,
+        num_neighbors: list[int] | None = None,
         num_hops: int = 2,
-        max_pq_iterations: int = 20,
-        random_seed: Optional[int] = _RANDOM_SEED,
-        verbose: Union[bool, ProgressLogger] = True,
+        max_pq_iterations: int = 10,
+        random_seed: int | None = _RANDOM_SEED,
+        verbose: bool | ProgressLogger = True,
         use_prediction_time: bool = False,
     ) -> pd.DataFrame:
         """Evaluates a predictive query.
@@ -597,7 +616,7 @@ class KumoRFM:
         msg = f'[bold]EVALUATE[/bold] {query_repr}'
 
         if not isinstance(verbose, ProgressLogger):
-            verbose = InteractiveProgressLogger(msg, verbose=verbose)
+            verbose = ProgressLogger.default(msg=msg, verbose=verbose)
 
         with verbose as logger:
             context = self._get_context(
@@ -656,9 +675,9 @@ class KumoRFM:
         query: str,
         size: int,
         *,
-        anchor_time: Union[pd.Timestamp, Literal['entity'], None] = None,
-        random_seed: Optional[int] = _RANDOM_SEED,
-        max_iterations: int = 20,
+        anchor_time: pd.Timestamp | Literal['entity'] | None = None,
+        random_seed: int | None = _RANDOM_SEED,
+        max_iterations: int = 10,
     ) -> pd.DataFrame:
         """Returns the labels of a predictive query for a specified anchor
         time.
@@ -678,40 +697,37 @@ class KumoRFM:
         query_def = self._parse_query(query)
 
         if anchor_time is None:
-            anchor_time = self._graph_store.max_time
+            anchor_time = self._get_default_anchor_time(query_def)
             if query_def.target_ast.date_offset_range is not None:
-                anchor_time = anchor_time - (
-                    query_def.target_ast.date_offset_range.end_date_offset *
-                    query_def.num_forecasts)
+                offset = query_def.target_ast.date_offset_range.end_date_offset
+                offset *= query_def.num_forecasts
+                anchor_time -= offset
 
         assert anchor_time is not None
         if isinstance(anchor_time, pd.Timestamp):
             self._validate_time(query_def, anchor_time, None, evaluate=True)
         else:
             assert anchor_time == 'entity'
-            if (query_def.entity_table not in self._graph_store.time_dict):
+            if query_def.entity_table not in self._sampler.time_column_dict:
                 raise ValueError(f"Anchor time 'entity' requires the entity "
                                  f"table '{query_def.entity_table}' "
                                  f"to have a time column")
 
-        query_driver = LocalPQueryDriver(self._graph_store, query_def,
-                                         random_seed)
-
-        node, time, y = query_driver.collect_test(
-            size=size,
-            anchor_time=anchor_time,
-            batch_size=min(10_000, size),
-            max_iterations=max_iterations,
-            guarantee_train_examples=False,
+        train, test = self._sampler.sample_target(
+            query=query,
+            num_train_examples=0,
+            train_anchor_time=anchor_time,
+            num_train_trials=0,
+            num_test_examples=size,
+            test_anchor_time=anchor_time,
+            num_test_trials=max_iterations * size,
+            random_seed=random_seed,
         )
 
-        entity = self._graph_store.pkey_map_dict[
-            query_def.entity_table].index[node]
-
         return pd.DataFrame({
-            'ENTITY': entity,
-            'ANCHOR_TIMESTAMP': time,
-            'TARGET': y,
+            'ENTITY': test.entity_pkey,
+            'ANCHOR_TIMESTAMP': test.anchor_time,
+            'TARGET': test.target,
         })
 
     # Helpers #################################################################
@@ -734,8 +750,6 @@ class KumoRFM:
 
             resp = self._api_client.parse_query(request)
 
-            # TODO Expose validation warnings.
-
             if len(resp.validation_response.warnings) > 0:
                 msg = '\n'.join([
                     f'{i+1}. {warning.title}: {warning.message}' for i, warning
@@ -753,36 +767,92 @@ class KumoRFM:
             raise ValueError(f"Failed to parse query '{query}'. "
                              f"{msg}") from None
 
+    @staticmethod
+    def _get_task_type(
+        query: ValidatedPredictiveQuery,
+        edge_types: list[tuple[str, str, str]],
+    ) -> TaskType:
+        if isinstance(query.target_ast, (Condition, LogicalOperation)):
+            return TaskType.BINARY_CLASSIFICATION
+
+        target = query.target_ast
+        if isinstance(target, Join):
+            target = target.rhs_target
+        if isinstance(target, Aggregation):
+            if target.aggr == AggregationType.LIST_DISTINCT:
+                table_name, col_name = target._get_target_column_name().split(
+                    '.')
+                target_edge_types = [
+                    edge_type for edge_type in edge_types
+                    if edge_type[0] == table_name and edge_type[1] == col_name
+                ]
+                if len(target_edge_types) != 1:
+                    raise NotImplementedError(
+                        f"Multilabel-classification queries based on "
+                        f"'LIST_DISTINCT' are not supported yet. If you "
+                        f"planned to write a link prediction query instead, "
+                        f"make sure to register '{col_name}' as a "
+                        f"foreign key.")
+                return TaskType.TEMPORAL_LINK_PREDICTION
+
+            return TaskType.REGRESSION
+
+        assert isinstance(target, Column)
+
+        if target.stype in {Stype.ID, Stype.categorical}:
+            return TaskType.MULTICLASS_CLASSIFICATION
+
+        if target.stype in {Stype.numerical}:
+            return TaskType.REGRESSION
+
+        raise NotImplementedError("Task type not yet supported")
+
+    def _get_default_anchor_time(
+        self,
+        query: ValidatedPredictiveQuery,
+    ) -> pd.Timestamp:
+        if query.query_type == QueryType.TEMPORAL:
+            aggr_table_names = [
+                aggr._get_target_column_name().split('.')[0]
+                for aggr in query.get_all_target_aggregations()
+            ]
+            return self._sampler.get_max_time(aggr_table_names)
+
+        assert query.query_type == QueryType.STATIC
+        return self._sampler.get_max_time()
+
     def _validate_time(
         self,
         query: ValidatedPredictiveQuery,
         anchor_time: pd.Timestamp,
-        context_anchor_time: Union[pd.Timestamp, None],
+        context_anchor_time: pd.Timestamp | None,
         evaluate: bool,
     ) -> None:
 
-        if self._graph_store.min_time == pd.Timestamp.max:
+        if len(self._sampler.time_column_dict) == 0:
             return  # Graph without timestamps
 
-        if anchor_time < self._graph_store.min_time:
+        min_time = self._sampler.get_min_time()
+        max_time = self._sampler.get_max_time()
+
+        if anchor_time < min_time:
             raise ValueError(f"Anchor timestamp '{anchor_time}' is before "
-                             f"the earliest timestamp "
-                             f"'{self._graph_store.min_time}' in the data.")
+                             f"the earliest timestamp '{min_time}' in the "
+                             f"data.")
 
-        if (context_anchor_time is not None
-                and context_anchor_time < self._graph_store.min_time):
+        if context_anchor_time is not None and context_anchor_time < min_time:
             raise ValueError(f"Context anchor timestamp is too early or "
                              f"aggregation time range is too large. To make "
                              f"this prediction, we would need data back to "
                              f"'{context_anchor_time}', however, your data "
-                             f"only contains data back to "
-                             f"'{self._graph_store.min_time}'.")
+                             f"only contains data back to '{min_time}'.")
 
         if query.target_ast.date_offset_range is not None:
             end_offset = query.target_ast.date_offset_range.end_date_offset
         else:
             end_offset = pd.DateOffset(0)
-        forecast_end_offset = end_offset * query.num_forecasts
+        end_offset = end_offset * query.num_forecasts
+
         if (context_anchor_time is not None
                 and context_anchor_time > anchor_time):
             warnings.warn(f"Context anchor timestamp "
@@ -792,7 +862,7 @@ class KumoRFM:
                           f"intended.")
         elif (query.query_type == QueryType.TEMPORAL
               and context_anchor_time is not None
-              and context_anchor_time + forecast_end_offset > anchor_time):
+              and context_anchor_time + end_offset > anchor_time):
             warnings.warn(f"Aggregation for context examples at timestamp "
                           f"'{context_anchor_time}' will leak information "
                           f"from the prediction anchor timestamp "
@@ -800,40 +870,37 @@ class KumoRFM:
                           f"intended.")
 
         elif (context_anchor_time is not None
-              and context_anchor_time - forecast_end_offset
-              < self._graph_store.min_time):
-            _time = context_anchor_time - forecast_end_offset
+              and context_anchor_time - end_offset < min_time):
+            _time = context_anchor_time - end_offset
             warnings.warn(f"Context anchor timestamp is too early or "
                           f"aggregation time range is too large. To form "
                           f"proper input data, we would need data back to "
                           f"'{_time}', however, your data only contains "
-                          f"data back to '{self._graph_store.min_time}'.")
+                          f"data back to '{min_time}'.")
 
-        if (not evaluate and anchor_time
-                > self._graph_store.max_time + pd.DateOffset(days=1)):
+        if not evaluate and anchor_time > max_time + pd.DateOffset(days=1):
             warnings.warn(f"Anchor timestamp '{anchor_time}' is after the "
-                          f"latest timestamp '{self._graph_store.max_time}' "
-                          f"in the data. Please make sure this is intended.")
+                          f"latest timestamp '{max_time}' in the data. Please "
+                          f"make sure this is intended.")
 
-        max_eval_time = self._graph_store.max_time - forecast_end_offset
-        if evaluate and anchor_time > max_eval_time:
+        if evaluate and anchor_time > max_time - end_offset:
             raise ValueError(
                 f"Anchor timestamp for evaluation is after the latest "
-                f"supported timestamp '{max_eval_time}'.")
+                f"supported timestamp '{max_time - end_offset}'.")
 
     def _get_context(
         self,
         query: ValidatedPredictiveQuery,
-        indices: Union[List[str], List[float], List[int], None],
-        anchor_time: Union[pd.Timestamp, Literal['entity'], None],
-        context_anchor_time: Union[pd.Timestamp, None],
+        indices: list[str] | list[float] | list[int] | None,
+        anchor_time: pd.Timestamp | Literal['entity'] | None,
+        context_anchor_time: pd.Timestamp | None,
         run_mode: RunMode,
-        num_neighbors: Optional[List[int]],
+        num_neighbors: list[int] | None,
         num_hops: int,
         max_pq_iterations: int,
         evaluate: bool,
-        random_seed: Optional[int] = _RANDOM_SEED,
-        logger: Optional[ProgressLogger] = None,
+        random_seed: int | None = _RANDOM_SEED,
+        logger: ProgressLogger | None = None,
     ) -> Context:
 
         if num_neighbors is not None:
@@ -850,10 +917,9 @@ class KumoRFM:
                              f"'https://github.com/kumo-ai/kumo-rfm' if you "
                              f"must go beyond this for your use-case.")
 
-        query_driver = LocalPQueryDriver(self._graph_store, query, random_seed)
-        task_type = LocalPQueryDriver.get_task_type(
-            query,
-            edge_types=self._graph_store.edge_types,
+        task_type = self._get_task_type(
+            query=query,
+            edge_types=self._sampler.edge_types,
         )
 
         if logger is not None:
@@ -885,14 +951,17 @@ class KumoRFM:
                 num_neighbors = [64, 64, 8, 8, 4, 4][:num_hops]
 
         if query.target_ast.date_offset_range is None:
-            end_offset = pd.DateOffset(0)
+            step_offset = pd.DateOffset(0)
         else:
-            end_offset = query.target_ast.date_offset_range.end_date_offset
-        forecast_end_offset = end_offset * query.num_forecasts
+            step_offset = query.target_ast.date_offset_range.end_date_offset
+        end_offset = step_offset * query.num_forecasts
+
         if anchor_time is None:
-            anchor_time = self._graph_store.max_time
+            anchor_time = self._get_default_anchor_time(query)
+
             if evaluate:
-                anchor_time = anchor_time - forecast_end_offset
+                anchor_time = anchor_time - end_offset
+
             if logger is not None:
                 assert isinstance(anchor_time, pd.Timestamp)
                 if anchor_time == pd.Timestamp.min:
@@ -906,57 +975,71 @@ class KumoRFM:
 
         assert anchor_time is not None
         if isinstance(anchor_time, pd.Timestamp):
+            if context_anchor_time == 'entity':
+                raise ValueError("Anchor time 'entity' needs to be shared "
+                                 "for context and prediction examples")
             if context_anchor_time is None:
-                context_anchor_time = anchor_time - forecast_end_offset
+                context_anchor_time = anchor_time - end_offset
             self._validate_time(query, anchor_time, context_anchor_time,
                                 evaluate)
         else:
             assert anchor_time == 'entity'
-            if query.entity_table not in self._graph_store.time_dict:
+            if query.query_type != QueryType.STATIC:
+                raise ValueError("Anchor time 'entity' is only valid for "
+                                 "static predictive queries")
+            if query.entity_table not in self._sampler.time_column_dict:
                 raise ValueError(f"Anchor time 'entity' requires the entity "
                                  f"table '{query.entity_table}' to "
                                  f"have a time column")
-            if context_anchor_time is not None:
-                warnings.warn("Ignoring option 'context_anchor_time' for "
-                              "`anchor_time='entity'`")
-            context_anchor_time = None
+            if isinstance(context_anchor_time, pd.Timestamp):
+                raise ValueError("Anchor time 'entity' needs to be shared "
+                                 "for context and prediction examples")
+            context_anchor_time = 'entity'
 
-        y_test: Optional[pd.Series] = None
+        num_train_examples = _MAX_CONTEXT_SIZE[run_mode]
         if evaluate:
-            max_test_size = _MAX_TEST_SIZE[run_mode]
+            num_test_examples = _MAX_TEST_SIZE[run_mode]
             if task_type.is_link_pred:
-                max_test_size = max_test_size // 5
+                num_test_examples = num_test_examples // 5
+        else:
+            num_test_examples = 0
+
+        train, test = self._sampler.sample_target(
+            query=query,
+            num_train_examples=num_train_examples,
+            train_anchor_time=context_anchor_time,
+            num_train_trials=max_pq_iterations * num_train_examples,
+            num_test_examples=num_test_examples,
+            test_anchor_time=anchor_time,
+            num_test_trials=max_pq_iterations * num_test_examples,
+            random_seed=random_seed,
+        )
+        train_pkey, train_time, y_train = train
+        test_pkey, test_time, y_test = test
 
-            test_node, test_time, y_test = query_driver.collect_test(
-                size=max_test_size,
-                anchor_time=anchor_time,
-                max_iterations=max_pq_iterations,
-                guarantee_train_examples=True,
-            )
-            if logger is not None:
-                if task_type == TaskType.BINARY_CLASSIFICATION:
-                    pos = 100 * int((y_test > 0).sum()) / len(y_test)
-                    msg = (f"Collected {len(y_test):,} test examples with "
-                           f"{pos:.2f}% positive cases")
-                elif task_type == TaskType.MULTICLASS_CLASSIFICATION:
-                    msg = (f"Collected {len(y_test):,} test examples "
-                           f"holding {y_test.nunique()} classes")
-                elif task_type == TaskType.REGRESSION:
-                    _min, _max = float(y_test.min()), float(y_test.max())
-                    msg = (f"Collected {len(y_test):,} test examples with "
-                           f"targets between {format_value(_min)} and "
-                           f"{format_value(_max)}")
-                elif task_type == TaskType.TEMPORAL_LINK_PREDICTION:
-                    num_rhs = y_test.explode().nunique()
-                    msg = (f"Collected {len(y_test):,} test examples with "
-                           f"{num_rhs:,} unique items")
-                else:
-                    raise NotImplementedError
-                logger.log(msg)
+        if evaluate and logger is not None:
+            if task_type == TaskType.BINARY_CLASSIFICATION:
+                pos = 100 * int((y_test > 0).sum()) / len(y_test)
+                msg = (f"Collected {len(y_test):,} test examples with "
+                       f"{pos:.2f}% positive cases")
+            elif task_type == TaskType.MULTICLASS_CLASSIFICATION:
+                msg = (f"Collected {len(y_test):,} test examples holding "
+                       f"{y_test.nunique()} classes")
+            elif task_type == TaskType.REGRESSION:
+                _min, _max = float(y_test.min()), float(y_test.max())
+                msg = (f"Collected {len(y_test):,} test examples with targets "
+                       f"between {format_value(_min)} and "
+                       f"{format_value(_max)}")
+            elif task_type == TaskType.TEMPORAL_LINK_PREDICTION:
+                num_rhs = y_test.explode().nunique()
+                msg = (f"Collected {len(y_test):,} test examples with "
+                       f"{num_rhs:,} unique items")
+            else:
+                raise NotImplementedError
+            logger.log(msg)
 
-        else:
+        if not evaluate:
             assert indices is not None
-
             if len(indices) > _MAX_PRED_SIZE[task_type]:
                 raise ValueError(f"Cannot predict for more than "
                                  f"{_MAX_PRED_SIZE[task_type]:,} entities at "
@@ -964,26 +1047,12 @@ class KumoRFM:
                                  f"`KumoRFM.batch_mode` to process entities "
                                  f"in batches")
 
-            test_node = self._graph_store.get_node_id(
-                table_name=query.entity_table,
-                pkey=pd.Series(indices),
-            )
-
+            test_pkey = pd.Series(indices, dtype=train_pkey.dtype)
             if isinstance(anchor_time, pd.Timestamp):
-                test_time = pd.Series(anchor_time).repeat(
-                    len(test_node)).reset_index(drop=True)
+                test_time = pd.Series([anchor_time]).repeat(
+                    len(indices)).reset_index(drop=True)
             else:
-                time = self._graph_store.time_dict[query.entity_table]
-                time = time[test_node] * 1000**3
-                test_time = pd.Series(time, dtype='datetime64[ns]')
-
-        train_node, train_time, y_train = query_driver.collect_train(
-            size=_MAX_CONTEXT_SIZE[run_mode],
-            anchor_time=context_anchor_time or 'entity',
-            exclude_node=test_node if (query.query_type == QueryType.STATIC
-                                       or anchor_time == 'entity') else None,
-            max_iterations=max_pq_iterations,
-        )
+                train_time = test_time = 'entity'
 
         if logger is not None:
             if task_type == TaskType.BINARY_CLASSIFICATION:
@@ -1006,12 +1075,12 @@ class KumoRFM:
                 raise NotImplementedError
             logger.log(msg)
 
-        entity_table_names: Tuple[str, ...]
+        entity_table_names: tuple[str, ...]
         if task_type.is_link_pred:
             final_aggr = query.get_final_target_aggregation()
             assert final_aggr is not None
             edge_fkey = final_aggr._get_target_column_name()
-            for edge_type in self._graph_store.edge_types:
+            for edge_type in self._sampler.edge_types:
                 if edge_fkey == f'{edge_type[0]}.{edge_type[1]}':
                     entity_table_names = (
                         query.entity_table,
@@ -1023,20 +1092,24 @@ class KumoRFM:
         # Exclude the entity anchor time from the feature set to prevent
         # running out-of-distribution between in-context and test examples:
         exclude_cols_dict = query.get_exclude_cols_dict()
-        if anchor_time == 'entity':
+        if entity_table_names[0] in self._sampler.time_column_dict:
             if entity_table_names[0] not in exclude_cols_dict:
                 exclude_cols_dict[entity_table_names[0]] = []
-            time_column_dict = self._graph_store.time_column_dict
-            time_column = time_column_dict[entity_table_names[0]]
+            time_column = self._sampler.time_column_dict[entity_table_names[0]]
             exclude_cols_dict[entity_table_names[0]].append(time_column)
 
-        subgraph = self._graph_sampler(
+        subgraph = self._sampler.sample_subgraph(
             entity_table_names=entity_table_names,
-            node=np.concatenate([train_node, test_node]),
-            time=np.concatenate([
-                train_time.astype('datetime64[ns]').astype(int).to_numpy(),
-                test_time.astype('datetime64[ns]').astype(int).to_numpy(),
-            ]),
+            entity_pkey=pd.concat(
+                [train_pkey, test_pkey],
+                axis=0,
+                ignore_index=True,
+            ),
+            anchor_time=pd.concat(
+                [train_time, test_time],
+                axis=0,
+                ignore_index=True,
+            ) if isinstance(train_time, pd.Series) else 'entity',
             num_neighbors=num_neighbors,
             exclude_cols_dict=exclude_cols_dict,
         )
@@ -1048,23 +1121,19 @@ class KumoRFM:
                              f"'https://github.com/kumo-ai/kumo-rfm' if you "
                              f"must go beyond this for your use-case.")
 
-        step_size: Optional[int] = None
-        if query.query_type == QueryType.TEMPORAL:
-            step_size = date_offset_to_seconds(end_offset)
-
         return Context(
             task_type=task_type,
             entity_table_names=entity_table_names,
             subgraph=subgraph,
             y_train=y_train,
-            y_test=y_test,
+            y_test=y_test if evaluate else None,
             top_k=query.top_k,
-            step_size=step_size,
+            step_size=None,
         )
 
     @staticmethod
     def _validate_metrics(
-        metrics: List[str],
+        metrics: list[str],
         task_type: TaskType,
     ) -> None:
 
@@ -1121,7 +1190,7 @@ class KumoRFM:
                                  f"'https://github.com/kumo-ai/kumo-rfm'.")
 
 
-def format_value(value: Union[int, float]) -> str:
+def format_value(value: int | float) -> str:
     if value == int(value):
         return f'{int(value):,}'
     if abs(value) >= 1000: