feat: Add AWS provider support and related API endpoints

Author: onuratakan

gpt_computer_assistant/agent/agent.py

@@ -83,8 +83,11 @@ def get_agent_executor(the_anthropic_model=False):
     if (
         llm_settings[model]["provider"] == "openai"
         or llm_settings[model]["provider"] == "groq"
-        or llm_settings[model]["provider"] == "azureai",
-        llm_settings[model]["provider"] == "anthropic",
+        or llm_settings[model]["provider"] == "azureai"
+        or llm_settings[model]["provider"] == "anthropic"
+        or llm_settings[model]["provider"] == "aws"
+
+
     ):
         return chat_agent_executor.create_tool_calling_executor(get_model(), tools)
 

gpt_computer_assistant/agent/assistant.py

@@ -78,6 +78,7 @@ def image_explaination():
             or llm_settings[the_model]["provider"] == "ollama"
             or llm_settings[the_model]["provider"] == "azureai"
             or llm_settings[the_model]["provider"] == "anthropic"
+            or llm_settings[the_model]["provider"] == "aws"
         ):
             msg = get_agent_executor().invoke(
                 {"messages": llm_history + [the_message]}, config=config
@@ -193,6 +194,7 @@ def assistant(
         llm_settings[the_model]["provider"] == "openai"
         or llm_settings[the_model]["provider"] == "azureai"
         or llm_settings[the_model]["provider"] == "anthropic"
+        or llm_settings[the_model]["provider"] == "aws"
     ):
         if just_screenshot:
             msg = {"messages": llm_history + [the_message]}

gpt_computer_assistant/api.py

@@ -420,6 +420,26 @@ def save_openai_api_key():
     return jsonify({"response": "OpenAI API key saved."})
 
 
+@app.route("/save_aws_access_key_id", methods=["POST"])
+def save_aws_access_key_id():
+
+    data = request.json
+    aws_access_key_id = data["aws_access_key_id"]
+    from .utils.db import save_aws_access_key_id
+
+    save_aws_access_key_id(aws_access_key_id)
+    return jsonify({"response": "aws_access_key_id key saved."})
+
+
+@app.route("/save_aws_secret_access_key", methods=["POST"])
+def save_aws_secret_access_key():
+
+    data = request.json
+    aws_secret_access_key = data["aws_secret_access_key"]
+    from .utils.db import save_aws_secret_access_key
+
+    save_aws_secret_access_key(aws_secret_access_key)
+    return jsonify({"response": "aws_secret_access_key key saved."})
 
 
 @app.route("/save_system_prompt", methods=["POST"])

gpt_computer_assistant/llm.py

@@ -4,6 +4,8 @@
 from langchain_google_genai import ChatGoogleGenerativeAI
 from langchain_groq import ChatGroq
 from langchain_anthropic import ChatAnthropic
+from langchain_aws import ChatBedrock
+
 
 try:
     from .utils.db import *
@@ -57,6 +59,14 @@ def open_ai_base(high_context):
             "streaming": False,
             "callbacks": [the_callback],
         },
+        ChatBedrock: {
+            "model_id": the_model,
+            "aws_access_key_id": the_anthropic_api_key,
+            "aws_secret_access_key": the_groq_api_key,
+            "max_retries": 15,
+            "streaming": False,
+            "callbacks": [the_callback],
+        },
         AzureChatOpenAI: {
             "azure_deployment": the_model.replace("-azureopenai", ""),
             "api_version": the_api_version,
@@ -84,6 +94,8 @@ def open_ai_base(high_context):
             the_tuple = (ChatOpenAI, args_mapping[ChatOpenAI])
         elif model_args["provider"] == "anthropic":
             the_tuple = (ChatAnthropic, args_mapping[ChatAnthropic])
+        elif model_args["provider"] == "aws":
+            the_tuple = (ChatBedrock, args_mapping[ChatBedrock])
         elif model_args["provider"] == "azureai":
             import os
             os.environ["AZURE_OPENAI_API_KEY"] = the_api_key

gpt_computer_assistant/llm_settings.py

@@ -19,6 +19,13 @@
         "tools": True,
         "stream": False,
     },
+    "us.anthropic.claude-3-5-sonnet-20241022-v2:0-aws": {
+        "show_name": "claude-3-5-sonnet-20241022 (AWS)",
+        "vision": True,
+        "provider": "aws",
+        "tools": True,
+        "stream": False,
+    },
     "gpt-4o-azureopenai": {
         "show_name": "gpt-4o (AzureAI)",
         "vision": True,

gpt_computer_assistant/remote.py

@@ -205,6 +205,16 @@ def save_openai_api_key(self, openai_api_key):
         response = self.send_request("/save_openai_api_key", data)
         return response["response"]
 
+    def save_aws_access_key_id(self, aws_access_key_id):
+        data = {"aws_access_key_id": aws_access_key_id}
+        response = self.send_request("/save_aws_access_key_id", data)
+        return response["response"]
+    def save_aws_secret_access_key(self, aws_secret_access_key):
+        data = {"aws_secret_access_key": aws_secret_access_key}
+        response = self.send_request("/save_aws_secret_access_key", data)
+        return response["response"]
+
+
     def save_system_prompt(self, prompt):
         data = {"prompt": prompt}
         response = self.send_request("/save_system_prompt", data)

gpt_computer_assistant/utils/db.py

@@ -551,3 +551,25 @@ def load_location_setting():
         return "right"
     with open(location_setting, "r") as f:
         return f.read()
+
+
+
+# OPENAI URL SAVING AND LOADING
+def save_aws_access_key_id(id):
+    kot_db_.set("aws_access_key_id", id)
+def load_aws_access_key_id():
+    if kot_db_.get("aws_access_key_id"):
+        return kot_db_.get("aws_access_key_id")
+    else:
+        return "default"
+
+
+# OPENAI URL SAVING AND LOADING
+def save_aws_secret_access_key(key):
+    kot_db_.set("aws_secret_access_key", key)
+def load_aws_secret_access_key():
+    if kot_db_.get("aws_secret_access_key"):
+        return kot_db_.get("aws_secret_access_key")
+    else:
+        return "default"
+

requirements.in

@@ -53,4 +53,6 @@ StrEnum==0.4.15
 langchain-mcp==0.1.0a1
 
 
-waitress==3.0.2
+waitress==3.0.2
+
+langchain-aws==0.2.9

requirements.txt

@@ -49,4 +49,6 @@ StrEnum==0.4.15
 
 langchain-mcp==0.1.0a1
 
-waitress==3.0.2
+waitress==3.0.2
+
+langchain-aws==0.2.9