Add support for chat and tool call messages

(cherry picked from commit e4e1da5)

Author: iroqueta

java/src/main/java/com/genexus/GXProcedure.java

@@ -3,6 +3,8 @@
 
 import java.sql.SQLException;
 import java.util.Date;
+import java.util.List;
+
 import com.genexus.db.Namespace;
 import com.genexus.db.UserInformation;
 import com.genexus.diagnostics.GXDebugInfo;
@@ -261,12 +263,22 @@ protected void mockExecute() {
 	}
 
 	protected String callAssistant(String assistant, GXProperties properties, CallResult result) {
+		return callAssistant(assistant, properties, null, result);
+	}
+
+	protected String callAssistant(String assistant, GXProperties properties, List<OpenAIResponse.Message> messages, CallResult result) {
 		OpenAIRequest aiRequest = new OpenAIRequest();
 		aiRequest.setModel(String.format("saia:agent:%s", assistant));
+		if (messages != null)
+			aiRequest.setMessages(messages);
 		aiRequest.setVariables(properties.getList());
 		OpenAIResponse aiResponse = SaiaService.call(aiRequest, result);
-		if (aiResponse != null)
-			return aiResponse.getChoices().get(0).getMessage().getContent();
+		if (aiResponse != null) {
+			for (OpenAIResponse.Choice element : aiResponse.getChoices()) {
+				if (element.getFinishReason().equals("stop"))
+					return element.getMessage().getContent();
+			}
+		}
 		return "";
 	}
 }

java/src/main/java/com/genexus/util/saia/OpenAIRequest.java

@@ -14,6 +14,9 @@ public class OpenAIRequest {
 	@JsonProperty("model")
 	private String model;
 
+	@JsonProperty("messages")
+	private List<OpenAIResponse.Message> messages;
+
 	@JsonProperty("prompt")
 	private String prompt;
 
@@ -50,6 +53,9 @@ public class OpenAIRequest {
 	public String getModel() { return model; }
 	public void setModel(String model) { this.model = model; }
 
+	public List<OpenAIResponse.Message> getMessages() { return messages; }
+	public void setMessages(List<OpenAIResponse.Message> messages) { this.messages = messages; }
+
 	public String getPrompt() { return prompt; }
 	public void setPrompt(String prompt) { this.prompt = prompt; }
 

java/src/main/java/com/genexus/util/saia/OpenAIResponse.java

@@ -22,6 +22,9 @@ public class OpenAIResponse {
 	@JsonProperty("usage")
 	private Usage usage;
 
+	@JsonProperty("tool_calls")
+	private List<Message> tool_calls;
+
 	@JsonProperty("data")
 	private List<DataItem> data;
 
@@ -40,6 +43,9 @@ public class OpenAIResponse {
 	public Usage getUsage() { return usage; }
 	public void setUsage(Usage usage) { this.usage = usage; }
 
+	public List<Message> getToolCalls() { return tool_calls; }
+	public void setToolCalls(List<Message> tool_calls) { this.tool_calls = tool_calls; }
+
 	public List<DataItem> getData() { return data; }
 	public void setData(List<DataItem> data) { this.data = data; }
 
@@ -77,6 +83,9 @@ public static class Message {
 		@JsonProperty("tool_calls")
 		private List<ToolCall> toolCalls;
 
+		@JsonProperty("tool_call_id")
+		private String toolCallId;
+
 		public String getRole() { return role; }
 		public void setRole(String role) { this.role = role; }
 
@@ -85,44 +94,47 @@ public static class Message {
 
 		public List<ToolCall> getToolCalls() { return toolCalls; }
 		public void setToolCalls(List<ToolCall> toolCalls) { this.toolCalls = toolCalls; }
+
+		public String getToolCallId() { return toolCallId; }
+		public void setToolCallId(String toolCallId) { this.toolCallId = toolCallId; }
 	}
 
 	@JsonIgnoreProperties(ignoreUnknown = true)
 	public static class ToolCall {
 
-		@JsonProperty("tool_name")
-		private String toolName;
+		@JsonProperty("id")
+		private String id;
 
-		@JsonProperty("tool_input")
-		private ToolInput toolInput;
+		@JsonProperty("type")
+		private String type;
 
-		@JsonProperty("tool_output")
-		private String toolOutput;
+		@JsonProperty("function")
+		private Function function;
 
-		public String getToolName() { return toolName; }
-		public void setToolName(String toolName) { this.toolName = toolName; }
+		public String getId() { return id; }
+		public void setId(String id) { this.id = id; }
 
-		public ToolInput getToolInput() { return toolInput; }
-		public void setToolInput(ToolInput toolInput) { this.toolInput = toolInput; }
+		public String getType() { return type; }
+		public void setType(String type) { this.type = type; }
 
-		public String getToolOutput() { return toolOutput; }
-		public void setToolOutput(String toolOutput) { this.toolOutput = toolOutput; }
+		public Function getFunction() { return function; }
+		public void setFunction(Function function) { this.function = function; }
 	}
 
 	@JsonIgnoreProperties(ignoreUnknown = true)
-	public static class ToolInput {
+	public static class Function {
 
-		@JsonProperty("prompt")
-		private String prompt;
+		@JsonProperty("name")
+		private String name;
 
-		@JsonProperty("size")
-		private String size;
+		@JsonProperty("arguments")
+		private String arguments;
 
-		public String getPrompt() { return prompt; }
-		public void setPrompt(String prompt) { this.prompt = prompt; }
+		public String getName() { return name; }
+		public void setName(String name) { this.name = name; }
 
-		public String getSize() { return size; }
-		public void setSize(String size) { this.size = size; }
+		public String getArguments() { return arguments; }
+		public void setArguments(String arguments) { this.arguments = arguments; }
 	}
 
 	@JsonIgnoreProperties(ignoreUnknown = true)

java/src/test/java/com/genexus/assistant/Assistant.java

@@ -2,6 +2,10 @@
 
 import com.genexus.*;
 import com.genexus.util.CallResult;
+import com.genexus.util.saia.OpenAIResponse;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public final  class Assistant extends GXProcedure
 {
@@ -30,10 +34,28 @@ private void execute_int( String aP0 ,
 	protected void privateExecute( )
 	{
 		Gxproperties = new com.genexus.util.GXProperties();
-		Gxproperties.set("&Parameter1", AV3Parameter1);
-		Gxproperties.set("&Parameter2", AV4Parameter2);
-		Gxproperties.set("$context", "Los Angeles");
-		AV5OutputVariable = callAssistant( "The weatherman", Gxproperties, new CallResult()) ;
+		List<OpenAIResponse.Message> messages = null;
+		if (AV3Parameter1.equals("chat")) {
+			messages = new ArrayList<>();
+			OpenAIResponse.Message message = new OpenAIResponse.Message();
+			message.setRole("user");
+			message.setContent("Dime el clima en Lima - Peru");
+			messages.add(message);
+			message = new OpenAIResponse.Message();
+			message.setRole("assistant");
+			message.setContent("El clima actual en Lima, Perú, es soleado con una temperatura de 20.9°C (69.6°F). La dirección del viento es del suroeste (SSW) a 15.1 km/h (9.4 mph), y la humedad relativa es del 68%. La presión atmosférica es de 1013 mb. La visibilidad es de 10 km y el índice UV es de 12.5.");
+			messages.add(message);
+			message = new OpenAIResponse.Message();
+			message.setRole("user");
+			message.setContent("Que me puedes contar de la ciudad que te pedi el clima previamente?");
+			messages.add(message);
+		}
+		else {
+			Gxproperties.set("&Parameter1", AV3Parameter1);
+			Gxproperties.set("&Parameter2", AV4Parameter2);
+			Gxproperties.set("$context", "Los Angeles");
+		}
+		AV5OutputVariable = callAssistant( "The weatherman", Gxproperties, messages, new CallResult()) ;
 		cleanup();
 	}
 

java/src/test/java/com/genexus/assistant/TestAssistant.java

@@ -21,5 +21,9 @@ public void testAPICallAssistant() {
 		String[] GXv_char4 = new String[1] ;
 		new com.genexus.assistant.Assistant(-1).execute( "Today", "Tomorrow", GXv_char4) ;
 		System.out.println(GXv_char4[0]);
+
+		String[] GXv_char5 = new String[1] ;
+		new com.genexus.assistant.Assistant(-1).execute( "chat", "", GXv_char5) ;
+		System.out.println(GXv_char5[0]);
 	}
 }