diff --git a/miles/rollout/fully_async_data_buffer.py b/miles/rollout/fully_async_data_buffer.py index 1e432488f0..f6326d2a46 100644 --- a/miles/rollout/fully_async_data_buffer.py +++ b/miles/rollout/fully_async_data_buffer.py @@ -16,14 +16,10 @@ from miles.rollout.filter_hub.base_types import MetricGatherer, call_dynamic_filter from miles.utils.misc import load_function -from miles.utils.types import Sample +from miles.utils.types import Group, Sample logger = logging.getLogger(__name__) -# A finished group is list[Sample], or list[list[Sample]] when a generate function -# returns multiple samples per trajectory (e.g. multi-agent). -Group = list[Sample | list[Sample]] - def iter_samples(group: Group) -> Iterator[Sample]: for item in group: diff --git a/miles/rollout/fully_async_rollout.py b/miles/rollout/fully_async_rollout.py index 74d85d2e80..84794f7c4f 100644 --- a/miles/rollout/fully_async_rollout.py +++ b/miles/rollout/fully_async_rollout.py @@ -33,14 +33,13 @@ DataBufferConstructorInput, DataBufferInput, DefaultDataBuffer, - Group, first_sample, ) from miles.rollout.inference_rollout.inference_rollout_common import GenerateState, generate_and_rm_group from miles.rollout.inference_rollout.inference_rollout_eval import run_eval_datasets from miles.rollout.submission_scheduler import make_submission_scheduler from miles.utils.misc import load_function -from miles.utils.types import Sample +from miles.utils.types import Group, Sample logger = logging.getLogger(__name__) diff --git a/miles/rollout/inference_rollout/inference_rollout_common.py b/miles/rollout/inference_rollout/inference_rollout_common.py index ce1ffee73f..2372272018 100644 --- a/miles/rollout/inference_rollout/inference_rollout_common.py +++ b/miles/rollout/inference_rollout/inference_rollout_common.py @@ -21,7 +21,7 @@ from miles.rollout.inference_rollout.compatibility import load_generate_function from miles.rollout.rm_hub import async_rm, batched_async_rm from miles.utils.processing_utils import load_processor, load_tokenizer -from miles.utils.types import Sample +from miles.utils.types import Group, Sample logger = logging.getLogger(__name__) @@ -126,7 +126,7 @@ async def generate_and_rm_group( sampling_params: dict[str, Any], evaluation: bool = False, sample_done_callback: Callable[[], None] | None = None, -) -> list[Sample]: +) -> Group: args = state.args if state.aborted: diff --git a/miles/rollout/inference_rollout/inference_rollout_train.py b/miles/rollout/inference_rollout/inference_rollout_train.py index a486bb2fbc..6e6050aa7d 100644 --- a/miles/rollout/inference_rollout/inference_rollout_train.py +++ b/miles/rollout/inference_rollout/inference_rollout_train.py @@ -15,7 +15,7 @@ from miles.utils import dumper_utils from miles.utils.http_utils import get, post, router_worker_base_urls from miles.utils.misc import as_completed_async, call_agent_abort_hook, load_function -from miles.utils.types import Sample +from miles.utils.types import Group, Sample logger = logging.getLogger(__name__) @@ -119,7 +119,7 @@ async def generate_rollout_async( logger.debug(f"[rollout] asyncio.wait returned: {len(done)} done, {len(pendings)} pending") for task in done: try: - group: list[Sample] = task.result() + group: Group = task.result() except Exception as e: logger.error(f"[rollout] Task raised exception: {e!r}", exc_info=True) continue diff --git a/miles/rollout/multi_lora/async_rollout.py b/miles/rollout/multi_lora/async_rollout.py index 21bb36179c..d937621a8a 100644 --- a/miles/rollout/multi_lora/async_rollout.py +++ b/miles/rollout/multi_lora/async_rollout.py @@ -21,15 +21,12 @@ from miles.utils.misc import load_function from miles.utils.multi_lora import EmptyBatchTimeoutError, min_groups_per_dp_split from miles.utils.tracking_utils import tracking -from miles.utils.types import Sample +from miles.utils.types import Group, Sample logger = logging.getLogger(__name__) GenerateFn = Callable[..., Any] -# Generate fns may return several samples per rollout; the manager flattens later. -Group = list[Sample | list[Sample]] - def iter_group_samples(group: Group): return itertools.chain.from_iterable(item if isinstance(item, list) else (item,) for item in group) diff --git a/miles/rollout/sglang_rollout.py b/miles/rollout/sglang_rollout.py index 5c369e40da..adae5162c6 100644 --- a/miles/rollout/sglang_rollout.py +++ b/miles/rollout/sglang_rollout.py @@ -32,7 +32,7 @@ load_processor, load_tokenizer, ) -from miles.utils.types import Sample +from miles.utils.types import Group, Sample from .generate_utils.generate_endpoint_utils import ( compute_routing_headers, @@ -400,7 +400,7 @@ async def generate_and_rm( async def generate_and_rm_group( args: Namespace, group: list[Sample], sampling_params: dict[str, Any], evaluation: bool = False -) -> list[Sample]: +) -> Group: state = GenerateState(args) if state.aborted: diff --git a/miles/utils/types.py b/miles/utils/types.py index 78d24e49f1..dff61d26e0 100644 --- a/miles/utils/types.py +++ b/miles/utils/types.py @@ -297,6 +297,11 @@ def update_from_meta_info(self, args, meta_info: dict): self.status = Sample.Status.COMPLETED +# One prompt's finished trajectories. A generate function may expand one trajectory +# into several samples (e.g. multi-agent), so an element is a Sample or a list of them. +Group = list[Sample | list[Sample]] + + @dataclass(frozen=True) class ParamInfo: name: str