Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@chtrembl
chtrembl committed Jan 3, 2024
1 parent e2f25aa commit 635bc85
Show file tree
Hide file tree
Showing 2 changed files with 121 additions and 113 deletions.
230 changes: 121 additions & 109 deletions .../petstoreassistant/src/main/java/com/chtrembl/petstoreassistant/PetStoreAssistantBot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
@Primary
public class PetStoreAssistantBot extends ActivityHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(PetStoreAssistantBot.class);

@Autowired
private IAzureAIServices azureOpenAI;

@Autowired
private IAzurePetStore azurePetStore;

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 UserState userState;

public PetStoreAssistantBot(UserState withUserState) {
Expand All @@ -69,136 +69,61 @@ public PetStoreAssistantBot(UserState withUserState) {
@Override
public CompletableFuture<Void> onTurn(TurnContext turnContext) {
return super.onTurn(turnContext)
.thenCompose(saveResult -> userState.saveChanges(turnContext));
.thenCompose(saveResult -> userState.saveChanges(turnContext));
}

@Override
protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
String text = turnContext.getActivity().getText().toLowerCase();

// strip out session id and csrf token if one was passed from soul machines sendTextMessage() function
AzurePetStoreSessionInfo azurePetStoreSessionInfo = PetStoreAssistantUtilities.getAzurePetStoreSessionInfo(text);
if(azurePetStoreSessionInfo != null)
{
text = azurePetStoreSessionInfo.getNewText();

}
else
{
return turnContext.sendActivity(
MessageFactory.text("")).thenApply(sendResult -> null);
}

if(text.equals("variables"))
{
RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();

String debug = requestAttributes.toString();

if (requestAttributes instanceof ServletRequestAttributes) {

HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();

try
{
debug += " headers: "+request.getHeaderNames().toString();
}
catch(Exception e)
{

}

try
{
debug += " attributes: "+request.getAttributeNames().toString();
}
catch(Exception e)
{

}

try
{
debug += " parameters: "+request.getParameterNames().toString();
}
catch(Exception e)
{

}

try
{
debug += " session attributes: "+request.getSession().getAttributeNames().toString();
}
catch(Exception e)
{
// strip out session id and csrf token if one was passed from soul machines
// sendTextMessage() function
AzurePetStoreSessionInfo azurePetStoreSessionInfo = PetStoreAssistantUtilities
.getAzurePetStoreSessionInfo(text);

}

return turnContext.sendActivity(
MessageFactory.text("debug: "+debug)).thenApply(sendResult -> null);
}else{
return turnContext.sendActivity(
MessageFactory.text("no request data " + debug)).thenApply(sendResult -> null);
}
//DEBUG ONLY
if (text.equals("variables")) {
return getVariables(turnContext);
}

// for debugging during development :)
if(text.equals("session"))
{
return turnContext.sendActivity(
MessageFactory.text("your session id is "+azurePetStoreSessionInfo.getSessionID()+" and your csrf token is "+azurePetStoreSessionInfo.getCsrfToken())).thenApply(sendResult -> null);
if (text.equals("session")) {
return getSession(turnContext, azurePetStoreSessionInfo);
}
if (text.equals("card")) {
return getCard(turnContext);
}

// for debugging during development :)
if(text.equals("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 ball\"}}";

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-content-card");
if (azurePetStoreSessionInfo != null) {
text = azurePetStoreSessionInfo.getNewText();

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


MessageFactory.text("")).thenApply(sendResult -> null);
}

DPResponse dpResponse = this.azureOpenAI.classification(text);

if(dpResponse.getClassification() == null)
{

if (dpResponse.getClassification() == null) {
dpResponse.setClassification(Classification.SEARCH_FOR_PRODUCTS);
dpResponse = this.azureOpenAI.search(text, dpResponse.getClassification());
}

switch (dpResponse.getClassification()) {
case UPDATE_SHOPPING_CART:
if(azurePetStoreSessionInfo != null)
{
if (azurePetStoreSessionInfo != null) {
dpResponse = this.azureOpenAI.search(text, Classification.SEARCH_FOR_PRODUCTS);
if(dpResponse.getProducts() != null)
{
dpResponse = this.azurePetStore.updateCart(azurePetStoreSessionInfo, dpResponse.getProducts().get(0).getProductId());
if (dpResponse.getProducts() != null) {
dpResponse = this.azurePetStore.updateCart(azurePetStoreSessionInfo,
dpResponse.getProducts().get(0).getProductId());
}
}
break;
case VIEW_SHOPPING_CART:
if(azurePetStoreSessionInfo != null)
{
if (azurePetStoreSessionInfo != null) {
dpResponse = this.azurePetStore.viewCart(azurePetStoreSessionInfo);
}
break;
case PLACE_ORDER:
if(azurePetStoreSessionInfo != null)
{
if (azurePetStoreSessionInfo != null) {
dpResponse = this.azurePetStore.completeCart(azurePetStoreSessionInfo);
}
break;
Expand All @@ -216,11 +141,11 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
break;
}

//only respond to the user if the user sent something (seems to be a bug where initial messages are sent without a prompt while page loads)
if(dpResponse.getDpResponseText() != null && dpResponse.getDpResponseText().length()>0)
{
// only respond to the user if the user sent something (seems to be a bug where
// initial messages are sent without a prompt while page loads)
if (dpResponse.getDpResponseText() != null && dpResponse.getDpResponseText().length() > 0) {
return turnContext.sendActivity(
MessageFactory.text(dpResponse.getDpResponseText())).thenApply(sendResult -> null);
MessageFactory.text(dpResponse.getDpResponseText())).thenApply(sendResult -> null);
}
return null;
}
Expand All @@ -229,7 +154,7 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
protected CompletableFuture<Void> onMembersAdded(
List<ChannelAccount> membersAdded,
TurnContext turnContext) {

return membersAdded.stream()
.filter(
member -> !StringUtils
Expand All @@ -238,5 +163,92 @@ protected CompletableFuture<Void> onMembersAdded(
.sendActivity(
MessageFactory.text(this.WELCOME_MESSAGE)))
.collect(CompletableFutures.toFutureList()).thenApply(resourceResponses -> null);
}
}

private CompletableFuture<Void> getVariables(TurnContext turnContext) {

RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();

String debug = requestAttributes.toString();

if (requestAttributes instanceof ServletRequestAttributes) {

HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();

try {
java.util.Enumeration<String> enumeration = request.getHeaderNames();
debug += " headers: ";
while (enumeration.hasMoreElements()) {
String headerName = enumeration.nextElement();
debug += headerName + " ";
}
} catch (Exception e) {

}

try {
java.util.Enumeration<String> enumeration = request.getAttributeNames();
debug += " attributes: ";
while (enumeration.hasMoreElements()) {
String attributeName = enumeration.nextElement();
debug += attributeName + " ";
}

} catch (Exception e) {

}

try {
java.util.Enumeration<String> enumeration = request.getParameterNames();
debug += " parameters: ";
while (enumeration.hasMoreElements()) {
String parameterName = enumeration.nextElement();
debug += parameterName + " ";
}
} catch (Exception e) {

}

try {
java.util.Enumeration<String> enumeration = request.getSession().getAttributeNames();
debug += " session attributes: ";
while (enumeration.hasMoreElements()) {
String attributeName = enumeration.nextElement();
debug += attributeName + " ";
}
} catch (Exception e) {

}

return turnContext.sendActivity(
MessageFactory.text("debug: " + debug)).thenApply(sendResult -> null);
} else {
return turnContext.sendActivity(
MessageFactory.text("no request data " + debug)).thenApply(sendResult -> null);
}
}

private CompletableFuture<Void> getSession(TurnContext turnContext,
AzurePetStoreSessionInfo azurePetStoreSessionInfo) {

return turnContext.sendActivity(
MessageFactory.text("your session id is " + azurePetStoreSessionInfo.getSessionID()
+ " and your csrf token is " + azurePetStoreSessionInfo.getCsrfToken()))
.thenApply(sendResult -> null);
}

private CompletableFuture<Void> getCard(TurnContext turnContext) {
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-content-card");

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

}
4 changes: 0 additions & 4 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 @@ -5,7 +5,6 @@
import java.util.List;

import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -15,9 +14,6 @@
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.util.StreamUtils;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.reactive.function.BodyInserters;
import org.springframework.web.reactive.function.client.WebClient;

Expand Down

0 comments on commit 635bc85

Please sign in to comment.