diff --git a/eval_protocol/__init__.py b/eval_protocol/__init__.py index 37749010..fb9a9d16 100644 --- a/eval_protocol/__init__.py +++ b/eval_protocol/__init__.py @@ -36,6 +36,7 @@ from .log_utils.rollout_id_filter import RolloutIdFilter from .log_utils.util import setup_rollout_logging_for_elasticsearch_handler from .log_utils.fireworks_tracing_http_handler import FireworksTracingHttpHandler +from .log_utils.elasticsearch_client import ElasticsearchConfig from .types.remote_rollout_processor import ( @@ -75,6 +76,7 @@ warnings.filterwarnings("default", category=DeprecationWarning, module="eval_protocol") __all__ = [ + "ElasticsearchConfig", "ElasticsearchDirectHttpHandler", "RolloutIdFilter", "setup_rollout_logging_for_elasticsearch_handler", diff --git a/eval_protocol/pytest/remote_rollout_processor.py b/eval_protocol/pytest/remote_rollout_processor.py index 2c67e307..4dce27af 100644 --- a/eval_protocol/pytest/remote_rollout_processor.py +++ b/eval_protocol/pytest/remote_rollout_processor.py @@ -93,7 +93,7 @@ def __init__( poll_interval: float = 1.0, timeout_seconds: float = 120.0, output_data_loader: Optional[Callable[[DataLoaderConfig], DynamicDataLoader]] = None, - disable_elastic_search: bool = False, + disable_elastic_search_setup: bool = False, elastic_search_config: Optional[ElasticsearchConfig] = None, ): # Prefer constructor-provided configuration. These can be overridden via @@ -108,11 +108,11 @@ def __init__( self._poll_interval = poll_interval self._timeout_seconds = timeout_seconds self._output_data_loader = output_data_loader or _default_output_data_loader - self._disable_elastic_search = disable_elastic_search + self._disable_elastic_search_setup = disable_elastic_search_setup self._elastic_search_config = elastic_search_config def setup(self) -> None: - if self._disable_elastic_search: + if self._disable_elastic_search_setup: logger.info("Elasticsearch is disabled, skipping setup") return logger.info("Setting up Elasticsearch")