orgo 0.0.26__tar.gz → 0.0.28__tar.gz

{orgo-0.0.26 → orgo-0.0.28}/PKG-INFO

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

{orgo-0.0.26 → orgo-0.0.28}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "orgo"
-version = "0.0.26"
+version = "0.0.28"
 description = "Computers for AI agents"
 authors = [{name = "Orgo Team"}]
 license = {text = "MIT"}

{orgo-0.0.26 → orgo-0.0.28}/src/orgo/api/client.py

@@ -2,9 +2,12 @@
 
 import requests
 from typing import Dict, Any, Optional, List
+import logging
 
 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 +31,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']}"
+                        raise Exception(error_data['error']) from None
                 except ValueError:
                     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 +64,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 +82,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 +95,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-0.0.26 → orgo-0.0.28}/src/orgo/computer.py

@@ -1,6 +1,5 @@
 """Computer class for interacting with Orgo virtual environments"""
-import os
-import io
+import os as operating_system
 import base64
 import logging
 import uuid
@@ -50,7 +49,7 @@ class Computer:
             # Connect to existing computer in project
             computer = Computer(project="manus")
         """
-        self.api_key = api_key or os.environ.get("ORGO_API_KEY")
+        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)
         

{orgo-0.0.26 → orgo-0.0.28}/src/orgo/project.py

@@ -1,5 +1,5 @@
 """Project class for managing Orgo projects"""
-import os
+import os as operating_system  # Renamed to avoid any potential conflicts
 import uuid
 from typing import Dict, List, Any, Optional
 
@@ -18,7 +18,7 @@ class Project:
             api_key: Orgo API key (defaults to ORGO_API_KEY env var)
             base_api_url: Custom API URL (optional)
         """
-        self.api_key = api_key or os.environ.get("ORGO_API_KEY")
+        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)
         

{orgo-0.0.26 → orgo-0.0.28}/src/orgo.egg-info/PKG-INFO

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