Merge branch 'main' into nova_reel_java_example

Author: temnikovd

.doc_gen/metadata/bedrock-runtime_metadata.yaml

@@ -72,14 +72,6 @@ bedrock-runtime_Converse_Ai21LabsJurassic2:
             - description: Send a text message to AI21 Labs Jurassic-2, using Bedrock's Converse API.
               snippet_tags:
                 - python.example_code.bedrock-runtime.Converse_Ai21LabsJurassic2
-    JavaScript:
-      versions:
-        - sdk_version: 3
-          github: javascriptv3/example_code/bedrock-runtime
-          excerpts:
-            - description: Send a text message to AI21 Labs Jurassic-2, using Bedrock's Converse API.
-              snippet_tags:
-                - javascript.v3.bedrock-runtime.Converse_Ai21LabsJurassic2
   services:
     bedrock-runtime: {Converse}
 
@@ -108,6 +100,10 @@ bedrock-runtime_Converse_AmazonNovaText:
             - description: Send a text message to Amazon Nova, using Bedrock's Converse API.
               snippet_tags:
                 - javascript.v3.bedrock-runtime.Converse_AmazonNovaText
+            - description: Send a conversation of messages to Amazon Nova using Bedrock's Converse API with a tool configuration.
+              genai: some
+              snippet_tags:
+                - Bedrock.ConverseTool.javascriptv3.SendConverseRequest
     Kotlin:
       versions:
         - sdk_version: 1
@@ -189,6 +185,22 @@ bedrock-runtime_Scenario_ToolUse:
   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: Scenarios
   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
@@ -206,6 +218,15 @@ bedrock-runtime_Scenario_ToolUse:
               genai: some
               snippet_tags:
                 - Bedrock.ConverseTool.dotnetv3.SendConverseRequest
+    JavaScript:
+      versions:
+        - sdk_version: 3
+          github: javascriptv3/example_code/bedrock-runtime/scenarios/converse_tool_scenario
+          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."
+              genai: some
+              snippet_tags:
+                - Bedrock.ConverseTool.javascriptv3.Scenario
     Python:
       versions:
         - sdk_version: 3
@@ -739,14 +760,6 @@ bedrock-runtime_InvokeModel_Ai21LabsJurassic2:
               snippet_tags:
                 - gov2.bedrock-runtime.InvokeModelWrapper.struct
                 - gov2.bedrock-runtime.InvokeJurassic2
-    JavaScript:
-      versions:
-        - sdk_version: 3
-          github: javascriptv3/example_code/bedrock-runtime
-          excerpts:
-            - description: Use the Invoke Model API to send a text message.
-              snippet_files:
-                - javascriptv3/example_code/bedrock-runtime/models/ai21LabsJurassic2/invoke_model.js
     PHP:
       versions:
         - sdk_version: 3
@@ -1484,6 +1497,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
@@ -1501,6 +1530,15 @@ bedrock-runtime_Scenario_ToolUseDemo_AmazonNova:
               genai: some
               snippet_tags:
                 - Bedrock.ConverseTool.dotnetv3.SendConverseRequest
+    JavaScript:
+      versions:
+        - sdk_version: 3
+          github: javascriptv3/example_code/bedrock-runtime/scenarios/converse_tool_scenario
+          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."
+              genai: some
+              snippet_tags:
+                - Bedrock.ConverseTool.javascriptv3.Scenario
   services:
     bedrock-runtime: {Converse}
 

.doc_gen/metadata/sns_metadata.yaml

@@ -311,6 +311,7 @@ sns_ListTopics:
           github: swift/example_code/sns/basics
           excerpts:
             - snippet_tags:
+                - swift.sns.import
                 - swift.sns.ListTopics
     SAP ABAP:
       versions:
@@ -549,6 +550,7 @@ sns_CreateTopic:
           github: swift/example_code/sns
           excerpts:
             - snippet_tags:
+                - swift.sns.import
                 - swift.sns.CreateTopic
     SAP ABAP:
       versions:
@@ -638,6 +640,7 @@ sns_DeleteTopic:
           github: swift/example_code/sns
           excerpts:
             - snippet_tags:
+                - swift.sns.import
                 - swift.sns.DeleteTopic
     SAP ABAP:
       versions:
@@ -783,6 +786,7 @@ sns_Publish:
           github: swift/example_code/sns
           excerpts:
             - snippet_tags:
+                - swift.sns.import
                 - swift.sns.Publish
     SAP ABAP:
       versions:
@@ -1113,9 +1117,11 @@ sns_Subscribe:
           excerpts:
             - description: Subscribe an email address to a topic.
               snippet_tags:
+                - swift.sns.import
                 - swift.sns.SubscribeEmail
             - description: Subscribe a phone number to a topic to receive notifications by SMS.
               snippet_tags:
+                - swift.sns.import
                 - swift.sns.SubscribeSMS
     SAP ABAP:
       versions:
@@ -1196,6 +1202,7 @@ sns_Unsubscribe:
           github: swift/example_code/sns
           excerpts:
             - snippet_tags:
+                - swift.sns.import
                 - swift.sns.Unsubscribe
     SAP ABAP:
       versions:

.doc_gen/metadata/sqs_metadata.yaml

@@ -183,6 +183,7 @@ sqs_CreateQueue:
           excerpts:
             - description:
               snippet_tags:
+                - swift.sqs.import
                 - swift.sqs.CreateQueue
   services:
     sqs: {CreateQueue}
@@ -349,6 +350,7 @@ sqs_ListQueues:
           excerpts:
             - description:
               snippet_tags:
+                - swift.sqs.import
                 - swift.sqs.ListQueues
   services:
     sqs: {ListQueues}
@@ -452,6 +454,7 @@ sqs_DeleteQueue:
           excerpts:
             - description:
               snippet_tags:
+                - swift.sqs.import
                 - swift.sqs.DeleteQueue
   services:
     sqs: {DeleteQueue}
@@ -709,6 +712,7 @@ sqs_ReceiveMessage:
           excerpts:
             - description:
               snippet_tags:
+                - swift.sqs.import
                 - swift.sqs.ReceiveMessage
   services:
     sqs: {ReceiveMessage}
@@ -834,6 +838,7 @@ sqs_DeleteMessageBatch:
           excerpts:
             - description:
               snippet_tags:
+                - swift.sqs.import
                 - swift.sqs.DeleteMessageBatch
   services:
     sqs: {DeleteMessageBatch}
@@ -914,6 +919,7 @@ sqs_GetQueueAttributes:
           excerpts:
             - description:
               snippet_tags:
+                - swift.sqs.import
                 - swift.sqs.GetQueueAttributes
   services:
     sqs: {GetQueueAttributes}
@@ -1018,6 +1024,7 @@ sqs_SetQueueAttributes:
           excerpts:
             - description:
               snippet_tags:
+                - swift.sqs.import
                 - swift.sqs.SetQueueAttributes
     Java:
       versions:

.doc_gen/validation.yaml

@@ -1,5 +1,6 @@
 allow_list:
   # Git commits
+  - "cad7e7ba2c59a54837212e789a5304b9108fac47"
   - "cd5e746ec203c8c3c61647e0886a8df8c1e78e41"
   - "725feb26d6f73bc1d83dbbe075ae8ea991efb245"
   - "e9772d140489982e0e3704fea5ee93d536f1e275"

.tools/base_requirements.txt

@@ -5,4 +5,4 @@ pathspec==0.11.2
 PyYAML==6.0.1
 requests==2.32.0
 types-PyYAML==6.0.12.12
-yamale==4.0.4
+yamale==4.0.4

.tools/readmes/requirements.txt

@@ -1,4 +1,4 @@
 jinja2>=3.0.3
 pyyaml>=5.3.1
 typer==0.15.1
-aws-doc-sdk-examples-tools @ git+https://github.com/awsdocs/aws-doc-sdk-examples-tools
+aws-doc-sdk-examples-tools @ git+https://github.com/awsdocs/aws-doc-sdk-examples-tools

.tools/readmes/requirements_freeze.txt

@@ -29,4 +29,4 @@ typer==0.15.1
 types-PyYAML==6.0.12.12
 typing_extensions==4.12.2
 urllib3==2.3.0
-yamale==4.0.4
+yamale==4.0.4

.tools/readmes/runner.py

@@ -78,7 +78,7 @@ def writeme(
         typer.Option(
             help="Save a copy of the original README as the 'saved_readme' value specified in config.py ({config.saved_readme})."
         ),
-    ] = True,
+    ] = False,
     verbose: Annotated[
         bool, typer.Option(help="When set, output verbose debugging info.")
     ] = False,

.tools/test/stacks/plugin/typescript/package-lock.json

@@ -26,7 +26,7 @@
     "@aws-cdk/aws-lambda-event-sources": "^1.204.0",
     "@aws-cdk/aws-s3": "^1.204.0",
     "@aws-cdk/core": "^1.204.0",
-    "aws-cdk-lib": "2.184.0",
+    "aws-cdk-lib": "2.189.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21",
     "yaml": "^2.4.2"

.tools/test/stacks/plugin/typescript/package.json

@@ -18,7 +18,7 @@
   "dependencies": {
     "@aws-cdk/aws-cloudformation": "^1.196.0",
     "@aws-sdk/client-cloudformation": "^3.621.0",
-    "aws-cdk-lib": "^2.186.0",
+    "aws-cdk-lib": "^2.189.0",
     "constructs": "^10.0.0"
   }
 }