File tree Expand file tree Collapse file tree 6 files changed +25
-32
lines changed
Expand file tree Collapse file tree 6 files changed +25
-32
lines changed Original file line number Diff line number Diff line change 1313from ax .api .client import Client
1414from ax .api .configs import RangeParameterConfig
1515from ax .core .arm import Arm
16- from ax .core .trial_status import TrialStatus
16+ from ax .core .trial_status import DEFAULT_ANALYSIS_STATUSES , TrialStatus
1717from ax .exceptions .core import UserInputError
1818from ax .utils .common .testutils import TestCase
1919from ax .utils .testing .core_stubs import (
@@ -78,12 +78,10 @@ def test_trial_statuses_behavior(self) -> None:
7878 # When neither trial_statuses nor trial_index is provided,
7979 # should use default statuses (excluding ABANDONED, STALE, and FAILED)
8080 analysis = ArmEffectsPlot (metric_name = "foo" )
81- expected_statuses = {* TrialStatus } - {
82- TrialStatus .ABANDONED ,
83- TrialStatus .STALE ,
84- TrialStatus .FAILED ,
85- }
86- self .assertEqual (set (none_throws (analysis .trial_statuses )), expected_statuses )
81+ self .assertEqual (
82+ set (none_throws (analysis .trial_statuses )),
83+ DEFAULT_ANALYSIS_STATUSES ,
84+ )
8785
8886 # When trial_statuses is explicitly provided, it should be used
8987 explicit_statuses = [TrialStatus .COMPLETED , TrialStatus .RUNNING ]
Original file line number Diff line number Diff line change 2020 OptimizationConfig ,
2121)
2222from ax .core .outcome_constraint import ScalarizedOutcomeConstraint
23- from ax .core .trial_status import TrialStatus
23+ from ax .core .trial_status import DEFAULT_ANALYSIS_STATUSES , TrialStatus
2424from ax .core .types import ComparisonOp
2525from ax .utils .common .testutils import TestCase
2626from ax .utils .testing .core_stubs import (
@@ -52,12 +52,10 @@ def test_trial_statuses_behavior(self) -> None:
5252 # When neither trial_statuses nor trial_index is provided,
5353 # should use default statuses (excluding ABANDONED, STALE, and FAILED)
5454 analysis = ObjectivePFeasibleFrontierPlot ()
55- expected_statuses = {* TrialStatus } - {
56- TrialStatus .ABANDONED ,
57- TrialStatus .STALE ,
58- TrialStatus .FAILED ,
59- }
60- self .assertEqual (set (none_throws (analysis .trial_statuses )), expected_statuses )
55+ self .assertEqual (
56+ set (none_throws (analysis .trial_statuses )),
57+ DEFAULT_ANALYSIS_STATUSES ,
58+ )
6159
6260 # When trial_statuses is explicitly provided, it should be used
6361 explicit_statuses = [TrialStatus .COMPLETED , TrialStatus .RUNNING ]
Original file line number Diff line number Diff line change 1414from ax .api .client import Client
1515from ax .api .configs import RangeParameterConfig
1616from ax .core .arm import Arm
17- from ax .core .trial_status import TrialStatus
17+ from ax .core .trial_status import DEFAULT_ANALYSIS_STATUSES , TrialStatus
1818from ax .exceptions .core import UserInputError
1919from ax .utils .common .testutils import TestCase
2020from ax .utils .testing .core_stubs import (
@@ -75,12 +75,10 @@ def test_trial_statuses_behavior(self) -> None:
7575 # When neither trial_statuses nor trial_index is provided,
7676 # should use default statuses (excluding ABANDONED, STALE, and FAILED)
7777 analysis = ScatterPlot (x_metric_name = "foo" , y_metric_name = "bar" )
78- expected_statuses = {* TrialStatus } - {
79- TrialStatus .ABANDONED ,
80- TrialStatus .STALE ,
81- TrialStatus .FAILED ,
82- }
83- self .assertEqual (set (none_throws (analysis .trial_statuses )), expected_statuses )
78+ self .assertEqual (
79+ set (none_throws (analysis .trial_statuses )),
80+ DEFAULT_ANALYSIS_STATUSES ,
81+ )
8482
8583 # When trial_statuses is explicitly provided, it should be used
8684 explicit_statuses = [TrialStatus .COMPLETED , TrialStatus .RUNNING ]
Original file line number Diff line number Diff line change 1111 get_trial_statuses_with_fallback ,
1212 trial_index_to_color ,
1313)
14- from ax .core .trial_status import TrialStatus
14+ from ax .core .trial_status import DEFAULT_ANALYSIS_STATUSES , TrialStatus
1515from ax .utils .common .testutils import TestCase
1616from pyre_extensions import none_throws
1717
@@ -38,12 +38,7 @@ def test_get_trial_statuses_with_fallback_default(self) -> None:
3838 get_trial_statuses_with_fallback (trial_statuses = None , trial_index = None )
3939 )
4040
41- expected_statuses = {* TrialStatus } - {
42- TrialStatus .ABANDONED ,
43- TrialStatus .STALE ,
44- TrialStatus .FAILED ,
45- }
46- self .assertEqual (set (result ), expected_statuses )
41+ self .assertEqual (set (result ), DEFAULT_ANALYSIS_STATUSES )
4742 self .assertNotIn (TrialStatus .ABANDONED , result )
4843 self .assertNotIn (TrialStatus .STALE , result )
4944 self .assertNotIn (TrialStatus .FAILED , result )
Original file line number Diff line number Diff line change 1313from ax .analysis .plotly .color_constants import BOTORCH_COLOR_SCALE , LIGHT_AX_BLUE
1414from ax .core .experiment import Experiment
1515from ax .core .objective import MultiObjective , ScalarizedObjective
16- from ax .core .trial_status import TrialStatus
16+ from ax .core .trial_status import DEFAULT_ANALYSIS_STATUSES , TrialStatus
1717from ax .exceptions .core import UnsupportedError
1818from plotly import express as px
1919
@@ -232,6 +232,4 @@ def get_trial_statuses_with_fallback(
232232 return None
233233 elif trial_statuses is not None :
234234 return [* trial_statuses ]
235- return [
236- * {* TrialStatus } - {TrialStatus .ABANDONED , TrialStatus .STALE , TrialStatus .FAILED }
237- ]
235+ return [* DEFAULT_ANALYSIS_STATUSES ]
Original file line number Diff line number Diff line change @@ -173,3 +173,9 @@ def __repr__(self) -> str:
173173 TrialStatus .STALE ,
174174 TrialStatus .CANDIDATE ,
175175]
176+
177+ DEFAULT_ANALYSIS_STATUSES : set [TrialStatus ] = set (TrialStatus ) - {
178+ TrialStatus .ABANDONED ,
179+ TrialStatus .STALE ,
180+ TrialStatus .FAILED ,
181+ }
You can’t perform that action at this time.
0 commit comments