Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions astraflow/core/config/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ def load_dataflow_config(raw: dict) -> dict:
_set_if_missing(agent_fields, "replay_size", buffer.get("replay_size"))
_set_if_missing(agent_fields, "replay_ratio", buffer.get("replay_ratio"))
_set_if_missing(agent_fields, "max_staleness", buffer.get("max_staleness"))
_set_if_missing(agent_fields, "queue_order", buffer.get("queue_order"))
_set_if_missing(agent_fields, "filter_function", buffer.get("filter_function"))

# Extract service-level config from agent_fields (they're in the
Expand Down
2 changes: 2 additions & 0 deletions astraflow/dataflow/astraflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def __init__(
max_staleness: int | None = None,
replay_max_size: int | None = None,
replay_selection_fn: ReplaySelectionFn | str | None = None,
queue_order: str = "edf",
producer_error_backoff: float = 0.5,
data_serving: DataServing | None = None,
data_acquisition: DataAcquisition | None = None,
Expand All @@ -71,6 +72,7 @@ def __init__(
max_staleness=max_staleness,
replay_max_size=replay_max_size,
replay_selection_fn=replay_selection_fn,
queue_order=queue_order,
per_model_config=per_model_buffer_config,
)
self.data_serving = data_serving
Expand Down
6 changes: 5 additions & 1 deletion astraflow/dataflow/data_serving.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ def __init__(
max_staleness: int | None = None,
replay_max_size: int | None = None,
replay_selection_fn: ReplaySelectionFn | str | None = None,
queue_order: str = "edf",
):
resolved_replay_selection_fn = self._resolve_replay_selection_fn(
replay_selection_fn
Expand All @@ -139,6 +140,7 @@ def __init__(
max_staleness=max_staleness,
replay_max_size=replay_max_size,
replay_selection_fn=resolved_replay_selection_fn,
queue_order=queue_order,
)
self._acq_stats_lock = threading.Lock()
self._acq_stats: dict[str, float | int] = _empty_acquisition_stats()
Expand Down Expand Up @@ -392,7 +394,7 @@ class MultiModelDataServing:
per_model_config : dict[str, dict] | None
Optional per-model overrides. Keys are model_ids, values are dicts
with optional keys ``buffer_size``, ``max_staleness``,
``replay_max_size``.
``replay_max_size``, ``queue_order``.
"""

def __init__(
Expand All @@ -405,6 +407,7 @@ def __init__(
max_staleness: int | None = None,
replay_max_size: int | None = None,
replay_selection_fn: ReplaySelectionFn | str | None = None,
queue_order: str = "edf",
per_model_config: dict[str, dict] | None = None,
):
if model_ids is not None and len(model_ids) > 0:
Expand All @@ -424,6 +427,7 @@ def __init__(
max_staleness=cfg.get("max_staleness", max_staleness),
replay_max_size=cfg.get("replay_max_size", replay_max_size),
replay_selection_fn=replay_selection_fn,
queue_order=cfg.get("queue_order", queue_order),
)
buf.buffer.label = f"[{mid}] " if self._is_multi_model else ""
self.buffers[mid] = buf
Expand Down
Loading
Loading