xenfra 0.3.7__py3-none-any.whl → 0.3.8__py3-none-any.whl

xenfra/commands/deployments.py

@@ -14,7 +14,7 @@ from xenfra_sdk.privacy import scrub_logs
 
 from ..utils.auth import API_BASE_URL, get_auth_token
 from ..utils.codebase import has_xenfra_config
-from ..utils.config import apply_patch
+from ..utils.config import apply_patch, read_xenfra_yaml
 from ..utils.validation import (
     validate_branch_name,
     validate_deployment_id,
@@ -23,6 +23,12 @@ from ..utils.validation import (
     validate_project_name,
 )
 
+import time
+from datetime import datetime
+
+from rich.live import Live
+from rich.progress import BarColumn, Progress, SpinnerColumn, TextColumn
+
 console = Console()
 
 # Maximum number of retry attempts for auto-healing
@@ -59,6 +65,186 @@ def show_patch_preview(patch_data: dict):
     console.print()
 
 
+def _stream_deployment(client: XenfraClient, project_name: str, git_repo: str, branch: str, framework: str, region: str, size: str):
+    """
+    Creates deployment with real-time SSE streaming (no polling needed).
+
+    Returns tuple of (status, deployment_id, logs_buffer)
+    """
+    console.print(Panel(
+        f"[bold cyan]Project:[/bold cyan] {project_name}\n"
+        f"[bold cyan]Mode:[/bold cyan] Real-time Streaming Deployment",
+        title="[bold green]🚀 Deployment Starting[/bold green]",
+        border_style="green"
+    ))
+
+    deployment_id = None
+    logs_buffer = []
+    status_val = "PENDING"
+
+    try:
+        for event in client.deployments.create_stream(
+            project_name=project_name,
+            git_repo=git_repo,
+            branch=branch,
+            framework=framework,
+            region=region,
+            size_slug=size,
+        ):
+            event_type = event.get("event", "message")
+            data = event.get("data", "")
+
+            if event_type == "deployment_created":
+                # Extract deployment ID
+                if isinstance(data, dict):
+                    deployment_id = data.get("deployment_id")
+                    console.print(f"[bold green]✓[/bold green] Deployment created: [cyan]{deployment_id}[/cyan]\n")
+
+            elif event_type == "log":
+                # Real-time log output
+                log_line = str(data)
+                logs_buffer.append(log_line)
+
+                # Colorize output
+                if any(x in log_line for x in ["ERROR", "FAILED", "✗"]):
+                    console.print(f"[bold red]{log_line}[/bold red]")
+                elif any(x in log_line for x in ["WARN", "WARNING", "⚠"]):
+                    console.print(f"[yellow]{log_line}[/yellow]")
+                elif any(x in log_line for x in ["SUCCESS", "COMPLETED", "✓", "passed!"]):
+                    console.print(f"[bold green]{log_line}[/bold green]")
+                elif "PHASE" in log_line:
+                    console.print(f"\n[bold blue]{log_line}[/bold blue]")
+                elif "[InfraEngine]" in log_line or "[INFO]" in log_line:
+                    console.print(f"[cyan]›[/cyan] {log_line}")
+                else:
+                    console.print(f"[dim]{log_line}[/dim]")
+
+            elif event_type == "error":
+                error_msg = str(data)
+                logs_buffer.append(f"ERROR: {error_msg}")
+                console.print(f"\n[bold red]❌ Error: {error_msg}[/bold red]")
+                status_val = "FAILED"
+
+            elif event_type == "deployment_complete":
+                # Final status
+                if isinstance(data, dict):
+                    status_val = data.get("status", "UNKNOWN")
+                    ip_address = data.get("ip_address")
+
+                    console.print()
+                    if status_val == "SUCCESS":
+                        console.print("[bold green]✨ SUCCESS: Your application is live![/bold green]")
+                        if ip_address and ip_address != "unknown":
+                            console.print(f"[bold]Accessible at:[/bold] [link=http://{ip_address}]http://{ip_address}[/link]")
+                    elif status_val == "FAILED":
+                        console.print("[bold red]❌ DEPLOYMENT FAILED[/bold red]")
+                        error = data.get("error")
+                        if error:
+                            console.print(f"[red]Error: {error}[/red]")
+                break
+
+    except Exception as e:
+        console.print(f"\n[bold red]❌ Streaming error: {e}[/bold red]")
+        status_val = "FAILED"
+        logs_buffer.append(f"Streaming error: {e}")
+
+    return (status_val, deployment_id, "\n".join(logs_buffer))
+
+
+def _follow_deployment(client: XenfraClient, deployment_id: str):
+    """
+    Polls logs and status in real-time until completion with CI/CD style output.
+    (LEGACY - Used for backward compatibility)
+    """
+    console.print(Panel(
+        f"[bold cyan]Deployment ID:[/bold cyan] {deployment_id}\n"
+        f"[bold cyan]Mode:[/bold cyan] Streaming Real-time Infrastructure Logs",
+        title="[bold green]🚀 Deployment Monitor[/bold green]",
+        border_style="green"
+    ))
+
+    last_log_len = 0
+    status_val = "PENDING"
+
+    # Use a live display for the progress bar at the bottom
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[bold blue]{task.description}"),
+        BarColumn(bar_width=40),
+        TextColumn("[progress.percentage]{task.percentage:>3.0f}%"),
+        console=console,
+        transient=False,
+    ) as progress:
+        task = progress.add_task("Waiting for server response...", total=100)
+
+        while status_val not in ["SUCCESS", "FAILED", "CANCELLED"]:
+            try:
+                # 1. Update Status
+                dep_status = client.deployments.get_status(deployment_id)
+                status_val = dep_status.get("status", "PENDING")
+                progress_val = dep_status.get("progress", 0)
+                state = dep_status.get("state", "preparing")
+
+                # Use a more descriptive description for the progress task
+                desc = f"Phase: {state}"
+                if status_val == "FAILED":
+                    desc = "[bold red]FAILED[/bold red]"
+                elif status_val == "SUCCESS":
+                    desc = "[bold green]SUCCESS[/bold green]"
+
+                progress.update(task, completed=progress_val, description=desc)
+
+                # 2. Update Logs
+                log_content = client.deployments.get_logs(deployment_id)
+                if log_content and len(log_content) > last_log_len:
+                    new_logs = log_content[last_log_len:].strip()
+                    for line in new_logs.split("\n"):
+                        # Process and colorize lines
+                        clean_line = line.strip()
+                        if not clean_line:
+                            continue
+
+                        if any(x in clean_line for x in ["ERROR", "FAILED", "✗"]):
+                            progress.console.print(f"[bold red]{clean_line}[/bold red]")
+                        elif any(x in clean_line for x in ["WARN", "WARNING", "⚠"]):
+                            progress.console.print(f"[yellow]{clean_line}[/yellow]")
+                        elif any(x in clean_line for x in ["SUCCESS", "COMPLETED", "✓", "passed!"]):
+                            progress.console.print(f"[bold green]{clean_line}[/bold green]")
+                        elif "PHASE" in clean_line:
+                            progress.console.print(f"\n[bold blue]{clean_line}[/bold blue]")
+                        elif "[InfraEngine]" in clean_line:
+                            progress.console.print(f"[dim]{clean_line}[/dim]")
+                        else:
+                            progress.console.print(f"[cyan]›[/cyan] {clean_line}")
+
+                    last_log_len = len(log_content)
+
+                if status_val in ["SUCCESS", "FAILED", "CANCELLED"]:
+                    break
+
+                time.sleep(1.5)  # Slightly faster polling for better feel
+            except Exception as e:
+                # progress.console.print(f"[dim]Transient connection issue: {e}[/dim]")
+                time.sleep(3)
+                continue
+
+    console.print()
+    if status_val == "SUCCESS":
+        console.print("[bold green]✨ SUCCESS: Your application is live![/bold green]")
+        # Try to get the IP address
+        try:
+            final_status = client.deployments.get_status(deployment_id)
+            ip = final_status.get("ip_address")
+            if ip:
+                console.print(f"[bold]Accessible at:[/bold] [link=http://{ip}]http://{ip}[/link]")
+        except:
+            pass
+    elif status_val == "FAILED":
+        console.print("\n[bold red]❌ FAILURE DETECTED: Entering AI Diagnosis Mode...[/bold red]")
+
+    return status_val
+
+
 def zen_nod_workflow(logs: str, client: XenfraClient, attempt: int) -> bool:
     """
     Execute the Zen Nod auto-healing workflow.
@@ -74,6 +260,12 @@ def zen_nod_workflow(logs: str, client: XenfraClient, attempt: int) -> bool:
     console.print()
     console.print(f"[cyan]🤖 Analyzing failure (attempt {attempt}/{MAX_RETRY_ATTEMPTS})...[/cyan]")
 
+    # Slice logs to last 300 lines for focused diagnosis (Fix #26)
+    log_lines = logs.split("\n")
+    if len(log_lines) > 300:
+        logs = "\n".join(log_lines[-300:])
+        console.print("[dim]Note: Analyzing only the last 300 lines of logs for efficiency.[/dim]")
+
     # Scrub sensitive data from logs
     scrubbed_logs = scrub_logs(logs)
 
@@ -120,8 +312,10 @@ def zen_nod_workflow(logs: str, client: XenfraClient, attempt: int) -> bool:
 @click.option("--git-repo", help="Git repository URL (if deploying from git)")
 @click.option("--branch", default="main", help="Git branch (default: main)")
 @click.option("--framework", help="Framework override (fastapi, flask, django)")
+@click.option("--region", help="DigitalOcean region override")
+@click.option("--size", help="DigitalOcean size slug override")
 @click.option("--no-heal", is_flag=True, help="Disable auto-healing on failure")
-def deploy(project_name, git_repo, branch, framework, no_heal):
+def deploy(project_name, git_repo, branch, framework, region, size, no_heal):
     """
     Deploy current project to DigitalOcean with auto-healing.
 
@@ -150,6 +344,35 @@ def deploy(project_name, git_repo, branch, framework, no_heal):
             console.print("[dim]Deployment cancelled.[/dim]")
             return
 
+    # Load configuration from xenfra.yaml if it exists
+    config = {}
+    if has_xenfra_config():
+        try:
+            config = read_xenfra_yaml()
+        except Exception as e:
+            console.print(f"[yellow]Warning: Could not read xenfra.yaml: {e}[/dim]")
+
+    # Resolve values with precedence: 1. CLI Flag, 2. xenfra.yaml, 3. Default
+    project_name = project_name or config.get("name") or os.path.basename(os.getcwd())
+    framework = framework or config.get("framework")
+    region = region or config.get("region") or "nyc3"
+    
+    # Resolve size slug (complex mapping)
+    if not size:
+        if config.get("size"):
+            size = config.get("size")
+        else:
+            instance_size = config.get("instance_size", "basic")
+            resources = config.get("resources", {})
+            cpu = resources.get("cpu", 1)
+            
+            if instance_size == "standard" or cpu >= 2:
+                size = "s-2vcpu-4gb"
+            elif instance_size == "premium" or cpu >= 4:
+                size = "s-4vcpu-8gb"
+            else:
+                size = "s-1vcpu-1gb"
+
     # Default project name to current directory
     if not project_name:
         project_name = os.path.basename(os.getcwd())
@@ -211,67 +434,34 @@ def deploy(project_name, git_repo, branch, framework, no_heal):
                     console.print("[dim]Auto-detecting framework...[/dim]")
                     framework = "fastapi"  # Default for now
 
-                # Create deployment
+                # Create deployment with real-time streaming
                 try:
-                    from rich.progress import Progress, SpinnerColumn, TextColumn, BarColumn
-                    
-                    with Progress(
-                        SpinnerColumn(),
-                        TextColumn("[bold blue]{task.description}"),
-                        BarColumn(),
-                        TextColumn("[progress.percentage]{task.percentage:>3.0f}%"),
-                        console=console,
-                    ) as progress:
-                        # Track deployment phases
-                        task = progress.add_task("Creating deployment...", total=100)
-                        
-                        deployment = client.deployments.create(
-                            project_name=project_name,
-                            git_repo=git_repo,
-                            branch=branch,
-                            framework=framework,
-                        )
-                        
-                        progress.update(task, advance=100, description="Deployment created!")
-
-                    deployment_id = deployment["deployment_id"]
-                    console.print(
-                        f"[bold green]✓[/bold green] Deployment created: [cyan]{deployment_id}[/cyan]"
+                    status_result, deployment_id, logs_data = _stream_deployment(
+                        client=client,
+                        project_name=project_name,
+                        git_repo=git_repo,
+                        branch=branch,
+                        framework=framework,
+                        region=region,
+                        size=size,
                     )
 
-                    # Show deployment details
-                    details_table = Table(show_header=False, box=None)
-                    details_table.add_column("Property", style="cyan")
-                    details_table.add_column("Value", style="white")
+                    if status_result == "FAILED" and not no_heal:
+                        # Hand off to the Zen Nod AI Agent
+                        should_retry = zen_nod_workflow(logs_data, client, attempt)
 
-                    details_table.add_row("Deployment ID", str(deployment_id))
-                    details_table.add_row("Project", project_name)
-                    if git_repo:
-                        details_table.add_row("Repository", git_repo)
-                        details_table.add_row("Branch", branch)
+                        if should_retry:
+                            # The agent applied a fix, loop back for attempt + 1
+                            continue
+                        else:
+                            # Agent couldn't fix it or user declined
+                            raise click.Abort()
+
+                    # If we got here with success, break the retry loop
+                    if status_result == "SUCCESS":
+                        break
                     else:
-                        details_table.add_row("Source", "Local directory")
-                    details_table.add_row("Framework", framework)
-                    details_table.add_row("Status", deployment.get("status", "PENDING"))
-
-                    panel = Panel(
-                        details_table,
-                        title="[bold green]Deployment Started[/bold green]",
-                        border_style="green",
-                    )
-                    console.print(panel)
-
-                    # Show next steps
-                    console.print("\n[bold]Next steps:[/bold]")
-                    console.print(f"  • Monitor status: [cyan]xenfra status {deployment_id}[/cyan]")
-                    console.print(f"  • View logs: [cyan]xenfra logs {deployment_id}[/cyan]")
-                    if not no_heal:
-                        console.print(
-                            f"  • Diagnose issues: [cyan]xenfra diagnose {deployment_id}[/cyan]"
-                        )
-
-                    # Success - break out of retry loop
-                    break
+                        raise click.Abort()
 
                 except XenfraAPIError as e:
                     # Deployment failed - try to provide helpful error
@@ -373,9 +563,8 @@ def logs(deployment_id, follow, tail):
             console.print(f"\n[bold]Logs for deployment {deployment_id}:[/bold]\n")
 
             if follow:
-                console.print(
-                    "[yellow]Note: --follow flag not yet implemented (showing static logs)[/yellow]\n"
-                )
+                _follow_deployment(client, deployment_id)
+                return
 
             # Display logs
             for line in log_lines:
@@ -427,9 +616,8 @@ def status(deployment_id, watch):
             deployment_status = client.deployments.get_status(deployment_id)
 
             if watch:
-                console.print(
-                    "[yellow]Note: --watch flag not yet implemented (showing current status)[/yellow]\n"
-                )
+                _follow_deployment(client, deployment_id)
+                return
 
             # Display status
             status_value = deployment_status.get("status", "UNKNOWN")

xenfra/commands/intelligence.py

@@ -190,7 +190,16 @@ def init(manual, accept_all):
             table.add_row("Workers", ", ".join(analysis.workers))
         table.add_row("Package Manager", selected_package_manager)
         table.add_row("Dependency File", selected_dependency_file)
+        
+        # New: Infrastructure details in summary
+        table.add_row("Region", "nyc3 (default)")
         table.add_row("Instance Size", analysis.instance_size)
+        
+        # Resource visualization
+        cpu = 1 if analysis.instance_size == "basic" else (2 if analysis.instance_size == "standard" else 4)
+        ram = "1GB" if analysis.instance_size == "basic" else ("4GB" if analysis.instance_size == "standard" else "8GB")
+        table.add_row("Resources", f"{cpu} vCPU, {ram} RAM")
+
         table.add_row("Estimated Cost", f"${analysis.estimated_cost_monthly:.2f}/month")
         table.add_row("Confidence", f"{analysis.confidence:.0%}")
 
@@ -371,7 +380,16 @@ def analyze():
             table.add_row("Workers", ", ".join(analysis.workers))
         if analysis.env_vars:
             table.add_row("Environment Variables", ", ".join(analysis.env_vars))
+        
+        # New: Infrastructure details in preview
+        table.add_row("Region", "nyc3 (default)")
         table.add_row("Instance Size", analysis.instance_size)
+        
+        # Resource visualization
+        cpu = 1 if analysis.instance_size == "basic" else (2 if analysis.instance_size == "standard" else 4)
+        ram = "1GB" if analysis.instance_size == "basic" else ("4GB" if analysis.instance_size == "standard" else "8GB")
+        table.add_row("Resources", f"{cpu} vCPU, {ram} RAM")
+
         table.add_row("Estimated Cost", f"${analysis.estimated_cost_monthly:.2f}/month")
         table.add_row("Confidence", f"{analysis.confidence:.0%}")
 

xenfra/utils/config.py

@@ -61,6 +61,7 @@ def generate_xenfra_yaml(analysis: CodebaseAnalysisResponse, filename: str = "xe
     config = {
         "name": os.path.basename(os.getcwd()),
         "framework": analysis.framework,
+        "region": "nyc3",  # Default to NYC3
         "port": analysis.port,
     }
 
@@ -80,8 +81,20 @@ def generate_xenfra_yaml(analysis: CodebaseAnalysisResponse, filename: str = "xe
     if analysis.env_vars and len(analysis.env_vars) > 0:
         config["env_vars"] = analysis.env_vars
 
-    # Add instance size
+    # Infrastructure configuration
     config["instance_size"] = analysis.instance_size
+    config["resources"] = {
+        "cpu": 1,
+        "ram": "1GB"
+    }
+    
+    # Map resources based on detected size for better defaults
+    if analysis.instance_size == "standard":
+        config["resources"]["cpu"] = 2
+        config["resources"]["ram"] = "4GB"
+    elif analysis.instance_size == "premium":
+        config["resources"]["cpu"] = 4
+        config["resources"]["ram"] = "8GB"
 
     # Add package manager info (for intelligent diagnosis)
     if analysis.package_manager:
@@ -380,12 +393,21 @@ def manual_prompt_for_config(filename: str = "xenfra.yaml") -> str:
         cache_type = Prompt.ask("Cache type", choices=["redis", "memcached"], default="redis")
         config["cache"] = {"type": cache_type, "env_var": f"{cache_type.upper()}_URL"}
 
+    # Region
+    config["region"] = Prompt.ask("Region", choices=["nyc3", "sfo3", "ams3", "fra1", "lon1"], default="nyc3")
+
     # Instance size
     instance_size = Prompt.ask(
         "Instance size", choices=["basic", "standard", "premium"], default="basic"
     )
     config["instance_size"] = instance_size
 
+    # Resources (CPU/RAM)
+    config["resources"] = {
+        "cpu": IntPrompt.ask("CPU (vCPUs)", default=1 if instance_size == "basic" else 2),
+        "ram": Prompt.ask("RAM (e.g., 1GB, 4GB)", default="1GB" if instance_size == "basic" else "4GB"),
+    }
+
     # Environment variables
     add_env = Confirm.ask("Add environment variables?", default=False)
     if add_env:

{xenfra-0.3.7.dist-info → xenfra-0.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: xenfra
-Version: 0.3.7
+Version: 0.3.8
 Summary: A 'Zen Mode' infrastructure engine for Python developers.
 Author: xenfra-cloud
 Author-email: xenfra-cloud <xenfracloud@gmail.com>

{xenfra-0.3.7.dist-info → xenfra-0.3.8.dist-info}/RECORD

@@ -2,19 +2,19 @@ xenfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xenfra/commands/__init__.py,sha256=kTTwVnTvoxikyPUhQiyTAbnw4PYafktuE1----TqQoA,43
 xenfra/commands/auth.py,sha256=ecReVCGl7Ys2d77mv_e4mCbs4ug6FLIb3S9dl2FUhr4,4178
 xenfra/commands/auth_device.py,sha256=caD2UdveEZtAFjgjmnA-l5bjbbPONFjXJXgeJN7mhbk,6710
-xenfra/commands/deployments.py,sha256=bVpQ9kuFDT5a9M7ADwXZzXIXYyPS92saZEuYmiI_lU8,30016
-xenfra/commands/intelligence.py,sha256=jDQa2Bx4blTFoqtyutf1xsf6fHjIjRYEFW5G3mrz-Ks,16594
+xenfra/commands/deployments.py,sha256=6-wwUno1uEHxse2X2yNhnNoKxdcNFLSBcvEiWkbuv4E,37873
+xenfra/commands/intelligence.py,sha256=_H0t9OJwPbd9E0r1tcMACrt6-UBPrrTII8M47kC_iHA,17496
 xenfra/commands/projects.py,sha256=SAxF_pOr95K6uz35U-zENptKndKxJNZn6bcD45PHcpI,6696
 xenfra/commands/security_cmd.py,sha256=EI5sjX2lcMxgMH-LCFmPVkc9YqadOrcoSgTiKknkVRY,7327
 xenfra/main.py,sha256=2EPPuIdxjhW-I-e-Mc0i2ayeLaSJdmzddNThkXq7B7c,2033
 xenfra/utils/__init__.py,sha256=4ZRYkrb--vzoXjBHG8zRxz2jCXNGtAoKNtkyu2WRI2A,45
 xenfra/utils/auth.py,sha256=9JbFnv0-rdlJF-4hKD2uWd9h9ehqC1iIHee1O5e-3RM,13769
 xenfra/utils/codebase.py,sha256=GMrqhOJWX8q5ZXSLI9P3hJZBpufXMQA3Z4fKh2XSTNo,5949
-xenfra/utils/config.py,sha256=BylyzHLkL6rmvNNW9zxCaSvk1dV0yzJQPaW-dP7E5j0,13931
+xenfra/utils/config.py,sha256=K2k7hxz94dzbxvCw_PDXtq4o1VlmJMTFktlL-F2g5rY,14786
 xenfra/utils/errors.py,sha256=6G91YzzDDNkKHANTgfAMiOiMElEyi57wo6-FzRa4VuQ,4211
 xenfra/utils/security.py,sha256=EA8CIPLt8Y-QP5uZ7c5NuC6ZLRV1aZS8NapS9ix_vok,11479
 xenfra/utils/validation.py,sha256=cvuL_AEFJ2oCoP0abCqoOIABOwz79Gkf-jh_dcFIQlM,6912
-xenfra-0.3.7.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
-xenfra-0.3.7.dist-info/entry_points.txt,sha256=a_2cGhYK__X6eW05Ba8uB6RIM_61c2sHtXsPY8N0mic,45
-xenfra-0.3.7.dist-info/METADATA,sha256=P2qLV0wwwrioPQtkXda94RA7FUOBSmKmzOooQCNiD8Q,3898
-xenfra-0.3.7.dist-info/RECORD,,
+xenfra-0.3.8.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
+xenfra-0.3.8.dist-info/entry_points.txt,sha256=a_2cGhYK__X6eW05Ba8uB6RIM_61c2sHtXsPY8N0mic,45
+xenfra-0.3.8.dist-info/METADATA,sha256=VqoXK6mEDKpitS0Em_3Okgq00fupy19Mp39qUPiloHI,3898
+xenfra-0.3.8.dist-info/RECORD,,