Add stream in chat Agent calls.

(cherry picked from commit e33217a)

Author: iroqueta

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

@@ -274,6 +274,11 @@ protected String callAssistant(String agent, GXProperties properties, ArrayList<
 		return callAgent(agent, properties, messages, result);
 	}
 
+	protected ChatResult chatAgent(String agent, GXProperties properties, ArrayList<OpenAIResponse.Message> messages, CallResult result) {
+		callAgent(agent, true, properties, messages, result);
+		return new ChatResult(this, agent, properties, messages, result, client);
+	}
+
 	protected String callAgent(String agent, GXProperties properties, ArrayList<OpenAIResponse.Message> messages, CallResult result) {
 		return callAgent(agent, false, properties, messages, result);
 	}
@@ -299,12 +304,12 @@ protected String callAgent(String agent, boolean stream, GXProperties properties
 				}
 			}
 		} else if (client.getStatusCode() == 200) {
-			return readChunk(agent, properties, messages, result);
+			return "";
 		}
 		return "";
 	}
 
-	private String processNotChunkedResponse(String agent, boolean stream, GXProperties properties, ArrayList<OpenAIResponse.Message> messages, CallResult result, ArrayList<OpenAIResponse.ToolCall> toolCalls) {
+	public String processNotChunkedResponse(String agent, boolean stream, GXProperties properties, ArrayList<OpenAIResponse.Message> messages, CallResult result, ArrayList<OpenAIResponse.ToolCall> toolCalls) {
 		for (OpenAIResponse.ToolCall tollCall : toolCalls) {
 			processToolCall(tollCall, messages);
 		}
@@ -326,36 +331,4 @@ private void processToolCall(OpenAIResponse.ToolCall toolCall, ArrayList<OpenAIR
 		toolCallMessage.setToolCallId(toolCall.getId());
 		messages.add(toolCallMessage);
 	}
-
-	protected String readChunk() {
-		return readChunk(null, null, null, null);
-	}
-
-	protected String readChunk(String agent, GXProperties properties, ArrayList<OpenAIResponse.Message> messages, CallResult result) {
-		String data = client.readChunk();
-		if (data.isEmpty())
-			return "";
-		int index = data.indexOf("data:") + "data:".length();
-		String chunkJson = data.substring(index).trim();
-		try {
-			JSONObject jsonResponse = new JSONObject(chunkJson);
-			OpenAIResponse chunkResponse = new ObjectMapper().readValue(jsonResponse.toString(), OpenAIResponse.class);
-			OpenAIResponse.Choice choise = chunkResponse.getChoices().get(0);
-			if (choise.getFinishReason() != null && choise.getFinishReason().equals("tool_calls") && agent != null) {
-				messages.add(choise.getMessage());
-				return processNotChunkedResponse(agent, true, properties, messages, result, choise.getMessage().getToolCalls());
-			}
-			String chunkString = choise.getDelta().getContent();
-			if (chunkString == null)
-				return "";
-			return chunkString;
-		}
-		catch (Exception e) {
-			return "";
-		}
-	}
-
-	protected boolean isStreamEOF() {
-		return client.getEof();
-	}
 }

java/src/main/java/com/genexus/util/ChatResult.java

@@ -0,0 +1,58 @@
+package com.genexus.util;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.genexus.GXProcedure;
+import com.genexus.internet.HttpClient;
+import com.genexus.util.saia.OpenAIResponse;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+public class ChatResult {
+	private HttpClient client = null;
+	private String agent = null;
+	private GXProperties properties = null;
+	private ArrayList<OpenAIResponse.Message> messages = null;
+	private CallResult result = null;
+	private GXProcedure agentProcedure = null;
+
+	public ChatResult() {
+	}
+
+	public ChatResult(GXProcedure agentProcedure, String agent, GXProperties properties, ArrayList<OpenAIResponse.Message> messages, CallResult result, HttpClient client) {
+		this.agentProcedure = agentProcedure;
+		this.agent = agent;
+		this.properties = properties;
+		this.messages = messages;
+		this.result = result;
+		this.client = client;
+	}
+
+	public boolean hasMoreData() {
+		return !client.getEof();
+	}
+
+	public String getMoreData() {
+		String data = client.readChunk();
+		if (data.isEmpty())
+			return "";
+		int index = data.indexOf("data:") + "data:".length();
+		String chunkJson = data.substring(index).trim();
+		try {
+			JSONObject jsonResponse = new JSONObject(chunkJson);
+			OpenAIResponse chunkResponse = new ObjectMapper().readValue(jsonResponse.toString(), OpenAIResponse.class);
+			OpenAIResponse.Choice choise = chunkResponse.getChoices().get(0);
+			if (choise.getFinishReason() != null && choise.getFinishReason().equals("tool_calls") && agent != null) {
+				messages.add(choise.getMessage());
+				return agentProcedure.processNotChunkedResponse(agent, true, properties, messages, result, choise.getMessage().getToolCalls());
+			}
+			String chunkString = choise.getDelta().getContent();
+			if (chunkString == null)
+				return "";
+			return chunkString;
+		}
+		catch (Exception e) {
+			return "";
+		}
+	}
+}

java/src/test/java/com/genexus/agent/Agent.java

@@ -2,6 +2,7 @@
 
 import com.genexus.*;
 import com.genexus.util.CallResult;
+import com.genexus.util.ChatResult;
 import com.genexus.util.saia.OpenAIResponse;
 import java.util.ArrayList;
 
@@ -61,10 +62,9 @@ else if (AV3Parameter1.equals("chat_stream")) {
 			message.setRole("user");
 			message.setContent("Que me puedes contar de la ciudad que te pedi el clima previamente?");
 			messages.add(message);
-			AV5OutputVariable = callAgent( "The weatherman", true, Gxproperties, messages, new CallResult()) ;
-			System.out.print(AV5OutputVariable);
-			while (!isStreamEOF()) {
-				System.out.print(readChunk());
+			ChatResult chatResult = chatAgent( "The weatherman", Gxproperties, messages, new CallResult()) ;
+			while (chatResult.hasMoreData()) {
+				System.out.print(chatResult.hasMoreData());
 			}
 		}
 		else if (AV3Parameter1.equals("toolcall")) {
@@ -88,10 +88,9 @@ else if (AV3Parameter1.equals("toolcall_stream")) {
 			message.setRole("user");
 			message.setContent("Necesito nombre y descripcion del producto 1779");
 			messages.add(message);
-			AV5OutputVariable = callAgent( "ProductInfo", true, Gxproperties, messages, new CallResult()) ;
-			System.out.print(AV5OutputVariable);
-			while (!isStreamEOF()) {
-				System.out.print(readChunk());
+			ChatResult chatResult = chatAgent( "ProductInfo", Gxproperties, messages, new CallResult()) ;
+			while (chatResult.hasMoreData()) {
+				System.out.print(chatResult.hasMoreData());
 			}
 		}
 		else {