Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move the advisor name to low cardinality key values

Browse Source 
- Adviser name is moved from hight to low cardinality key values.
- Updated tests in  to reflect these changes, ensuring the new low cardinality key is correctly captured.

Resolves #1716
This commit is contained in:
Christian Tzolov
2024-11-12 15:32:44 +01:00
committed by Mark Pollack
parent 420bf5ed78
commit 7474852b58
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationDocumentation.java
View File

@@ -68,11 +68,7 @@ public enum AdvisorObservationDocumentation implements ObservationDocumentation
public String asString() {
return "spring.ai.advisor.type";
}
}
}
public enum HighCardinalityKeyNames implements KeyName {
},
/**
* Advisor name.
@@ -83,6 +79,11 @@ public enum AdvisorObservationDocumentation implements ObservationDocumentation
return "spring.ai.advisor.name";
}
},
}
public enum HighCardinalityKeyNames implements KeyName {
/**
* Advisor order in the advisor chain.
*/

15
spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/DefaultAdvisorObservationConvention.java
View File

@@ -62,7 +62,7 @@ public class DefaultAdvisorObservationConvention implements AdvisorObservationCo
@Override
public KeyValues getLowCardinalityKeyValues(AdvisorObservationContext context) {
return KeyValues.of(springAiKind(), advisorType(context));
return KeyValues.of(springAiKind(), advisorType(context), advisorName(context));
}
protected KeyValue advisorType(AdvisorObservationContext context) {
@@ -70,8 +70,11 @@ public class DefaultAdvisorObservationConvention implements AdvisorObservationCo
}
protected KeyValue springAiKind() {
return KeyValue.of(AdvisorObservationDocumentation.LowCardinalityKeyNames.SPRING_AI_KIND,
SpringAiKind.ADVISOR.value());
return KeyValue.of(LowCardinalityKeyNames.SPRING_AI_KIND, SpringAiKind.ADVISOR.value());
}
protected KeyValue advisorName(AdvisorObservationContext context) {
return KeyValue.of(LowCardinalityKeyNames.ADVISOR_NAME, context.getAdvisorName());
}
// ------------------------
@@ -80,11 +83,7 @@ public class DefaultAdvisorObservationConvention implements AdvisorObservationCo
@Override
public KeyValues getHighCardinalityKeyValues(AdvisorObservationContext context) {
return KeyValues.of(advisorName(context), advisorOrder(context));
}
protected KeyValue advisorName(AdvisorObservationContext context) {
return KeyValue.of(HighCardinalityKeyNames.ADVISOR_NAME, context.getAdvisorName());
return KeyValues.of(advisorOrder(context));
}
protected KeyValue advisorOrder(AdvisorObservationContext context) {

2
spring-ai-core/src/test/java/org/springframework/ai/chat/client/advisor/observation/DefaultAdvisorObservationConventionTests.java
View File

@@ -69,6 +69,7 @@ class DefaultAdvisorObservationConventionTests {
assertThat(this.observationConvention.getLowCardinalityKeyValues(observationContext)).contains(
KeyValue.of(LowCardinalityKeyNames.ADVISOR_TYPE.asString(),
AdvisorObservationContext.Type.AROUND.name()),
KeyValue.of(LowCardinalityKeyNames.ADVISOR_NAME.asString(), "MyName"),
KeyValue.of(LowCardinalityKeyNames.SPRING_AI_KIND.asString(), SpringAiKind.ADVISOR.value()));
}
@@ -81,7 +82,6 @@ class DefaultAdvisorObservationConventionTests {
.build();
assertThat(this.observationConvention.getHighCardinalityKeyValues(observationContext))
.contains(KeyValue.of(HighCardinalityKeyNames.ADVISOR_NAME.asString(), "MyName"))
.contains(KeyValue.of(HighCardinalityKeyNames.ADVISOR_ORDER.asString(), "678"));
}