3233 - added variable for property 'format'

marko-kriskovic · ivicac · commit 9be92ea4398c · 2025-10-15T08:17:10.000+02:00
diff --git a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AiAgentChatAction.java b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AiAgentChatAction.java
@@ -138,7 +138,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,
diff --git a/server/libs/modules/components/ai/llm/anthropic/src/main/java/com/bytechef/component/ai/llm/anthropic/action/AnthropicChatAction.java b/server/libs/modules/components/ai/llm/anthropic/src/main/java/com/bytechef/component/ai/llm/anthropic/action/AnthropicChatAction.java
@@ -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);
     }
 }
diff --git a/server/libs/modules/components/ai/llm/azure-open-ai/src/main/java/com/bytechef/component/ai/llm/azure/openai/action/AzureOpenAiChatAction.java b/server/libs/modules/components/ai/llm/azure-open-ai/src/main/java/com/bytechef/component/ai/llm/azure/openai/action/AzureOpenAiChatAction.java
@@ -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);
     }
 }
diff --git a/server/libs/modules/components/ai/llm/deepseek/src/main/java/com/bytechef/component/ai/llm/deepseek/action/DeepSeekChatAction.java b/server/libs/modules/components/ai/llm/deepseek/src/main/java/com/bytechef/component/ai/llm/deepseek/action/DeepSeekChatAction.java
@@ -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);
     }
 }
diff --git a/server/libs/modules/components/ai/llm/groq/src/main/java/com/bytechef/component/ai/llm/groq/action/GroqChatAction.java b/server/libs/modules/components/ai/llm/groq/src/main/java/com/bytechef/component/ai/llm/groq/action/GroqChatAction.java
@@ -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);
     }
 }
diff --git a/server/libs/modules/components/ai/llm/hugging-face/src/main/java/com/bytechef/component/ai/llm/hugging/face/action/HuggingFaceChatAction.java b/server/libs/modules/components/ai/llm/hugging-face/src/main/java/com/bytechef/component/ai/llm/hugging/face/action/HuggingFaceChatAction.java
@@ -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);
     }
 }
diff --git a/server/libs/modules/components/ai/llm/mistral/src/main/java/com/bytechef/component/ai/llm/mistral/action/MistralChatAction.java b/server/libs/modules/components/ai/llm/mistral/src/main/java/com/bytechef/component/ai/llm/mistral/action/MistralChatAction.java
@@ -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);
     }
 }
diff --git a/server/libs/modules/components/ai/llm/nvidia/src/main/java/com/bytechef/component/ai/llm/nvidia/action/NvidiaChatAction.java b/server/libs/modules/components/ai/llm/nvidia/src/main/java/com/bytechef/component/ai/llm/nvidia/action/NvidiaChatAction.java
@@ -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);
     }
 }
diff --git a/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/action/OllamaChatAction.java b/server/libs/modules/components/ai/llm/ollama/src/main/java/com/bytechef/component/ai/llm/ollama/action/OllamaChatAction.java
@@ -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);
     }
 }
diff --git a/server/libs/modules/components/ai/llm/open-ai/src/main/java/com/bytechef/component/ai/llm/openai/action/OpenAiChatAction.java b/server/libs/modules/components/ai/llm/open-ai/src/main/java/com/bytechef/component/ai/llm/openai/action/OpenAiChatAction.java
@@ -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);
     }
 }
diff --git a/server/libs/modules/components/ai/llm/perplexity/src/main/java/com/bytechef/component/ai/llm/perplexity/action/PerplexityChatAction.java b/server/libs/modules/components/ai/llm/perplexity/src/main/java/com/bytechef/component/ai/llm/perplexity/action/PerplexityChatAction.java
@@ -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);
     }
 }
diff --git a/server/libs/modules/components/ai/llm/src/main/java/com/bytechef/component/ai/llm/ChatModel.java b/server/libs/modules/components/ai/llm/src/main/java/com/bytechef/component/ai/llm/ChatModel.java
@@ -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, false);
+            inputParameters, actionContext, messageFormatRequired);
 
         ChatClient.ChatClientRequestSpec chatClientRequestSpec = createPrompt(
             inputParameters, actionContext, chatModel);
diff --git a/server/libs/modules/components/ai/llm/src/main/java/com/bytechef/component/ai/llm/util/ModelUtils.java b/server/libs/modules/components/ai/llm/src/main/java/com/bytechef/component/ai/llm/util/ModelUtils.java
@@ -120,10 +120,10 @@ public static <R> List<Option<R>> getEnumOptions(Map<String, R> map) {
             .toList();
     }
 
-    public static List<Message> getMessages(Parameters inputParameters, ActionContext actionContext, boolean responseFormatRequired) {
+    public static List<Message> getMessages(Parameters inputParameters, ActionContext actionContext, boolean messageFormatRequired) {
         List<ChatModel.Message> chatModelMessages = new ArrayList<>();
 
-        if (responseFormatRequired) {
+        if (messageFormatRequired) {
             String format = inputParameters.getRequiredString(FORMAT);
             if (format.equals(Format.SIMPLE.name())) {
                 String userPrompt = inputParameters.getRequiredString(USER_PROMPT);
diff --git a/server/libs/modules/components/ai/llm/vertex/gemini/src/main/java/com/bytechef/component/ai/llm/vertex/gemini/action/VertexGeminiChatAction.java b/server/libs/modules/components/ai/llm/vertex/gemini/src/main/java/com/bytechef/component/ai/llm/vertex/gemini/action/VertexGeminiChatAction.java
@@ -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);
     }
 }
diff --git a/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/action/definition/AiTextActionDefinition.java b/server/libs/modules/components/ai/universal/universal-text/src/main/java/com/bytechef/component/ai/universal/text/action/definition/AiTextActionDefinition.java
@@ -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;
     }

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,6 @@ private AnthropicChatAction() {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {`
`97`		`- return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);`
	`97`	`+ return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);`
`98`	`98`	`}`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,6 @@ private AzureOpenAiChatAction() {`
`131`	`131`	`public static Object perform(`
`132`	`132`	`Parameters inputParameters, Parameters connectionParameters, ActionContext context) {`
`133`	`133`
`134`		`- return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);`
	`134`	`+ return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);`
`135`	`135`	`}`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,6 @@ private DeepSeekChatAction() {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {`
`122`		`- return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);`
	`122`	`+ return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);`
`123`	`123`	`}`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,6 @@ private GroqChatAction() {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {`
`135`		`- return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);`
	`135`	`+ return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);`
`136`	`136`	`}`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,6 @@ private HuggingFaceChatAction() {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {`
`65`		`- return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);`
	`65`	`+ return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,6 @@ private MistralChatAction() {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {`
`120`		`- return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);`
	`120`	`+ return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,6 @@ private NvidiaChatAction() {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {`
`135`		`- return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);`
	`135`	`+ return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);`
`136`	`136`	`}`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,6 @@ private OllamaChatAction() {`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {`
`208`		`- return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);`
	`208`	`+ return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context, true);`
`209`	`209`	`}`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,6 @@ private OpenAiChatAction() {`
`133`	`133`	`public static Object perform(`
`134`	`134`	`Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {`
`135`	`135`
`136`		`- return CHAT_MODEL.getResponse(inputParameters, connectionParameters, actionContext);`
	`136`	`+ return CHAT_MODEL.getResponse(inputParameters, connectionParameters, actionContext, true);`
`137`	`137`	`}`
`138`	`138`	`}`