update demo app flow

Author: Yuriy Bezsonov

samples/spring-ai-te-agent/ai-agent/src/main/java/com/example/ai/agent/service/ChatService.java

@@ -25,7 +25,7 @@ public class ChatService {
         1. Use markdown tables for structured data
         2. If unsure, say "I don't know"
         3. Use provided context for company policies
-        4. Use tools for dynamic data (flights, weather, bookings, currency)
+        4. Use tools for dynamic data (weather, dates, flights, bookings, expenses, currency)
         """;
 
     public ChatService(ChatMemoryService chatMemoryService,

samples/spring-ai-te-agent/ai-agent/src/main/java/com/example/ai/agent/tool/DateTimeService.java

@@ -11,12 +11,12 @@ public class DateTimeService {
 
     @Tool(description = """
         Get current date and time in specified timezone.
-        
+
         Parameters:
         - timeZone: e.g., 'UTC', 'America/New_York', 'Europe/London'
-        
+
         Returns: ISO format (YYYY-MM-DDTHH:MM:SS)
-        
+
         Use this when users mention relative dates like "next week" or "tomorrow".
         """)
     public String getCurrentDateTime(String timeZone) {

samples/spring-ai-te-agent/demo-scripts/01-create-app.sh

@@ -1,66 +1,39 @@
 #!/bin/bash
 
-# Clear current directory completely
-echo "Clearing current directory: $(pwd)"
-rm -rf ./*
-rm -rf ./.[!.]* 2>/dev/null || true
-
-echo "Checking if spring-boot-cli directory exists and remove it if it does..."
-if [ -d "spring-boot-cli" ]; then
-    echo "Found existing spring-boot-cli directory, removing it..."
-    rm -rf spring-boot-cli
-fi
-
-echo "Downloading Spring Boot CLI 3.5.0..."
-curl -L https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/3.5.0/spring-boot-cli-3.5.0-bin.zip -o spring-boot-cli-3.5.0-bin.zip
-
-echo "Creating spring-boot-cli directory..."
-mkdir -p spring-boot-cli
-
-echo "Extracting Spring Boot CLI to spring-boot-cli folder..."
-unzip -q spring-boot-cli-3.5.0-bin.zip -d spring-boot-cli
-
-echo "Cleaning up zip file..."
-rm spring-boot-cli-3.5.0-bin.zip
-
-echo "Spring Boot CLI setup complete!"
-echo "You can find the CLI in the spring-boot-cli directory."
+pause_and_execute() {
+    echo ""
+    echo "About to execute:"
+    echo "$1"
+    echo ""
+    echo "Press any key to continue..."
+    read -n 1 -s
+    echo ""
+    eval "$1"
+}
 
 echo "Checking if ai-agent directory exists and remove it..."
 if [ -d "ai-agent" ]; then
     echo "Found existing ai-agent directory, removing it..."
     rm -rf ai-agent
 fi
 
-echo ""
-echo "About to initialize Spring Boot project with the following command:"
-echo -e "\033[1m./spring-boot-cli/spring-3.5.0/bin/spring init --java-version=21 \033[0m"
-echo "   --build=maven \\"
-echo "   --packaging=jar \\"
-echo "   --type=maven-project \\"
-echo "   --artifact-id=ai.agent \\"
-echo "   --name=ai-agent \\"
-echo "   --group-id=com.example \\"
-echo -e "   \033[1m--dependencies=spring-ai-bedrock-converse,web,thymeleaf \033[0m\\"
-echo "   --extract \\"
-echo "   ai-agent"
-
-echo ""
-echo "Press any key to continue with Spring initialization..."
-read -n 1 -s
-
-echo ""
-echo "Initializing Spring Boot project..."
-./spring-boot-cli/spring-3.5.0/bin/spring init --java-version=21 \
-   --build=maven \
-   --packaging=jar \
-   --type=maven-project \
-   --artifact-id=ai.agent \
-   --name=ai-agent \
-   --group-id=com.example \
-   --dependencies=spring-ai-bedrock-converse,web,thymeleaf \
-   --extract \
-   ai-agent
+pause_and_execute "curl https://start.spring.io/starter.zip \\
+  -d type=maven-project \\
+  -d language=java \\
+  -d bootVersion=3.5.7 \\
+  -d baseDir=ai-agent \\
+  -d groupId=com.example \\
+  -d artifactId=ai-agent \\
+  -d name=ai-agent \\
+  -d description='AI Agent with Spring AI and Amazon Bedrock' \\
+  -d packageName=com.example.ai.agent \\
+  -d packaging=jar \\
+  -d javaVersion=21 \\
+  -d dependencies=spring-ai-bedrock-converse,web,thymeleaf \\
+  -o ai-agent.zip"
+
+unzip ai-agent.zip
+rm ai-agent.zip
 
 echo ""
 echo "Initializing Git repository..."
@@ -111,19 +84,15 @@ echo ""
 echo "Git status:"
 git status
 
-# echo ""
-# echo "Opening files in VS Code..."
-# code src/main/resources/application.properties
-# code pom.xml
-# code src/main/java/com/example/ai/agent/ChatService.java
+sleep 1
+./mvnw clean package
+./mvnw spring-boot:run
 
 echo ""
 echo "Committing changes to Git repository..."
 git add .
 git commit -m "Update initial files"
 
-./mvnw spring-boot:run
-
 cp "$SOURCES_FOLDER/demo-scripts/Steps/ChatService.java.1" src/main/java/com/example/ai/agent/service/ChatService.java
 
 ./mvnw spring-boot:run

samples/spring-ai-te-agent/demo-scripts/Steps/ChatService.java.5

@@ -25,7 +25,7 @@ public class ChatService {
         1. Use markdown tables for structured data
         2. If unsure, say "I don't know"
         3. Use provided context for company policies
-        4. Use tools for dynamic data (flights, weather, bookings)
+        4. Use tools for dynamic data (weather, dates, flights, bookings)
         """;
 
     public ChatService(ChatMemoryService chatMemoryService,
@@ -49,11 +49,6 @@ public class ChatService {
     public Flux<String> processChat(String prompt) {
         logger.info("Processing chat: '{}'", prompt);
         try {
-            // Simple streaming without memory:
-            // return chatClient
-            //     .prompt().user(prompt)
-            //     .stream()
-            //     .content();
             return chatMemoryService.callWithMemory(chatClient, prompt);
         } catch (Exception e) {
             logger.error("Error processing chat", e);

samples/spring-ai-te-agent/demo-scripts/demo-flow.md

@@ -7,17 +7,19 @@ mkdir spring-ai-agent
 kiro spring-ai-agent/
 ```
 
+We use 4 terminals, open to save time
+
 In the new terminal (Main terminal):
 
 ```bash
 # git clone https://github.com/aws-samples/java-on-aws.git ./java-on-aws
 # export SOURCES_FOLDER=$(pwd)/java-on-aws/samples/spring-ai-te-agent
 
-export SOURCES_FOLDER=../workshops/java-on-aws/samples/spring-ai-te-agent
-cd $SOURCES_FOLDER
+pushd ../workshops/java-on-aws/samples/spring-ai-te-agent
 export SOURCES_FOLDER=$(pwd)
-cd ../../../../spring-ai-agent
+echo $SOURCES_FOLDER
 export AWS_REGION=us-east-1
+popd
 ```
 
 > Ensure AWS credentials are available in this terminal
@@ -65,13 +67,23 @@ In the AI Agent terminal:
 $SOURCES_FOLDER/demo-scripts/02-add-memory.sh
 ```
 
+Show changes in:
+
+- pom.xml
+- application.properties
+- ChatService
+- ChatMemoryService
+- ConversationSummaryService
+- ChatController
+- WebViewController
+
 > In the AI Agent terminal:
 
 ```bash
 ./mvnw spring-boot:test-run
 ```
 
-Open localhost:8080 in the browser and ask questions:
+Open localhost:8080 in the browser, refresh and ask questions:
 
 > My name in Alex
 > What is my name?
@@ -89,6 +101,17 @@ Open localhost:8080 in the browser and ask questions:
 $SOURCES_FOLDER/demo-scripts/03-add-rag.sh
 ```
 
+Show changes in:
+
+- pom.xml
+- application.properties
+- ChatService
+- ChatController
+- VectorStoreService
+- VectorStoreController
+
+Highlight in Terminal output for RAG
+
 > In the AI Agent terminal:
 
 ```bash
@@ -100,20 +123,22 @@ $SOURCES_FOLDER/demo-scripts/03-add-rag.sh
 ```bash
 curl -X POST \
   -H "Content-Type: text/plain" \
-  --data-binary @ai-agent/samples/policy-travel.md \
+  --data-binary @$SOURCES_FOLDER/ai-agent/samples/policy-travel.md \
   http://localhost:8080/api/admin/rag-load
 
 curl -X POST \
   -H "Content-Type: text/plain" \
-  --data-binary @ai-agent/samples/policy-expense.md \
+  --data-binary @$SOURCES_FOLDER/ai-agent/samples/policy-expense.md \
   http://localhost:8080/api/admin/rag-load
 
 ```
 
 Open localhost:8080 in the browser and ask questions:
 
 > What is our travel policy?
+Highlight Europe 130
 
+> What is the weather in Paris tomorrow?
 > What is the weather in Las Vegas tomorrow?
 
 `Ctrl+C`
@@ -126,6 +151,11 @@ Open localhost:8080 in the browser and ask questions:
 $SOURCES_FOLDER/demo-scripts/04-add-tools.sh
 ```
 
+Show changes in:
+
+- ChatService
+- /tools
+
 > In the AI Agent terminal:
 
 ```bash
@@ -134,7 +164,10 @@ $SOURCES_FOLDER/demo-scripts/04-add-tools.sh
 
 Open localhost:8080 in the browser and ask questions:
 
-> What is the weather in Las Vegas tomorrow?
+> What is the weather in Paris tomorrow?
+
+> Please find me inbound and outbound flights and accommodations for a trip from London to Paris next week, From Monday to Friday. I travel alone, prefer BA flights in the first part of the day, and choose accommodation which is the most expensive, but comply with our travel policy.
+Give me a travel itinerary with flights, accommodation, prices for each day of the travel.
 
 `Ctrl+C`
 
@@ -168,6 +201,8 @@ cd travel/
 ./mvnw spring-boot:test-run
 ```
 
+Highlight in Terminal output for MCP server
+
 Open localhost:8080 in the browser and ask questions:
 
 > Please find me inbound and outbound flights and accommodations for a trip from London to Paris next week, From Monday to Friday. I travel alone, prefer BA flights in the first part of the day, and choose accommodation which is the most expensive, but comply with our travel policy.
@@ -192,6 +227,8 @@ cd backoffice/
 ./mvnw spring-boot:test-run
 ```
 
+spring.ai.bedrock.converse.chat.options.cache-options.strategy=SYSTEM_AND_TOOLS
+
 ---
 
 ## Maintenance Prompt for AI Assistant