Skip to content

fix: missing serializer specification #179

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
merged 1 commit into from
Jun 23, 2025
Merged

fix: missing serializer specification #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...arser/src/main/java/modelengine/example/ai/chat/parser/OutputParserExampleController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import modelengine.fit.http.annotation.RequestMapping;
import modelengine.fit.http.annotation.RequestParam;
import modelengine.fitframework.annotation.Component;
import modelengine.fitframework.annotation.Fit;
import modelengine.fitframework.annotation.Property;
import modelengine.fitframework.annotation.Value;
import modelengine.fitframework.flowable.Choir;
Expand All @@ -42,7 +43,7 @@ public class OutputParserExampleController {
@Value("${example.model}")
private String modelName;

public OutputParserExampleController(ChatModel chatModel, ObjectSerializer serializer) {
public OutputParserExampleController(ChatModel chatModel, @Fit(alias = "json") ObjectSerializer serializer) {
this.chatModel = chatModel;
this.outputParser = JsonOutputParser.createPartial(serializer, Demo.class);
this.template = new HumanMessageTemplate(new DefaultStringTemplate(
Expand Down
5 changes: 3 additions & 2 deletions ...ieval/src/main/java/modelengine/example/ai/chat/retrieval/RetrievalExampleController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import modelengine.fit.http.annotation.RequestMapping;
import modelengine.fit.http.annotation.RequestParam;
import modelengine.fitframework.annotation.Component;
import modelengine.fitframework.annotation.Fit;
import modelengine.fitframework.annotation.Value;
import modelengine.fitframework.serialization.ObjectSerializer;
import modelengine.fitframework.util.FileUtils;
Expand All @@ -65,8 +66,8 @@ public class RetrievalExampleController {
private final AiProcessFlow<String, ChatMessage> ragFlow;
private final Memory memory = new CacheMemory();

public RetrievalExampleController(ChatModel chatModel, EmbedModel embedModel, ObjectSerializer serializer,
@Value("${example.model.chat}") String chatModelName,
public RetrievalExampleController(ChatModel chatModel, EmbedModel embedModel,
@Fit(alias = "json") ObjectSerializer serializer, @Value("${example.model.chat}") String chatModelName,
@Value("${example.model.embed}") String embedModelName) {
DocumentEmbedModel documentEmbedModel =
new DefaultDocumentEmbedModel(embedModel, EmbedOption.custom().model(embedModelName).build());
Expand Down
9 changes: 5 additions & 4 deletions ...ins/tool-discoverer/src/main/java/modelengine/fel/tool/support/DefaultToolDiscoverer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
import static modelengine.fitframework.inspection.Validation.notNull;

import modelengine.fel.tool.ToolInfoEntity;
import modelengine.fel.tool.info.entity.ToolEntity;
import modelengine.fel.tool.ToolSchema;
import modelengine.fel.tool.info.entity.ToolEntity;
import modelengine.fel.tool.info.entity.ToolGroupEntity;
import modelengine.fel.tool.info.entity.ToolJsonEntity;
import modelengine.fel.tool.service.ToolRepository;
import modelengine.fitframework.annotation.Component;
import modelengine.fitframework.annotation.Fit;
import modelengine.fitframework.annotation.Value;
import modelengine.fitframework.plugin.Plugin;
import modelengine.fitframework.plugin.PluginStartedObserver;
Expand All @@ -42,7 +43,6 @@
*/
@Component
public class DefaultToolDiscoverer implements PluginStartedObserver, PluginStoppingObserver {
private static final String TOOLS = "tools";
private final ToolRepository toolRepository;
private final ObjectSerializer serializer;
private final int maxToolNum;
Expand All @@ -55,7 +55,7 @@ public class DefaultToolDiscoverer implements PluginStartedObserver, PluginStopp
* @param maxNum 表示插件最大工具数量的 {@code int}。
* @throws IllegalArgumentException 当 {@code toolRepository}、{@code objectSerializer} 为 {@code null} 时。
*/
public DefaultToolDiscoverer(ToolRepository toolRepository, ObjectSerializer serializer,
public DefaultToolDiscoverer(ToolRepository toolRepository, @Fit(alias = "json") ObjectSerializer serializer,
@Value("${tool.max-num}") int maxNum) {
this.toolRepository = notNull(toolRepository, "The tool repository cannot be null.");
this.serializer = notNull(serializer, "The serializer cannot be null.");
Expand Down Expand Up @@ -94,7 +94,8 @@ private List<ToolEntity> parseTools(Resource resource) {
if (toolJsonEntity == null) {
return Collections.emptyList();
}
return toolJsonEntity.getToolGroups().stream()
return toolJsonEntity.getToolGroups()
.stream()
.filter(Objects::nonNull)
.map(ToolGroupEntity::getTools)
.filter(Objects::nonNull)
Expand Down
Loading