From 22552b73f6014675d08d5489a8327d8b5aed57a6 Mon Sep 17 00:00:00 2001 From: supertick Date: Mon, 11 Nov 2024 15:00:43 -0800 Subject: [PATCH] fixed file uris --- src/main/java/org/myrobotlab/service/LLM.java | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/myrobotlab/service/LLM.java b/src/main/java/org/myrobotlab/service/LLM.java index 9411220fb6..514fd9bd5c 100644 --- a/src/main/java/org/myrobotlab/service/LLM.java +++ b/src/main/java/org/myrobotlab/service/LLM.java @@ -5,8 +5,10 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -722,31 +724,30 @@ public void clearHistory() { userMessages.clear(); } - @Override - public void onImage(ImageData img) { - StringBuilder fileUrl = new StringBuilder(); - if (img.encoding == null && img.src != null && (!img.src.startsWith("file://") && !img.src.startsWith("http://") && !img.src.startsWith("https://"))) { - if (img.src.startsWith("/") || img.src.contains(":\\")) { - // absolute path already - fileUrl.append("file://"); - // Windows :() - if (img.src != null) { - fileUrl.append(img.src.replace("\\", "/")); - } - if (img.source != null) { - fileUrl.append(img.source.replace("\\", "/")); + public static URI toFileURI(String filePath) throws URISyntaxException { + try { + URI uri = new URI(filePath); + if (uri.isAbsolute()) { + return uri; } - - } else { - // assume relative - File file = new File(img.src); - fileUrl.append("file://"); - fileUrl.append(file.getAbsolutePath()); - } + } catch (URISyntaxException e) { } + + Path path = Paths.get(filePath); + + return path.toUri(); +} + + @Override + public void onImage(ImageData img) { + try { + String src = (img.src != null)?img.src:img.source; List urls = new ArrayList<>(); - urls.add(fileUrl.toString()); + urls.add(toFileURI(src).toASCIIString()); getResponse(urls); + } catch(Exception e) { + error(e); + } } public static void main(String[] args) {