Remove parsing for streaming

Author: MatKuhr

orchestration/src/main/java/com/sap/ai/sdk/orchestration/LLMModuleResultDeserializer.java

@@ -2,12 +2,9 @@
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.sap.ai.sdk.orchestration.client.model.LLMModuleResult;
-import com.sap.ai.sdk.orchestration.client.model.LLMModuleResultStreaming;
 import com.sap.ai.sdk.orchestration.client.model.LLMModuleResultSynchronous;
 import java.io.IOException;
 import java.io.Serial;
@@ -28,13 +25,7 @@ class LLMModuleResultDeserializer extends StdDeserializer<LLMModuleResult> {
   }
 
   /**
-   * Deserialize the JSON object into one of the subtypes of the base type.
-   *
-   * <ul>
-   *   <li>If elements of "choices" array contains "delta", deserialize into {@link
-   *       LLMModuleResultStreaming}.
-   *   <li>Otherwise, deserialize into {@link LLMModuleResultSynchronous}.
-   * </ul>
+   * Always deserialize into {@link LLMModuleResultSynchronous} since streaming isn't supported yet.
    *
    * @param parser The JSON parser.
    * @param context The deserialization context.
@@ -46,50 +37,9 @@ class LLMModuleResultDeserializer extends StdDeserializer<LLMModuleResult> {
   public LLMModuleResult deserialize(
       @Nonnull final JsonParser parser, @Nonnull final DeserializationContext context)
       throws IOException {
-
-    // Check if the target type is a concrete class
-    val targetType = context.getContextualType();
-    if (targetType != null && !LLMModuleResult.class.equals(targetType.getRawClass())) {
-      return delegateToDefaultDeserializer(parser, context, targetType);
-    }
-
-    // Custom deserialization logic for LLMModuleResult interface
     val mapper = (ObjectMapper) parser.getCodec();
     val rootNode = mapper.readTree(parser);
-    Class<? extends LLMModuleResult> concreteClass = LLMModuleResultSynchronous.class;
-
-    // Inspect the "choices" field
-    val choicesNode = rootNode.get("choices");
-    if (choicesNode != null && choicesNode.isArray()) {
-      val firstChoice = (JsonNode) choicesNode.get(0);
-      if (firstChoice != null && firstChoice.has("delta")) {
-        concreteClass = LLMModuleResultStreaming.class;
-      }
-    }
 
-    // Create a new parser for the root node
-    val rootParser = rootNode.traverse(mapper);
-    rootParser.nextToken(); // Advance to the first token
-
-    // Use the default deserializer for the concrete class
-    return delegateToDefaultDeserializer(rootParser, context, mapper.constructType(concreteClass));
-  }
-
-  /**
-   * Delegate deserialization to the default deserializer for the given concrete type.
-   *
-   * @param parser The JSON parser.
-   * @param context The deserialization context.
-   * @param concreteType The concrete type to deserialize into.
-   * @return The deserialized object.
-   * @throws IOException If an I/O error occurs.
-   */
-  private LLMModuleResult delegateToDefaultDeserializer(
-      @Nonnull final JsonParser parser,
-      @Nonnull final DeserializationContext context,
-      @Nonnull final JavaType concreteType)
-      throws IOException {
-    val defaultDeserializer = context.findRootValueDeserializer(concreteType);
-    return (LLMModuleResult) defaultDeserializer.deserialize(parser, context);
+    return mapper.readValue(rootNode.toString(), LLMModuleResultSynchronous.class);
   }
 }

orchestration/src/test/java/com/sap/ai/sdk/orchestration/LLMModuleResultDeserializerTest.java

@@ -4,7 +4,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sap.ai.sdk.orchestration.client.model.LLMModuleResult;
-import com.sap.ai.sdk.orchestration.client.model.LLMModuleResultStreaming;
 import com.sap.ai.sdk.orchestration.client.model.LLMModuleResultSynchronous;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
@@ -54,42 +53,4 @@ void testSubtypeResolutionSynchronous() {
     // Assert
     assertThat(result).isExactlyInstanceOf(LLMModuleResultSynchronous.class);
   }
-
-  @SneakyThrows
-  @Test
-  void testSubtypeResolutionStreaming() {
-    var choices =
-        """
-          [
-             {
-               "index": 0,
-               "delta": {
-                 "content": "Sample response content."
-               }
-             }
-           ]
-        """;
-
-    var json = String.format(jsonTemplate, choices);
-
-    // Deserialize JSON content
-    LLMModuleResult result = objectMapper.readValue(json, LLMModuleResult.class);
-
-    // Assert
-    assertThat(result).isExactlyInstanceOf(LLMModuleResultStreaming.class);
-  }
-
-  @SneakyThrows
-  @Test
-  void testSubtypeResolutionEmptyChoices() {
-
-    String choice = "[]";
-    var json = String.format(jsonTemplate, choice);
-
-    // Deserialize JSON content
-    LLMModuleResult result = objectMapper.readValue(json, LLMModuleResult.class);
-
-    // Assert
-    assertThat(result).isExactlyInstanceOf(LLMModuleResultSynchronous.class);
-  }
 }