Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@chtrembl
chtrembl committed Feb 8, 2024
1 parent c3249fa commit e1f5d80
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 77 deletions.
88 changes: 19 additions & 69 deletions .../petstoreassistant/src/main/java/com/chtrembl/petstoreassistant/PetStoreAssistantBot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

package com.chtrembl.petstoreassistant;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
Expand All @@ -24,13 +23,10 @@
import com.chtrembl.petstoreassistant.utility.PetStoreAssistantUtilities;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.microsoft.bot.builder.ActivityHandler;
import com.microsoft.bot.builder.MessageFactory;
import com.microsoft.bot.builder.TurnContext;
import com.microsoft.bot.builder.UserState;
import com.microsoft.bot.schema.Attachment;
import com.microsoft.bot.schema.ChannelAccount;

/**
Expand Down Expand Up @@ -60,6 +56,9 @@ public class PetStoreAssistantBot extends ActivityHandler {
private ICosmosDB cosmosDB;

private String WELCOME_MESSAGE = "Hello and welcome to the Azure Pet Store, you can ask me questions about our products, your shopping cart and your order, you can also ask me for information about pet animals. How can I help you?";
private String RATE_LIMIT_EXCEEDED_MESSAGE = "I am sorry, you have exceeded your Azure Open AI rate limit, please try again shortly.";
private String SESSION_MISSING_ERROR_MESSAGE = "I am sorry, there is an error with audio translation, please try interacting via text or restarting your browser.";
private String ERROR_MESSAGE = "I am sorry, I am having trouble understanding you, please try interacting via text or restarting your browser.";

private UserState userState;

Expand Down Expand Up @@ -125,6 +124,7 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {

// the client browser initialized
if (text.equals("...")) {
LOGGER.info("onMessageActivity new session established, " + azurePetStoreSessionInfo != null ? "session id: " + azurePetStoreSessionInfo.getId() + " id: " + azurePetStoreSessionInfo.getId() : "session id: null");
return turnContext.sendActivity(
MessageFactory.text(WELCOME_MESSAGE)).thenApply(sendResult -> null);
}
Expand All @@ -133,13 +133,20 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
if (debug != null) {
return debug;
}

if(azurePetStoreSessionInfo == null)
{
return turnContext.sendActivity(
MessageFactory.text(this.SESSION_MISSING_ERROR_MESSAGE))
.thenApply(sendResult -> null);
}

DPResponse dpResponse = this.azureOpenAI.classification(text, azurePetStoreSessionInfo.getSessionID());
DPResponse dpResponse = this.azureOpenAI.classification(text, azurePetStoreSessionInfo);

if(dpResponse.isRateLimitExceeded())
{
return turnContext.sendActivity(
MessageFactory.text("I am sorry, you have exceeded your Azure Open AI Rate Limit, please try again shortly."))
MessageFactory.text(this.RATE_LIMIT_EXCEEDED_MESSAGE))
.thenApply(sendResult -> null);
}

Expand Down Expand Up @@ -183,7 +190,7 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
case SOMETHING_ELSE:
if (azurePetStoreSessionInfo != null) {
if (!text.isEmpty()) {
dpResponse = this.azureOpenAI.completion(text, dpResponse.getClassification(), azurePetStoreSessionInfo.getSessionID());
dpResponse = this.azureOpenAI.completion(text, dpResponse.getClassification(), azurePetStoreSessionInfo);
} else {
dpResponse.setDpResponseText("chatgpt called without a search query... text: " + text);
}
Expand All @@ -194,13 +201,12 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
if(dpResponse.isRateLimitExceeded())
{
return turnContext.sendActivity(
MessageFactory.text("I am sorry, you have exceeded your Azure Open AI Rate Limit, please try again shortly."))
MessageFactory.text(this.RATE_LIMIT_EXCEEDED_MESSAGE))
.thenApply(sendResult -> null);
}

if ((dpResponse.getDpResponseText() == null)) {
String responseText = "I am not sure how to handle that.";
dpResponse.setDpResponseText(responseText);
dpResponse.setDpResponseText(this.ERROR_MESSAGE);
}

if (azurePetStoreSessionInfo != null) {
Expand Down Expand Up @@ -259,6 +265,7 @@ protected CompletableFuture<Void> onMembersAdded(

// the client browser initialized
if (text.equals("...")) {
LOGGER.info("onMembersAdded new session established, " + azurePetStoreSessionInfo != null ? "session id: " + azurePetStoreSessionInfo.getId() + " id: " + azurePetStoreSessionInfo.getId() : "session id: null");
return turnContext.sendActivity(
MessageFactory.text(WELCOME_MESSAGE)).thenApply(sendResult -> null);
}
Expand Down Expand Up @@ -295,7 +302,7 @@ private AzurePetStoreSessionInfo configureSession(TurnContext turnContext, Strin
}

AzurePetStoreSessionInfo azurePetStoreSessionInfo = this.cache.getIfPresent(id);

List<Prompt> existingPrompts = null;
if (azurePetStoreSessionInfo != null && azurePetStoreSessionInfo.getPrompts() != null) {
existingPrompts = azurePetStoreSessionInfo.getPrompts();
Expand All @@ -309,9 +316,9 @@ private AzurePetStoreSessionInfo configureSession(TurnContext turnContext, Strin
// turnContext.getActivity().getId() is unique per browser over the broken
// recipient for some reason
LOGGER.info("configureSession() incoming text contains new session info, caching session " + id + " for text: " + text);
incomingAzurePetStoreSessionInfo.setId(id);
this.cache.put(id, incomingAzurePetStoreSessionInfo);
azurePetStoreSessionInfo = incomingAzurePetStoreSessionInfo;
azurePetStoreSessionInfo.setId(id);
} else if (azurePetStoreSessionInfo != null) {
LOGGER.info("configureSession() incoming text does not contain new session info, using existing session " + azurePetStoreSessionInfo.getId() + " for text: " + text);
azurePetStoreSessionInfo.setNewText(text);
Expand All @@ -338,63 +345,6 @@ private CompletableFuture<Void> getDebug(TurnContext turnContext, String text,
.thenApply(sendResult -> null);
}
}
if (text.equals("button card")) {
if (azurePetStoreSessionInfo != null && azurePetStoreSessionInfo.getNewText() != null) {
text = azurePetStoreSessionInfo.getNewText();
}
String jsonString = "{\"type\":\"buttonWithImage\",\"id\":\"buttonWithImage\",\"data\":{\"title\":\"Soul Machines\",\"imageUrl\":\"https://www.soulmachines.com/wp-content/uploads/cropped-sm-favicon-180x180.png\",\"description\":\"Soul Machines is the leader in astonishing AGI\",\"imageAltText\":\"some text\",\"buttonText\":\"push me\"}}";

Attachment attachment = new Attachment();
attachment.setContentType("application/json");

attachment.setContent(new Gson().fromJson(jsonString, JsonObject.class));
attachment.setName("public-buttonWithImage");

return turnContext.sendActivity(
MessageFactory.attachment(attachment,
"I have something nice to show @showcards(buttonWithImage) you."))
.thenApply(sendResult -> null);
}

if (text.equals("image card")) {
String jsonString = "{\"type\":\"image\",\"id\":\"image-ball\",\"data\":{\"url\": \"https://raw.githubusercontent.com/chtrembl/staticcontent/master/dog-toys/ball.jpg?raw=true\",\"alt\": \"This is a pretty ball\",\"caption\": \"ball blah blah blah\"}}";
Attachment attachment = new Attachment();
attachment.setContentType("application/json");

attachment.setContent(new Gson().fromJson(jsonString, JsonObject.class));
attachment.setName("public-image-ball");

return turnContext.sendActivity(
MessageFactory.attachment(attachment, "I have something nice to show @showcards(image-ball) you."))
.thenApply(sendResult -> null);
}

if(text.equals("button carousel"))
{
String jsonString = "{\"type\":\"buttonCarousel\",\"id\":\"buttonCarousel\",\"data\":{\"buttonCards\":[{\"title\":\"Soul Machines\",\"imageUrl\":\"https://www.soulmachines.com/wp-content/uploads/cropped-sm-favicon-180x180.png\",\"description\":\"1 Soul Machines is the leader in astonishing AGI\",\"imageAltText\":\"some text\",\"buttonText\":\"push me\",\"productId\":\"1\"},{\"title\":\"Soul Machines\",\"imageUrl\":\"https://www.soulmachines.com/wp-content/uploads/cropped-sm-favicon-180x180.png\",\"description\":\"2 Soul Machines is the leader in astonishing AGI\",\"imageAltText\":\"some text\",\"buttonText\":\"push me\",\"productId\":\"2\"},{\"title\":\"Soul Machines\",\"imageUrl\":\"https://www.soulmachines.com/wp-content/uploads/cropped-sm-favicon-180x180.png\",\"description\":\"3 Soul Machines is the leader in astonishing AGI\",\"imageAltText\":\"some text\",\"buttonText\":\"push me\",\"productId\":\"3\"},]}}";
Attachment attachment = new Attachment();
attachment.setContentType("application/json");

attachment.setContent(new Gson().fromJson(jsonString, JsonObject.class));
attachment.setName("public-buttonCarousel");

return turnContext.sendActivity(
MessageFactory.attachment(attachment, "I have something nice to show @showcards(buttonCarousel) you."))
.thenApply(sendResult -> null);
}

if(text.equals("list"))
{
List<String> cart = new ArrayList<String>() {
{
add("Product A (1)");
add("Product B (2)");
add("Product C (3)");
}
};

return turnContext.sendActivity(MessageFactory.suggestedActions(cart, "Sample message, cart contains the following:")).thenApply(sendResult -> null);
}

return null;
}
Expand Down
13 changes: 7 additions & 6 deletions ...tstoreassistant/src/main/java/com/chtrembl/petstoreassistant/service/AzureAIServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.reactive.function.client.WebClientException;

import com.chtrembl.petstoreassistant.model.AzurePetStoreSessionInfo;
import com.chtrembl.petstoreassistant.model.DPResponse;
import com.chtrembl.petstoreassistant.model.Product;
import com.chtrembl.petstoreassistant.utility.PetStoreAssistantUtilities;
Expand Down Expand Up @@ -118,14 +119,14 @@ public static Classification valueOfLabel(String label) {
}

@Override
public DPResponse classification(String text, String sessionID) {
public DPResponse classification(String text, AzurePetStoreSessionInfo azurePetStoreSessionInfo) {
LOGGER.info("classification invoked, text: {}", text);

DPResponse dpResponse = new DPResponse();

try {
String aoaiResponse = this.httpRequest(String.format(this.classificationRequestBodyString, text),
this.CLASSIFICATION_URI, this.aoaiKey, this.apimKey, sessionID, this.aoaiClient);
this.CLASSIFICATION_URI, this.aoaiKey, this.apimKey, azurePetStoreSessionInfo.getSessionID(), this.aoaiClient);

String classification = new Gson().fromJson(aoaiResponse, JsonElement.class).getAsJsonObject()
.get("choices")
Expand All @@ -147,14 +148,14 @@ public DPResponse classification(String text, String sessionID) {
}
}
catch (Exception e) {
LOGGER.error("Error parsing classification response ", e);
LOGGER.error("Error parsing classification response azure " + azurePetStoreSessionInfo != null ? "session id: " + azurePetStoreSessionInfo.getId() + " id: " + azurePetStoreSessionInfo.getId() : "session id: null", e);
}

return dpResponse;
}

@Override
public DPResponse completion(String text, Classification classification, String sessionID) {
public DPResponse completion(String text, Classification classification, AzurePetStoreSessionInfo azurePetStoreSessionInfo) {
LOGGER.info("completion invoked, text: {}", text);

DPResponse dpResponse = new DPResponse();
Expand All @@ -167,7 +168,7 @@ public DPResponse completion(String text, Classification classification, String
String aoaiResponse = this.httpRequest(
String.format(aoaiRequestBody,
text),
uri, this.aoaiKey, this.apimKey, sessionID, this.aoaiClient);
uri, this.aoaiKey, this.apimKey, azurePetStoreSessionInfo.getSessionID(), this.aoaiClient);

String content = null;

Expand All @@ -190,7 +191,7 @@ public DPResponse completion(String text, Classification classification, String
}
}
catch (Exception e) {
LOGGER.error("Error parsing completion response ", e);
LOGGER.error("Error parsing completion response azure " + azurePetStoreSessionInfo != null ? "session id: " + azurePetStoreSessionInfo.getId() + " id: " + azurePetStoreSessionInfo.getId() : "session id: null", e);
}
return dpResponse;
}
Expand Down
5 changes: 3 additions & 2 deletions ...storeassistant/src/main/java/com/chtrembl/petstoreassistant/service/IAzureAIServices.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.chtrembl.petstoreassistant.service;

import com.chtrembl.petstoreassistant.model.AzurePetStoreSessionInfo;
import com.chtrembl.petstoreassistant.model.DPResponse;
import com.chtrembl.petstoreassistant.service.AzureAIServices.Classification;

public interface IAzureAIServices {
public DPResponse classification(String text, String sessionID);
public DPResponse completion(String text, Classification classification, String sessionID);
public DPResponse classification(String text, AzurePetStoreSessionInfo azurePetStoreSessionInfo);
public DPResponse completion(String text, Classification classification, AzurePetStoreSessionInfo azurePetStoreSessionInfo);
public DPResponse search(String text,Classification classification);
}

0 comments on commit e1f5d80

Please sign in to comment.