Merge pull request #1070 from quarkiverse/#685

Properly handle Ollama streaming
quarkiverse · Nov 12, 2024 · 29d197e · 29d197e
2 parents 0b5cf23 + 8ad9c26
commit 29d197e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...oviders/ollama/runtime/src/main/java/io/quarkiverse/langchain4j/ollama/OllamaRestApi.java b/...oviders/ollama/runtime/src/main/java/io/quarkiverse/langchain4j/ollama/OllamaRestApi.java
@@ -33,6 +33,7 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 
 import io.quarkiverse.langchain4j.QuarkusJsonCodecFactory;
 import io.quarkiverse.langchain4j.auth.ModelAuthProvider;
@@ -85,7 +86,8 @@ public Object aroundReadFrom(ReaderInterceptorContext context) throws IOExceptio
             try {
                 return context.proceed();
             } catch (ClientWebApplicationException e) {
-                if (e.getCause() instanceof JsonParseException) {
+                Throwable cause = e.getCause();
+                if ((cause instanceof JsonParseException) || (cause instanceof MismatchedInputException)) {
                     if (e.getResponse().getStatus() == 200) {
                         Object invokedMethod = context.getProperty("org.eclipse.microprofile.rest.client.invokedMethod");
                         if ((invokedMethod != null) && invokedMethod.toString().contains("OllamaRestApi.streamingChat")) {