xenfra-sdk 0.1.9__tar.gz → 0.2.1__tar.gz

{xenfra_sdk-0.1.9 → xenfra_sdk-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: xenfra-sdk
-Version: 0.1.9
+Version: 0.2.1
 Summary: Xenfra SDK: Core engine and utilities for the Xenfra platform.
 Author: xenfra-cloud
 Author-email: xenfra-cloud <xenfracloud@gmail.com>

{xenfra_sdk-0.1.9 → xenfra_sdk-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xenfra-sdk"
-version = "0.1.9"
+version = "0.2.1"
 description = "Xenfra SDK: Core engine and utilities for the Xenfra platform."
 readme = "README.md"
 authors = [

{xenfra_sdk-0.1.9 → xenfra_sdk-0.2.1}/src/xenfra_sdk/dockerizer.py

@@ -13,11 +13,12 @@ def detect_framework(path="."):
 
     # Check for Django first (common pattern: manage.py in root)
     if (project_root / "manage.py").is_file():
+        # Assume the project name is the current directory name
         project_name = project_root.name
         return "django", 8000, f"gunicorn {project_name}.wsgi:application --bind 0.0.0.0:8000"
 
     candidate_files = []
-
+    
     # Check directly in project root
     for name in ["main.py", "app.py"]:
         if (project_root / name).is_file():
@@ -33,17 +34,23 @@ def detect_framework(path="."):
     for file_path in candidate_files:
         with open(file_path, "r") as f:
             content = f.read()
-
-            module_name = str(file_path.relative_to(project_root)).replace(os.sep, ".")[:-3]
-            if module_name.startswith("src."):
-                module_name = module_name[4:]
+            
+            try:
+                module_name = str(file_path.relative_to(project_root)).replace(os.sep, '.')[:-3]
+                # If path is like src/testdeploy/main.py, module_name becomes src.testdeploy.main
+                if module_name.startswith("src."):
+                    # Strip the "src." prefix for gunicorn/uvicorn
+                    module_name = module_name[4:]
+            except ValueError:
+                module_name = file_path.stem
 
             if "FastAPI" in content:
+                # Use standard :app convention
                 return "fastapi", 8000, f"uvicorn {module_name}:app --host 0.0.0.0 --port 8000"
-
+            
             if "Flask" in content:
                 return "flask", 5000, f"gunicorn {module_name}:app -b 0.0.0.0:5000"
-
+    
     return None, None, None
 
 
@@ -59,14 +66,24 @@ def generate_templated_assets(context: dict):
     template_dir = Path(__file__).parent / "templates"
     env = Environment(loader=FileSystemLoader(template_dir))
 
-    # Detect framework specifics
-    framework, port, command = detect_framework()
+    # Detect framework specifics (use context if available, otherwise fallback to manual)
+    detected_framework, detected_port, detected_command = detect_framework()
+    
+    framework = context.get("framework") or detected_framework
+    port = context.get("port") or detected_port
+    command = context.get("command") or detected_command
+
     if not framework:
-        print("Warning: No recognizable web framework detected.")
+        print("Warning: No recognizable web framework detected and no framework provided in context.")
         return []
 
-    # Merge detected context with provided context
-    render_context = {"port": port, "command": command, **context}
+    # Merge detected values with provided context (context takes precedence)
+    render_context = {
+        "framework": framework, 
+        "port": port, 
+        "command": command, 
+        **context
+    }
 
     generated_files = []
 

{xenfra_sdk-0.1.9 → xenfra_sdk-0.2.1}/src/xenfra_sdk/engine.py

@@ -162,7 +162,7 @@ class InfraEngine:
         # 3. Stream logs
         ip_address = droplet.ip_address
         with self._get_connection(ip_address) as conn:
-            conn.run("cd /root/app && docker-compose logs -f app", pty=True)
+            conn.run("cd /root/app && docker compose logs -f app", pty=True)
 
     def get_account_balance(self) -> dict:
         """
@@ -242,7 +242,11 @@ class InfraEngine:
         email: Optional[str] = None,
         domain: Optional[str] = None,
         repo_url: Optional[str] = None,
+        is_dockerized: bool = True,
         db_session: Session = None,
+        port: int = 8000,
+        command: str = None,
+        database: str = None,
         **kwargs,
     ):
         """A stateful, blocking orchestrator for deploying a new server."""
@@ -259,7 +263,10 @@ class InfraEngine:
                 "email": email,
                 "domain": domain,
                 "repo_url": repo_url,
-                **kwargs,  # Pass db config, etc.
+                "port": port,
+                "command": command,
+                "database": database,
+                **kwargs,  # Pass any additional config
             }
             files = dockerizer.generate_templated_assets(context)
             for file in files:
@@ -267,7 +274,7 @@ class InfraEngine:
 
             # === 3. CLOUD-INIT STAGE ===
             logger("\n[bold blue]PHASE 3: CREATING SERVER SETUP SCRIPT[/bold blue]")
-            cloud_init_script = recipes.generate_stack(context)
+            cloud_init_script = recipes.generate_stack(context, is_dockerized=is_dockerized)
             logger("   - Generated cloud-init script.")
             logger(
                 f"--- Cloud-init script content ---\n{cloud_init_script}\n---------------------------------"
@@ -281,8 +288,8 @@ class InfraEngine:
                 region=region,
                 image=image,
                 size_slug=size,
-                ssh_keys=[ssh_key],
-                userdata=cloud_init_script,
+                ssh_keys=[ssh_key.id],
+                user_data=cloud_init_script,
                 tags=["xenfra"],
             )
             droplet.create()
@@ -323,11 +330,37 @@ class InfraEngine:
             if not conn or not conn.is_connected:
                 raise DeploymentError("Could not establish SSH connection.", stage="Polling")
 
+            logger("   - [DEBUG] Entering SSH context for Phase 5 polling...")
             with conn:
-                for i in range(120):  # 20-minute timeout for cloud-init (installing Docker, Caddy, etc.)
-                    if conn.run("test -f /root/setup_complete", warn=True).ok:
-                        logger("   - Cloud-init setup complete.")
-                        break
+                last_log_line = 0
+                logger("   - Polling server setup log (/root/setup.log)...")
+                for i in range(120):  # 20-minute timeout
+                    # Heartbeat
+                    if i % 3 == 0:  # Every 30 seconds
+                        logger(f"   - Phase 5 Heartbeat: Waiting for setup completion ({i+1}/120)...")
+
+                    # Check for completion with timeout
+                    try:
+                        check_result = conn.run("test -f /root/setup_complete", warn=True, hide=True, timeout=10)
+                        if check_result.ok:
+                            logger("   - Cloud-init setup complete.")
+                            break
+                    except Exception as e:
+                        logger(f"   - [Warning] Status check failed: {e}. Retrying...")
+                    
+                    # Tail the setup log for visibility
+                    try:
+                        log_result = conn.run(f"tail -n +{last_log_line + 1} /root/setup.log 2>/dev/null", warn=True, hide=True, timeout=10)
+                        if log_result.ok and log_result.stdout.strip():
+                            new_lines = log_result.stdout.strip().split("\n")
+                            for line in new_lines:
+                                if line.strip():
+                                    logger(f"     [Server Setup] {line.strip()}")
+                            last_log_line += len(new_lines)
+                    except Exception as e:
+                        # Log doesn't exist yet or tail failed
+                        pass
+
                     time.sleep(10)
                 else:
                     raise DeploymentError(
@@ -342,18 +375,39 @@ class InfraEngine:
                     logger(f"   - Cloning repository from {repo_url}...")
                     conn.run(f"git clone {repo_url} /root/app")
                 else:
-                    fabric.transfer.Transfer(conn).upload(
-                        ".", "/root/app", exclude=[".git", ".venv", "__pycache__"]
-                    )
+                    # Safety check: Prevent accidental deployment of Xenfra service code
+                    if os.getenv("XENFRA_SERVICE_MODE") == "true":
+                        raise DeploymentError(
+                            "Local folder deployment is not yet supported via the cloud API. "
+                            "Please provide a git_repo URL in your xenfra.yaml or CLI command.",
+                            stage="Code Upload",
+                        )
+                    
+                    # Use rsync for efficient local folder upload
+                    private_key_path = str(Path.home() / ".ssh" / "id_rsa")
+                    rsync_cmd = f'rsync -avz --exclude=".git" --exclude=".venv" --exclude="__pycache__" -e "ssh -i {private_key_path} -o StrictHostKeyChecking=no" . root@{ip_address}:/root/app/'
+                    logger(f"   - Uploading local code via rsync...")
+                    result = subprocess.run(rsync_cmd, shell=True, capture_output=True, text=True)
+                    if result.returncode != 0:
+                        raise DeploymentError(f"rsync failed: {result.stderr}", stage="Code Upload")
             logger("   - Code upload complete.")
 
             # === 7. FINAL DEPLOY STAGE ===
-            logger("\n[bold blue]PHASE 7: BUILDING AND DEPLOYING CONTAINERS[/bold blue]")
-            with self._get_connection(ip_address) as conn:
-                result = conn.run("cd /root/app && docker-compose up -d --build", hide=True)
-                if result.failed:
-                    raise DeploymentError(f"docker-compose failed: {result.stderr}", stage="Deploy")
-            logger("   - Docker containers are building in the background...")
+            if is_dockerized:
+                logger("\n[bold blue]PHASE 7: BUILDING AND DEPLOYING CONTAINERS[/bold blue]")
+                with self._get_connection(ip_address) as conn:
+                    result = conn.run("cd /root/app && docker compose up -d --build", hide=True)
+                    if result.failed:
+                        raise DeploymentError(f"docker-compose failed: {result.stderr}", stage="Deploy")
+                logger("   - Docker containers are building in the background...")
+            else:
+                logger("\n[bold blue]PHASE 7: STARTING HOST-BASED APPLICATION[/bold blue]")
+                start_command = context.get("command", f"uvicorn main:app --port {context.get('port', 8000)}")
+                with self._get_connection(ip_address) as conn:
+                    result = conn.run(f"cd /root/app && python3 -m venv .venv && .venv/bin/pip install -r requirements.txt && nohup .venv/bin/{start_command} > app.log 2>&1 &", hide=True)
+                    if result.failed:
+                        raise DeploymentError(f"Host-based start failed: {result.stderr}", stage="Deploy")
+                logger(f"   - Application started via: {start_command}")
 
             # === 8. VERIFICATION STAGE ===
             logger("\n[bold blue]PHASE 8: VERIFYING DEPLOYMENT[/bold blue]")
@@ -361,9 +415,15 @@ class InfraEngine:
             for i in range(24):  # 2-minute timeout for health checks
                 logger(f"   - Health check attempt {i + 1}/24...")
                 with self._get_connection(ip_address) as conn:
-                    # Check if container is running
-                    ps_result = conn.run("cd /root/app && docker-compose ps", hide=True)
-                    if "running" not in ps_result.stdout:
+                    # Check if running
+                    if is_dockerized:
+                        ps_result = conn.run("cd /root/app && docker compose ps", hide=True)
+                        running = "running" in ps_result.stdout
+                    else:
+                        ps_result = conn.run("ps aux | grep -v grep | grep python", hide=True)
+                        running = ps_result.ok and len(ps_result.stdout.strip()) > 0
+
+                    if not running:
                         time.sleep(5)
                         continue
 
@@ -396,7 +456,7 @@ class InfraEngine:
             else:
                 # On failure, get logs and destroy droplet
                 with self._get_connection(ip_address) as conn:
-                    logs = conn.run("cd /root/app && docker-compose logs", hide=True).stdout
+                    logs = conn.run("cd /root/app && docker compose logs", hide=True).stdout
                 raise DeploymentError(
                     f"Application failed to become healthy in time. Logs:\n{logs}",
                     stage="Verification",

{xenfra_sdk-0.1.9 → xenfra_sdk-0.2.1}/src/xenfra_sdk/models.py

@@ -178,5 +178,6 @@ class CodebaseAnalysisResponse(BaseModel):
         ..., description="Recommended instance size (basic, standard, premium)"
     )
     estimated_cost_monthly: float = Field(..., description="Estimated monthly cost in USD")
+    is_dockerized: bool = Field(True, description="Whether to use Docker containerization")
     confidence: float = Field(..., description="Confidence score (0.0-1.0)")
     notes: str | None = Field(None, description="Additional observations")

{xenfra_sdk-0.1.9 → xenfra_sdk-0.2.1}/src/xenfra_sdk/recipes.py

@@ -3,13 +3,14 @@ from pathlib import Path
 from jinja2 import Environment, FileSystemLoader
 
 
-def generate_stack(context: dict):
+def generate_stack(context: dict, is_dockerized: bool = True):
     """
     Generates a cloud-init startup script from a Jinja2 template.
 
     Args:
         context: A dictionary containing information for rendering the template,
                  e.g., {'domain': 'example.com', 'email': 'user@example.com'}
+        is_dockerized: Whether to setup Docker and Docker Compose (default: True)
     """
     # Path to the templates directory
     template_dir = Path(__file__).parent / "templates"
@@ -17,9 +18,9 @@ def generate_stack(context: dict):
 
     template = env.get_template("cloud-init.sh.j2")
 
-    # The non-dockerized logic has been removed as we are focusing on
-    # a purely Docker-based deployment strategy for simplicity and scalability.
     # The context will contain all necessary variables for the template.
-    script = template.render(context)
+    # Pass is_dockerized to the template for conditional setup
+    render_context = {**context, "is_dockerized": is_dockerized}
+    script = template.render(render_context)
 
     return script

{xenfra_sdk-0.1.9 → xenfra_sdk-0.2.1}/src/xenfra_sdk/resources/deployments.py

@@ -12,7 +12,7 @@ logger = logging.getLogger(__name__)
 
 
 class DeploymentsManager(BaseManager):
-    def create(self, project_name: str, git_repo: str, branch: str, framework: str, region: str = None, size_slug: str = None) -> dict:
+    def create(self, project_name: str, git_repo: str, branch: str, framework: str, region: str = None, size_slug: str = None, is_dockerized: bool = True) -> dict:
         """Creates a new deployment."""
         try:
             payload = {
@@ -25,6 +25,8 @@ class DeploymentsManager(BaseManager):
                 payload["region"] = region
             if size_slug:
                 payload["size_slug"] = size_slug
+            if is_dockerized is not None:
+                payload["is_dockerized"] = is_dockerized
             
             response = self._client._request("POST", "/deployments", json=payload)
             # Safe JSON parsing
@@ -95,7 +97,7 @@ class DeploymentsManager(BaseManager):
         except Exception as e:
             raise XenfraError(f"Failed to get logs for deployment {deployment_id}: {e}")
 
-    def create_stream(self, project_name: str, git_repo: str, branch: str, framework: str, region: str = None, size_slug: str = None) -> Iterator[dict]:
+    def create_stream(self, project_name: str, git_repo: str, branch: str, framework: str, region: str = None, size_slug: str = None, is_dockerized: bool = True, port: int = None, command: str = None, database: str = None) -> Iterator[dict]:
         """
         Creates a new deployment with real-time SSE log streaming.
 
@@ -108,6 +110,10 @@ class DeploymentsManager(BaseManager):
             framework: Framework type (fastapi, flask, django)
             region: DigitalOcean region (optional)
             size_slug: DigitalOcean droplet size (optional)
+            is_dockerized: Whether to use Docker (optional)
+            port: Application port (optional, default 8000)
+            command: Start command (optional, auto-detected if not provided)
+            database: Database type (optional, e.g. 'postgres')
 
         Yields:
             dict: SSE events with 'event' and 'data' fields
@@ -129,6 +135,14 @@ class DeploymentsManager(BaseManager):
             payload["region"] = region
         if size_slug:
             payload["size_slug"] = size_slug
+        if is_dockerized is not None:
+            payload["is_dockerized"] = is_dockerized
+        if port:
+            payload["port"] = port
+        if command:
+            payload["command"] = command
+        if database:
+            payload["database"] = database
 
         try:
             # Use httpx to stream the SSE response
@@ -146,11 +160,8 @@ class DeploymentsManager(BaseManager):
             streaming_api_url = os.getenv("XENFRA_STREAMING_API_URL")
             if streaming_api_url:
                 base_url = streaming_api_url
-            elif self._client.api_url == "https://api.xenfra.tech":
-                # Production: use non-proxied streaming subdomain
-                base_url = "https://stream.xenfra.tech"
             else:
-                # Local/dev: use regular API URL
+                # Local/dev/production: use regular API URL
                 base_url = self._client.api_url
 
             url = f"{base_url}/deployments/stream"

{xenfra_sdk-0.1.9 → xenfra_sdk-0.2.1}/src/xenfra_sdk/templates/cloud-init.sh.j2

@@ -11,17 +11,30 @@ echo "--------------------------------" >> $LOG
 mkdir -p /root/app
 cd /root/app
 
-# --- AGGRESSIVE FIX: KILL BACKGROUND UPDATES ---
-echo "⚔️  [0/6] Stopping Background Updates..." >> $LOG
+# --- MERCILESS FIX: TERMINATE BACKGROUND PROCESSES ---
+echo "⚔️  [0/6] Mercilessly Terminating Background Processes..." >> $LOG
+
+kill_apt_processes() {
+  echo "🎯 Killing processes holding apt/dpkg locks..." >> $LOG
+  fuser -k /var/lib/dpkg/lock >/dev/null 2>&1
+  fuser -k /var/lib/apt/lists/lock >/dev/null 2>&1
+  fuser -k /var/lib/dpkg/lock-frontends >/dev/null 2>&1
+}
+
+# Explicitly stop and disable services that cause locks
 systemctl stop unattended-upgrades.service || true
+systemctl disable unattended-upgrades.service || true
 systemctl stop apt-daily.service || true
+systemctl disable apt-daily.service || true
 systemctl stop apt-daily-upgrade.service || true
-systemctl kill --kill-who=all apt-daily.service || true
-systemctl kill --kill-who=all apt-daily-upgrade.service || true
+systemctl disable apt-daily-upgrade.service || true
+
+# Forcefully kill any remaining lock holders
+kill_apt_processes
 
-# Force remove locks if they exist
+# Force remove locks if they still exist (The Nuclear Option)
 rm -f /var/lib/dpkg/lock*
-rm -f /var/lib/apt/lists/lock
+rm -f /var/lib/apt/lists/lock*
 rm -f /var/cache/apt/archives/lock
 dpkg --configure -a || true
 # -----------------------------------------------
@@ -31,19 +44,28 @@ echo "🔄 [1/5] Refreshing Package Lists..." >> $LOG
 apt-get update
 apt-get install -y python3-pip git curl
 
-# 2. Install Docker & Compose
+# 2. Setup Environment
+{% if is_dockerized %}
 echo "🐳 [2/5] Installing Docker..." >> $LOG
 apt-get install -y docker.io || (curl -fsSL https://get.docker.com | sh)
 echo "🎶 [3/5] Installing Docker Compose..." >> $LOG
 apt-get install -y docker-compose-v2
+{% else %}
+echo "🐍 [2/5] Setting up host-based Python environment..." >> $LOG
+apt-get install -y python3-venv python3-dev build-essential
+{% endif %}
 
-# --- DOCKERIZED DEPLOYMENT ---
-echo "📦 [4/5] Installing Caddy..." >> $LOG
+# 3. Setup Reverse Proxy
+{% if is_dockerized %}
+echo "📦 [3/5] Installing Caddy..." >> $LOG
 apt-get install -y debian-keyring debian-archive-keyring apt-transport-https
 curl -LsSf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
 curl -LsSf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list
 apt-get update
 apt-get install -y caddy
+{% else %}
+echo "🛡️ [3/5] Skipping Caddy for host deployment (setup manual reverse proxy if needed)." >> $LOG
+{% endif %}
 
 {% if domain %}
 # Dynamically generate Caddyfile content

{xenfra_sdk-0.1.9 → xenfra_sdk-0.2.1}/src/xenfra_sdk/templates/docker-compose.yml.j2

@@ -6,17 +6,13 @@ services:
     build: .
     ports:
       - "{{ port | default(8000) }}:{{ port | default(8000) }}"
-    volumes:
-      - .:/app
-    command: {{ command }}
-    {% if database == 'postgres' %}
+    command: {{ command | default('uvicorn main:app --host 0.0.0.0 --port 8000') }}
+{% if database == 'postgres' or database == 'postgresql' %}
     depends_on:
       - db
     environment:
       - DATABASE_URL=postgresql://{{ db_user | default('user') }}:{{ db_password | default('password') }}@db:5432/{{ db_name | default('appdb') }}
-    {% endif %}
 
-  {% if database == 'postgres' %}
   db:
     image: postgres:15-alpine
     volumes:
@@ -25,9 +21,7 @@ services:
       - POSTGRES_USER={{ db_user | default('user') }}
       - POSTGRES_PASSWORD={{ db_password | default('password') }}
       - POSTGRES_DB={{ db_name | default('appdb') }}
-  {% endif %}
 
 volumes:
-  {% if database == 'postgres' %}
   postgres_data:
-  {% endif %}
+{% endif %}