Skip to content

fix: [Orchestration] default values for template messages #391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
newtork merged 3 commits into from
Mar 25, 2025
Merged

fix: [Orchestration] default values for template messages #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d08f7a4
Initial
a-d Mar 19, 2025
af10832
Merge remote-tracking branch 'origin/main' into orchestration/fix-def…
a-d Mar 24, 2025
583b091
Add test assertion
a-d Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions orchestration/src/main/java/com/sap/ai/sdk/orchestration/ConfigToRequestTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,30 @@ static TemplatingModuleConfig toTemplateModuleConfig(
if (config instanceof TemplateRef) {
return config;
}

val template = config instanceof Template t ? t : Template.create().template();
val messages = template.getTemplate();
val responseFormat = template.getResponseFormat();
val messagesWithPrompt = new ArrayList<>(messages);

messagesWithPrompt.addAll(
prompt.getMessages().stream().map(Message::createChatMessage).toList());
if (messagesWithPrompt.isEmpty()) {
throw new IllegalStateException(
"A prompt is required. Pass at least one message or configure a template with messages or a template reference.");
}
return Template.create()
.template(messagesWithPrompt)
.tools(template.getTools())
.responseFormat(responseFormat);

val result =
Template.create()
.template(messagesWithPrompt)
.tools(template.getTools())
.defaults(template.getDefaults())
.responseFormat(responseFormat);

for (val customFieldName : template.getCustomFieldNames()) {
result.setCustomField(customFieldName, template.getCustomField(customFieldName));
}
return result;
}

@Nonnull
Expand Down
8 changes: 6 additions & 2 deletions orchestration/src/test/java/com/sap/ai/sdk/orchestration/ConfigToRequestTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,16 @@ void testMergingTemplateConfig() {
List.of(
systemMessage.createChatMessage(),
userMessage.createChatMessage(),
userMessage2.createChatMessage()));
userMessage2.createChatMessage()))
.defaults(Map.of("city", "Paris"));
expected.setCustomField("country", "France");

var prompt = new OrchestrationPrompt(userMessage2);
var templateConfig =
Template.create()
.template(List.of(systemMessage.createChatMessage(), userMessage.createChatMessage()));
.template(List.of(systemMessage.createChatMessage(), userMessage.createChatMessage()))
.defaults(Map.of("city", "Paris"));
templateConfig.setCustomField("country", "France");
var actual = ConfigToRequestTransformer.toTemplateModuleConfig(prompt, templateConfig);

assertThat(actual).isEqualTo(expected);
Expand Down