Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ public void applyOptions(
params.setPresencePenalty(presencePenalty);
}

var responseFormat = getOption(options, defaultOptions, GenerateOptions::getResponseFormat);
if (responseFormat != null) {
params.setResponseFormat(responseFormat);
}

// Apply parallel tool calls
Boolean parallelToolCalls =
getOption(options, defaultOptions, GenerateOptions::getParallelToolCalls);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
Comment thread
guslegend0510 marked this conversation as resolved.

import io.agentscope.core.formatter.ResponseFormat;
import io.agentscope.core.formatter.dashscope.dto.DashScopeParameters;
import io.agentscope.core.formatter.dashscope.dto.DashScopeTool;
import io.agentscope.core.formatter.dashscope.dto.DashScopeToolCall;
import io.agentscope.core.formatter.openai.dto.JsonSchema;
import io.agentscope.core.message.ToolUseBlock;
import io.agentscope.core.model.GenerateOptions;
import io.agentscope.core.model.ToolChoice;
Expand Down Expand Up @@ -112,6 +114,12 @@ void testApplyOptionsWithAllOptions() {
.topP(0.9)
.maxTokens(1024)
.thinkingBudget(500)
.responseFormat(
ResponseFormat.jsonSchema(
JsonSchema.builder()
.name("WeatherResponse")
.schema(Map.of("type", "object"))
.build()))
.build();

helper.applyOptions(params, options, null);
Expand All @@ -121,18 +129,31 @@ void testApplyOptionsWithAllOptions() {
assertEquals(1024, params.getMaxTokens());
assertEquals(500, params.getThinkingBudget());
assertTrue(params.getEnableThinking());
assertNotNull(params.getResponseFormat());
assertEquals("json_schema", params.getResponseFormat().getType());
}

@Test
void testApplyOptionsWithDefaultOptions() {
DashScopeParameters params = DashScopeParameters.builder().build();
GenerateOptions defaultOptions =
GenerateOptions.builder().temperature(0.7).maxTokens(512).build();
GenerateOptions.builder()
.temperature(0.7)
.maxTokens(512)
.responseFormat(
ResponseFormat.jsonSchema(
JsonSchema.builder()
.name("DefaultResponse")
.schema(Map.of("type", "object"))
.build()))
.build();

helper.applyOptions(params, null, defaultOptions);

assertEquals(0.7, params.getTemperature());
assertEquals(512, params.getMaxTokens());
assertNotNull(params.getResponseFormat());
assertEquals("json_schema", params.getResponseFormat().getType());
}

@Test
Expand Down
Loading