pr/update (#83)

gpt_computer_agent/__init__.py

@@ -1,7 +1,288 @@
-from .start import start
+try:
+    from .start import start
 
-from .agentic import Agent
+    from .agentic import Agent
 
-from .tooler import Tool
+    from .tooler import Tool
+except:
+    pass
+__version__ = '0.28.3'  # fmt: skip
 
-__version__ = '0.23.0'  # fmt: skip
+
+
+
+
+from .classes import BaseClass, BaseVerifier, TypeVerifier, Task
+
+import os
+import time
+import subprocess
+import requests
+
+
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
+
+
+
+class instance:
+    def __init__(self, url, tasks=[]):
+        self.url = url
+        self.task = []
+        for t in tasks:
+            self.add_task(t)
+
+
+    def request(self):
+        pass
+
+    def add_task(self, task):
+        if isinstance(task, list):
+            for t in task:
+                self.task.append(t)
+        else:
+            self.task.append(task)
+
+        for t in self.task:
+            t.add_client(self)
+
+    def kick(self):
+        for t in self.task:
+            t.run()
+
+        results = []
+        for t in self.task:
+            results.append(t.result)
+
+        return results
+
+
+    def run(self, task):
+        task.add_client(self)   
+        task.run()
+        return task.result
+
+
+    def user_id(self):
+        from .utils.user_id import load_user_id
+        return load_user_id()
+
+
+class interface:
+    pass
+
+
+
+class local_instance(instance):
+    def __init__(self, *args, **kwargs):
+        super().__init__("http://localhost:7541", *args, **kwargs)
+        from .remote import Remote_Client
+
+        self.client = Remote_Client(self.url)
+
+    def request(self, the_request, the_response, screen=False):
+
+        return self.client.request(the_request, the_response, screen)
+
+
+    def start(self):
+        command = "python -c 'from gpt_computer_agent import start; start(True);'"
+        self.process = subprocess.Popen(command, shell=True)
+
+
+    def close(self):
+        try:
+            self.client.stop_server()
+        except:
+            pass
+
+        self.process.terminate()
+        self.process.wait()
+
+
+
+    def client_status(self):
+        return self.client.status
+
+
+
+
+class local(interface):
+
+    @staticmethod
+    def agent( *args, **kwargs):
+        the_instance = local_instance( *args, **kwargs)
+        the_instance.start()
+
+        time.sleep(5)
+
+        client_status = the_instance.client_status()
+
+        if not client_status:
+            raise Exception("Failed to start the local instance")
+
+        return the_instance
+
+
+
+class cloud_instance(instance):
+    def __init__(self, *args, **kwargs):
+        super().__init__("https://free_cloud_1.gca.dev/", *args, **kwargs)
+
+
+    def request(self, the_request, the_response, screen=False):
+        screen = "false" if not screen else "true"
+
+        response = requests.post(self.url+"request", data={"request": the_request, "response": the_response, "screen":screen, "instance":self.instance_id}, verify=False)
+        json_response = response.json()
+        request_id = json_response["request_id"]
+        try:
+            while True:
+                response = requests.post(self.url+"request_result", data={"request_id": request_id}, verify=False)
+                the_json = response.json()
+                if the_json["status"] == True:
+                    return the_json["result"]
+                time.sleep(1)
+        except:
+            return response.text
+
+
+
+    def change_profile(self, profile):
+        response = requests.post(self.url+"change_profile", data={"profile": profile, "instance":self.instance_id}, verify=False)
+        the_json = response.json()
+        return the_json["result"]
+
+    def add_system_message(self, system_message):
+        response = requests.post(self.url+"add_system_message", data={"system_message": system_message, "instance":self.instance_id}, verify=False)
+        the_json = response.json()
+        return the_json["result"]
+
+
+    def add_user_id(self, user_id):
+        response = requests.post(self.url+"add_user_id", data={"user_id": user_id, "instance":self.instance_id}, verify=False)
+        the_json = response.json()
+        return the_json["result"]
+
+    def get_logs(self):
+        response = requests.post(self.url+"get_logs", data={"instance":self.instance_id}, verify=False)
+        the_json = response.json()
+        return the_json["result"]
+
+    def reset_memory(self):
+        response = requests.post(self.url+"reset_memory", data={"instance":self.instance_id}, verify=False)
+        the_json = response.json()
+        return the_json["result"]
+
+    def screenshot(self):
+        response = requests.post(self.url+"screenshot_instance", data={"instance":self.instance_id}, verify=False)
+
+        its_an_error = False
+
+        try:
+            the_json = response.json()
+            if "result" in the_json:
+                its_an_error = True
+        except:
+            pass
+
+
+        if not its_an_error:
+            with open('current_screenshot.png', 'wb') as file:
+                file.write(response.content)
+            import matplotlib.pyplot as plt
+            import matplotlib.image as mpimg
+
+            img = mpimg.imread('current_screenshot.png')
+            plt.imshow(img)
+            plt.axis('off')
+            plt.show()
+
+
+
+
+
+    def start(self):
+        req = requests.get(self.url+"start_instance", verify=False)
+        the_json = req.json()
+
+        self.instance_id = the_json["result"]
+        self.add_user_id(self.user_id())
+
+
+
+    def close(self):
+        req = requests.post(self.url+"stop_instance", data={"instance": self.instance_id}, verify=False)
+        the_json = req.json()
+        return the_json["result"]
+
+    def client_status(self):
+        return True
+
+
+
+class Cloud(interface):
+
+    @staticmethod
+    def agent(*args, **kwargs):
+        start_time = time.time()
+
+        the_instance = cloud_instance( *args, **kwargs)
+        the_instance.start()
+        time.sleep(1)
+
+        end_time = time.time()
+
+        print(f"Time to start the instance: {end_time - start_time}")
+
+        return the_instance
+
+
+
+
+
+
+
+class docker_instance(instance):
+    def __init__(self, url, *args, **kwargs):
+        super().__init__(url, *args, **kwargs)
+        from .remote import Remote_Client
+
+        self.client = Remote_Client(self.url)
+
+    def request(self, the_request, the_response, screen=False):
+
+        return self.client.request(the_request, the_response, screen)
+
+
+    def start(self):
+        pass
+
+
+    def close(self):
+        pass
+
+
+
+    def client_status(self):
+        return self.client.status
+
+
+
+
+class docker(interface):
+
+    @staticmethod
+    def agent(url, *args, **kwargs):
+        the_instance = docker_instance(url, *args, **kwargs)
+        the_instance.start()
+
+
+        client_status = the_instance.client_status()
+
+        if not client_status:
+            raise Exception("Failed to start the docker instance")
+
+        return the_instance
+

gpt_computer_agent/agent/agent.py

@@ -4,19 +4,26 @@
     from ..llm_settings import llm_settings
     from ..tooler import *
     from ..display_tools import *
+    from ..cu.computer import *
     from ..teams import *
     from .agent_tools import get_tools
+    from ..mcp.tool import mcp_tools
+    from ..standard_tools import get_standard_tools
+
 except ImportError:
     from llm import get_model
     from utils.db import *
     from llm_settings import llm_settings
     from tooler import *
     from display_tools import *
+    from cu.computer import *
     from teams import *
     from agent.agent_tools import get_tools
+    from mcp.tool import mcp_tools
+    from standard_tools import get_standard_tools
 
 
-from langgraph.prebuilt import chat_agent_executor
+from langgraph.prebuilt import create_react_agent
 
 
 custom_tools_ = []
@@ -44,7 +51,7 @@ def get_prompt(name):
         return prompt
 
 
-def get_agent_executor():
+def get_agent_executor(the_anthropic_model=False, no_tools=False):
     tools = get_tools()
     tools += custom_tools()
 
@@ -58,23 +65,24 @@ def get_agent_executor():
         except ImportError:
             pass
 
-    if llm_settings[model]["provider"] == "openai":
-        tools += [
-            click_on_a_text_on_the_screen,
-            click_on_a_icon_on_the_screen,
-            move_on_a_text_on_the_screen,
-            move_on_a_icon_on_the_screen,
-            mouse_scroll,
-        ]
-
-    tools += [get_texts_on_the_screen]
-
-    if (
-        llm_settings[model]["provider"] == "openai"
-        or llm_settings[model]["provider"] == "groq"
-    ):
-        return chat_agent_executor.create_tool_calling_executor(get_model(), tools)
-
-    if llm_settings[model]["provider"] == "ollama":
-        print("Ollama tool len", len(tools))
-        return chat_agent_executor.create_tool_calling_executor(get_model(), tools)
+
+    if the_anthropic_model:
+        tools += []
+        if load_aws_access_key_id() == "default":
+            model_catch = get_model(the_model="claude-3-5-sonnet-20241022")
+        else:
+            model_catch = get_model(the_model="us.anthropic.claude-3-5-sonnet-20241022-v2:0")
+
+        print("Anthropic model catch", model_catch)
+        print("Anthropic tools len", len(tools))
+        return create_react_agent(model_catch, tools)
+    else:
+        tools += [mouse_scroll, click_to_text, click_to_icon, click_to_area] + mcp_tools() + get_standard_tools()
+
+
+
+    if no_tools:
+        tools = []
+
+
+    return create_react_agent(get_model(), tools)