hanzo 0.2.5__tar.gz → 0.2.7__tar.gz

{hanzo-0.2.5 → hanzo-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hanzo
-Version: 0.2.5
+Version: 0.2.7
 Summary: Hanzo AI - Complete AI Infrastructure Platform with CLI, Router, MCP, and Agent Runtime
 Project-URL: Homepage, https://hanzo.ai
 Project-URL: Repository, https://github.com/hanzoai/python-sdk
@@ -23,6 +23,7 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Requires-Dist: click>=8.1.0
+Requires-Dist: hanzo-net>=0.1.0
 Requires-Dist: httpx>=0.23.0
 Requires-Dist: prompt-toolkit>=3.0.0
 Requires-Dist: pydantic>=2.0.0

{hanzo-0.2.5 → hanzo-0.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hanzo"
-version = "0.2.5"
+version = "0.2.7"
 description = "Hanzo AI - Complete AI Infrastructure Platform with CLI, Router, MCP, and Agent Runtime"
 authors = [
     {name = "Hanzo AI", email = "dev@hanzo.ai"},
@@ -13,6 +13,7 @@ dependencies = [
     "httpx>=0.23.0",
     "pydantic>=2.0.0",
     "pyyaml>=6.0",
+    "hanzo-net>=0.1.0",
 ]
 readme = "README.md"
 requires-python = ">= 3.8"

{hanzo-0.2.5 → hanzo-0.2.7}/src/hanzo/__init__.py

@@ -1,6 +1,6 @@
 """Hanzo - Complete AI Infrastructure Platform with CLI, Router, MCP, and Agent Runtime."""
 
-__version__ = "0.2.5"
+__version__ = "0.2.7"
 __all__ = ["main", "cli"]
 
 from .cli import main, cli

{hanzo-0.2.5 → hanzo-0.2.7}/src/hanzo/cli.py

@@ -12,7 +12,7 @@ from .interactive.repl import HanzoREPL
 from .utils.output import console
 
 # Version
-__version__ = "0.2.5"
+__version__ = "0.2.7"
 
 
 @click.group(invoke_without_command=True)
@@ -104,78 +104,63 @@ async def start_compute_node(ctx, name: str = None, port: int = 52415,
                             network: str = "mainnet", models: tuple = None, 
                             max_jobs: int = 10):
     """Start this instance as a compute node using hanzo/net."""
+    from .utils.net_check import check_net_installation, get_missing_dependencies
+    
     console = ctx.obj.get("console", Console())
     
     console.print("[bold cyan]Starting Hanzo Net Compute Node[/bold cyan]")
     console.print(f"Network: {network}")
     console.print(f"Port: {port}")
     
+    # Check hanzo/net availability
+    is_available, net_path, python_exe = check_net_installation()
+    
+    if not is_available:
+        console.print("[red]Error:[/red] hanzo-net is not installed")
+        console.print("\nTo install hanzo-net from PyPI:")
+        console.print("  pip install hanzo-net")
+        console.print("\nOr for development, clone from GitHub:")
+        console.print("  git clone https://github.com/hanzoai/net.git ~/work/hanzo/net")
+        console.print("  cd ~/work/hanzo/net && pip install -e .")
+        return
+    
     try:
         import subprocess
         import sys
         import os
         
-        # Check if hanzo/net is available
-        net_path = "/Users/z/work/hanzo/net"
-        if not os.path.exists(net_path):
-            # Try to find net in the Python environment
-            try:
-                import net
-                # net is installed as a package
-                console.print("[green]✓[/green] Using installed hanzo/net")
-                
-                # Run net directly
-                from net.main import run as net_run
-                
-                # Set up environment for net
-                if models:
-                    os.environ["NET_MODELS"] = ",".join(models)
-                if name:
-                    os.environ["NET_NODE_NAME"] = name
-                
-                console.print(f"\n[green]✓[/green] Node initialized")
-                console.print(f"  Port: {port}")
-                console.print(f"  Models: {', '.join(models) if models else 'auto-detect'}")
-                console.print("\n[bold green]Hanzo Net is running![/bold green]")
-                console.print("WebUI: http://localhost:52415")
-                console.print("API: http://localhost:52415/v1/chat/completions")
-                console.print("\nPress Ctrl+C to stop\n")
-                
-                # Run net
-                await net_run()
-                
-            except ImportError:
-                # net not installed, try to run from source
-                console.print("[yellow]hanzo/net not installed, checking for source...[/yellow]")
-                
-                if os.path.exists(net_path):
-                    console.print(f"[green]✓[/green] Found hanzo/net at {net_path}")
-                    
-                    # Add net to Python path
-                    sys.path.insert(0, os.path.join(net_path, "src"))
-                    
-                    # Import and run net
-                    from net.main import run as net_run
-                    
-                    console.print(f"\n[green]✓[/green] Starting net node")
-                    console.print(f"  Port: {port}")
-                    console.print(f"  Models: {', '.join(models) if models else 'auto-detect'}")
-                    console.print("\n[bold green]Hanzo Net is running![/bold green]")
-                    console.print("WebUI: http://localhost:52415")
-                    console.print("API: http://localhost:52415/v1/chat/completions")
-                    console.print("\nPress Ctrl+C to stop\n")
-                    
-                    # Run net
-                    await net_run()
-                else:
-                    console.print("[red]Error:[/red] hanzo/net not found")
-                    console.print("\nInstall hanzo/net:")
-                    console.print("  git clone https://github.com/hanzoai/net.git")
-                    console.print("  cd net && pip install -e .")
-                    return
+        # Use the checked net_path and python_exe
+        if not net_path:
+            # net is installed as a package
+            console.print("[green]✓[/green] Using installed hanzo/net")
+            
+            # Import and run net
+            sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.executable)), "lib", "python3.*/site-packages"))
+            from net.main import run as net_run
+            
+            # Set up environment for net
+            if models:
+                os.environ["NET_MODELS"] = ",".join(models)
+            if name:
+                os.environ["NET_NODE_NAME"] = name
+            
+            console.print(f"\n[green]✓[/green] Node initialized")
+            console.print(f"  Port: {port}")
+            console.print(f"  Models: {', '.join(models) if models else 'auto-detect'}")
+            console.print("\n[bold green]Hanzo Net is running![/bold green]")
+            console.print("WebUI: http://localhost:52415")
+            console.print("API: http://localhost:52415/v1/chat/completions")
+            console.print("\nPress Ctrl+C to stop\n")
+            
+            # Run net
+            await net_run()
         else:
-            # Run from source directory
+            # Run from source directory using the detected python_exe
             console.print(f"[green]✓[/green] Using hanzo/net from {net_path}")
+            if python_exe != sys.executable:
+                console.print(f"[green]✓[/green] Using hanzo/net venv")
+            else:
+                console.print("[yellow]⚠[/yellow] Using system Python")
             
             # Change to net directory and run
             original_cwd = os.getcwd()
@@ -188,6 +173,7 @@ async def start_compute_node(ctx, name: str = None, port: int = 52415,
                     env["NET_MODELS"] = ",".join(models)
                 if name:
                     env["NET_NODE_NAME"] = name
+                env["PYTHONPATH"] = os.path.join(net_path, "src") + ":" + env.get("PYTHONPATH", "")
                 
                 console.print(f"\n[green]✓[/green] Starting net node")
                 console.print(f"  Port: {port}")
@@ -197,12 +183,9 @@ async def start_compute_node(ctx, name: str = None, port: int = 52415,
                 console.print("API: http://localhost:52415/v1/chat/completions")
                 console.print("\nPress Ctrl+C to stop\n")
                 
-                # Add src to path and run net
-                env["PYTHONPATH"] = os.path.join(net_path, "src") + ":" + env.get("PYTHONPATH", "")
-                
-                # Run net command
+                # Run net command with detected python
                 process = subprocess.run(
-                    [sys.executable, "-c", "from net.main import run; run()"],
+                    [python_exe, "-c", "from net.main import run; run()"],
                     env=env,
                     check=False
                 )

hanzo-0.2.7/src/hanzo/utils/net_check.py

@@ -0,0 +1,109 @@
+"""Utilities for checking hanzo/net availability and dependencies."""
+
+import os
+import subprocess
+import sys
+from typing import Optional, Tuple
+from pathlib import Path
+
+
+def check_net_installation() -> Tuple[bool, Optional[str], Optional[str]]:
+    """Check if hanzo/net is available and properly configured.
+    
+    Returns:
+        Tuple of (is_available, net_path, python_exe)
+    """
+    # First try to import as PyPI package (hanzo-net)
+    try:
+        import net
+        return True, None, sys.executable
+    except ImportError:
+        pass
+    
+    # For development: check for hanzo/net in standard location
+    net_path = Path.home() / "work" / "hanzo" / "net"
+    if not net_path.exists():
+        net_path = Path("/Users/z/work/hanzo/net")
+    
+    if not net_path.exists():
+        return False, None, None
+    
+    # Check for venv
+    venv_python = net_path / ".venv" / "bin" / "python"
+    if venv_python.exists():
+        # Check if venv has required packages
+        result = subprocess.run(
+            [str(venv_python), "-c", "import net, scapy, mlx, transformers"],
+            capture_output=True,
+            text=True
+        )
+        if result.returncode == 0:
+            return True, str(net_path), str(venv_python)
+        else:
+            # Venv exists but missing dependencies
+            return False, str(net_path), str(venv_python)
+    
+    # No venv, check system Python
+    result = subprocess.run(
+        [sys.executable, "-c", "import scapy"],
+        capture_output=True,
+        text=True
+    )
+    
+    if result.returncode == 0:
+        return True, str(net_path), sys.executable
+    else:
+        return False, str(net_path), None
+
+
+def install_net_dependencies(net_path: str, python_exe: str = None) -> bool:
+    """Install hanzo/net dependencies.
+    
+    Args:
+        net_path: Path to hanzo/net directory
+        python_exe: Python executable to use (optional)
+        
+    Returns:
+        True if installation successful
+    """
+    if python_exe is None:
+        python_exe = sys.executable
+    
+    # Install dependencies
+    result = subprocess.run(
+        [python_exe, "-m", "pip", "install", "-e", net_path],
+        capture_output=True,
+        text=True
+    )
+    
+    return result.returncode == 0
+
+
+def get_missing_dependencies(python_exe: str = None) -> list:
+    """Check which dependencies are missing for hanzo/net.
+    
+    Args:
+        python_exe: Python executable to check (default: sys.executable)
+        
+    Returns:
+        List of missing package names
+    """
+    if python_exe is None:
+        python_exe = sys.executable
+    
+    required_packages = [
+        "scapy", "mlx", "mlx_lm", "transformers", "tinygrad",
+        "aiohttp", "grpcio", "pydantic", "rich", "tqdm"
+    ]
+    
+    missing = []
+    for package in required_packages:
+        result = subprocess.run(
+            [python_exe, "-c", f"import {package}"],
+            capture_output=True,
+            text=True
+        )
+        if result.returncode != 0:
+            missing.append(package)
+    
+    return missing