Fixing Method ...changing approach slightly.

Author: n-o-u-r-h-a-n

core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/spring/SpringUtil.java

@@ -0,0 +1,49 @@
+package com.sap.ai.sdk.prompt.registry.spring;
+
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplateSubstitutionResponse;
+import com.sap.ai.sdk.prompt.registry.model.SingleChatTemplate;
+import com.sap.ai.sdk.prompt.registry.model.Template;
+import java.util.List;
+import javax.annotation.Nonnull;
+import lombok.val;
+import org.springframework.ai.chat.messages.AssistantMessage;
+import org.springframework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.SystemMessage;
+import org.springframework.ai.chat.messages.UserMessage;
+
+/** Utility class for orchestration-related operations in a Spring context. */
+public class SpringUtil {
+
+  private SpringUtil() {
+    // Utility class, no instantiation allowed
+  }
+
+  /**
+   * Get a SpringAI list of messages from a Prompt Registry Response.
+   *
+   * @param promptResponse the response from Prompt Registry.
+   * @return list of SpringAI messages.
+   */
+  @Nonnull
+  public static List<Message> promptRegistryToSpringAi(
+      @Nonnull final PromptTemplateSubstitutionResponse promptResponse) {
+
+    val res = promptResponse.getParsedPrompt();
+
+    // TRANSFORM TEMPLATE TO SPRING AI MESSAGES
+    return res.stream()
+        .map(
+            (Template t) -> {
+              final SingleChatTemplate message = (SingleChatTemplate) t;
+              return (Message)
+                  switch (message.getRole()) {
+                    case "system" -> new SystemMessage(message.getContent());
+                    case "user" -> new UserMessage(message.getContent());
+                    case "assistant" -> new AssistantMessage(message.getContent());
+                    default ->
+                        throw new IllegalArgumentException("Unknown role: " + message.getRole());
+                  };
+            })
+        .toList();
+  }
+}

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/SpringAiOrchestrationService.java

@@ -15,12 +15,15 @@
 import com.sap.ai.sdk.orchestration.model.DPIEntities;
 import com.sap.ai.sdk.orchestration.spring.OrchestrationChatModel;
 import com.sap.ai.sdk.orchestration.spring.OrchestrationChatOptions;
-import com.sap.ai.sdk.orchestration.spring.OrchestrationSpringUtil;
+import com.sap.ai.sdk.prompt.registry.spring.SpringUtil;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+
+import com.sap.ai.sdk.prompt.registry.PromptClient;
+import com.sap.ai.sdk.prompt.registry.model.PromptTemplateSubstitutionRequest;
 import lombok.val;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
@@ -279,20 +282,25 @@ public Translation responseFormat() {
    * @return the chat response containing the prompt template
    */
   @Nullable
-  public ChatResponse getPromptTemplate() {
+  public ChatResponse promptRegistryToSpringAi() {
     val repository = new InMemoryChatMemoryRepository();
     val memory = MessageWindowChatMemory.builder().chatMemoryRepository(repository).build();
     val advisor = MessageChatMemoryAdvisor.builder(memory).build();
     val cl = ChatClient.builder(client).defaultAdvisors(advisor).build();
 
-    List<Message> m =
-        OrchestrationSpringUtil.getPromptTemplate(
-            "prompt_template_name",
-            "MyScenario",
-            "1.0.0",
-            Map.of(
-                "current_timestamp", String.valueOf(System.currentTimeMillis()), "topic", "Time"));
-    val prompt = new Prompt(m, defaultOptions);
+    val promptResponse =
+        new PromptClient()
+            .parsePromptTemplateByNameVersion(
+                "categorization",
+                "0.0.1",
+                "java-e2e-test",
+                "default",
+                false,
+                PromptTemplateSubstitutionRequest.create()
+                    .inputParams(Map.of("inputExample", "I love football")));
+
+    List<Message> messages = SpringUtil.promptRegistryToSpringAi(promptResponse);
+    val prompt = new Prompt(messages, defaultOptions);
     return cl.prompt(prompt).call().chatResponse();
   }
 }

sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/SpringAiOrchestrationTest.java

@@ -168,10 +168,9 @@ void testResponseFormat() {
   }
 
   @Test
-  void getPromptTemplate() {
-    var ChatResponse = service.getPromptTemplate();
+  void promptRegistryToSpringAi() {
+    var ChatResponse = service.promptRegistryToSpringAi();
     assertThat(ChatResponse).isNotNull();
-    assertThat(ChatResponse.getResult().getOutput().getText()).isNotEmpty();
-    assertThat(ChatResponse.getResult().getOutput().getText()).contains("blabla");
+    assertThat(ChatResponse.getResult().getOutput().getText()).contains("Sports");
   }
 }