Skip to content

Commit edf07e0

Browse files
committed
Changing the variable name to metrics interval in seconds to be more exact,
1 parent 3546969 commit edf07e0

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

nodestream/cli/commands/run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Run(NodestreamCommand):
5858
flag=False,
5959
),
6060
option(
61-
"time-interval-seconds",
61+
"metrics-interval-seconds",
6262
description="Time interval to report metrics in seconds",
6363
default=None,
6464
flag=False,

nodestream/cli/operations/run_pipeline.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@ def create_progress_reporter(
122122
self, command: NodestreamCommand, pipeline_name: str
123123
) -> PipelineProgressReporter:
124124
indicator = self.get_progress_indicator(command, pipeline_name)
125-
time_interval_seconds = (
126-
float(command.option("time-interval-seconds"))
127-
if command.option("time-interval-seconds")
125+
metrics_interval_in_seconds = (
126+
float(command.option("metrics-interval-in-seconds"))
127+
if command.option("metrics-interval-in-seconds")
128128
else None
129129
)
130130
return PipelineProgressReporter(
131131
reporting_frequency=int(command.option("reporting-frequency")),
132-
time_interval_seconds=time_interval_seconds,
132+
metrics_interval_in_seconds=metrics_interval_in_seconds,
133133
callback=indicator.progress_callback,
134134
on_start_callback=indicator.on_start,
135135
on_finish_callback=indicator.on_finish,

nodestream/pipeline/progress_reporter.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class PipelineProgressReporter:
3333
"""A `PipelineProgressReporter` is a utility that can be used to report on the progress of a pipeline."""
3434

3535
reporting_frequency: int = 10000
36-
time_interval_seconds: Optional[float] = None
36+
metrics_interval_in_seconds: Optional[float] = None
3737
logger: Logger = field(default_factory=getLogger)
3838
callback: Callable[[int, Metrics], None] = field(default=no_op)
3939
on_start_callback: Callable[[], None] = field(default=no_op)
@@ -71,9 +71,9 @@ def for_testing(cls, results_list: list) -> "PipelineProgressReporter":
7171
)
7272

7373
def report(self, index, metrics: Metrics):
74-
if self.time_interval_seconds is not None:
74+
if self.metrics_interval_in_seconds is not None:
7575
current_time = time.time()
76-
if current_time - self.last_report_time >= self.time_interval_seconds:
76+
if current_time - self.last_report_time >= self.metrics_interval_in_seconds:
7777
self.callback(index, metrics)
7878
self.last_report_time = current_time
7979
elif index % self.reporting_frequency == 0:

tests/unit/cli/operations/test_run_pipeline.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def test_create_progress_reporter_with_time_interval_seconds(
6060
"""Test that time_interval_seconds gets properly converted to float and passed to PipelineProgressReporter"""
6161
command = mocker.Mock()
6262
command.option.side_effect = lambda opt: {
63-
"time-interval-seconds": "30.5",
63+
"metrics-interval-in-seconds": "30.5",
6464
"reporting-frequency": "1000",
6565
}.get(opt)
6666
command.has_json_logging_set = False
@@ -75,7 +75,7 @@ def test_create_progress_reporter_with_time_interval_seconds(
7575
# Verify PipelineProgressReporter was called with correct time_interval_seconds
7676
mock_progress_reporter.assert_called_once()
7777
call_args = mock_progress_reporter.call_args
78-
assert_that(call_args.kwargs["time_interval_seconds"], equal_to(30.5))
78+
assert_that(call_args.kwargs["metrics_interval_in_seconds"], equal_to(30.5))
7979
assert_that(call_args.kwargs["reporting_frequency"], equal_to(1000))
8080

8181

@@ -85,7 +85,7 @@ def test_create_progress_reporter_without_time_interval_seconds(
8585
"""Test that time_interval_seconds is None when not provided"""
8686
command = mocker.Mock()
8787
command.option.side_effect = lambda opt: {
88-
"time-interval-seconds": None,
88+
"metrics-interval-in-seconds": None,
8989
"reporting-frequency": "2000",
9090
}.get(opt)
9191
command.has_json_logging_set = False
@@ -100,15 +100,15 @@ def test_create_progress_reporter_without_time_interval_seconds(
100100
# Verify PipelineProgressReporter was called with None for time_interval_seconds
101101
mock_progress_reporter.assert_called_once()
102102
call_args = mock_progress_reporter.call_args
103-
assert_that(call_args.kwargs["time_interval_seconds"], equal_to(None))
103+
assert_that(call_args.kwargs["metrics_interval_in_seconds"], equal_to(None))
104104
assert_that(call_args.kwargs["reporting_frequency"], equal_to(2000))
105105

106106

107107
def test_create_progress_reporter_with_json_indicator(run_pipeline_operation, mocker):
108108
"""Test that create_progress_reporter works correctly with JSON progress indicator"""
109109
command = mocker.Mock()
110110
command.option.side_effect = lambda opt: {
111-
"time-interval-seconds": "15.0",
111+
"metrics-interval-in-seconds": "15.0",
112112
"reporting-frequency": "500",
113113
}.get(opt)
114114
command.has_json_logging_set = True
@@ -123,7 +123,7 @@ def test_create_progress_reporter_with_json_indicator(run_pipeline_operation, mo
123123
# Verify PipelineProgressReporter was called with correct arguments
124124
mock_progress_reporter.assert_called_once()
125125
call_args = mock_progress_reporter.call_args
126-
assert_that(call_args.kwargs["time_interval_seconds"], equal_to(15.0))
126+
assert_that(call_args.kwargs["metrics_interval_in_seconds"], equal_to(15.0))
127127
assert_that(call_args.kwargs["reporting_frequency"], equal_to(500))
128128

129129

@@ -142,7 +142,7 @@ def test_make_run_request_with_time_interval_seconds_integration(
142142
"annotations": annotations,
143143
"step-outbox-size": "10001",
144144
"target": targets,
145-
"time-interval-seconds": "45.0",
145+
"metrics-interval-in-seconds": "45.0",
146146
"reporting-frequency": "5000",
147147
}
148148
command.option.side_effect = lambda opt: option_responses.get(opt)
@@ -168,7 +168,7 @@ def test_make_run_request_with_time_interval_seconds_integration(
168168
# Verify the progress reporter was created with correct time_interval_seconds
169169
mock_progress_reporter.assert_called_once()
170170
call_args = mock_progress_reporter.call_args
171-
assert_that(call_args.kwargs["time_interval_seconds"], equal_to(45.0))
171+
assert_that(call_args.kwargs["metrics_interval_in_seconds"], equal_to(45.0))
172172
assert_that(call_args.kwargs["reporting_frequency"], equal_to(5000))
173173

174174
# Verify other parts of the request are still correct

tests/unit/pipeline/test_pipeline_progress_reporter.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ async def test_pipeline_progress_reporter_for_testing(mocker):
2222
assert_that(result.logger.name, equal_to("test"))
2323

2424

25-
def test_pipeline_progress_reporter_with_time_interval_seconds(mocker):
26-
"""Test that time_interval_seconds works correctly"""
25+
def test_pipeline_progress_reporter_with_metrics_interval_in_seconds(mocker):
26+
"""Test that metrics_interval_in_seconds works correctly"""
2727
mock_callback = Mock()
2828
reporter = PipelineProgressReporter(
29-
time_interval_seconds=0.1, callback=mock_callback
29+
metrics_interval_in_seconds=0.1, callback=mock_callback
3030
)
3131

3232
mock_time = mocker.patch("nodestream.pipeline.progress_reporter.time.time")
@@ -39,11 +39,11 @@ def test_pipeline_progress_reporter_with_time_interval_seconds(mocker):
3939
assert_that(mock_callback.call_count, equal_to(1))
4040

4141

42-
def test_pipeline_progress_reporter_without_time_interval_uses_frequency():
43-
"""Test that None time_interval_seconds falls back to frequency-based reporting"""
42+
def test_pipeline_progress_reporter_without_metrics_interval_in_seconds_uses_frequency():
43+
"""Test that None metrics_interval_in_seconds falls back to frequency-based reporting"""
4444
mock_callback = Mock()
4545
reporter = PipelineProgressReporter(
46-
time_interval_seconds=None, reporting_frequency=3, callback=mock_callback
46+
metrics_interval_in_seconds=None, reporting_frequency=3, callback=mock_callback
4747
)
4848

4949
metrics = Metrics()

0 commit comments

Comments
 (0)