Skip to content

Commit 7e38515

Browse files
committed
[N/A]: Fixed OnlineExperimentTest.testLogAndGetParameter to match current server implementation of returning full parameter name.
1 parent f113358 commit 7e38515

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

comet-java-client/src/main/java/ml/comet/experiment/context/ExperimentContext.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ public final class ExperimentContext {
1818
ExperimentContext() {
1919
}
2020

21+
/**
22+
* Creates new instance with specified parameters.
23+
*
24+
* @param context the current context identifier of the data log operation.
25+
*/
26+
public ExperimentContext(String context) {
27+
this.context = context;
28+
}
29+
2130
/**
2231
* Creates new instance with specified parameters.
2332
*

comet-java-client/src/main/java/ml/comet/experiment/impl/utils/CometUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ public static <T> void putNotNull(@NonNull Map<T, String> map, @NonNull T key, O
8080
}
8181

8282
/**
83-
* Creates full name of the metric as it is returned by backend.
83+
* Creates full name of the metric/parameter as it is returned by backend.
8484
*
85-
* @param name the short name of the metric
85+
* @param name the short name of the metric/parameter
8686
* @param context the experiment context associated with metric
8787
* @return the full name of the metric, which can be prefixed by context ID if present in the
8888
* provided {@code context} parameter.
8989
*/
90-
public static String fullMetricName(@NonNull String name, @NonNull ExperimentContext context) {
90+
public static String fullMetricParameterName(@NonNull String name, @NonNull ExperimentContext context) {
9191
if (StringUtils.isEmpty(context.getContext())) {
9292
return name;
9393
} else {

comet-java-client/src/test/java/ml/comet/experiment/impl/OnlineExperimentTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import static ml.comet.experiment.impl.asset.AssetType.TEXT_SAMPLE;
3838
import static ml.comet.experiment.impl.resources.LogMessages.FAILED_REGISTER_EXPERIMENT;
3939
import static ml.comet.experiment.impl.resources.LogMessages.getString;
40-
import static ml.comet.experiment.impl.utils.CometUtils.fullMetricName;
40+
import static ml.comet.experiment.impl.utils.CometUtils.fullMetricParameterName;
4141
import static org.junit.jupiter.api.Assertions.assertEquals;
4242
import static org.junit.jupiter.api.Assertions.assertFalse;
4343
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -177,10 +177,10 @@ public void testLogAndGetMetric() {
177177
awaitForCondition(() -> experiment.getMetrics().size() == 3, "experiment metrics get timeout");
178178

179179
List<Value> metrics = experiment.getMetrics();
180-
validateValues(metrics, fullMetricName(ONE_MORE_PARAMETER,
180+
validateValues(metrics, fullMetricParameterName(ONE_MORE_PARAMETER,
181181
ExperimentContext.builder().withContext(TestUtils.SOME_CONTEXT_ID).build()), ONE_MORE_PARAMETER_VALUE);
182-
validateValues(metrics, fullMetricName(SOME_PARAMETER, TestUtils.SOME_FULL_CONTEXT), SOME_PARAMETER_VALUE);
183-
validateValues(metrics, fullMetricName(ANOTHER_PARAMETER, SOME_PARTIAL_CONTEXT), ANOTHER_PARAMETER_VALUE);
182+
validateValues(metrics, fullMetricParameterName(SOME_PARAMETER, TestUtils.SOME_FULL_CONTEXT), SOME_PARAMETER_VALUE);
183+
validateValues(metrics, fullMetricParameterName(ANOTHER_PARAMETER, SOME_PARTIAL_CONTEXT), ANOTHER_PARAMETER_VALUE);
184184
} catch (Throwable throwable) {
185185
fail(throwable);
186186
}
@@ -191,7 +191,7 @@ public void testLogAndGetParameter() {
191191
try (OnlineExperimentImpl experiment = (OnlineExperimentImpl) createOnlineExperiment()) {
192192
// Test log parameter with base context's ID set directly to experiment
193193
//
194-
experiment.setContext(TestUtils.SOME_CONTEXT_ID);
194+
experiment.setContext(SOME_CONTEXT_ID);
195195
OnCompleteAction onComplete = new OnCompleteAction();
196196
experiment.logParameter(
197197
ONE_MORE_PARAMETER, ONE_MORE_PARAMETER_VALUE, ExperimentContext.empty(), Optional.of(onComplete));
@@ -201,7 +201,7 @@ public void testLogAndGetParameter() {
201201
//
202202
onComplete = new OnCompleteAction();
203203
experiment.logParameter(
204-
SOME_PARAMETER, SOME_PARAMETER_VALUE, TestUtils.SOME_FULL_CONTEXT, Optional.of(onComplete));
204+
SOME_PARAMETER, SOME_PARAMETER_VALUE, SOME_FULL_CONTEXT, Optional.of(onComplete));
205205
awaitForCondition(onComplete, "logParameterAsync onComplete timeout");
206206

207207
// Test log parameter with partial context
@@ -215,8 +215,9 @@ public void testLogAndGetParameter() {
215215
//
216216
awaitForCondition(() -> experiment.getParameters().size() == 3, "experiment parameters get timeout");
217217
List<Value> params = experiment.getParameters();
218-
validateValues(params, ONE_MORE_PARAMETER, ONE_MORE_PARAMETER_VALUE);
219-
validateValues(params, SOME_PARAMETER, SOME_PARAMETER_VALUE);
218+
validateValues(params, fullMetricParameterName(ONE_MORE_PARAMETER, new ExperimentContext(SOME_CONTEXT_ID)),
219+
ONE_MORE_PARAMETER_VALUE);
220+
validateValues(params, fullMetricParameterName(SOME_PARAMETER, SOME_FULL_CONTEXT), SOME_PARAMETER_VALUE);
220221
validateValues(params, ANOTHER_PARAMETER, ANOTHER_PARAMETER_VALUE);
221222

222223
} catch (Throwable throwable) {

0 commit comments

Comments
 (0)