orgo 0.0.40__py3-none-any.whl → 0.0.41__py3-none-any.whl

orgo/template.py

@@ -0,0 +1,347 @@
+"""
+Orgo Template - Pre-configure computer environments.
+
+Usage:
+    from orgo import Template, Computer
+
+    # Create a template with pre-installed software
+    template = Template("python-ml")
+    template.run("pip install numpy pandas scikit-learn")
+    template.build()
+
+    # Launch computers from the template
+    computer = Computer(template="python-ml")
+"""
+
+import os
+import subprocess
+import logging
+from typing import Optional, List
+
+from .api.client import ApiClient
+
+logger = logging.getLogger(__name__)
+
+
+def _print_info(message: str):
+    print(f"-> {message}")
+
+
+def _print_success(message: str):
+    print(f"[ok] {message}")
+
+
+def _print_error(message: str):
+    print(f"[error] {message}")
+
+
+class Template:
+    """
+    Create reusable computer templates with pre-installed software.
+
+    Templates let you define a base environment once and launch multiple
+    computers from it. This is useful for:
+    - Pre-installing dependencies (Python packages, apt packages, etc.)
+    - Cloning repositories
+    - Setting up configuration files
+
+    Examples:
+        # Create and build a template
+        template = Template("data-science")
+        template.run("apt-get update && apt-get install -y python3-pip")
+        template.run("pip install numpy pandas matplotlib jupyter")
+        template.build()
+
+        # Launch a computer from the template
+        computer = Computer(template="data-science")
+
+        # Or pass the template object directly
+        computer = Computer(template=template)
+    """
+
+    def __init__(self,
+                 name: str,
+                 workspace: Optional[str] = None,
+                 api_key: Optional[str] = None,
+                 base_api_url: Optional[str] = None,
+                 verbose: bool = True):
+        """
+        Initialize a Template.
+
+        Args:
+            name: Template name (used to reference it later)
+            workspace: Workspace to store the template in (auto-created if needed)
+            api_key: Orgo API key (defaults to ORGO_API_KEY env var)
+            base_api_url: Custom API URL
+            verbose: Show console output (default: True)
+        """
+        self.name = name
+        self.verbose = verbose
+        self.api_key = api_key or os.environ.get("ORGO_API_KEY")
+        self.base_api_url = base_api_url
+        self.api = ApiClient(self.api_key, self.base_api_url)
+
+        # Resolve workspace
+        workspace_name = workspace or "templates"
+        self._resolve_workspace(workspace_name)
+
+        # Build steps (starts with Orgo base image)
+        self._steps: List[str] = ["FROM registry.fly.io/orgo-image-repo:latest"]
+        self._image_ref: Optional[str] = None
+
+        if self.verbose:
+            _print_info(f"Template '{name}' initialized")
+
+    def _resolve_workspace(self, workspace_name: str):
+        """Find or create workspace for templates"""
+        try:
+            workspace = self.api.get_project_by_name(workspace_name)
+            self._workspace_id = workspace["id"]
+            self._org_id = workspace.get("user_id", "orgo")
+        except Exception:
+            if self.verbose:
+                _print_info(f"Creating workspace '{workspace_name}'...")
+            workspace = self.api.create_project(workspace_name)
+            self._workspace_id = workspace["id"]
+            self._org_id = workspace.get("user_id", "orgo")
+
+    # =========================================================================
+    # Build Steps (Chainable)
+    # =========================================================================
+
+    def run(self, command: str) -> 'Template':
+        """
+        Run a command during build (like apt-get, pip install, etc.)
+
+        Args:
+            command: Shell command to run
+
+        Returns:
+            Self for chaining
+
+        Example:
+            template.run("apt-get update")
+            template.run("pip install requests")
+        """
+        self._steps.append(f"RUN {command}")
+        return self
+
+    def copy(self, src: str, dest: str) -> 'Template':
+        """
+        Copy local files into the template.
+
+        Args:
+            src: Local file or directory path
+            dest: Destination path in the template
+
+        Returns:
+            Self for chaining
+
+        Example:
+            template.copy("./config.json", "/app/config.json")
+            template.copy("./scripts", "/app/scripts")
+        """
+        self._steps.append(f"COPY {src} {dest}")
+        return self
+
+    def env(self, key: str, value: str) -> 'Template':
+        """
+        Set an environment variable.
+
+        Args:
+            key: Environment variable name
+            value: Environment variable value
+
+        Returns:
+            Self for chaining
+
+        Example:
+            template.env("PYTHONPATH", "/app")
+            template.env("DEBUG", "true")
+        """
+        self._steps.append(f"ENV {key}={value}")
+        return self
+
+    def workdir(self, path: str) -> 'Template':
+        """
+        Set the working directory.
+
+        Args:
+            path: Directory path
+
+        Returns:
+            Self for chaining
+
+        Example:
+            template.workdir("/app")
+        """
+        self._steps.append(f"WORKDIR {path}")
+        return self
+
+    def clone(self, repo_url: str, dest: str = "/repo") -> 'Template':
+        """
+        Clone a git repository.
+
+        Args:
+            repo_url: Git repository URL
+            dest: Destination directory (default: /repo)
+
+        Returns:
+            Self for chaining
+
+        Example:
+            template.clone("https://github.com/user/repo.git")
+            template.clone("https://github.com/user/repo.git", "/app")
+        """
+        self._steps.append(f"RUN git clone {repo_url} {dest}")
+        return self
+
+    # =========================================================================
+    # Build
+    # =========================================================================
+
+    def build(self, context: str = ".") -> str:
+        """
+        Build and publish the template.
+
+        This builds a Docker image with your configuration and pushes it
+        to Orgo's registry. After building, you can launch computers from
+        this template using Computer(template="name").
+
+        Args:
+            context: Build context directory (default: current directory)
+
+        Returns:
+            Image reference string
+
+        Example:
+            template.run("pip install pandas")
+            image_ref = template.build()
+            print(f"Built: {image_ref}")
+        """
+        if len(self._steps) <= 1:
+            raise ValueError("No build steps defined. Use .run(), .copy(), etc. first.")
+
+        if self.verbose:
+            _print_info(f"Building template '{self.name}'...")
+
+        # Register build with API
+        try:
+            build_info = self.api.create_build(self._org_id, self._workspace_id, self.name)
+            build_data = build_info.get('build', {})
+
+            build_id = build_data.get('id')
+            tag = build_data.get('tag')
+            image_ref = build_data.get('imageRef')
+
+            if not build_id or not image_ref:
+                raise ValueError("Failed to register build")
+
+            if self.verbose:
+                _print_info(f"Build ID: {build_id}")
+                _print_info(f"Image: {image_ref}")
+
+        except Exception as e:
+            _print_error(f"Failed to register build: {e}")
+            raise
+
+        # Generate Dockerfile
+        dockerfile_path = f"Dockerfile.{tag}"
+        logs = []
+
+        try:
+            with open(dockerfile_path, "w") as f:
+                f.write("\n".join(self._steps))
+
+            # Update status
+            self.api.update_build(build_id, "building")
+
+            # Setup remote builder
+            builder_name = "orgo-remote"
+            remote_url = "tcp://orgoforge.fly.dev:1234"
+
+            try:
+                subprocess.run(
+                    ["docker", "buildx", "inspect", builder_name],
+                    check=True,
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL
+                )
+            except subprocess.CalledProcessError:
+                if self.verbose:
+                    _print_info("Setting up build environment...")
+                subprocess.run([
+                    "docker", "buildx", "create",
+                    "--name", builder_name,
+                    "--driver", "remote",
+                    remote_url,
+                    "--use"
+                ], check=True)
+                subprocess.run(["docker", "buildx", "inspect", "--bootstrap"], check=True)
+
+            # Build and push
+            cmd = [
+                "docker", "buildx", "build",
+                "--builder", builder_name,
+                "-t", image_ref,
+                "-f", dockerfile_path,
+                context,
+                "--push"
+            ]
+
+            if self.verbose:
+                _print_info("Building image...")
+
+            process = subprocess.Popen(
+                cmd,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+                text=True,
+                bufsize=1
+            )
+
+            while True:
+                line = process.stdout.readline()
+                if not line and process.poll() is not None:
+                    break
+                if line:
+                    if self.verbose:
+                        print(line, end="")
+                    logs.append(line)
+
+            if process.returncode != 0:
+                raise Exception(f"Build failed with exit code {process.returncode}")
+
+            # Success
+            self.api.update_build(build_id, "completed", build_log="".join(logs))
+            self._image_ref = image_ref
+
+            if self.verbose:
+                _print_success(f"Template '{self.name}' built successfully!")
+
+            return image_ref
+
+        except Exception as e:
+            _print_error(f"Build failed: {e}")
+            try:
+                self.api.update_build(build_id, "failed", error_message=str(e), build_log="".join(logs))
+            except:
+                pass
+            raise
+
+        finally:
+            if os.path.exists(dockerfile_path):
+                os.remove(dockerfile_path)
+
+    # =========================================================================
+    # Properties
+    # =========================================================================
+
+    @property
+    def image_ref(self) -> Optional[str]:
+        """Get the built image reference (None if not built yet)."""
+        return self._image_ref
+
+    def __repr__(self):
+        status = "built" if self._image_ref else "not built"
+        return f"Template(name='{self.name}', status='{status}')"

orgo/utils/__init__.py

@@ -1,6 +1,6 @@
-# src/orgo/utils/__init__.py
-"""Utility functions for Orgo SDK"""
-
-from .auth import get_api_key
-
+# src/orgo/utils/__init__.py
+"""Utility functions for Orgo SDK"""
+
+from .auth import get_api_key
+
 __all__ = ["get_api_key"]

orgo/utils/auth.py

@@ -1,17 +1,17 @@
-# src/orgo/utils/auth.py
-"""Authentication utilities for Orgo SDK"""
-
-import os
-from typing import Optional
-
-def get_api_key(api_key: Optional[str] = None) -> str:
-    """Get the Orgo API key from parameters or environment"""
-    key = api_key or os.environ.get("ORGO_API_KEY")
-    
-    if not key:
-        raise ValueError(
-            "API key required. Set ORGO_API_KEY environment variable or pass api_key parameter. "
-            "Get a key at https://www.orgo.ai/start"
-        )
-        
+# src/orgo/utils/auth.py
+"""Authentication utilities for Orgo SDK"""
+
+import os
+from typing import Optional
+
+def get_api_key(api_key: Optional[str] = None) -> str:
+    """Get the Orgo API key from parameters or environment"""
+    key = api_key or os.environ.get("ORGO_API_KEY")
+    
+    if not key:
+        raise ValueError(
+            "API key required. Set ORGO_API_KEY environment variable or pass api_key parameter. "
+            "Get a key at https://www.orgo.ai/start"
+        )
+        
     return key

{orgo-0.0.40.dist-info → orgo-0.0.41.dist-info}/METADATA

@@ -1,47 +1,47 @@
-Metadata-Version: 2.4
-Name: orgo
-Version: 0.0.40
-Summary: Computers for AI agents
-Author: Orgo Team
-License: MIT
-Project-URL: Homepage, https://www.orgo.ai
-Project-URL: Documentation, https://docs.orgo.ai
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown
-Requires-Dist: requests>=2.28.0
-Requires-Dist: pillow>=9.0.0
-Requires-Dist: anthropic>=0.50.0
-Requires-Dist: websocket-client>=1.6.0
-
-# Orgo SDK
-
-Desktop infrastructure for AI agents.
-
-## Install
-
-```bash
-pip install orgo
-```
-
-## Usage
-
-```python
-from orgo import Computer
-
-# Create computer
-computer = Computer()
-
-# Control
-computer.left_click(100, 200)
-computer.type("Hello world")
-computer.key("Enter")
-computer.screenshot()  # Returns PIL Image
-
-# Execute Python code
-computer.exec("import pyautogui; pyautogui.click(512, 384)")
-
-# Cleanup
-computer.shutdown()
-```
-
-Full documentation: [docs.orgo.ai](https://docs.orgo.ai)
+Metadata-Version: 2.4
+Name: orgo
+Version: 0.0.41
+Summary: Computers for AI agents
+Author: Orgo Team
+License: MIT
+Project-URL: Homepage, https://www.orgo.ai
+Project-URL: Documentation, https://docs.orgo.ai
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+Requires-Dist: requests>=2.28.0
+Requires-Dist: pillow>=9.0.0
+Requires-Dist: anthropic>=0.50.0
+Requires-Dist: websocket-client>=1.6.0
+
+# Orgo SDK
+
+Desktop infrastructure for AI agents.
+
+## Install
+
+```bash
+pip install orgo
+```
+
+## Usage
+
+```python
+from orgo import Computer
+
+# Create computer
+computer = Computer()
+
+# Control
+computer.left_click(100, 200)
+computer.type("Hello world")
+computer.key("Enter")
+computer.screenshot()  # Returns PIL Image
+
+# Execute Python code
+computer.exec("import pyautogui; pyautogui.click(512, 384)")
+
+# Cleanup
+computer.shutdown()
+```
+
+Full documentation: [docs.orgo.ai](https://docs.orgo.ai)

orgo-0.0.41.dist-info/RECORD

@@ -0,0 +1,14 @@
+orgo/__init__.py,sha256=o4kBswIVy40yNdjBs6a96EZgTJrWhzPOD_eRaRZSggM,370
+orgo/computer.py,sha256=797UPugdPbAFgk2IWwW_kSenZE8RRR_6yaPe6IboB-M,20087
+orgo/forge.py,sha256=Ey_X3tZwlgHPCSBYBIxPInNaERARoDZQ3vxjvOBLn_I,6714
+orgo/project.py,sha256=Abn58FKAL3vety-MzHJDR-G0GFnEDSD_ljTYnXp9e1I,3148
+orgo/prompt.py,sha256=EluyrgMLfgQ8C6kR4l_jKhu6mnCuSL14PGYO1AE4FKk,39685
+orgo/template.py,sha256=lZJ4J5VisVUW5hN3_nsv1byNKnzZXQ-DDrIPm00C_DA,10745
+orgo/api/__init__.py,sha256=9Tzb_OPJ5DH7Cg7OrHzpZZUT4ip05alpa9RLDYmnId8,113
+orgo/api/client.py,sha256=5VltfI0HGS1uZjPQXMIg5U9BnIFqsnoc_EeDtnwRRo0,9125
+orgo/utils/__init__.py,sha256=W4G_nwGBf_7jy0w_mfcrkllurYHSRU4B5cMTVYH_uCc,123
+orgo/utils/auth.py,sha256=tPLBJY-6gdBQWLUjUbwIwxHphC3KoRT_XgP3Iykw3Mw,509
+orgo-0.0.41.dist-info/METADATA,sha256=UhjQ-0PFCF53aVof3Wd_03aqyYJbE5BBzKLDwzSuJX0,894
+orgo-0.0.41.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+orgo-0.0.41.dist-info/top_level.txt,sha256=q0rYtFji8GbYuhFW8A5Ab9e0j27761IKPhnL0E9xow4,5
+orgo-0.0.41.dist-info/RECORD,,

orgo-0.0.40.dist-info/RECORD

@@ -1,13 +0,0 @@
-orgo/__init__.py,sha256=mEaj9vlEbEqf-GJlm7C9fJSafEYP42NcX3MW8ZedZpo,318
-orgo/computer.py,sha256=1-8tGqoOyo-gvwLFWJkWXTYRmeRP7gbC_gz1lzyrwOA,19415
-orgo/forge.py,sha256=EVhogsUH5Jpw-8Cw375-jYqbh-G3QZ2PEU08UuekTyQ,6890
-orgo/project.py,sha256=h-RZtcY2cowMxVOdJs0pF-SNHYQ_UWm9N4iZUB3U86k,3234
-orgo/prompt.py,sha256=4e7iTG_V8Epg6M_2BsjOtFZn37VY31L784F7sYi7N6Q,40700
-orgo/api/__init__.py,sha256=LwQLTr9SvEskIKJYBSTLdGCIBrn9ooWec3PEd1F1MaU,118
-orgo/api/client.py,sha256=WRIT9Hk02lDA-E0ukHDiYBA9vkylZEcgM4mRd2yv2k4,9370
-orgo/utils/__init__.py,sha256=pXHS1agLROOLJRKo82gFIF-0QwNl-qcmrWy-kYgEvO0,128
-orgo/utils/auth.py,sha256=8lwpnxlhraI7t96gNR1sCeKeu-eJSsTlrYy4YsdX16k,525
-orgo-0.0.40.dist-info/METADATA,sha256=pZq9IutUcAXlIJRzehInCL5GtjBNncUsrPyFKyk__G4,941
-orgo-0.0.40.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-orgo-0.0.40.dist-info/top_level.txt,sha256=q0rYtFji8GbYuhFW8A5Ab9e0j27761IKPhnL0E9xow4,5
-orgo-0.0.40.dist-info/RECORD,,