Merge branch 'master' into fix/bump-netty-framework

Author: sgrampone

common/src/main/java/com/genexus/ApplicationContext.java

@@ -132,7 +132,7 @@ public boolean checkIfResourceExist(String path)
 		if (isSpringBootApp())
 			return new ClassPathResource(path).exists();
 		else
-			return new File(path).exists();
+			return new File(path).exists() || getClass().getClassLoader().getResource(path) != null;
 	}
 
 	public void setEJBEngine(boolean isEJBEngine)

common/src/main/java/com/genexus/xml/XMLReader.java

@@ -785,7 +785,11 @@ public void open(String url)
 			else
 			{
 				File xmlFile = new File(url);
-				fileInputStream = new FileInputStream(xmlFile);
+				if (xmlFile.exists())
+					fileInputStream = new FileInputStream(xmlFile);
+				else {
+					fileInputStream = getClass().getClassLoader().getResourceAsStream(url);
+				}
 			}
 			inputSource = new XMLInputSource(null, url, null, fileInputStream, null);
 			if (documentEncoding.length() > 0)

gxcache-memcached/src/main/java/com/genexus/cache/memcached/Memcached.java

@@ -121,7 +121,8 @@ public void clear(String cacheid, String key) {
 	}
 
 	public void clearCache(String cacheid) {
-		_cache.incr(cacheid, 1);
+		Long newPrefix = CommonUtil.now(false, false).getTime();
+		set(cacheid, newPrefix);
 	}
 
 	public void clearKey(String key) {

gxcryptocommon/pom.xml

@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>org.apache.santuario</groupId>
 			<artifactId>xmlsec</artifactId>
-			<version>2.2.3</version>
+			<version>${xmlsec.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>*</groupId>

gxoffice/src/main/java/com/genexus/gxoffice/ExcelDoc.java

@@ -56,19 +56,18 @@ public IExcelDocument getDocument() {
 	public void checkExcelDocument() {
 		if (document == null) {
 			try {
-				if (excelFileName.endsWith(".xlsx") || excelFileName.endsWith(".xlsm")
-						|| excelFileName.endsWith(".xlsb") || excelFileName.endsWith(".xlam")
-						|| isXlsx(excelFileName)) {
+				if (excelFileName.endsWith(".xls") || excelFileName.endsWith(".xlm")
+						|| excelFileName.endsWith(".xlb") || excelFileName.endsWith(".xlm")) {
+					Class.forName("org.apache.poi.hssf.usermodel.HSSFWorkbook");
+					document = new com.genexus.gxoffice.poi.hssf.ExcelDocument();
+				} else {
 					if (bufferedStreaming) {
 						Class.forName("org.apache.poi.xssf.streaming.SXSSFWorkbook");
 						document = new com.genexus.gxoffice.poi.sxssf.ExcelDocument();
 					} else {
 						Class.forName("org.apache.poi.xssf.usermodel.XSSFWorkbook");
 						document = new com.genexus.gxoffice.poi.xssf.ExcelDocument();
 					}
-				} else {
-					Class.forName("org.apache.poi.hssf.usermodel.HSSFWorkbook");
-					document = new com.genexus.gxoffice.poi.hssf.ExcelDocument();
 				}
 			} catch (Throwable e) {
 				document = new com.genexus.gxoffice.ExcelDocument();

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

@@ -5,7 +5,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.genexus.db.Namespace;
 import com.genexus.db.UserInformation;
 import com.genexus.diagnostics.GXDebugInfo;
@@ -18,8 +17,8 @@
 import com.genexus.util.*;
 import com.genexus.util.saia.OpenAIRequest;
 import com.genexus.util.saia.OpenAIResponse;
+import com.genexus.util.saia.SaiaEvents;
 import com.genexus.util.saia.SaiaService;
-import org.json.JSONObject;
 
 public abstract class GXProcedure implements IErrorHandler, ISubmitteable {
 	public abstract void initialize();
@@ -275,13 +274,19 @@ protected String callAssistant(String agent, GXProperties properties, ArrayList<
 	}
 
 	protected ChatResult chatAgent(String agent, GXProperties properties, ArrayList<OpenAIResponse.Message> messages, CallResult result) {
+		return chatAgent(agent, properties, messages, null, result);
+	}
+
+	protected ChatResult chatAgent(String agent, GXProperties properties, ArrayList<OpenAIResponse.Message> messages, GXExternalCollection<?> history, CallResult result) {
 		ChatResult chatResult = new ChatResult();
 
 		new Thread(() -> {
 			try {
 				context.setThreadModelContext(context);
 				callAgent(agent, true, properties, messages, result, chatResult);
 			} finally {
+				if (history != null)
+					history.setExternalInstance(messages);
 				chatResult.markDone();
 			}
 		}).start();
@@ -321,16 +326,18 @@ protected String callAgent(String agent, boolean stream, GXProperties properties
 
 	public String processNotChunkedResponse(String agent, boolean stream, GXProperties properties, ArrayList<OpenAIResponse.Message> messages, CallResult result, ChatResult chatResult, ArrayList<OpenAIResponse.ToolCall> toolCalls) {
 		for (OpenAIResponse.ToolCall tollCall : toolCalls) {
-			processToolCall(tollCall, messages);
+			processToolCall(tollCall, messages, chatResult);
 		}
 		return callAgent(agent, stream, properties, messages, result, chatResult);
 	}
 
-	private void processToolCall(OpenAIResponse.ToolCall toolCall, ArrayList<OpenAIResponse.Message> messages) {
+	private void processToolCall(OpenAIResponse.ToolCall toolCall, ArrayList<OpenAIResponse.Message> messages, ChatResult chatResult) {
 		String result;
 		String functionName = toolCall.getFunction().getName();
 		try {
+			addToolCallChunk(chatResult, toolCall, "saia.metadata.tool.started", "started", null);
 			result = callTool(functionName, toolCall.getFunction().getArguments());
+			addToolCallChunk(chatResult, toolCall, "saia.metadata.tool.finished", "finished_successfully", result);
 		}
 		catch (Throwable e) {
 			result = String.format("Error calling tool %s", functionName);
@@ -341,4 +348,13 @@ private void processToolCall(OpenAIResponse.ToolCall toolCall, ArrayList<OpenAIR
 		toolCallMessage.setToolCallId(toolCall.getId());
 		messages.add(toolCallMessage);
 	}
+
+	private void addToolCallChunk(ChatResult chatResult, OpenAIResponse.ToolCall toolCall, String event, String tollStatus, String result) {
+		if (chatResult != null) {
+			SaiaEvents saiaToolStarted = new SaiaEvents();
+			String eventJson = saiaToolStarted.serializeSaiaEvent(toolCall, event, tollStatus, result);
+			if (eventJson != null)
+				chatResult.addChunk("data: " + eventJson);
+		}
+	}
 }

java/src/main/java/com/genexus/GXutil.java

@@ -10,12 +10,14 @@
 import com.genexus.common.interfaces.SpecificImplementation;
 import com.genexus.db.DataStoreProvider;
 import com.genexus.db.GXEmbedding;
+import com.genexus.internet.HttpClient;
 import com.genexus.internet.HttpContext;
 import com.genexus.internet.StringCollection;
 import com.genexus.platform.INativeFunctions;
 import com.genexus.platform.NativeFunctions;
 import com.genexus.util.*;
 
+import org.apache.commons.io.IOUtils;
 import org.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 
@@ -1782,4 +1784,11 @@ public static String embeddingToStr(GXEmbedding embedding) {
 		return embedding.toString();
 	}
 
+	public static byte[] ImageUrlToBytes(String url) throws IOException{
+		HttpClient httpClient = new HttpClient();
+		httpClient.execute( "GET", url);
+		try (InputStream in = httpClient.getInputStream()) {
+			return IOUtils.toByteArray(in);
+		}
+	}
 }

java/src/main/java/com/genexus/db/driver/GXPreparedStatement.java

@@ -1391,10 +1391,10 @@ public void setBLOBFile(int index, String fileName, boolean isMultiMedia) throws
 					int queryIndex = fileName.lastIndexOf('?');
 					if (queryIndex > -1)
 						fileName = fileName.substring(0, queryIndex + 1) + PrivateUtilities.encodeURL(fileName.substring(queryIndex + 1));
-					URL fileURL = new URL(fileName);
+					String fileURL = fileName;
 					String blobPath = com.genexus.Preferences.getDefaultPreferences().getBLOB_PATH();
 					fileName = com.genexus.PrivateUtilities.getTempFileName(blobPath, CommonUtil.getFileName(fileName), CommonUtil.getFileType(fileName), true);
-					com.genexus.PrivateUtilities.InputStreamToFile(fileURL.openStream() ,fileName);						
+					new com.genexus.util.GXFile(fileName).fromBytes(GXutil.ImageUrlToBytes(fileURL));
 				}
 			}
 			catch(MalformedURLException e)

java/src/main/java/com/genexus/internet/HttpClientJavaLib.java

@@ -93,6 +93,10 @@ public HttpClientJavaLib() {
 		if (isFirstIpDnsEnabled()) {
 			builder.setDnsResolver(FIRST_IP_DNS_RESOLVER);
 		}
+		String userAgent = clientCfg.getProperty("Client", "UserAgentHeader", "");
+		if (!userAgent.isEmpty()) {
+			builder.setUserAgent(userAgent);
+		}
 		httpClientBuilder = builder;
 		cookies = new BasicCookieStore();
 		streamsToClose = new Vector<>();

java/src/main/java/com/genexus/reports/PDFReportItext2.java

@@ -9,6 +9,7 @@
 
 import com.genexus.ApplicationContext;
 import com.genexus.CommonUtil;
+import com.genexus.GXutil;
 import com.genexus.ModelContext;
 import com.genexus.platform.NativeFunctions;
 import com.genexus.webpanels.HttpContextWeb;
@@ -396,9 +397,8 @@ public void GxDrawBitMap(String bitmap, int left, int top, int right, int bottom
 					}
 				}
 			}
-			catch(java.lang.IllegalArgumentException ex) {//Puede ser una url absoluta
-				java.net.URL url= new java.net.URL(bitmap);
-				image = com.lowagie.text.Image.getInstance(url);
+			catch(java.lang.IllegalArgumentException | IOException ex) {//Puede ser una url absoluta
+				image = com.lowagie.text.Image.getInstance(GXutil.ImageUrlToBytes(bitmap));
 			}
 
 			if (documentImages == null) {
@@ -443,9 +443,6 @@ public void GxDrawBitMap(String bitmap, int left, int top, int right, int bottom
 		catch(DocumentException de) {
 			log.error("GxDrawBitMap failed:", de);
 		}
-		catch(IOException ioe) {
-			log.error("GxDrawBitMap failed:", ioe);
-		}
 		catch(Exception e) {
 			log.error("GxDrawBitMap failed:", e);
 		}