rolled in review comments

scmacdon · scmacdon · commit b1de8d2dd919 · 2025-04-10T15:28:21.000-04:00
diff --git a/.doc_gen/metadata/bedrock-runtime_metadata.yaml b/.doc_gen/metadata/bedrock-runtime_metadata.yaml
@@ -1484,6 +1484,22 @@ bedrock-runtime_Scenario_ToolUseDemo_AmazonNova:
   synopsis: "build a typical interaction between an application, a generative AI model, and connected tools or APIs to mediate interactions between the AI and the outside world. It uses the example of connecting an external weather API to the AI model so it can provide real-time weather information based on user input."
   category: Amazon Nova
   languages:
+    Java:
+      versions:
+        - sdk_version: 2
+          github: javav2/example_code/bedrock-runtime
+          excerpts:
+            - description: "The primary execution of the scenario flow. This scenario orchestrates the conversation between the user, the &BR; Converse API, and a weather tool."
+              snippet_tags:
+                - bedrock.converseTool.javav2.scenario
+            - description: "The weather tool used by the demo. This file defines the tool specification and implements the logic to retrieve weather data using from the Open-Meteo API."
+              genai: some
+              snippet_tags:
+                - bedrock.converseTool.javav2.weathertool
+            - description: "The Converse API action with a tool configuration."
+              genai: some
+              snippet_tags:
+                - bedrockruntime.java2.converse.main  
     .NET:
       versions:
         - sdk_version: 3
diff --git a/javav2/example_code/bedrock-runtime/src/main/java/com/example/bedrockruntime/scenario/BedrockActions.java b/javav2/example_code/bedrock-runtime/src/main/java/com/example/bedrockruntime/scenario/BedrockActions.java
@@ -9,13 +9,8 @@
 import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient;
-import software.amazon.awssdk.services.bedrockruntime.model.ConverseRequest;
-import software.amazon.awssdk.services.bedrockruntime.model.ConverseResponse;
-import software.amazon.awssdk.services.bedrockruntime.model.Message;
-import software.amazon.awssdk.services.bedrockruntime.model.SystemContentBlock;
-import software.amazon.awssdk.services.bedrockruntime.model.Tool;
-import software.amazon.awssdk.services.bedrockruntime.model.ToolConfiguration;
-import software.amazon.awssdk.services.bedrockruntime.model.ToolSpecification;
+import software.amazon.awssdk.services.bedrockruntime.model.*;
+
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -92,11 +87,11 @@ public ConverseResponse sendConverseRequestAsync(String modelId, String systemPr
             ConverseResponse response = getClient().converse(request).join();
             return response;
 
-        } catch (Exception ex) {
-            ex.printStackTrace();
+        } catch (ModelNotReadyException ex) {
+            throw new RuntimeException("Model is not ready: " + ex.getMessage(), ex);
+        } catch (BedrockRuntimeException ex) {
+            throw new RuntimeException("Failed to converse with Bedrock model: " + ex.getMessage(), ex);
         }
-
-        return null;
     }
     // snippet-end:[bedrockruntime.java2.converse.main]
 }
diff --git a/javav2/example_code/bedrock-runtime/src/main/java/com/example/bedrockruntime/scenario/BedrockScenario.java b/javav2/example_code/bedrock-runtime/src/main/java/com/example/bedrockruntime/scenario/BedrockScenario.java
@@ -8,16 +8,9 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Scanner;
+
 import software.amazon.awssdk.core.document.Document;
-import software.amazon.awssdk.services.bedrockruntime.model.ContentBlock;
-import software.amazon.awssdk.services.bedrockruntime.model.ConversationRole;
-import software.amazon.awssdk.services.bedrockruntime.model.ConverseOutput;
-import software.amazon.awssdk.services.bedrockruntime.model.ConverseResponse;
-import software.amazon.awssdk.services.bedrockruntime.model.Message;
-import software.amazon.awssdk.services.bedrockruntime.model.ToolResultBlock;
-import software.amazon.awssdk.services.bedrockruntime.model.ToolResultContentBlock;
-import software.amazon.awssdk.services.bedrockruntime.model.ToolSpecification;
-import software.amazon.awssdk.services.bedrockruntime.model.ToolUseBlock;
+import software.amazon.awssdk.services.bedrockruntime.model.*;
 
 // snippet-start:[bedrock.converseTool.javav2.scenario]
 /*
@@ -27,7 +20,7 @@
  */
 public class BedrockScenario {
     public static final String DASHES = new String(new char[80]).replace("\0", "-");
-    private static String modelId = "anthropic.claude-3-sonnet-20240229-v1:0";
+    private static String modelId = "amazon.nova-lite-v1:0";
     private static String defaultPrompt = "What is the weather like in Seattle?";
     private static WeatherTool weatherTool = new WeatherTool();
 
@@ -38,49 +31,49 @@ public class BedrockScenario {
     public static boolean interactive = true;
 
     private static final String systemPrompt = """
-        You are a weather assistant that provides current weather data for user-specified locations using only
-        the Weather_Tool, which expects latitude and longitude. Infer the coordinates from the location yourself.
-        If the user provides coordinates, infer the approximate location and refer to it in your response.
-        To use the tool, you strictly apply the provided tool specification.
-
-        - Explain your step-by-step process, and give brief updates before each step.
-        - Only use the Weather_Tool for data. Never guess or make up information. 
-        - Repeat the tool use for subsequent requests if necessary.
-        - If the tool errors, apologize, explain weather is unavailable, and suggest other options.
-        - Report temperatures in °C (°F) and wind in km/h (mph). Keep weather reports concise. Sparingly use
-          emojis where appropriate.
-        - Only respond to weather queries. Remind off-topic users of your purpose. 
-        - Never claim to search online, access external data, or use tools besides Weather_Tool.
-        - Complete the entire process until you have all required data before sending the complete response.
-        """;
+            You are a weather assistant that provides current weather data for user-specified locations using only
+            the Weather_Tool, which expects latitude and longitude. Infer the coordinates from the location yourself.
+            If the user provides coordinates, infer the approximate location and refer to it in your response.
+            To use the tool, you strictly apply the provided tool specification.
+            
+            - Explain your step-by-step process, and give brief updates before each step.
+            - Only use the Weather_Tool for data. Never guess or make up information. 
+            - Repeat the tool use for subsequent requests if necessary.
+            - If the tool errors, apologize, explain weather is unavailable, and suggest other options.
+            - Report temperatures in °C (°F) and wind in km/h (mph). Keep weather reports concise. Sparingly use
+              emojis where appropriate.
+            - Only respond to weather queries. Remind off-topic users of your purpose. 
+            - Never claim to search online, access external data, or use tools besides Weather_Tool.
+            - Complete the entire process until you have all required data before sending the complete response.
+            """;
 
     public static void main(String[] args) {
         Scanner scanner = new Scanner(System.in);
         System.out.println("""
-         =================================================
-         Welcome to the Amazon Bedrock Tool Use demo!
-         =================================================
-                    
-         This assistant provides current weather information for user-specified locations.
-         You can ask for weather details by providing the location name or coordinates.
-                    
-         Example queries:
-         - What's the weather like in New York?
-         - Current weather for latitude 40.70, longitude -74.01
-         - Is it warmer in Rome or Barcelona today?
-                    
-         To exit the program, simply type 'x' and press Enter.
-                    
-         P.S.: You're not limited to single locations, or even to using English!
-         Have fun and experiment with the app!
-         """);
+                =================================================
+                Welcome to the Amazon Bedrock Tool Use demo!
+                =================================================
+                
+                This assistant provides current weather information for user-specified locations.
+                You can ask for weather details by providing the location name or coordinates.
+                
+                Example queries:
+                - What's the weather like in New York?
+                - Current weather for latitude 40.70, longitude -74.01
+                - Is it warmer in Rome or Barcelona today?
+                
+                To exit the program, simply type 'x' and press Enter.
+                
+                P.S.: You're not limited to single locations, or even to using English!
+                Have fun and experiment with the app!
+                """);
         System.out.println(DASHES);
 
         try {
             runConversation(scanner);
 
         } catch (Exception ex) {
-            System.out.println("There was a problem running the scenario: "+ ex.getMessage());
+            System.out.println("There was a problem running the scenario: " + ex.getMessage());
         }
 
         waitForInputToContinue(scanner);
@@ -91,7 +84,7 @@ public static void main(String[] args) {
     }
 
     /**
-     Starts the conversation with the user and handles the interaction with Bedrock.
+     * Starts the conversation with the user and handles the interaction with Bedrock.
      */
     private static List<Message> runConversation(Scanner scanner) {
         List<Message> conversation = new ArrayList<>();
@@ -102,16 +95,16 @@ private static List<Message> runConversation(Scanner scanner) {
 
         while (userInput != null) {
             ContentBlock block = ContentBlock.builder()
-                .text(userInput)
-                .build();
+                    .text(userInput)
+                    .build();
 
             List<ContentBlock> blockList = new ArrayList<>();
             blockList.add(block);
 
             Message message = Message.builder()
-                .role(ConversationRole.USER)
-                .content(blockList)
-                .build();
+                    .role(ConversationRole.USER)
+                    .content(blockList)
+                    .build();
 
             conversation.add(message);
 
@@ -131,9 +124,9 @@ private static List<Message> runConversation(Scanner scanner) {
     /**
      * Processes the response from the model and updates the conversation accordingly.
      *
-     * @param modelResponse   the response from the model
-     * @param conversation   the ongoing conversation
-     * @param maxRecursion   the maximum number of recursions allowed
+     * @param modelResponse the response from the model
+     * @param conversation  the ongoing conversation
+     * @param maxRecursion  the maximum number of recursions allowed
      */
     private static void processModelResponse(ConverseResponse modelResponse, List<Message> conversation, int maxRecursion) {
         if (maxRecursion <= 0) {
@@ -150,7 +143,7 @@ private static void processModelResponse(ConverseResponse modelResponse, List<Me
             handleToolUse(modelResponse.output(), conversation, maxRecursion - 1);
         }
 
-        if (modelResponseVal.compareTo ("end_turn") ==0) {
+        if (modelResponseVal.compareTo("end_turn") == 0) {
             // If the stop reason is "end_turn", print the model's response text, and finish the process
             PrintModelResponse(modelResponse.output().message().content().get(0).text());
             if (!interactive) {
@@ -163,8 +156,8 @@ private static void processModelResponse(ConverseResponse modelResponse, List<Me
      * Handles the use of a tool by the model in a conversation.
      *
      * @param modelResponse the response from the model, which may include a tool use request
-     * @param conversation the current conversation, which will be updated with the tool use results
-     * @param maxRecursion the maximum number of recursive calls allowed to handle the model's response
+     * @param conversation  the current conversation, which will be updated with the tool use results
+     * @param maxRecursion  the maximum number of recursive calls allowed to handle the model's response
      */
     private static void handleToolUse(ConverseOutput modelResponse, List<Message> conversation, int maxRecursion) {
         List<ContentBlock> toolResults = new ArrayList<>();
@@ -182,35 +175,35 @@ private static void handleToolUse(ConverseOutput modelResponse, List<Message> co
                 // Add the tool use ID and the tool's response to the list of results
                 List<ToolResultContentBlock> contentBlockList = new ArrayList<>();
                 ToolResultContentBlock block = ToolResultContentBlock.builder()
-                    .json(toolResponse.getContent())
-                    .build();
+                        .json(toolResponse.getContent())
+                        .build();
                 contentBlockList.add(block);
 
                 ToolResultBlock toolResultBlock = ToolResultBlock.builder()
-                    .toolUseId(toolResponse.getToolUseId())
-                    .content(contentBlockList)
-                    .build();
+                        .toolUseId(toolResponse.getToolUseId())
+                        .content(contentBlockList)
+                        .build();
 
                 ContentBlock contentBlock1 = ContentBlock.builder()
-                    .toolResult(toolResultBlock)
-                    .build();
+                        .toolResult(toolResultBlock)
+                        .build();
 
                 toolResults.add(contentBlock1);
             }
         }
 
         // Embed the tool results in a new user message
         Message message = Message.builder()
-            .role(ConversationRole.USER)
-            .content(toolResults)
-            .build();
+                .role(ConversationRole.USER)
+                .content(toolResults)
+                .build();
 
         // Append the new message to the ongoing conversation
         //conversation.add(message);
         conversation.add(message);
 
         // Send the conversation to Amazon Bedrock
-        var response =  sendConversationToBedrock(conversation);
+        var response = sendConversationToBedrock(conversation);
 
         // Recursively handle the model's response until the model has returned its final response or the recursion counter has reached 0
         processModelResponse(response, conversation, maxRecursion);
@@ -221,7 +214,7 @@ private static void handleToolUse(ConverseOutput modelResponse, List<Message> co
     private static ToolResponse invokeTool(ToolUseBlock payload) {
         String toolName = payload.name();
 
-        if (Objects.equals(toolName, "Weather_Tool")){
+        if (Objects.equals(toolName, "Weather_Tool")) {
             Map<String, Document> inputData = payload.input().asMap();
             printToolUse(toolName, inputData);
 
@@ -233,7 +226,7 @@ private static ToolResponse invokeTool(ToolUseBlock payload) {
             toolResponse.setToolUseId(payload.toolUseId());
             return toolResponse;
         } else {
-            String errorMessage = "The requested tool with name "+toolName +" does not exist.";
+            String errorMessage = "The requested tool with name " + toolName + " does not exist.";
             System.out.println(errorMessage);
             return null;
         }
@@ -252,8 +245,18 @@ private static void PrintModelResponse(String message) {
     private static ConverseResponse sendConversationToBedrock(List<Message> conversation) {
         System.out.println("Calling Bedrock...");
 
-        // Send the conversation, system prompt, and tool configuration, and return the response
-        return bedrockActions.sendConverseRequestAsync(modelId, systemPrompt, conversation, weatherTool.getToolSpec());
+        try {
+            return bedrockActions.sendConverseRequestAsync(modelId, systemPrompt, conversation, weatherTool.getToolSpec());
+        } catch (ModelNotReadyException ex) {
+             System.err.println("Model is not ready. Please try again later: " + ex.getMessage());
+            throw ex;
+        } catch (BedrockRuntimeException ex) {
+            System.err.println("Bedrock service error: " + ex.getMessage());
+            throw ex;
+        } catch (RuntimeException ex) {
+            System.err.println("Unexpected error occurred: " + ex.getMessage());
+            throw ex;
+        }
     }
 
     private static ConverseResponse sendConversationToBedrockwithSpec(List<Message> conversation, ToolSpecification toolSpec) {
@@ -299,17 +302,16 @@ private static void waitForInputToContinue(Scanner scanner) {
         }
     }
 
-    public static void printFooter()
-    {
+    public static void printFooter() {
         System.out.println("""
-        =================================================
-        Thank you for checking out the Amazon Bedrock Tool Use demo. We hope you
-        learned something new, or got some inspiration for your own apps today!
-
-        For more Bedrock examples in different programming languages, have a look at:
-        https://docs.aws.amazon.com/bedrock/latest/userguide/service_code_examples.html
-        =================================================
-        """);
+                =================================================
+                Thank you for checking out the Amazon Bedrock Tool Use demo. We hope you
+                learned something new, or got some inspiration for your own apps today!
+                
+                For more Bedrock examples in different programming languages, have a look at:
+                https://docs.aws.amazon.com/bedrock/latest/userguide/service_code_examples.html
+                =================================================
+                """);
     }
 }
 // snippet-end:[bedrock.converseTool.javav2.scenario]
diff --git a/javav2/example_code/bedrock-runtime/src/main/java/com/example/bedrockruntime/scenario/WeatherTool.java b/javav2/example_code/bedrock-runtime/src/main/java/com/example/bedrockruntime/scenario/WeatherTool.java
@@ -5,15 +5,12 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.json.JSONArray;
 import software.amazon.awssdk.core.SdkNumber;
 import software.amazon.awssdk.core.document.Document;
 import software.amazon.awssdk.services.bedrockruntime.model.ToolSpecification;
 import software.amazon.awssdk.services.bedrockruntime.model.ToolInputSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import java.math.BigInteger;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -23,17 +20,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
-import org.json.JSONObject;
 
 // snippet-start:[bedrock.converseTool.javav2.weathertool]
 public class WeatherTool {
 
     private static final Logger logger = LoggerFactory.getLogger(WeatherTool.class);
     private static java.net.http.HttpClient httpClient = null;
 
-
     /**
      * Returns the JSON Schema specification for the Weather tool. The tool specification
      * defines the input schema and describes the tool's functionality.
@@ -149,9 +142,9 @@ private static Map<String, Document> convertToDocumentMap(Map<String, Object> in
     private static Document convertToDocument(Object value) {
         if (value instanceof Map) {
             return Document.fromMap(convertToDocumentMap((Map<String, Object>) value));
-        } else if (value instanceof Integer) {  // ✅ Fix: Use fromInteger() for integers
+        } else if (value instanceof Integer) {
             return Document.fromNumber(SdkNumber.fromInteger((Integer) value));
-        } else if (value instanceof Double) {  // ✅ Fix: Use fromDouble() for floating-point numbers
+        } else if (value instanceof Double) {  //
             return Document.fromNumber(SdkNumber.fromDouble((Double) value));
         } else if (value instanceof Boolean) {
             return Document.fromBoolean((Boolean) value);
