xenfra-sdk 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

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:
         """
@@ -244,6 +244,9 @@ class InfraEngine:
         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."""
@@ -260,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:
@@ -282,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()
@@ -324,22 +330,36 @@ 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:
                 last_log_line = 0
-                for i in range(120):  # 20-minute timeout for cloud-init (installing Docker, Caddy, etc.)
-                    # Check for completion
-                    if conn.run("test -f /root/setup_complete", warn=True, hide=True).ok:
-                        logger("   - Cloud-init setup complete.")
-                        break
+                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
-                    log_result = conn.run(f"tail -n +{last_log_line + 1} /root/setup.log 2>/dev/null", warn=True, hide=True)
-                    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)
+                    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:
@@ -363,16 +383,20 @@ class InfraEngine:
                             stage="Code Upload",
                         )
                     
-                    fabric.transfer.Transfer(conn).upload(
-                        ".", "/root/app", exclude=[".git", ".venv", "__pycache__"]
-                    )
+                    # 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 ===
             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)
+                    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...")
@@ -393,7 +417,7 @@ class InfraEngine:
                 with self._get_connection(ip_address) as conn:
                     # Check if running
                     if is_dockerized:
-                        ps_result = conn.run("cd /root/app && docker-compose ps", hide=True)
+                        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)
@@ -432,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/resources/deployments.py

@@ -97,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, is_dockerized: bool = True) -> 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.
 
@@ -110,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
@@ -133,6 +137,12 @@ class DeploymentsManager(BaseManager):
             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
@@ -150,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/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 %}

{xenfra_sdk-0.2.0.dist-info → xenfra_sdk-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: xenfra-sdk
-Version: 0.2.0
+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.2.0.dist-info → xenfra_sdk-0.2.1.dist-info}/RECORD

@@ -9,7 +9,7 @@ xenfra_sdk/db/models.py,sha256=oNT9UhYzr_SgzDJdPu5fF6IiiztWjm2tHZzpIAYVJ4Y,706
 xenfra_sdk/db/session.py,sha256=ul6tFBBDKU8UErJsZ-g7b8cryLr9-yA6jGY3d8fD15Q,853
 xenfra_sdk/dependencies.py,sha256=k7tiy_5dayr_iQx_i2klGeNjGWhxfivGVC38SpvQvzE,1250
 xenfra_sdk/dockerizer.py,sha256=Fml-1QpUtQqslHYG12igxDvGEpYjx1E9qp0oWbBsofk,3962
-xenfra_sdk/engine.py,sha256=3qA67wwjxSs66sIPAbyMIfZ1y990n2xp021jdIHYFHw,19363
+xenfra_sdk/engine.py,sha256=ACle-suwDNu-KY2Sv3W86aXP5-HFHdJ6vnpK4w5TSk8,20820
 xenfra_sdk/exceptions.py,sha256=FaKctVJNMFIw09G8Lm2yd_DHhSngGcyh2j_BTgXMM60,496
 xenfra_sdk/mcp_client.py,sha256=GPsVJtWT87G7k_GxePATLfCqFkYFFNIbpW5AsZi4Bhk,5931
 xenfra_sdk/models.py,sha256=-QkHFAnimEQA1hZ70YcordlbKWbO9mgzDUdO03qg5BI,7278
@@ -18,14 +18,14 @@ xenfra_sdk/privacy.py,sha256=ksGf5L9PVtRP-xZS3T-Gj7MKfexTqIMgbFLoYkIESOE,5662
 xenfra_sdk/recipes.py,sha256=jSFlPLIze3rKpBaeFKNVkWESQzBXWGkoSwSH1jwx0Vs,973
 xenfra_sdk/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xenfra_sdk/resources/base.py,sha256=C6BuZfhR-oU5ecHSfkGG6ZLU6MHGXUyCWoy1F-yTIf8,84
-xenfra_sdk/resources/deployments.py,sha256=LGq41a5SyLavcL9kzuA50UTBgAzP-YDFM2o0yTN1SM4,9424
+xenfra_sdk/resources/deployments.py,sha256=0IS54LyoLLCB6h25a2jgM2jk3tvYmb2Auf49p11C2nU,9751
 xenfra_sdk/resources/intelligence.py,sha256=Y11K6_iXfm2QKTbH1vUmt45MifLoVtZtlHEkqbzmTzs,3418
 xenfra_sdk/resources/projects.py,sha256=EsCVXmqkhWl_Guz_8WDQDi3kAm1Wyg1rjXcyAigPD6E,3712
 xenfra_sdk/security.py,sha256=Px887RRb1BUDXaPUrxmQITJ1mHyOyupCJqEDZ78F7Tk,1240
 xenfra_sdk/templates/Dockerfile.j2,sha256=GXc0JiaF-HsxTQS15Gs2fcvsIhA1EHnwapdFVitUWS0,689
 xenfra_sdk/templates/cloud-init.sh.j2,sha256=fxQP2GVAAVVvDAqlOVH3eNmeKSTFQ2soErQQRD5RX3U,3072
-xenfra_sdk/templates/docker-compose.yml.j2,sha256=qMHiatuZlxiYZ1pE_g2ag1M798MvQbeq0cVTVK07jkM,893
+xenfra_sdk/templates/docker-compose.yml.j2,sha256=93AvztUyUMgYbdycB9EHow1qCkeNmQ2NR2G9FD5zh5A,840
 xenfra_sdk/utils.py,sha256=d8eCjjV32QwqoJa759CEcETnnsjG5qVKDLQ84yYtlus,3898
-xenfra_sdk-0.2.0.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
-xenfra_sdk-0.2.0.dist-info/METADATA,sha256=oPBPzMsjzenmDrxQoHsUG8XSUk4jqDh8S9E8hSD-eLg,3980
-xenfra_sdk-0.2.0.dist-info/RECORD,,
+xenfra_sdk-0.2.1.dist-info/WHEEL,sha256=eycQt0QpYmJMLKpE3X9iDk8R04v2ZF0x82ogq-zP6bQ,79
+xenfra_sdk-0.2.1.dist-info/METADATA,sha256=-nLfpSQm2a5dz_hhGafkZ1OVyVX9ZU6IRCmQKGMu5es,3980
+xenfra_sdk-0.2.1.dist-info/RECORD,,

{xenfra_sdk-0.2.0.dist-info → xenfra_sdk-0.2.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.22
+Generator: uv 0.9.24
 Root-Is-Purelib: true
 Tag: py3-none-any