Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
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 @@ -271,7 +271,7 @@ const OutputTab = ({connectionMissing, currentNode, variablePropertiesDefined =
>
<div
className={twMerge(
'flex items-center justify-center',
'flex items-center justify-center mt-1',
!currentNode.trigger && 'w-full'
)}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ protected Object perform(
ChatClient.CallResponseSpec call = chatClient.prompt()
.advisors(getAdvisors(clusterElementMap, connectionParameters))
.advisors(getConversationAdvisor(inputParameters))
.messages(ModelUtils.getMessages(inputParameters, actionContext))
.messages(ModelUtils.getMessages(inputParameters, actionContext, true))
.toolCallbacks(
getToolCallbacks(
clusterElementMap.getClusterElements(ToolFunction.TOOLS), connectionParameters,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@ private AnthropicChatAction() {
}

public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,6 @@ private AzureOpenAiChatAction() {
public static Object perform(
Parameters inputParameters, Parameters connectionParameters, ActionContext context) {

return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,6 @@ private DeepSeekChatAction() {
}

public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,6 @@ private GroqChatAction() {
}

public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ private HuggingFaceChatAction() {
}

public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@ private MistralChatAction() {
}

public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,6 @@ private NvidiaChatAction() {
}

public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,6 @@ private OllamaChatAction() {
}

public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,6 @@ private OpenAiChatAction() {
public static Object perform(
Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {

return CHAT_MODEL.getResponse(inputParameters, connectionParameters, actionContext);
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, actionContext, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,6 @@ private PerplexityChatAction() {
}

public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ org.springframework.ai.chat.model.ChatModel createChatModel(

@Nullable
default Object getResponse(
Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext, boolean messageFormatRequired) {

org.springframework.ai.chat.model.ChatModel chatModel = createChatModel(
inputParameters, connectionParameters, true);

List<org.springframework.ai.chat.messages.Message> messages = ModelUtils.getMessages(
inputParameters, actionContext);
inputParameters, actionContext, messageFormatRequired);

ChatClient.ChatClientRequestSpec chatClientRequestSpec = createPrompt(
inputParameters, actionContext, chatModel);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,27 +120,31 @@ public static <R> List<Option<R>> getEnumOptions(Map<String, R> map) {
.toList();
}

public static List<Message> getMessages(Parameters inputParameters, ActionContext actionContext) {
public static List<Message> getMessages(Parameters inputParameters, ActionContext actionContext, boolean messageFormatRequired) {
List<ChatModel.Message> chatModelMessages = new ArrayList<>();

String format = inputParameters.getRequiredString(FORMAT);
if (messageFormatRequired) {
String format = inputParameters.getRequiredString(FORMAT);
if (format.equals(Format.SIMPLE.name())) {
String userPrompt = inputParameters.getRequiredString(USER_PROMPT);

if (format.equals(Format.SIMPLE.name())) {
String userPrompt = inputParameters.getRequiredString(USER_PROMPT);
ChatModel.Message userMessage = new ChatModel.Message(
userPrompt, inputParameters.getList(ATTACHMENTS, FileEntry.class), Role.USER);

ChatModel.Message userMessage = new ChatModel.Message(
userPrompt, inputParameters.getList(ATTACHMENTS, FileEntry.class), Role.USER);
chatModelMessages.add(userMessage);

chatModelMessages.add(userMessage);
String systemPrompt = inputParameters.getString(SYSTEM_PROMPT);

String systemPrompt = inputParameters.getString(SYSTEM_PROMPT);
if (systemPrompt != null && !systemPrompt.isEmpty()) {
ChatModel.Message systeMMessage = new ChatModel.Message(systemPrompt, null, Role.SYSTEM);

if (systemPrompt != null && !systemPrompt.isEmpty()) {
ChatModel.Message systeMMessage = new ChatModel.Message(systemPrompt, null, Role.SYSTEM);

chatModelMessages.add(systeMMessage);
chatModelMessages.add(systeMMessage);
}
} else {
chatModelMessages = inputParameters.getList(MESSAGES, new TypeReference<>() {});
}
} else {
}
else {
chatModelMessages = inputParameters.getList(MESSAGES, new TypeReference<>() {});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,6 @@ private VertexGeminiChatAction() {
public static Object perform(
Parameters inputParameters, Parameters connectionParameters, ActionContext context) {

return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import static com.bytechef.component.definition.ComponentDsl.object;
import static com.bytechef.component.definition.ComponentDsl.string;

import com.bytechef.component.ai.llm.ChatModel;
import com.bytechef.component.ai.universal.text.action.definition.AiTextActionDefinition;
import com.bytechef.component.ai.universal.text.constant.AiTextConstants;
import com.bytechef.component.definition.Parameters;
Expand Down Expand Up @@ -113,6 +114,8 @@ public Parameters createParameters(Parameters inputParameters) {
Map.of("content", systemPrompt, ROLE, SYSTEM.name()),
Map.of("content", userBuilder, ROLE, USER.name())));
modelInputParametersMap.put("model", inputParameters.getString(MODEL));
modelInputParametersMap.put("response", Map.of(
"responseFormat", ChatModel.ResponseFormat.TEXT));

return ParametersFactory.createParameters(modelInputParametersMap);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import static com.bytechef.component.definition.ComponentDsl.object;
import static com.bytechef.component.definition.ComponentDsl.string;

import com.bytechef.component.ai.llm.ChatModel;
import com.bytechef.component.ai.universal.text.action.definition.AiTextActionDefinition;
import com.bytechef.component.ai.universal.text.constant.AiTextConstants;
import com.bytechef.component.ai.universal.text.util.AiTextUtils;
Expand Down Expand Up @@ -150,6 +151,9 @@ public Parameters createParameters(Parameters inputParameters) {
Map.of("content", systemPrompt, ROLE, SYSTEM.name()),
Map.of("content", userBuilder.toString(), ROLE, USER.name())));
modelInputParametersMap.put("model", inputParameters.getString(MODEL));
modelInputParametersMap.put("response",
Map.of("responseFormat", ChatModel.ResponseFormat.JSON,
"responseSchema", "{\"type\":\"array\",\"items\":{\"type\":\"object\",\"properties\":{\"criteriaName\":{\"type\":\"string\",\"title\":\"name\"},\"criteriaValue\":{\"type\":\"number\",\"title\":\"value\"}}},\"title\":\"criteria\"}"));

return ParametersFactory.createParameters(modelInputParametersMap);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ protected String perform(
modelConnectionParametersMap.put(TOKEN, chatModelResult.token);

Object response = chatModelResult.chatModel.getResponse(
modelInputParameters, ParametersFactory.createParameters(modelConnectionParametersMap), context);
modelInputParameters, ParametersFactory.createParameters(modelConnectionParametersMap), context, false);

return response != null ? response.toString() : null;
}
Expand Down
Loading