Skip to content

Commit d8f15af

Browse files
danabensqidewenwhen
authored andcommitted
Change: Minimize use of lower case tc name (aws#769)
1 parent 68d9d11 commit d8f15af

File tree

4 files changed

+25
-26
lines changed

4 files changed

+25
-26
lines changed

src/sagemaker/experiments/_metrics.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def _send_metrics(self, metrics):
283283
def _construct_batch_put_metrics_request(self, batch):
284284
"""Creates dictionary object used as request to metrics service."""
285285
return {
286-
"TrialComponentName": self._trial_component_name,
286+
"TrialComponentName": self._trial_component_name.lower(),
287287
"MetricData": list(map(lambda x: x.to_raw_metric_data(), batch)),
288288
}
289289

src/sagemaker/experiments/run.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -600,10 +600,7 @@ def _generate_trial_component_name(run_name: str, experiment_name: str) -> str:
600600
raise ValueError(
601601
err_msg_template.format("experiment_name", len(experiment_name), max_len)
602602
)
603-
experiment_scoped_tc_name = "{}{}{}".format(experiment_name, DELIMITER, run_name)
604-
# https://t.corp.amazon.com/P77144351
605-
lower_cased_tc_name = experiment_scoped_tc_name.lower()
606-
return lower_cased_tc_name
603+
return "{}{}{}".format(experiment_name, DELIMITER, run_name)
607604

608605
@staticmethod
609606
def _extract_run_name_from_tc_name(trial_component_name: str, experiment_name: str) -> str:

tests/integ/sagemaker/experiments/test_run.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import datetime
1616
import os
17+
import time
1718

1819
import pytest
1920

@@ -569,12 +570,13 @@ def _check_run_from_local_end_result(sagemaker_session, tc, is_complete_log=True
569570
assert s3_prefix in tc.output_artifacts[file_artifact_name].value
570571
assert "text/plain" == tc.output_artifacts[file_artifact_name].media_type
571572

572-
# https://t.corp.amazon.com/P77144351
573-
# assert len(tc.metrics) == 1
574-
# metric_summary = tc.metrics[0]
575-
# assert metric_summary.metric_name == metric_name
576-
# assert metric_summary.max == 9.0
577-
# assert metric_summary.min == 0.0
573+
# wait for metrics -> eureka propagation for test consistency
574+
time.sleep(3)
575+
assert len(tc.metrics) == 1
576+
metric_summary = tc.metrics[0]
577+
assert metric_summary.metric_name == metric_name
578+
assert metric_summary.max == 9.0
579+
assert metric_summary.min == 0.0
578580

579581

580582
def _check_run_from_job_result(sagemaker_session, tc_name=None, is_init=True, has_extra_load=False):

tests/unit/sagemaker/experiments/test_run.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -710,10 +710,10 @@ def test_list(mock_tc_search, mock_tc_list, mock_tc_load, run_obj, sagemaker_ses
710710
[
711711
TrialComponentSearchResult(
712712
trial_component_name=Run._generate_trial_component_name(
713-
"a" + str(i), TEST_EXP_NAME
713+
"A" + str(i), TEST_EXP_NAME
714714
),
715-
trial_component_arn="b" + str(i),
716-
display_name="c" + str(i),
715+
trial_component_arn="B" + str(i),
716+
display_name="C" + str(i),
717717
creation_time=creation_time + datetime.timedelta(hours=i),
718718
last_modified_time=last_modified_time + datetime.timedelta(hours=i),
719719
last_modified_by={},
@@ -724,12 +724,12 @@ def test_list(mock_tc_search, mock_tc_list, mock_tc_load, run_obj, sagemaker_ses
724724
]
725725
mock_tc_list.return_value = [
726726
TrialComponentSummary(
727-
trial_component_name=Run._generate_trial_component_name("a" + str(i), TEST_EXP_NAME),
728-
trial_component_arn="b" + str(i),
729-
display_name="c" + str(i),
730-
source_arn="d" + str(i),
727+
trial_component_name=Run._generate_trial_component_name("A" + str(i), TEST_EXP_NAME),
728+
trial_component_arn="B" + str(i),
729+
display_name="C" + str(i),
730+
source_arn="D" + str(i),
731731
status=TrialComponentStatus(
732-
primary_status=_TrialComponentStatusType.InProgress.value, message="e" + str(i)
732+
primary_status=_TrialComponentStatusType.InProgress.value, message="E" + str(i)
733733
),
734734
start_time=start_time + datetime.timedelta(hours=i),
735735
end_time=end_time + datetime.timedelta(hours=i),
@@ -743,13 +743,13 @@ def test_list(mock_tc_search, mock_tc_list, mock_tc_load, run_obj, sagemaker_ses
743743
(
744744
_TrialComponent(
745745
trial_component_name=Run._generate_trial_component_name(
746-
"a" + str(i), TEST_EXP_NAME
746+
"A" + str(i), TEST_EXP_NAME
747747
),
748-
trial_component_arn="b" + str(i),
749-
display_name="c" + str(i),
750-
source_arn="d" + str(i),
748+
trial_component_arn="B" + str(i),
749+
display_name="C" + str(i),
750+
source_arn="D" + str(i),
751751
status=TrialComponentStatus(
752-
primary_status=_TrialComponentStatusType.InProgress.value, message="e" + str(i)
752+
primary_status=_TrialComponentStatusType.InProgress.value, message="E" + str(i)
753753
),
754754
start_time=start_time + datetime.timedelta(hours=i),
755755
end_time=end_time + datetime.timedelta(hours=i),
@@ -783,12 +783,12 @@ def test_list(mock_tc_search, mock_tc_list, mock_tc_load, run_obj, sagemaker_ses
783783
for i in range(tc_list_len_half):
784784
run = run_list[i]
785785
assert run.experiment_name == TEST_EXP_NAME
786-
assert run.run_name == "a" + str(i)
786+
assert run.run_name == "A" + str(i)
787787
assert run._experiment
788788
assert run._trial
789789
assert isinstance(run._trial_component, _TrialComponent)
790790
assert run._trial_component.trial_component_name == Run._generate_trial_component_name(
791-
"a" + str(i), TEST_EXP_NAME
791+
"A" + str(i), TEST_EXP_NAME
792792
)
793793
assert run._in_load is False
794794
assert run._inside_load_context is False

0 commit comments

Comments
 (0)