xenfra-sdk 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

xenfra_sdk/engine.py

@@ -324,7 +324,7 @@ class InfraEngine:
                 raise DeploymentError("Could not establish SSH connection.", stage="Polling")
 
             with conn:
-                for i in range(30):  # 5-minute timeout for cloud-init
+                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

xenfra_sdk/resources/deployments.py

@@ -133,6 +133,7 @@ class DeploymentsManager(BaseManager):
         try:
             # Use httpx to stream the SSE response
             import httpx
+            import os
 
             headers = {
                 "Authorization": f"Bearer {self._client._token}",
@@ -140,7 +141,19 @@ class DeploymentsManager(BaseManager):
                 "Content-Type": "application/json",
             }
 
-            url = f"{self._client.api_url}/deployments/stream"
+            # Use streaming API URL if available (bypasses Cloudflare timeout)
+            # Otherwise fall back to regular API URL
+            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
+                base_url = self._client.api_url
+
+            url = f"{base_url}/deployments/stream"
 
             with httpx.stream(
                 "POST",
@@ -169,7 +182,13 @@ class DeploymentsManager(BaseManager):
                     )
 
                 # Parse SSE events
+                current_event = None  # Initialize before loop
                 for line in response.iter_lines():
+                    # No need to explicitly decode if iter_lines is used on a decoded response,
+                    # but if it returns bytes, we decode it.
+                    if isinstance(line, bytes):
+                        line = line.decode('utf-8', errors='ignore')
+                    
                     line = line.strip()
                     if not line:
                         continue
@@ -179,17 +198,25 @@ class DeploymentsManager(BaseManager):
                         current_event = line[6:].strip()
                     elif line.startswith("data:"):
                         data = line[5:].strip()
+
+                        # Get event type (default to "message" if no event line was sent)
+                        event_type = current_event if current_event is not None else "message"
+
+                        # Skip keep-alive events (used to prevent proxy timeouts)
+                        if event_type == "keep-alive":
+                            current_event = None
+                            continue
+
                         try:
                             # Try to parse as JSON
                             data_parsed = json.loads(data)
-                            yield {"event": current_event if 'current_event' in locals() else "message", "data": data_parsed}
+                            yield {"event": event_type, "data": data_parsed}
                         except json.JSONDecodeError:
                             # If not JSON, yield as plain text
-                            yield {"event": current_event if 'current_event' in locals() else "message", "data": data}
+                            yield {"event": event_type, "data": data}
 
-                        # Reset current_event
-                        if 'current_event' in locals():
-                            del current_event
+                        # Reset current_event after yielding
+                        current_event = None
 
         except httpx.HTTPError as e:
             raise XenfraError(f"HTTP error during streaming deployment: {e}")

{xenfra_sdk-0.1.7.dist-info → xenfra_sdk-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: xenfra-sdk
-Version: 0.1.7
+Version: 0.1.9
 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.7.dist-info → xenfra_sdk-0.1.9.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=hOXy6dKl3QGFamRN2WZ0rAh6Vguykhkdyal3grhGAOI,3146
-xenfra_sdk/engine.py,sha256=-EyDw5BrsyjgaH8NgYYi-UFWMRvPMm2UAou_TxRvRvY,17055
+xenfra_sdk/engine.py,sha256=K9HVqG37HcTbLFE4DeknNv00ADyKL68olYA7IudRJj8,17090
 xenfra_sdk/exceptions.py,sha256=FaKctVJNMFIw09G8Lm2yd_DHhSngGcyh2j_BTgXMM60,496
 xenfra_sdk/mcp_client.py,sha256=GPsVJtWT87G7k_GxePATLfCqFkYFFNIbpW5AsZi4Bhk,5931
 xenfra_sdk/models.py,sha256=VDd41JxqyzrsNZugXe5IP9OKkNuGVRFSnoTrHBOSKjk,7185
@@ -18,7 +18,7 @@ xenfra_sdk/privacy.py,sha256=ksGf5L9PVtRP-xZS3T-Gj7MKfexTqIMgbFLoYkIESOE,5662
 xenfra_sdk/recipes.py,sha256=g_UKQIcdSokYh7zn186mzDTr08P034-KZ1iiDNELyP4,877
 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=qRfd29FiN1nxv1cZnH6uh29q9oNNDgzjjiOoK710PPo,7921
+xenfra_sdk/resources/deployments.py,sha256=2GRF-BWwC8y-oM7Pje5YoHrlkKRduSWsC_3-erlw9V8,9174
 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
@@ -26,6 +26,6 @@ xenfra_sdk/templates/Dockerfile.j2,sha256=GXc0JiaF-HsxTQS15Gs2fcvsIhA1EHnwapdFVi
 xenfra_sdk/templates/cloud-init.sh.j2,sha256=NKIwtL9OgnlK2NnYRZI3gWC9aYl6wNPsS6r14g8eHQQ,2290
 xenfra_sdk/templates/docker-compose.yml.j2,sha256=qMHiatuZlxiYZ1pE_g2ag1M798MvQbeq0cVTVK07jkM,893
 xenfra_sdk/utils.py,sha256=d8eCjjV32QwqoJa759CEcETnnsjG5qVKDLQ84yYtlus,3898
-xenfra_sdk-0.1.7.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
-xenfra_sdk-0.1.7.dist-info/METADATA,sha256=tB4sG2i5_ZJuc5WTKAnQo2awOmmT5G7RC2ev3iuOOzQ,3980
-xenfra_sdk-0.1.7.dist-info/RECORD,,
+xenfra_sdk-0.1.9.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
+xenfra_sdk-0.1.9.dist-info/METADATA,sha256=PAeq0SV1LWdfLDH9Ey3PeVnrXT-7rs5uINdjAcqELbA,3980
+xenfra_sdk-0.1.9.dist-info/RECORD,,