orgo 0.0.30__py3-none-any.whl → 0.0.31__py3-none-any.whl

orgo/api/client.py

@@ -3,7 +3,6 @@
 import requests
 from typing import Dict, Any, Optional, List
 import logging
-import sys
 
 from orgo.utils.auth import get_api_key
 
@@ -54,7 +53,11 @@ class ApiClient:
     
     def get_project_by_name(self, name: str) -> Dict[str, Any]:
         """Get project details by name"""
-        return self._request("GET", f"projects/by-name/{name}")
+        projects = self.list_projects()
+        for project in projects:
+            if project.get("name") == name:
+                return project
+        raise Exception(f"Project '{name}' not found") from None
     
     def get_project(self, project_id: str) -> Dict[str, Any]:
         """Get project details by ID"""

orgo/computer.py

@@ -1,183 +1,333 @@
-"""API client for Orgo service"""
-
-import requests
-from typing import Dict, Any, Optional, List
+"""Computer class for interacting with Orgo virtual environments"""
+import os as operating_system
+import base64
 import logging
+import uuid
+import io
+from typing import Dict, List, Any, Optional, Callable, Literal, Union
+from PIL import Image
+import requests
+from requests.exceptions import RequestException
 
-from orgo.utils.auth import get_api_key
+from .api.client import ApiClient
+from .prompt import get_provider
 
 logger = logging.getLogger(__name__)
 
-class ApiClient:
-    def __init__(self, api_key: Optional[str] = None, base_url: Optional[str] = None):
-        self.api_key = get_api_key(api_key)
-        self.base_url = base_url or "https://www.orgo.ai/api"
-        self.session = requests.Session()
-        self.session.headers.update({
-            "Authorization": f"Bearer {self.api_key}",
-            "Content-Type": "application/json",
-            "Accept": "application/json"
-        })
-    
-    def _request(self, method: str, endpoint: str, data: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
-        url = f"{self.base_url}/{endpoint}"
+class Computer:
+    def __init__(self, 
+                 project: Optional[Union[str, 'Project']] = None,
+                 name: Optional[str] = None,
+                 computer_id: Optional[str] = None,
+                 api_key: Optional[str] = None, 
+                 base_api_url: Optional[str] = None,
+                 ram: Optional[Literal[1, 2, 4, 8, 16, 32, 64]] = None,
+                 memory: Optional[Literal[1, 2, 4, 8, 16, 32, 64]] = None,
+                 cpu: Optional[Literal[1, 2, 4, 8, 16]] = None,
+                 os: Optional[Literal["linux", "windows"]] = None,
+                 gpu: Optional[Literal["none", "a10", "l40s", "a100-40gb", "a100-80gb"]] = None):
+        """
+        Initialize an Orgo virtual computer.
         
-        try:
-            if method.upper() == "GET":
-                response = self.session.get(url, params=data)
-            else:
-                response = self.session.request(method, url, json=data)
+        Args:
+            project: Project name (str) or Project instance. If not provided, creates a new project.
+            name: Computer name within the project (optional, auto-generated if not provided)
+            computer_id: Existing computer ID to connect to (optional)
+            api_key: Orgo API key (defaults to ORGO_API_KEY env var)
+            base_api_url: Custom API URL (optional)
+            ram/memory: RAM in GB (1, 2, 4, 8, 16, 32, or 64) - only used when creating
+            cpu: CPU cores (1, 2, 4, 8, or 16) - only used when creating
+            os: Operating system ("linux" or "windows") - only used when creating
+            gpu: GPU type - only used when creating
+        
+        Examples:
+            # Create computer in new project
+            computer = Computer(ram=4, cpu=2)
             
-            response.raise_for_status()
-            return response.json()
-        except requests.exceptions.RequestException as e:
-            # Log the full error for debugging
-            logger.debug(f"API request failed: {method} {url}", exc_info=True)
+            # Create computer in existing project
+            computer = Computer(project="manus", ram=4, cpu=2)
             
-            if hasattr(e, 'response') and e.response is not None:
-                try:
-                    error_data = e.response.json()
-                    if 'error' in error_data:
-                        raise Exception(error_data['error']) from None
-                except (ValueError, KeyError):
-                    pass
-                raise Exception(f"Request failed with status {e.response.status_code}") from None
+            # Connect to existing computer in project
+            computer = Computer(project="manus")
+        """
+        self.api_key = api_key or operating_system.environ.get("ORGO_API_KEY")
+        self.base_api_url = base_api_url
+        self.api = ApiClient(self.api_key, self.base_api_url)
+        
+        # Handle memory parameter as an alias for ram
+        if ram is None and memory is not None:
+            ram = memory
+        
+        # Store configuration
+        self.os = os or "linux"
+        self.ram = ram or 2
+        self.cpu = cpu or 2
+        self.gpu = gpu or "none"
+        
+        if computer_id:
+            # Connect to existing computer by ID
+            self._connect_by_id(computer_id)
+        elif project:
+            # Work with specified project
+            if isinstance(project, str):
+                # Project name provided
+                self.project_name = project
+                self._initialize_with_project_name(project, name)
+            else:
+                # Project instance provided
+                from .project import Project as ProjectClass
+                if isinstance(project, ProjectClass):
+                    self.project_name = project.name
+                    self.project_id = project.id
+                    self._initialize_with_project_instance(project, name)
+                else:
+                    raise ValueError("project must be a string (project name) or Project instance")
+        else:
+            # No project specified, create a new one
+            self._create_new_project_and_computer(name)
+    
+    def _connect_by_id(self, computer_id: str):
+        """Connect to existing computer by ID"""
+        self.computer_id = computer_id
+        self._info = self.api.get_computer(computer_id)
+        self.project_id = self._info.get("project_id")
+        self.name = self._info.get("name")
+        # Get project name
+        if self.project_id:
+            project = self.api.get_project(self.project_id)
+            self.project_name = project.get("name")
+    
+    def _initialize_with_project_name(self, project_name: str, computer_name: Optional[str]):
+        """Initialize with a project name (create project if needed)"""
+        try:
+            # Try to get existing project
+            project = self.api.get_project_by_name(project_name)
+            self.project_id = project.get("id")
+            
+            # Check for existing computers
+            computers = self.api.list_computers(self.project_id)
             
-            # Generic error message without exposing internal details
-            raise Exception("Failed to connect to Orgo service. Please check your connection and try again.") from None
-    
-    # Project methods
-    def create_project(self, name: str) -> Dict[str, Any]:
-        """Create a new named project"""
-        return self._request("POST", "projects", {"name": name})
-    
-    def get_project_by_name(self, name: str) -> Dict[str, Any]:
-        """Get project details by name"""
-        projects = self.list_projects()
-        for project in projects:
-            if project.get("name") == name:
-                return project
-        raise Exception(f"Project '{name}' not found") from None
-    
-    def get_project(self, project_id: str) -> Dict[str, Any]:
-        """Get project details by ID"""
-        return self._request("GET", f"projects/{project_id}")
-    
-    def list_projects(self) -> List[Dict[str, Any]]:
-        """List all projects"""
-        response = self._request("GET", "projects")
-        return response.get("projects", [])
-    
-    def delete_project(self, project_id: str) -> Dict[str, Any]:
-        """Delete a project and all its computers"""
-        return self._request("DELETE", f"projects/{project_id}")
-    
-    # Computer methods
-    def create_computer(self, project_id: str, computer_name: str, 
-                       os: str = "linux", ram: int = 2, cpu: int = 2, 
-                       gpu: str = "none") -> Dict[str, Any]:
-        """Create a new computer within a project"""
-        return self._request("POST", "computers", {
-            "project_id": project_id,
-            "name": computer_name,
-            "os": os,
-            "ram": ram,
-            "cpu": cpu,
-            "gpu": gpu
-        })
-    
-    def list_computers(self, project_id: str) -> List[Dict[str, Any]]:
-        """List all computers in a project"""
-        project = self.get_project(project_id)
-        return project.get("desktops", [])
-    
-    def get_computer(self, computer_id: str) -> Dict[str, Any]:
-        """Get computer details"""
-        return self._request("GET", f"computers/{computer_id}")
-    
-    def delete_computer(self, computer_id: str) -> Dict[str, Any]:
-        """Delete a computer"""
-        return self._request("DELETE", f"computers/{computer_id}")
-    
-    def restart_computer(self, computer_id: str) -> Dict[str, Any]:
-        """Restart a computer"""
-        return self._request("POST", f"computers/{computer_id}/restart")
-    
-    # Computer control methods
-    def left_click(self, computer_id: str, x: int, y: int) -> Dict[str, Any]:
-        return self._request("POST", f"computers/{computer_id}/click", {
-            "button": "left", "x": x, "y": y
-        })
-    
-    def right_click(self, computer_id: str, x: int, y: int) -> Dict[str, Any]:
-        return self._request("POST", f"computers/{computer_id}/click", {
-            "button": "right", "x": x, "y": y
-        })
-    
-    def double_click(self, computer_id: str, x: int, y: int) -> Dict[str, Any]:
-        return self._request("POST", f"computers/{computer_id}/click", {
-            "button": "left", "x": x, "y": y, "double": True
-        })
-    
-    def drag(self, computer_id: str, start_x: int, start_y: int, 
-             end_x: int, end_y: int, button: str = "left", 
-             duration: float = 0.5) -> Dict[str, Any]:
-        """Perform a drag operation from start to end coordinates"""
-        return self._request("POST", f"computers/{computer_id}/drag", {
-            "start_x": start_x,
-            "start_y": start_y,
-            "end_x": end_x,
-            "end_y": end_y,
-            "button": button,
-            "duration": duration
-        })
-    
-    def scroll(self, computer_id: str, direction: str, amount: int = 3) -> Dict[str, Any]:
-        return self._request("POST", f"computers/{computer_id}/scroll", {
-            "direction": direction, "amount": amount
-        })
-    
-    def type_text(self, computer_id: str, text: str) -> Dict[str, Any]:
-        return self._request("POST", f"computers/{computer_id}/type", {
-            "text": text
-        })
-    
-    def key_press(self, computer_id: str, key: str) -> Dict[str, Any]:
-        return self._request("POST", f"computers/{computer_id}/key", {
-            "key": key
-        })
-    
-    def get_screenshot(self, computer_id: str) -> Dict[str, Any]:
-        return self._request("GET", f"computers/{computer_id}/screenshot")
-    
-    def execute_bash(self, computer_id: str, command: str) -> Dict[str, Any]:
-        return self._request("POST", f"computers/{computer_id}/bash", {
-            "command": command
-        })
-    
-    def execute_python(self, computer_id: str, code: str, timeout: int = 10) -> Dict[str, Any]:
-        """Execute Python code on the computer"""
-        return self._request("POST", f"computers/{computer_id}/exec", {
-            "code": code,
-            "timeout": timeout
-        })
-    
-    def wait(self, computer_id: str, duration: float) -> Dict[str, Any]:
-        return self._request("POST", f"computers/{computer_id}/wait", {
-            "duration": duration
-        })
+            if computer_name:
+                # Look for specific computer
+                existing = next((c for c in computers if c.get("name") == computer_name), None)
+                if existing:
+                    self._connect_to_existing_computer(existing)
+                else:
+                    # Create new computer with specified name
+                    self._create_computer(self.project_id, computer_name)
+            elif computers:
+                # No name specified, use first available computer
+                self._connect_to_existing_computer(computers[0])
+            else:
+                # No computers exist, create new one
+                self._create_computer(self.project_id, computer_name)
+                
+        except Exception:
+            # Project doesn't exist, create it
+            logger.info(f"Project {project_name} not found, creating new project")
+            project = self.api.create_project(project_name)
+            self.project_id = project.get("id")
+            self._create_computer(self.project_id, computer_name)
+    
+    def _initialize_with_project_instance(self, project: 'Project', computer_name: Optional[str]):
+        """Initialize with a Project instance"""
+        computers = project.list_computers()
+        
+        if computer_name:
+            # Look for specific computer
+            existing = next((c for c in computers if c.get("name") == computer_name), None)
+            if existing:
+                self._connect_to_existing_computer(existing)
+            else:
+                # Create new computer with specified name
+                self._create_computer(project.id, computer_name)
+        elif computers:
+            # No name specified, use first available computer
+            self._connect_to_existing_computer(computers[0])
+        else:
+            # No computers exist, create new one
+            self._create_computer(project.id, computer_name)
+    
+    def _create_new_project_and_computer(self, computer_name: Optional[str]):
+        """Create a new project and computer"""
+        # Generate a unique project name
+        project_name = f"project-{uuid.uuid4().hex[:8]}"
+        
+        # Create the project
+        project = self.api.create_project(project_name)
+        self.project_id = project.get("id")
+        self.project_name = project_name
+        
+        # Create a computer in the new project
+        self._create_computer(self.project_id, computer_name)
+    
+    def _connect_to_existing_computer(self, computer_info: Dict[str, Any]):
+        """Connect to an existing computer"""
+        self.computer_id = computer_info.get("id")
+        self.name = computer_info.get("name")
+        self._info = computer_info
+        logger.info(f"Connected to existing computer {self.name} (ID: {self.computer_id})")
+    
+    def _create_computer(self, project_id: str, computer_name: Optional[str]):
+        """Create a new computer in the project"""
+        # Generate name if not provided
+        if not computer_name:
+            computer_name = f"desktop-{uuid.uuid4().hex[:8]}"
+        
+        self.name = computer_name
+        
+        # Validate parameters
+        if self.ram not in [1, 2, 4, 8, 16, 32, 64]:
+            raise ValueError("ram must be one of: 1, 2, 4, 8, 16, 32, 64 GB")
+        if self.cpu not in [1, 2, 4, 8, 16]:
+            raise ValueError("cpu must be one of: 1, 2, 4, 8, 16 cores")
+        if self.os not in ["linux", "windows"]:
+            raise ValueError("os must be either 'linux' or 'windows'")
+        if self.gpu not in ["none", "a10", "l40s", "a100-40gb", "a100-80gb"]:
+            raise ValueError("gpu must be one of: 'none', 'a10', 'l40s', 'a100-40gb', 'a100-80gb'")
+        
+        computer = self.api.create_computer(
+            project_id=project_id,
+            computer_name=computer_name,
+            os=self.os,
+            ram=self.ram,
+            cpu=self.cpu,
+            gpu=self.gpu
+        )
+        self.computer_id = computer.get("id")
+        self._info = computer
+        logger.info(f"Created new computer {self.name} (ID: {self.computer_id})")
+    
+    def status(self) -> Dict[str, Any]:
+        """Get current computer status"""
+        return self.api.get_computer(self.computer_id)
+    
+    def restart(self) -> Dict[str, Any]:
+        """Restart the computer"""
+        return self.api.restart_computer(self.computer_id)
+    
+    def destroy(self) -> Dict[str, Any]:
+        """Terminate and delete the computer instance"""
+        return self.api.delete_computer(self.computer_id)
+    
+    # Navigation methods
+    def left_click(self, x: int, y: int) -> Dict[str, Any]:
+        """Perform left mouse click at specified coordinates"""
+        return self.api.left_click(self.computer_id, x, y)
+    
+    def right_click(self, x: int, y: int) -> Dict[str, Any]:
+        """Perform right mouse click at specified coordinates"""
+        return self.api.right_click(self.computer_id, x, y)
+    
+    def double_click(self, x: int, y: int) -> Dict[str, Any]:
+        """Perform double click at specified coordinates"""
+        return self.api.double_click(self.computer_id, x, y)
+    
+    def drag(self, start_x: int, start_y: int, end_x: int, end_y: int, 
+             button: str = "left", duration: float = 0.5) -> Dict[str, Any]:
+        """Perform a smooth drag operation from start to end coordinates"""
+        return self.api.drag(self.computer_id, start_x, start_y, end_x, end_y, button, duration)
+    
+    def scroll(self, direction: str = "down", amount: int = 3) -> Dict[str, Any]:
+        """Scroll in specified direction and amount"""
+        return self.api.scroll(self.computer_id, direction, amount)
+    
+    # Input methods
+    def type(self, text: str) -> Dict[str, Any]:
+        """Type the specified text"""
+        return self.api.type_text(self.computer_id, text)
+    
+    def key(self, key: str) -> Dict[str, Any]:
+        """Press a key or key combination (e.g., "Enter", "ctrl+c")"""
+        return self.api.key_press(self.computer_id, key)
+    
+    # View methods
+    def screenshot(self) -> Image.Image:
+        """Capture screenshot and return as PIL Image"""
+        response = self.api.get_screenshot(self.computer_id)
+        image_data = response.get("image", "")
+        
+        if image_data.startswith(('http://', 'https://')):
+            img_response = requests.get(image_data)
+            img_response.raise_for_status()
+            return Image.open(io.BytesIO(img_response.content))
+        else:
+            img_data = base64.b64decode(image_data)
+            return Image.open(io.BytesIO(img_data))
+    
+    def screenshot_base64(self) -> str:
+        """Capture screenshot and return as base64 string"""
+        response = self.api.get_screenshot(self.computer_id)
+        image_data = response.get("image", "")
+        
+        if image_data.startswith(('http://', 'https://')):
+            img_response = requests.get(image_data)
+            img_response.raise_for_status()
+            return base64.b64encode(img_response.content).decode('utf-8')
+        else:
+            return image_data
+    
+    # Execution methods
+    def bash(self, command: str) -> str:
+        """Execute a bash command and return output"""
+        response = self.api.execute_bash(self.computer_id, command)
+        return response.get("output", "")
+    
+    def exec(self, code: str, timeout: int = 10) -> Dict[str, Any]:
+        """Execute Python code on the remote computer"""
+        response = self.api.execute_python(self.computer_id, code, timeout)
+        return response
+    
+    def wait(self, seconds: float) -> Dict[str, Any]:
+        """Wait for specified number of seconds"""
+        return self.api.wait(self.computer_id, seconds)
     
     # Streaming methods
-    def start_stream(self, computer_id: str, connection_name: str) -> Dict[str, Any]:
-        """Start streaming to a configured RTMP connection"""
-        return self._request("POST", f"computers/{computer_id}/stream/start", {
-            "connection_name": connection_name
-        })
+    def start_stream(self, connection: str) -> Dict[str, Any]:
+        """Start streaming the computer screen to an RTMP server"""
+        return self.api.start_stream(self.computer_id, connection)
     
-    def stop_stream(self, computer_id: str) -> Dict[str, Any]:
+    def stop_stream(self) -> Dict[str, Any]:
         """Stop the active stream"""
-        return self._request("POST", f"computers/{computer_id}/stream/stop")
+        return self.api.stop_stream(self.computer_id)
+    
+    def stream_status(self) -> Dict[str, Any]:
+        """Get the current streaming status"""
+        return self.api.get_stream_status(self.computer_id)
+    
+    # AI control method
+    def prompt(self, 
+               instruction: str,
+               provider: str = "anthropic",
+               model: str = "claude-3-7-sonnet-20250219",
+               display_width: int = 1024,
+               display_height: int = 768,
+               callback: Optional[Callable[[str, Any], None]] = None,
+               thinking_enabled: bool = False,
+               thinking_budget: int = 1024,
+               max_tokens: int = 4096,
+               max_iterations: int = 20,
+               max_saved_screenshots: int = 5,
+               api_key: Optional[str] = None) -> List[Dict[str, Any]]:
+        """Control the computer with natural language instructions using an AI assistant"""
+        provider_instance = get_provider(provider)
+        
+        return provider_instance.execute(
+            computer_id=self.computer_id,
+            instruction=instruction,
+            callback=callback,
+            api_key=api_key,
+            model=model,
+            display_width=display_width,
+            display_height=display_height,
+            thinking_enabled=thinking_enabled,
+            thinking_budget=thinking_budget,
+            max_tokens=max_tokens,
+            max_iterations=max_iterations,
+            max_saved_screenshots=max_saved_screenshots,
+            orgo_api_key=self.api_key,
+            orgo_base_url=self.base_api_url
+        )
     
-    def get_stream_status(self, computer_id: str) -> Dict[str, Any]:
-        """Get current stream status"""
-        return self._request("GET", f"computers/{computer_id}/stream/status")
+    def __repr__(self):
+        return f"Computer(name='{self.name}', project='{self.project_name}', id='{self.computer_id}')"

{orgo-0.0.30.dist-info → orgo-0.0.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orgo
-Version: 0.0.30
+Version: 0.0.31
 Summary: Computers for AI agents
 Author: Orgo Team
 License: MIT

{orgo-0.0.30.dist-info → orgo-0.0.31.dist-info}/RECORD

@@ -1,12 +1,12 @@
 orgo/__init__.py,sha256=aw3BM7-Wy8jk-mvIWRG2gC4-nsc74s6ZFm1U21NyGeM,171
-orgo/computer.py,sha256=apny7V3IYJTyDwn5utukzyECLWT65oo-1EmFRwHL--E,7544
+orgo/computer.py,sha256=Twe3cWlZGppAqeyQUGCghaAcjcJ41NFbEpJWgxLmqsg,14400
 orgo/project.py,sha256=uVDFa8iyn5OaHzTzjGQhxnF_nVzwkqkqUShiV3M0AWU,3150
 orgo/prompt.py,sha256=ynblwXPTDp_aF1MbGBsY0PIEr9naklDaKFcfSE_EZ6E,19781
 orgo/api/__init__.py,sha256=9Tzb_OPJ5DH7Cg7OrHzpZZUT4ip05alpa9RLDYmnId8,113
-orgo/api/client.py,sha256=sBvX1e1BSY_BB7N4Cnb7mhBt1JBn-EpIYc5KO5sf6m4,7406
+orgo/api/client.py,sha256=apny7V3IYJTyDwn5utukzyECLWT65oo-1EmFRwHL--E,7544
 orgo/utils/__init__.py,sha256=W4G_nwGBf_7jy0w_mfcrkllurYHSRU4B5cMTVYH_uCc,123
 orgo/utils/auth.py,sha256=tPLBJY-6gdBQWLUjUbwIwxHphC3KoRT_XgP3Iykw3Mw,509
-orgo-0.0.30.dist-info/METADATA,sha256=piWp5WsPjKfXfJPjDKxtq9YBE2Io4FAH_JLASnoeJVg,822
-orgo-0.0.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-orgo-0.0.30.dist-info/top_level.txt,sha256=q0rYtFji8GbYuhFW8A5Ab9e0j27761IKPhnL0E9xow4,5
-orgo-0.0.30.dist-info/RECORD,,
+orgo-0.0.31.dist-info/METADATA,sha256=1oG_9j_vfM0l06pmjDtb12rCxknOehGrlewNVPsJ2OA,822
+orgo-0.0.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+orgo-0.0.31.dist-info/top_level.txt,sha256=q0rYtFji8GbYuhFW8A5Ab9e0j27761IKPhnL0E9xow4,5
+orgo-0.0.31.dist-info/RECORD,,