orgo 0.0.27__py3-none-any.whl → 0.0.29__py3-none-any.whl

orgo/api/client.py

@@ -2,9 +2,13 @@
 
 import requests
 from typing import Dict, Any, Optional, List
+import logging
+import sys
 
 from orgo.utils.auth import get_api_key
 
+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)
@@ -28,16 +32,20 @@ class ApiClient:
             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)
+            
             if hasattr(e, 'response') and e.response is not None:
-                error_message = f"API error: {e.response.status_code}"
                 try:
                     error_data = e.response.json()
                     if 'error' in error_data:
-                        error_message += f" - {error_data['error']}"
-                except ValueError:
+                        raise Exception(error_data['error']) from None
+                except (ValueError, KeyError):
                     pass
-                raise Exception(error_message) from e
-            raise Exception(f"Connection error: {str(e)}") from e
+                raise Exception(f"Request failed with status {e.response.status_code}") from None
+            
+            # 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]:
@@ -57,28 +65,17 @@ class ApiClient:
         response = self._request("GET", "projects")
         return response.get("projects", [])
     
-    def start_project(self, project_id: str) -> Dict[str, Any]:
-        """Start a project"""
-        return self._request("POST", f"projects/{project_id}/start")
-    
-    def stop_project(self, project_id: str) -> Dict[str, Any]:
-        """Stop a project"""
-        return self._request("POST", f"projects/{project_id}/stop")
-    
-    def restart_project(self, project_id: str) -> Dict[str, Any]:
-        """Restart a project"""
-        return self._request("POST", f"projects/{project_id}/restart")
-    
     def delete_project(self, project_id: str) -> Dict[str, Any]:
         """Delete a project and all its computers"""
-        return self._request("POST", f"projects/{project_id}/delete")
+        return self._request("DELETE", f"projects/{project_id}")
     
     # Computer methods
-    def create_computer(self, project_name: str, computer_name: str, 
+    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", f"projects/{project_name}/computers", {
+        return self._request("POST", "computers", {
+            "project_id": project_id,
             "name": computer_name,
             "os": os,
             "ram": ram,
@@ -86,10 +83,10 @@ class ApiClient:
             "gpu": gpu
         })
     
-    def list_computers(self, project_name: str) -> List[Dict[str, Any]]:
+    def list_computers(self, project_id: str) -> List[Dict[str, Any]]:
         """List all computers in a project"""
-        response = self._request("GET", f"projects/{project_name}/computers")
-        return response.get("computers", [])
+        project = self.get_project(project_id)
+        return project.get("desktops", [])
     
     def get_computer(self, computer_id: str) -> Dict[str, Any]:
         """Get computer details"""
@@ -99,14 +96,6 @@ class ApiClient:
         """Delete a computer"""
         return self._request("DELETE", f"computers/{computer_id}")
     
-    def start_computer(self, computer_id: str) -> Dict[str, Any]:
-        """Start a computer"""
-        return self._request("POST", f"computers/{computer_id}/start")
-    
-    def stop_computer(self, computer_id: str) -> Dict[str, Any]:
-        """Stop a computer"""
-        return self._request("POST", f"computers/{computer_id}/stop")
-    
     def restart_computer(self, computer_id: str) -> Dict[str, Any]:
         """Restart a computer"""
         return self._request("POST", f"computers/{computer_id}/restart")

orgo/computer.py

@@ -3,6 +3,7 @@ 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
@@ -89,8 +90,12 @@ class Computer:
         """Connect to existing computer by ID"""
         self.computer_id = computer_id
         self._info = self.api.get_computer(computer_id)
-        self.project_name = self._info.get("project_name")
+        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)"""
@@ -100,7 +105,7 @@ class Computer:
             self.project_id = project.get("id")
             
             # Check for existing computers
-            computers = self.api.list_computers(project_name)
+            computers = self.api.list_computers(self.project_id)
             
             if computer_name:
                 # Look for specific computer
@@ -109,20 +114,20 @@ class Computer:
                     self._connect_to_existing_computer(existing)
                 else:
                     # Create new computer with specified name
-                    self._create_computer(project_name, computer_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(project_name, computer_name)
+                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(project_name, computer_name)
+            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"""
@@ -135,13 +140,13 @@ class Computer:
                 self._connect_to_existing_computer(existing)
             else:
                 # Create new computer with specified name
-                self._create_computer(project.name, computer_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.name, computer_name)
+            self._create_computer(project.id, computer_name)
     
     def _create_new_project_and_computer(self, computer_name: Optional[str]):
         """Create a new project and computer"""
@@ -154,7 +159,7 @@ class Computer:
         self.project_name = project_name
         
         # Create a computer in the new project
-        self._create_computer(project_name, computer_name)
+        self._create_computer(self.project_id, computer_name)
     
     def _connect_to_existing_computer(self, computer_info: Dict[str, Any]):
         """Connect to an existing computer"""
@@ -163,7 +168,7 @@ class Computer:
         self._info = computer_info
         logger.info(f"Connected to existing computer {self.name} (ID: {self.computer_id})")
     
-    def _create_computer(self, project_name: str, computer_name: Optional[str]):
+    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:
@@ -182,7 +187,7 @@ class Computer:
             raise ValueError("gpu must be one of: 'none', 'a10', 'l40s', 'a100-40gb', 'a100-80gb'")
         
         computer = self.api.create_computer(
-            project_name=project_name,
+            project_id=project_id,
             computer_name=computer_name,
             os=self.os,
             ram=self.ram,
@@ -197,14 +202,6 @@ class Computer:
         """Get current computer status"""
         return self.api.get_computer(self.computer_id)
     
-    def start(self) -> Dict[str, Any]:
-        """Start the computer"""
-        return self.api.start_computer(self.computer_id)
-    
-    def stop(self) -> Dict[str, Any]:
-        """Stop the computer"""
-        return self.api.stop_computer(self.computer_id)
-    
     def restart(self) -> Dict[str, Any]:
         """Restart the computer"""
         return self.api.restart_computer(self.computer_id)

{orgo-0.0.27.dist-info → orgo-0.0.29.dist-info}/METADATA

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

{orgo-0.0.27.dist-info → orgo-0.0.29.dist-info}/RECORD

@@ -1,12 +1,12 @@
 orgo/__init__.py,sha256=aw3BM7-Wy8jk-mvIWRG2gC4-nsc74s6ZFm1U21NyGeM,171
-orgo/computer.py,sha256=B3B0NQwpSHzadjbssxHzoXe3-A3A3cuUD1fXW18k_bU,14487
+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=JofBHTnks4nO60786vAmzJmECVFFf-Yff1qF0ir-YQ8,7958
+orgo/api/client.py,sha256=sBvX1e1BSY_BB7N4Cnb7mhBt1JBn-EpIYc5KO5sf6m4,7406
 orgo/utils/__init__.py,sha256=W4G_nwGBf_7jy0w_mfcrkllurYHSRU4B5cMTVYH_uCc,123
 orgo/utils/auth.py,sha256=tPLBJY-6gdBQWLUjUbwIwxHphC3KoRT_XgP3Iykw3Mw,509
-orgo-0.0.27.dist-info/METADATA,sha256=Ty1vixQaj3ccyXNkTKFZEaZAEVYr-5O4zMGvKiQQZxo,822
-orgo-0.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-orgo-0.0.27.dist-info/top_level.txt,sha256=q0rYtFji8GbYuhFW8A5Ab9e0j27761IKPhnL0E9xow4,5
-orgo-0.0.27.dist-info/RECORD,,
+orgo-0.0.29.dist-info/METADATA,sha256=VpfFjfjyJAehx7VrARdyx_7Xyz8LC6tQegIaVB9oEs0,822
+orgo-0.0.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+orgo-0.0.29.dist-info/top_level.txt,sha256=q0rYtFji8GbYuhFW8A5Ab9e0j27761IKPhnL0E9xow4,5
+orgo-0.0.29.dist-info/RECORD,,