Amazon Bedrock Support (#955)

* deps: add boto3 * deps: upgrade litellm from 1.29.4 to 13.5.2 * feat(backend): add amazon bedrock * feat(ui): add amazon bedrock * Update version --------- Co-authored-by: Ismail Pelaseyed <homanp@gmail.com>
superagent-ai · Apr 13, 2024 · f4cd7e1 · f4cd7e1
1 parent e77ae82
commit f4cd7e1
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 19 deletions.
diff --git a/libs/superagent/app/agents/llm.py b/libs/superagent/app/agents/llm.py
@@ -84,6 +84,9 @@ def get_llm_params(self):
         return {
             "temperature": options.get("temperature"),
             "max_tokens": options.get("max_tokens"),
+            "aws_access_key_id": options.get("aws_access_key_id"),
+            "aws_secret_access_key": options.get("aws_secret_access_key"),
+            "aws_region_name": options.get("aws_region_name"),
         }
 
     async def _get_prompt(self):

diff --git a/libs/superagent/app/api/workflow_configs/saml_schema.py b/libs/superagent/app/api/workflow_configs/saml_schema.py
@@ -148,6 +148,7 @@ class LLMAgentTool(BaseAgentToolModel, LLMAgent):
     LLMProvider.PERPLEXITY.value,
     LLMProvider.TOGETHER_AI.value,
     LLMProvider.ANTHROPIC.value,
+    LLMProvider.BEDROCK.value,
 ]
 
 
@@ -157,6 +158,7 @@ class Workflow(BaseModel):
     # ~~OSS LLM providers~~
     perplexity: Optional[LLMAgent]
     together_ai: Optional[LLMAgent]
+    bedrock: Optional[LLMAgent]
     anthropic: Optional[LLMAgent]
     llm: Optional[LLMAgent] = Field(
         description="Deprecated! Use LLM providers instead. e.g. `perplexity` or `together_ai`"

diff --git a/libs/superagent/app/main.py b/libs/superagent/app/main.py
@@ -36,7 +36,7 @@
     title="Superagent",
     docs_url="/",
     description="🥷 Run AI-agents with an API",
-    version="0.2.27",
+    version="0.2.29",
     servers=[{"url": config("SUPERAGENT_API_URL")}],
 )
 

diff --git a/libs/superagent/poetry.lock b/libs/superagent/poetry.lock
diff --git a/libs/superagent/prisma/migrations/20240412075016_add_aws_bedrock/migration.sql b/libs/superagent/prisma/migrations/20240412075016_add_aws_bedrock/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "LLMProvider" ADD VALUE 'BEDROCK';
diff --git a/libs/superagent/prisma/schema.prisma b/libs/superagent/prisma/schema.prisma
@@ -23,6 +23,7 @@ enum LLMProvider {
   PERPLEXITY
   TOGETHER_AI
   ANTHROPIC
+  BEDROCK
 }
 
 enum LLMModel {

diff --git a/libs/superagent/pyproject.toml b/libs/superagent/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "superagent"
-version = "0.2.27"
+version = "0.2.29"
 description = "🥷 Run AI-agents with an API"
 authors = ["Ismail Pelaseyed"]
 readme = "../../README.md"
@@ -50,7 +50,7 @@ openai = "^1.1.1"
 langchain-experimental = "^0.0.37"
 pydub = "^0.25.1"
 algoliasearch = "^3.0.0"
-litellm = "^1.29.4"
+litellm = "1.35.2"
 weaviate-client = "^3.25.3"
 qdrant-client = "^1.6.9"
 vecs = "^0.4.2"
@@ -66,6 +66,7 @@ langsmith = "^0.1.9"
 langfuse = "2.21.3"
 tavily-python = "^0.3.1"
 scrapingbee = "^2.0.1"
+boto3 = "^1.34.83"
 
 
 

diff --git a/libs/ui/app/integrations/llm.tsx b/libs/ui/app/integrations/llm.tsx
@@ -36,9 +36,17 @@ const azureSchema = z.object({
   azure_deployment: z.string().nonempty("Deployment cannnot be empty"),
 })
 
+const bedrockSchema = z.object({
+  aws_access_key_id: z.string().nonempty("Access key ID cannot be empty"),
+  aws_secret_access_key: z
+    .string()
+    .nonempty("Secret access key cannot be empty"),
+  aws_region: z.string().nonempty("Region cannot be empty"),
+})
+
 const formSchema = z.object({
-  apiKey: z.string().nonempty("API key is mandatory"),
-  options: azureSchema.optional(),
+  apiKey: z.string().optional(),
+  options: z.union([azureSchema, bedrockSchema]),
 })
 
 export default function LLM({
@@ -59,6 +67,7 @@ export default function LLM({
     },
   })
 
+  console.log("form", form.formState.errors)
   async function onSubmit(values: z.infer<typeof formSchema>) {
     const payload = {
       ...values,

diff --git a/libs/ui/config/site.ts b/libs/ui/config/site.ts
@@ -249,7 +249,7 @@ export const siteConfig = {
         },
       ],
     },
-     {
+    {
       value: "ADVANCED_SCRAPER",
       title: "Advanced Web extractor",
       metadata: [
@@ -486,15 +486,25 @@ export const siteConfig = {
       ],
     },
     {
-      disabled: true,
-      formDescription: "Please enter your HF API key.",
-      provider: "HUGGINGFACE",
-      name: "Hugging Face",
+      disabled: false,
+      formDescription: "Please enter your AWS credentials.",
+      provider: "BEDROCK",
+      name: "Amazon Bedrock",
       metadata: [
         {
-          key: "apiKey",
+          key: "options.aws_access_key_id",
           type: "input",
-          label: "HF API Key",
+          label: "AWS Access Key",
+        },
+        {
+          key: "options.aws_secret_access_key",
+          type: "input",
+          label: "AWS Secret Access Key",
+        },
+        {
+          key: "options.aws_region_name",
+          type: "input",
+          label: "AWS Region",
         },
       ],
     },
@@ -526,6 +536,19 @@ export const siteConfig = {
         },
       ],
     },
+    {
+      disabled: true,
+      formDescription: "Please enter your HF API key.",
+      provider: "HUGGINGFACE",
+      name: "Hugging Face",
+      metadata: [
+        {
+          key: "apiKey",
+          type: "input",
+          label: "HF API Key",
+        },
+      ],
+    },
   ],
   vectorDbs: [
     {