grasp-sdk 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

grasp_sdk/__init__.py

@@ -24,7 +24,7 @@ from .models import (
     SandboxStatus,
 )
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 __author__ = "Grasp Team"
 __email__ = "team@grasp.dev"
 
@@ -40,6 +40,19 @@ class GraspServer:
         """
         if sandbox_config is None:
             sandbox_config = {}
+        
+        # Extract browser-specific options
+        browser_type = sandbox_config.pop('type', 'chromium')
+        headless = sandbox_config.pop('headless', True)
+        adblock = sandbox_config.pop('adblock', False)
+
+        self.__browser_type = browser_type
+        
+        # Create browser task
+        self.__browser_config = {
+            'headless': headless,
+            'envs': {'ADBLOCK': 'true' if adblock else 'false'}
+        }
             
         config = get_config()
         config['sandbox'].update(sandbox_config)
@@ -55,6 +68,22 @@ class GraspServer:
             f'GraspE2B initialized (templateId: {config["sandbox"]["templateId"]})'
         )
     
+    async def __aenter__(self):
+        connection = await self.create_browser_task()
+    
+        # Register server
+        # if connection['id']:
+        #    _servers[connection['id']] = self
+            
+        return connection
+    
+    async def __aexit__(self, exc_type, exc, tb):
+        if self.browser_service and self.browser_service.id:
+            service_id = self.browser_service.id
+            self.logger.info(f'Closing browser service {service_id}')
+            await _servers[service_id].cleanup()
+            del _servers[service_id]
+    
     @property
     def sandbox(self) -> Optional[SandboxService]:
         """Get the underlying sandbox service.
@@ -82,8 +111,6 @@ class GraspServer:
     
     async def create_browser_task(
         self, 
-        browser_type: Literal['chrome-stable', 'chromium'] = 'chromium',
-        config: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
         """Create and launch a browser task.
         
@@ -100,6 +127,9 @@ class GraspServer:
         if self.browser_service:
             raise RuntimeError('Browser service can only be initialized once')
         
+        config = self.__browser_config
+        browser_type = self.__browser_type
+
         if config is None:
             config = {}
             
@@ -132,6 +162,12 @@ class GraspServer:
             browser_config
         )
         await self.browser_service.initialize()
+
+        # Register server
+        _servers[str(self.browser_service.id)] = self
+        self.logger.info("🚀 Browser service initialized", {
+            'id': self.browser_service.id,
+        })
         
         self.logger.info('🌐 Launching Chromium browser with CDP...')
         cdp_connection = await self.browser_service.launch_browser(browser_type)
@@ -180,25 +216,11 @@ async def launch_browser(
         
     Returns:
         Dictionary containing connection information
-    """
-    if options is None:
-        options = {}
-        
-    # Extract browser-specific options
-    browser_type = options.pop('type', 'chromium')
-    headless = options.pop('headless', True)
-    adblock = options.pop('adblock', False)
-    
+    """    
     # Create server instance
     server = GraspServer(options)
     
-    # Create browser task
-    browser_config = {
-        'headless': headless,
-        'envs': {'ADBLOCK': 'true' if adblock else 'false'}
-    }
-    
-    connection = await server.create_browser_task(browser_type, browser_config)
+    connection = await server.create_browser_task()
     
     # Register server
     if connection['id']:
@@ -258,5 +280,5 @@ __all__ = [
 
 # Default export equivalent
 default = {
-    'launch_browser': launch_browser,
+    'GraspServer': GraspServer,
 }

grasp_sdk/sandbox/chrome-stable.mjs

@@ -232,6 +232,10 @@ try {
   });
   
   const server = http.createServer(async (req, res) => {
+    if (req.url === '/health') {
+      res.end('ok');
+      return;
+    }
     if (req.url === '/json/version' || req.url === '/json/version/') {
       try {
         // 向本地 CDP 发请求，获取原始 JSON

grasp_sdk/sandbox/chromium.mjs

@@ -6,7 +6,7 @@ import http from 'http';
 import { Logtail } from '@logtail/node';
 import * as Sentry from "@sentry/node";
 
-console.log(`💬 ${JSON.stringify(process.env)}`)
+// console.log(`💬 ${JSON.stringify(process.env)}`)
 
 const logtail = new Logtail(process.env.BS_SOURCE_TOKEN, {
   endpoint: `https://${process.env.BS_INGESTING_HOST}`,
@@ -229,6 +229,10 @@ try {
   });
   
   const server = http.createServer(async (req, res) => {
+    if (req.url === '/health') {
+      res.end('ok');
+      return;
+    }
     if (req.url === '/json/version' || req.url === '/json/version/') {
       try {
         // 向本地 CDP 发请求，获取原始 JSON

grasp_sdk/services/browser.py

@@ -80,27 +80,18 @@ class BrowserService:
         self._health_check_task: Optional[asyncio.Task] = None
     
     def _get_default_logger(self):
-        """Get default logger instance.
-        
-        Returns:
-            Logger instance
-        """
+        """Gets or creates a default logger instance."""
         try:
-            from utils.logger import Logger
             return get_logger().child('BrowserService')
         except Exception:
             # If logger is not initialized, create a default one
-            logger = logging.getLogger('BrowserService')
-            if not logger.handlers:
-                handler = logging.StreamHandler()
-                formatter = logging.Formatter(
-                    '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
-                )
-                handler.setFormatter(formatter)
-                logger.addHandler(handler)
-                logger.setLevel(logging.INFO)
-            return logger
-    
+            from ..utils.logger import Logger
+            default_logger = Logger({
+                'level': 'debug' if self.config.get('debug', False) else 'info',
+                'console': True,
+            })
+            return default_logger.child('BrowserService')
+
     async def initialize(self) -> None:
         """Initialize the Grasp sandbox.
         
@@ -307,7 +298,7 @@ class BrowserService:
     
     async def _start_health_check(self) -> None:
         """Start health check for browser process."""
-        while self.cdp_connection and self.browser_process:
+        while self.cdp_connection:
             try:
                 await asyncio.sleep(5)
                 

grasp_sdk/services/sandbox.py

@@ -48,8 +48,9 @@ class CommandEventEmitter:
             self._callbacks[event] = []
         self._callbacks[event].append(callback)
     
-    def emit(self, event: str, *args) -> None:
+    def emit(self, event: Any, *args) -> None:
         """Emit event to all registered listeners."""
+        # print(f'🚀 emit ${event}')
         if event in self._callbacks:
             for callback in self._callbacks[event]:
                 try:
@@ -132,9 +133,6 @@ class SandboxService:
 
         try:
             self.status = SandboxStatus.CREATING
-            self.logger.info('Creating Grasp sandbox', {
-                'templateId': self.config['templateId'],
-            })
             
             # Verify authentication
             res = await verify(self.config)
@@ -144,7 +142,9 @@ class SandboxService:
             api_key = res['data']['token']
             
             # Create sandbox
-
+            self.logger.info('Creating Grasp sandbox', {
+                'templateId': self.config['templateId'],
+            })
             # Use Sandbox constructor directly (e2b SDK 1.5.3+)
             self.sandbox = await AsyncSandbox.create(
                 template=self.config['templateId'],
@@ -244,7 +244,7 @@ class SandboxService:
                     # Generate log file name using sandbox id
                     log_file = f'~/logs/grasp/log-{self.id}.log'
                     nohup_command = f'nohup {command} > {log_file} 2>&1 &'
-                    print(f"💬 {nohup_command}")
+                    # print(f"💬 {nohup_command}")
                     await self.sandbox.commands.run(
                         nohup_command,
                         cwd=cwd,
@@ -287,8 +287,11 @@ class SandboxService:
                         # Wait for command completion (for non-nohup commands)
                         if not use_nohup:
                             try:
+                                # print(f"⏳ {command}")
                                 result = await handle.wait()
-                                event_emitter.emit('exit', result.exit_code, result)
+                                # print(f"✅ {command} 执行完毕")
+                                # event_emitter.emit('stdout', '🎉 ok')
+                                event_emitter.emit('exit', result.exit_code)
                             except Exception as error:
                                 event_emitter.emit('error', error)
                     

{grasp_sdk-0.1.0.dist-info → grasp_sdk-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grasp_sdk
-Version: 0.1.0
+Version: 0.1.2
 Summary: Python SDK for Grasp E2B - Browser automation and sandbox management
 Home-page: https://github.com/grasp-team/grasp-e2b
 Author: Grasp Team
@@ -73,35 +73,90 @@ pip install -e ".[dev]"
 
 ## 🔧 Quick Start
 
+### Using GraspServer Context Manager (Recommended)
+
 ```python
 import asyncio
+import os
+from pathlib import Path
+from playwright.async_api import async_playwright
+from dotenv import load_dotenv
+
 from grasp_sdk import GraspServer
+from grasp_sdk.models import IBrowserConfig, ISandboxConfig
+
+# 加载环境变量
+load_dotenv("../.env.grasp")
 
 async def main():
-    # Initialize Grasp server
-    server = GraspServer({
-        "key": api_key,
-        "timeout": 30000,
-    })
+    """主函数：演示 Grasp SDK 的基本用法"""
     
-    try:
-        # Start sandbox
-        await server.start()
-        
-        # Execute command
-        result = await server.execute_command("echo 'Hello from Python!'")
-        print(f"Output: {result.stdout}")
-        
-        # Browser automation
-        browser_task = await server.create_browser_task()
-        await browser_task.navigate("https://example.com")
-        screenshot = await browser_task.screenshot("example.png")
+    # 检查是否有 API key
+    api_key = os.getenv('GRASP_KEY')
+    if not api_key:
+        print("⚠️ 警告：未设置 GRASP_KEY 环境变量")
+        print("请设置 GRASP_KEY 环境变量或在 .env 文件中配置")
+        print("示例：export GRASP_KEY=your_api_key_here")
+        return
+
+    print("🚀 正在启动浏览器...")
+
+    async with GraspServer({
+            # 'key': api_key,
+            # 'type': 'chrome-stable',
+            # 'headless': False,
+            # 'adblock': True,
+            # 'debug': True,
+            'timeout': 3600000,  # 容器最长运行1小时（最大值可以为一天 86400000）
+        }) as connection:
+    
+        try:
+            print(f"连接信息: {connection}")
+            print(f"WebSocket URL: {connection['ws_url']}")
+            print(f"HTTP URL: {connection['http_url']}")
+            
+            # 使用 Playwright 连接到 CDP
+            async with async_playwright() as p:
+                browser = await p.chromium.connect_over_cdp(
+                    connection['ws_url'],
+                    timeout=150000
+                )
+                
+                # 创建第一个页面并访问网站
+                page1 = await browser.new_page()
+                await page1.goto('https://getgrasp.ai/', wait_until='domcontentloaded')
+                await page1.screenshot(path='grasp-ai.png')
+                await page1.close()
+                
+                # 获取或创建上下文
+                contexts = browser.contexts
+                context = contexts[0] if contexts else await browser.new_context()
+                
+                # 创建第二个页面
+                page2 = await context.new_page()
+                
+                # 将 HTML 字符串渲染到页面中
+                await page2.set_content('<h1>Hello Grasp</h1>', wait_until='networkidle')
+                
+                # 截图演示
+                await page2.screenshot(path='hello-world.png', full_page=True)
+                
+                # 清理资源
+                await page2.close()
+                await context.close()
+                await browser.close()
+                
+            print('✅ 任务完成。')
+            
+        except Exception as e:
+            print(f"❌ 执行过程中出现错误: {str(e)}")
+            raise
         
-    finally:
-        # Clean up
-        await server.close()
+        finally:
+            # 注意：使用 GraspServer 上下文管理器时，资源会自动清理
+            print("程序结束，资源将自动清理")
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     asyncio.run(main())
 ```
 
@@ -145,13 +200,32 @@ GRASP_TEMPLATE=python
 
 ## 🧪 Development
 
+### Quick Setup
+
 ```bash
-# Install development dependencies
+# Install development dependencies automatically
+python install_dev_deps.py
+
+# Or manually install
 pip install -e ".[dev]"
+```
+
+### Running Tests
+
+```bash
+# Simple tests (no pytest required)
+python test_connect_simple.py
+
+# Full test suite (requires pytest)
+pytest tests/
+
+# Run specific test file
+pytest tests/test_connect.py -v
+```
 
-# Run tests
-pytest
+### Code Quality
 
+```bash
 # Format code
 black .
 isort .
@@ -163,22 +237,54 @@ mypy .
 flake8 .
 ```
 
+### Examples
+
+```bash
+# Run Connect usage examples
+python example_connect.py
+```
+
 ## 📚 API Reference
 
+### GraspServer (Recommended)
+
+Async context manager for automatic sandbox resource management and browser automation.
+
+```python
+class GraspServer:
+    def __init__(self, options: Optional[Dict[str, Any]] = None)
+    async def __aenter__(self) -> Dict[str, Any]  # Returns connection info
+    async def __aexit__(self, exc_type, exc_val, exc_tb) -> None
+```
+
+**Usage:**
+```python
+async with GraspServer(options) as connection:
+    # connection contains: {'id', 'ws_url', 'http_url'}
+    # Automatic cleanup on exit
+```
+
+**Options:**
+- `key`: Your Grasp API key (loaded from environment if not provided)
+- `type`: Browser type ('chromium' or 'chrome-stable')
+- `headless`: Run in headless mode (default: True)
+- `adblock`: Enable adblock (default: False)
+- `debug`: Enable debug mode (default: False)
+- `timeout`: Container maximum runtime in milliseconds (default: 30000, max: 86400000)
+
 ### GraspServer
 
 Main class for interacting with E2B sandboxes and browser automation.
 
 ```python
 class GraspServer:
-    def __init__(self, config: ISandboxConfig = None)
-    async def start(self) -> None
-    async def close(self) -> None
-    async def execute_command(self, command: str, options: ICommandOptions = None) -> CommandResult
-    async def execute_script(self, script_path: str, options: IScriptOptions = None) -> CommandResult
-    async def create_browser_task(self, config: IBrowserConfig = None) -> BrowserTask
-    def get_sandbox_status(self) -> SandboxStatus
-    def get_sandbox_id(self) -> str
+    def __init__(self, sandbox_config: Optional[Dict[str, Any]] = None)
+    async def create_browser_task(self, browser_type: str = 'chromium', config: Optional[Dict[str, Any]] = None) -> Dict[str, Any]
+    async def cleanup(self) -> None
+    def get_status(self) -> Optional[SandboxStatus]
+    def get_sandbox_id(self) -> Optional[str]
+    @property
+    def sandbox(self) -> Optional[SandboxService]
 ```
 
 ## 🤝 Compatibility

grasp_sdk-0.1.2.dist-info/RECORD

@@ -0,0 +1,17 @@
+grasp_sdk/__init__.py,sha256=Rc6jzte40bC_ux1-MUOlvdnGJvprb6yI7Jvg8R1_Xjs,8227
+grasp_sdk/models/__init__.py,sha256=lAlbb9tG8fsKz1fo2IVr30pGVytU5V-KblDAzZnLbVQ,2738
+grasp_sdk/sandbox/chrome-stable.mjs,sha256=TxEegvv_UzDj8VkHGZvqWoMeTEq_mref2UxlJ9rw-as,11355
+grasp_sdk/sandbox/chromium.mjs,sha256=5_IymhmGjLmOiRv6fOP_Zgc1yEdhBFriQ2bDe4xh33w,11554
+grasp_sdk/sandbox/jsconfig.json,sha256=XkAgp68pCDDdHNpggzFb_dYB8hk3MHfJBOsUZZJXNCs,418
+grasp_sdk/services/__init__.py,sha256=HqRD-WRedLwOb2gZPXPFzI-3892VT9IknKSbuDyiss8,327
+grasp_sdk/services/browser.py,sha256=7pHvAFgEVwY4w_QQf_wr70F6DM4q1OntF700P217PHI,14566
+grasp_sdk/services/sandbox.py,sha256=QWOvuv7RO7zU67bsKFottBSCa9039fLqw8cn5d83qAw,22018
+grasp_sdk/utils/__init__.py,sha256=IQzRV-iZJXanSlaXBcgXBCcOXTVBCY6ZujxQpDTGW9w,816
+grasp_sdk/utils/auth.py,sha256=M_SX3uKTjjfi6fzk384IqPvUtqt98bif22HHMgio1D4,7258
+grasp_sdk/utils/config.py,sha256=txnmKQ6nxw-wvOBmr9mkZiWX7ROKwyHQLBpM_Wy9XZI,4171
+grasp_sdk/utils/logger.py,sha256=k6WDmzL3cPTcQbiiTD4Q6fsDdUO_kyXQHz7nlmtv7G4,7228
+grasp_sdk-0.1.2.dist-info/METADATA,sha256=yXxCCnLB2H3_y0goMWjfwYYhR87gSQ7JDLdolEHaCVI,9522
+grasp_sdk-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+grasp_sdk-0.1.2.dist-info/entry_points.txt,sha256=roDjUu4JR6b1tUtRmq018mw167AbfC5zQiOtv3o6IMo,45
+grasp_sdk-0.1.2.dist-info/top_level.txt,sha256=C9GL798_aP9Hgjq7UUlaGHLDfUohO2PSGYuGDV0cMx8,10
+grasp_sdk-0.1.2.dist-info/RECORD,,

grasp_sdk-0.1.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-grasp_sdk/__init__.py,sha256=7P4CFKAv1YgmbEog1s5uKMTVljSC0FDkC4ePhS0j_rE,7475
-grasp_sdk/models/__init__.py,sha256=lAlbb9tG8fsKz1fo2IVr30pGVytU5V-KblDAzZnLbVQ,2738
-grasp_sdk/sandbox/chrome-stable.mjs,sha256=8e20N7tlNRlQZ6bO3qpAdwllCBWE9cdbMN-iEW19F30,11281
-grasp_sdk/sandbox/chromium.mjs,sha256=DTepEfkJ75mQE_nLLRE11ZrnODpjZXw0ahAFaaFSVX4,11477
-grasp_sdk/sandbox/jsconfig.json,sha256=XkAgp68pCDDdHNpggzFb_dYB8hk3MHfJBOsUZZJXNCs,418
-grasp_sdk/services/__init__.py,sha256=HqRD-WRedLwOb2gZPXPFzI-3892VT9IknKSbuDyiss8,327
-grasp_sdk/services/browser.py,sha256=KBLy0ySJ8Zr7-XO_xVENhvP6h5-DLGi5eYDEHd4_CA4,14863
-grasp_sdk/services/sandbox.py,sha256=VFlRuBFe5AjIbTvK80ntWK6xt2dsCfh7MwkUC-1FvpU,21783
-grasp_sdk/utils/__init__.py,sha256=IQzRV-iZJXanSlaXBcgXBCcOXTVBCY6ZujxQpDTGW9w,816
-grasp_sdk/utils/auth.py,sha256=M_SX3uKTjjfi6fzk384IqPvUtqt98bif22HHMgio1D4,7258
-grasp_sdk/utils/config.py,sha256=txnmKQ6nxw-wvOBmr9mkZiWX7ROKwyHQLBpM_Wy9XZI,4171
-grasp_sdk/utils/logger.py,sha256=k6WDmzL3cPTcQbiiTD4Q6fsDdUO_kyXQHz7nlmtv7G4,7228
-grasp_sdk-0.1.0.dist-info/METADATA,sha256=y0oJ0nxQMqEDxzUAWFW6atYg9xcTxwQeFpLF5cwEGDM,6113
-grasp_sdk-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-grasp_sdk-0.1.0.dist-info/entry_points.txt,sha256=roDjUu4JR6b1tUtRmq018mw167AbfC5zQiOtv3o6IMo,45
-grasp_sdk-0.1.0.dist-info/top_level.txt,sha256=C9GL798_aP9Hgjq7UUlaGHLDfUohO2PSGYuGDV0cMx8,10
-grasp_sdk-0.1.0.dist-info/RECORD,,