updates

chtrembl · Dec 18, 2023 · 9061fc1 · 9061fc1
1 parent cdbeee8
commit 9061fc1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/.../petstoreassistant/src/main/java/com/chtrembl/petstoreassistant/PetStoreAssistantBot.java b/.../petstoreassistant/src/main/java/com/chtrembl/petstoreassistant/PetStoreAssistantBot.java
@@ -99,6 +99,10 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
                //MessageFactory.text(this.WELCOME_MESSAGE)).thenApply(sendResult -> null);
             //}
         }
+        else
+        {
+            return null;
+        }
         //if we have user state in the turn context use that instead
         //else if (sessionID != null && csrfToken != null) {
         //    azurePetStoreSessionInfo = new AzurePetStoreSessionInfo(sessionID, csrfToken, text);
@@ -123,27 +127,18 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
                         dpResponse = this.azurePetStore.updateCart(azurePetStoreSessionInfo, dpResponse.getResponseProductIDs().get(0));
                     }
                 }
-                else {
-                    dpResponse.setDpResponseText("Once I get your session information, I will be able to update your shopping cart.");
-                }
                 break;
             case VIEW_SHOPPING_CART:
                 if(azurePetStoreSessionInfo != null)
                 {
                     dpResponse = this.azurePetStore.viewCart(azurePetStoreSessionInfo);
                 }
-                else {
-                    dpResponse.setDpResponseText("Once I get your session information, I will be able to display your shopping cart.");
-                }
                 break;
             case PLACE_ORDER:
                 if(azurePetStoreSessionInfo != null)
                 {
                     dpResponse = this.azurePetStore.completeCart(azurePetStoreSessionInfo);
                 }
-                else {
-                    dpResponse.setDpResponseText("Once I get your session information, I will be able to place your order.");
-                }
                 break;
             case SEARCH_FOR_PRODUCTS:
                 dpResponse = this.azureOpenAI.completion(text, dpResponse.getClassification());

diff --git a/...tore/petstoreassistant/src/main/java/com/chtrembl/petstoreassistant/model/DPResponse.java b/...tore/petstoreassistant/src/main/java/com/chtrembl/petstoreassistant/model/DPResponse.java
@@ -5,13 +5,14 @@
 import com.chtrembl.petstoreassistant.service.AzureOpenAI.Classification;
 
 public class DPResponse {
-    Classification classification = null;
+    private Classification classification = null;
     private String dpResponseText = "I am not sure how to handle that.";  
-    List<Product> products = null;
-    List<String> responseProductIDs = null;
-    boolean updateCart = false;
-    boolean completeCart = false;
-
+    private List<Product> products = null;
+    private List<String> responseProductIDs = null;
+    private boolean updateCart = false;
+    private boolean completeCart = false;
+    private String aoaiResponse = null;
+
     public DPResponse() {
         super();
     }
@@ -56,4 +57,10 @@ public boolean isCompleteCart() {
     public void setCompleteCart(boolean completeCart) {
         this.completeCart = completeCart;
     }   
+    public String getAoaiResponse() {
+        return aoaiResponse;
+    }
+    public void setAoaiResponse(String aoaiResponse) {
+        this.aoaiResponse = aoaiResponse;
+    }
 }
diff --git a/...e/petstoreassistant/src/main/java/com/chtrembl/petstoreassistant/service/AzureOpenAI.java b/...e/petstoreassistant/src/main/java/com/chtrembl/petstoreassistant/service/AzureOpenAI.java
@@ -170,7 +170,7 @@ public DPResponse completion(String text, Classification classification) {
                         dpResponse.setDpResponseText(PetStoreAssistantUtilities.cleanDataFromAOAIResponseContent(content));
                         break;
                 }
-
+                dpResponse.setAoaiResponse(content);
                 LOGGER.info("completion response for text {} was {}", text, content);
             }
         } catch (Exception e) {