Feature: Add Amazon Bedrock Agents support by massi-ang · Pull Request #554 · aws-samples/aws-genai-llm-chatbot

massi-ang · 2024-08-21T10:42:02Z

Issue #, if available:
#277
Description of changes:

adds Bedrock Agents as a selectable "models" in the model dropdown. Agents must be manually created in the same region where Bedrock is accessed
restyle of the ChatUI following CloudScape guidelines

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

…hatbot into feat_appsync_newer

removed unused API resources

correctly replacing api_handler function for better code diff

…hatbot into feat_appsync

…nto feat_bedrock_agents

…i-llm-chatbot into feat_bedrock_agents

…nto feat_bedrock_agents

charles-marion · 2024-08-22T23:48:41Z

lib/model-interfaces/bedrock-agents/README.md

@@ -0,0 +1,67 @@
+# Support additional models


This doc is possibly a copy of https://github.com/aws-samples/aws-genai-llm-chatbot/blob/main/lib/model-interfaces/langchain/README.md (or a work in progress?)

Is the content applicable?

lib/model-interfaces/bedrock-agents/functions/request-handler/adapters/bedrock/base.py

charles-marion · 2024-08-22T23:55:35Z

lib/model-interfaces/bedrock-agents/functions/request-handler/adapters/openai/gpt.py

@@ -0,0 +1,31 @@
+import os


Is this file needed? (Could be extended to support open ai agent equivalent?)

lib/model-interfaces/bedrock-agents/functions/request-handler/index.py

charles-marion · 2024-08-23T00:22:48Z

lib/shared/layers/python-sdk/python/genai_core/models.py

+                "interface": ModelInterface.AGENT.value,
+                "ragSupported": False,
+                "agentId": a["agentId"],
+                "agentVersion": "TSTALIASID",


What is this value?

lib/shared/layers/python-sdk/python/genai_core/models.py

charles-marion · 2024-08-23T00:24:36Z

lib/shared/shared-asset-bundler.ts

  }
 }
+
+class BuildImageProvider extends Construct {


charles-marion · 2024-08-23T00:26:17Z

lib/agents/weather/schema.json

@@ -0,0 +1,257 @@
+{


I believe this file is auto generated by the weather lambda? Is there a cli command to do this?

charles-marion · 2024-08-23T00:29:11Z

lib/agents/weather/lambda.py

+import os
+import requests
+from typing import Annotated
+import pandas as pd


nip: I believe pandas is large and would cause cold start due to numpy. I would remove this dependency if it's easy (I believe Panda has smaller managed lambda layers)

charles-marion · 2024-08-23T14:06:36Z

lib/agents/index.ts

+      }:017000801446:layer:AWSLambdaPowertoolsPythonV2:58`
+    );
+
+    const placeIndex = new geo.CfnPlaceIndex(this, "place-index", {


nit: other classes use this case for construct ids

Suggested change

const placeIndex = new geo.CfnPlaceIndex(this, "place-index", {

const placeIndex = new geo.CfnPlaceIndex(this, "PlaceIndex", {

charles-marion · 2024-08-23T14:11:39Z

lib/user-interface/react-app/src/components/chatbot/chat-input-panel.tsx

      state.selectedModel.value
    );
-
+    console.log(state.selectedModel.value);


Suggested change

console.log(state.selectedModel.value);

debug code?

bigadsoleiman · 2024-08-27T13:16:13Z

lib/agents/index.ts

+
+    const agent = new bedrock.Agent(this, "weather-agent", {
+      foundationModel:
+        bedrock.BedrockFoundationModel.ANTHROPIC_CLAUDE_INSTANT_V1_2,


Better to switch to Sonnet 3 or Haiku now

bigadsoleiman · 2024-08-27T13:17:01Z

cli/magic-config.ts

+    {
+      type: "confirm",
+      name: "bedrockAgents",
+      message: "Do you want to deploy a sample Bedrock Agent?",


let's add something like (Agent with access to workspace and weather .. backed by Claude [insert model]) just to give an idea of the out of the box one

danielmitchell · 2024-10-09T03:13:03Z

Adding Bedrock Agents integration will be a great new feature. Is the intent for the identified issues/feedback to be addressed and have this merged into main? It's been a couple of months so not sure if it's going to progress.

I'm very keen to use this but not sure if I should try and merge this incomplete version or wait for it to progress into main.

massi-ang added 30 commits December 5, 2023 16:00

feat: appsync

f6f8853

feat(appsync): API

8a62b43

feat(appsync): api

988c57f

feat(appsync): poetry env

67224b6

feat(appsync): ongoing checkpoint

facc201

feat(appsync): checkpoint

91d1930

feat(appsync): final with removal of ApiGw

d11b1d1

feat(appsync): working GraphQL

569072a

feat(appsync): CF configuration

9440095

feat(appsync): removal of CF in front of AppSync

e195072

feat(appsync): using AOI for CF

924fd09

Merge branch 'main' of https://github.com/aws-samples/aws-genai-llm-c…

807b20b

…hatbot into feat_appsync_newer

feat(appsync): fix Delete session

031935d

removed unused API resources

feat(appsync) : delete session result

495c5a4

feat(appsync): moving handler function

3ad9ebb

correctly replacing api_handler function for better code diff

feat(appsync): json decoder

c015f39

feat(appsync): cleanup

514f125

feat(appsync): exclude autogenerated file from prettier linting

b475fa3

feat(appsync): remove unused imports

badc9ac

feat(appsync): remove unused imports

11e8de7

feat(appsync): fix appsync merge errors

384c3fb

feat(appsync): fixed semantic_search method based on graphql signature

c883541

fix(appsync): correct logic for adding form fields to POST

c3634e7

fix(appsync): merged api stability and cleanup

c4604d2

feat(appsync): schema improvements

9272cae

fix(appsync): reverting changes

5e97f59

feat(appsync): single api

dcd665f

fix(appsync): remove double resolver creation

433a647

Merge branch 'main' of https://github.com/aws-samples/aws-genai-llm-c…

0ace107

…hatbot into feat_appsync

feat(agents): init

8c8694c

massi-ang and others added 20 commits March 15, 2024 09:38

feat(agents): keep first letter as avatar

dc6a3e4

Merge branch 'main' of github.com:aws-samples/aws-genai-llm-chatbot i…

2f75db8

…nto feat_bedrock_agents

feat(agents): types

09a09b3

Merge branch 'main' of github.com:aws-samples/aws-genai-llm-chatbot i…

1d0f22a

…nto feat_bedrock_agents

Merge branch 'main' of github.com:aws-samples/aws-genai-llm-chatbot i…

5efc171

…nto feat_bedrock_agents

Merge branch 'main' of github.com:aws-samples/aws-genai-llm-chatbot

5d2eed3

Merge branch 'main' into feat_bedrock_agents

9bf5e43

chore: updated chat UI components to Cloudscape components

206f84b

fix: loading feedback and removed double handler

287940d

fix: clean up and fix styles

674093d

fix: removed feedback buttons from "human" message

5ce94b5

fix: fix errors from ci pipeline

fbb6159

fix: fix ci errors

8907882

fix: eslint issues

e9b49d7

Merge branch 'main' of github.com:aws-samples/aws-genai-llm-chatbot i…

c8afae0

…nto feat_bedrock_agents

test: updated snapshot

fa18001

test: Update cfn snapshot

6479bc0

Merge branch 'feat_bedrock_agents' of github.com:aws-samples/aws-gena…

cb25874

…i-llm-chatbot into feat_bedrock_agents

fix: linting errors

d3bac06

Merge branch 'main' of github.com:aws-samples/aws-genai-llm-chatbot i…

d9bab73

…nto feat_bedrock_agents

massi-ang requested review from bigadsoleiman and charles-marion August 21, 2024 10:42

massi-ang added 3 commits August 21, 2024 13:25

chore: remove unnecessary files

5d10c8d

chore: remove unnecessary file

0edeb63

fix: double entry

3e09b8c

charles-marion reviewed Aug 23, 2024

View reviewed changes

chore: address review comments - first run

a1c44fd

charles-marion reviewed Aug 23, 2024

View reviewed changes

bigadsoleiman suggested changes Aug 27, 2024

View reviewed changes

	const placeIndex = new geo.CfnPlaceIndex(this, "place-index", {
	const placeIndex = new geo.CfnPlaceIndex(this, "PlaceIndex", {

Conversation

massi-ang commented Aug 21, 2024

Uh oh!

charles-marion Aug 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

charles-marion Aug 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

danielmitchell commented Oct 9, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

charles-marion Aug 22, 2024 •

edited

Loading

charles-marion Aug 22, 2024 •

edited

Loading