From 606bc37035ea669314ab5946cdb72a8f972f84d9 Mon Sep 17 00:00:00 2001
From: Rob Chambers <robch@microsoft.com>
Date: Fri, 15 Dec 2023 14:37:49 -0800
Subject: [PATCH] small updates (#140)

---
 .../_.json                                           |  2 +-
 .../pom.xml                                          |  0
 .../scripts/1-copydependencies.bat                   |  0
 .../scripts/2-compile.bat                            |  0
 .../scripts/3-run.bat                                |  0
 .../src/OpenAIQuickstartStreaming.java               | 12 +++---------
 6 files changed, 4 insertions(+), 10 deletions(-)
 rename src/ai/.x/templates/{openai-chat-java-streaming => openai-chat-streaming-java}/_.json (83%)
 rename src/ai/.x/templates/{openai-chat-java-streaming => openai-chat-streaming-java}/pom.xml (100%)
 rename src/ai/.x/templates/{openai-chat-java-streaming => openai-chat-streaming-java}/scripts/1-copydependencies.bat (100%)
 rename src/ai/.x/templates/{openai-chat-java-streaming => openai-chat-streaming-java}/scripts/2-compile.bat (100%)
 rename src/ai/.x/templates/{openai-chat-java-streaming => openai-chat-streaming-java}/scripts/3-run.bat (100%)
 rename src/ai/.x/templates/{openai-chat-java-streaming => openai-chat-streaming-java}/src/OpenAIQuickstartStreaming.java (93%)

diff --git a/src/ai/.x/templates/openai-chat-java-streaming/_.json b/src/ai/.x/templates/openai-chat-streaming-java/_.json
similarity index 83%
rename from src/ai/.x/templates/openai-chat-java-streaming/_.json
rename to src/ai/.x/templates/openai-chat-streaming-java/_.json
index e11606dd..acb799d8 100644
--- a/src/ai/.x/templates/openai-chat-java-streaming/_.json
+++ b/src/ai/.x/templates/openai-chat-streaming-java/_.json
@@ -1,5 +1,5 @@
 {
-  "_Name": "OpenAI Chat Completions in Java",
+  "_Name": "OpenAI Chat Completions (Streaming) in Java",
   "_Language": "Java",
   "OPENAI_ENDPOINT": "<insert your OpenAI endpoint here>",
   "OPENAI_API_KEY": "<insert your OpenAI API key here>",
diff --git a/src/ai/.x/templates/openai-chat-java-streaming/pom.xml b/src/ai/.x/templates/openai-chat-streaming-java/pom.xml
similarity index 100%
rename from src/ai/.x/templates/openai-chat-java-streaming/pom.xml
rename to src/ai/.x/templates/openai-chat-streaming-java/pom.xml
diff --git a/src/ai/.x/templates/openai-chat-java-streaming/scripts/1-copydependencies.bat b/src/ai/.x/templates/openai-chat-streaming-java/scripts/1-copydependencies.bat
similarity index 100%
rename from src/ai/.x/templates/openai-chat-java-streaming/scripts/1-copydependencies.bat
rename to src/ai/.x/templates/openai-chat-streaming-java/scripts/1-copydependencies.bat
diff --git a/src/ai/.x/templates/openai-chat-java-streaming/scripts/2-compile.bat b/src/ai/.x/templates/openai-chat-streaming-java/scripts/2-compile.bat
similarity index 100%
rename from src/ai/.x/templates/openai-chat-java-streaming/scripts/2-compile.bat
rename to src/ai/.x/templates/openai-chat-streaming-java/scripts/2-compile.bat
diff --git a/src/ai/.x/templates/openai-chat-java-streaming/scripts/3-run.bat b/src/ai/.x/templates/openai-chat-streaming-java/scripts/3-run.bat
similarity index 100%
rename from src/ai/.x/templates/openai-chat-java-streaming/scripts/3-run.bat
rename to src/ai/.x/templates/openai-chat-streaming-java/scripts/3-run.bat
diff --git a/src/ai/.x/templates/openai-chat-java-streaming/src/OpenAIQuickstartStreaming.java b/src/ai/.x/templates/openai-chat-streaming-java/src/OpenAIQuickstartStreaming.java
similarity index 93%
rename from src/ai/.x/templates/openai-chat-java-streaming/src/OpenAIQuickstartStreaming.java
rename to src/ai/.x/templates/openai-chat-streaming-java/src/OpenAIQuickstartStreaming.java
index dc5fccd8..88c3db27 100644
--- a/src/ai/.x/templates/openai-chat-java-streaming/src/OpenAIQuickstartStreaming.java
+++ b/src/ai/.x/templates/openai-chat-streaming-java/src/OpenAIQuickstartStreaming.java
@@ -70,7 +70,6 @@ public Flux<ChatCompletions> getChatCompletionsStreamingAsync(String userPrompt,
         Flux<ChatCompletions> response = client.getChatCompletionsStream(deploymentName, options);
 
         response.subscribe(chatResponse -> {
-            // Process each response as it comes in.
             if (chatResponse.getChoices() != null) {
                 for (ChatChoice update : chatResponse.getChoices()) {
                     if (update.getDelta() == null || update.getDelta().getContent() == null)
@@ -94,13 +93,9 @@ public Flux<ChatCompletions> getChatCompletionsStreamingAsync(String userPrompt,
 
                 options.getMessages().add(new ChatRequestAssistantMessage(responseContent.toString()));
             }
-        }, error -> {
-            // Error encountered
-        }, () -> {
-            // Stream completed
         });
 
-        return response; // response.toIterable();
+        return response;
     }
 
     public static void main(String[] args) {
@@ -113,13 +108,12 @@ public static void main(String[] args) {
             if (userPrompt.isEmpty() || "exit".equals(userPrompt))
                 break;
 
-            System.out.print("Assistant: ");
+            System.out.print("\nAssistant: ");
             Flux<ChatCompletions> responseFlux = chat.getChatCompletionsStreamingAsync(userPrompt, update -> {
                 System.out.print(update.getContent());
             });
-            // block until the last element is available
             responseFlux.blockLast(Duration.ofSeconds(20));
-            System.out.println("");
+            System.out.println("\n");
         }
         scanner.close();
     }