Skip to content

Commit 20901c2

Browse files
committed
chore: dont throw on prompt scorer get
1 parent 7530ea1 commit 20901c2

File tree

8 files changed

+21
-116
lines changed

8 files changed

+21
-116
lines changed

judgeval-java/src/main/java/com/judgmentlabs/judgeval/v1/data/APIScorerType.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ public enum APIScorerType {
99
FAITHFULNESS("Faithfulness"),
1010
ANSWER_RELEVANCY("Answer Relevancy"),
1111
ANSWER_CORRECTNESS("Answer Correctness"),
12-
INSTRUCTION_ADHERENCE("Instruction Adherence"),
13-
EXECUTION_ORDER("Execution Order"),
14-
DERAILMENT("Derailment"),
1512
CUSTOM("Custom");
1613

1714
private final String value;

judgeval-java/src/main/java/com/judgmentlabs/judgeval/v1/scorers/built_in/AnswerCorrectnessScorer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static Builder builder() {
4040
* Builder for configuring and creating AnswerCorrectnessScorer instances.
4141
*/
4242
public static final class Builder {
43-
private double threshold = -1;
43+
private double threshold = 0.5;
4444
private String name;
4545
private Boolean strictMode;
4646
private String model;

judgeval-java/src/main/java/com/judgmentlabs/judgeval/v1/scorers/built_in/AnswerRelevancyScorer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static Builder builder() {
3939
* Builder for configuring and creating AnswerRelevancyScorer instances.
4040
*/
4141
public static final class Builder {
42-
private double threshold = -1;
42+
private double threshold = 0.5;
4343
private String name;
4444
private Boolean strictMode;
4545
private String model;

judgeval-java/src/main/java/com/judgmentlabs/judgeval/v1/scorers/built_in/BuiltInScorersFactory.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,4 @@ public AnswerRelevancyScorer.Builder answerRelevancy() {
3333
public FaithfulnessScorer.Builder faithfulness() {
3434
return FaithfulnessScorer.builder();
3535
}
36-
37-
/**
38-
* Creates a builder for an instruction adherence scorer.
39-
*
40-
* @return the scorer builder
41-
*/
42-
public InstructionAdherenceScorer.Builder instructionAdherence() {
43-
return InstructionAdherenceScorer.builder();
44-
}
4536
}

judgeval-java/src/main/java/com/judgmentlabs/judgeval/v1/scorers/built_in/FaithfulnessScorer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static Builder builder() {
3939
* Builder for configuring and creating FaithfulnessScorer instances.
4040
*/
4141
public static final class Builder {
42-
private double threshold = -1;
42+
private double threshold = 0.5;
4343
private String name;
4444
private Boolean strictMode;
4545
private String model;

judgeval-java/src/main/java/com/judgmentlabs/judgeval/v1/scorers/built_in/InstructionAdherenceScorer.java

Lines changed: 0 additions & 71 deletions
This file was deleted.

judgeval-java/src/main/java/com/judgmentlabs/judgeval/v1/scorers/prompt_scorer/PromptScorerFactory.java

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import java.util.Optional;
77
import java.util.concurrent.ConcurrentHashMap;
88

9-
import com.judgmentlabs.judgeval.exceptions.JudgmentAPIError;
109
import com.judgmentlabs.judgeval.internal.api.JudgmentSyncClient;
1110
import com.judgmentlabs.judgeval.internal.api.models.FetchPromptScorersRequest;
1211
import com.judgmentlabs.judgeval.internal.api.models.FetchPromptScorersResponse;
12+
import com.judgmentlabs.judgeval.utils.Logger;
1313

1414
/**
15-
* Factory for retrieving and creating prompt-based scorers.
15+
* Factory for retrieving prompt-based scorers.
1616
*/
1717
public final class PromptScorerFactory {
1818
private final JudgmentSyncClient client;
@@ -30,9 +30,7 @@ public PromptScorerFactory(JudgmentSyncClient client, boolean isTrace) {
3030
*
3131
* @param name
3232
* the scorer name
33-
* @return the configured prompt scorer
34-
* @throws JudgmentAPIError
35-
* if the scorer is not found or retrieval fails
33+
* @return the configured prompt scorer or null if not found or retrieval fails
3634
*/
3735
public PromptScorer get(String name) {
3836
CacheKey key = new CacheKey(name, client.getApiKey(), client.getOrganizationId());
@@ -51,22 +49,28 @@ public PromptScorer get(String name) {
5149
.map(FetchPromptScorersResponse::getScorers)
5250
.filter(scorers -> scorers != null && !scorers.isEmpty())
5351
.map(scorers -> scorers.get(0))
54-
.orElseThrow(
55-
() -> new JudgmentAPIError(404, "Failed to fetch prompt scorer '" + name + "': not found"));
52+
.orElseGet(
53+
() -> {
54+
Logger.error("Failed to fetch prompt scorer '" + name + "': not found");
55+
return null;
56+
});
57+
58+
if (scorer == null) {
59+
return null;
60+
}
5661

5762
if (Boolean.TRUE.equals(scorer.getIsTrace()) != isTrace) {
58-
String expectedType = isTrace ? "TracePromptScorer" : "PromptScorer";
59-
String actualType = Boolean.TRUE.equals(scorer.getIsTrace()) ? "TracePromptScorer" : "PromptScorer";
60-
throw new JudgmentAPIError(400,
61-
"Scorer with name " + name + " is a " + actualType + ", not a " + expectedType);
63+
Logger.error("Scorer with name " + name + " is a "
64+
+ (Boolean.TRUE.equals(scorer.getIsTrace()) ? "TracePromptScorer" : "PromptScorer") + ", not a "
65+
+ (isTrace ? "TracePromptScorer" : "PromptScorer"));
66+
return null;
6267
}
6368

6469
cache.put(key, scorer);
6570
return createFromModel(scorer, name);
66-
} catch (JudgmentAPIError e) {
67-
throw e;
6871
} catch (Exception e) {
69-
throw new JudgmentAPIError(500, "Failed to fetch prompt scorer '" + name + "': " + e.getMessage());
72+
Logger.error("Failed to fetch prompt scorer '" + name + "': " + e.getMessage());
73+
return null;
7074
}
7175
}
7276

@@ -95,16 +99,6 @@ private PromptScorer createFromModel(com.judgmentlabs.judgeval.internal.api.mode
9599
.build();
96100
}
97101

98-
/**
99-
* Creates a new prompt scorer builder.
100-
*
101-
* @return a new scorer builder
102-
*/
103-
public PromptScorer.Builder create() {
104-
return PromptScorer.builder()
105-
.isTrace(isTrace);
106-
}
107-
108102
private static final class CacheKey {
109103
private final String name;
110104
private final String apiKey;

judgeval-java/src/test/java/com/judgmentlabs/judgeval/v1/scorers/built_in/BuiltInScorersFactoryTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,4 @@ void faithfulness_returnsBuilder() {
3030
FaithfulnessScorer.Builder builder = factory.faithfulness();
3131
assertNotNull(builder);
3232
}
33-
34-
@Test
35-
void instructionAdherence_returnsBuilder() {
36-
InstructionAdherenceScorer.Builder builder = factory.instructionAdherence();
37-
assertNotNull(builder);
38-
}
3933
}

0 commit comments

Comments
 (0)