blocks-cli 0.1.30__tar.gz → 0.1.32__tar.gz

{blocks-cli-0.1.30 → blocks-cli-0.1.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blocks-cli
-Version: 0.1.30
+Version: 0.1.32
 Summary: CLI tool for Blocks, a platform for writing custom AI-enabled codebase automations in Python. Leverage a full codebase-aware API. Automatically trigger automations from Github, Slack, and other providers.
 Home-page: https://github.com/BlocksOrg/sdk
 Author: BlocksOrg

{blocks-cli-0.1.30 → blocks-cli-0.1.32}/blocks_cli/builds.py

@@ -17,7 +17,13 @@ def poll_build_status(image_id: str, build_id: str):
             build_completed = is_completed
 
             if is_completed and not is_succeeded:
-                raise Exception("Build failed")
-        except Exception:
-            raise Exception("Failed to retrieve build status")
+                error_message = build_status_response.get("error_message") or "Unknown build error"
+                logs = build_status_response.get("logs")
+                if logs:
+                    error_message += f"\nBuild logs: {logs}"
+                raise Exception(f"Build failed: {error_message}")
+        except Exception as e:
+            if "Build failed" in str(e):
+                raise
+            raise Exception(f"Failed to retrieve build status: {str(e)}")
         

{blocks-cli-0.1.30 → blocks-cli-0.1.32}/blocks_cli/bundles.py

@@ -1,6 +1,7 @@
 import os
 import requests
 from pathlib import Path
+from typing import Optional
 import uuid
 import zipfile
 
@@ -13,11 +14,17 @@ def get_bundle_upload_url():
     return response.json()
 
 
-def upload_bundle_zip(bundle_upload_url: str, base_path: Path):
+def upload_bundle_zip(bundle_upload_url: str, base_path: Path, zip_file_path: Optional[Path] = None, delete_after_upload: bool = True):
     try:
-        # Generate a unique ID for the run
-        random_file_name = str(uuid.uuid4())
-        zip_filename = f"{random_file_name}.zip"
+        # Determine zip filename based on provided path or generate a unique one
+        if zip_file_path:
+            zip_filename = str(zip_file_path)
+            # Ensure the directory exists
+            zip_file_path.parent.mkdir(parents=True, exist_ok=True)
+        else:
+            # Generate a unique ID for the run
+            random_file_name = str(uuid.uuid4())
+            zip_filename = f"{random_file_name}.zip"
 
         if os.path.exists(zip_filename):
             os.remove(zip_filename)
@@ -46,7 +53,8 @@ def upload_bundle_zip(bundle_upload_url: str, base_path: Path):
     except Exception:
         raise
     finally:
-        # Remove the zip file
-        os.remove(zip_filename)
+        # Remove the zip file only if delete_after_upload is True
+        if delete_after_upload and os.path.exists(zip_filename):
+            os.remove(zip_filename)
 
-    return response.text
+    return response.text

{blocks-cli-0.1.30 → blocks-cli-0.1.32}/blocks_cli/commands/push.py

@@ -121,6 +121,7 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
                 gpu_type = task_kwargs.get("gpu_type")
                 runtime = task_kwargs.get("runtime") # e.x. "python3.10"
                 plugins = task_kwargs.get("plugins", [])
+                required_env_vars = task_kwargs.get("required_env_vars", [])
 
                 repos: list = trigger_kwargs.get("repos", [])
 
@@ -139,6 +140,7 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
                     "runner": runner,
                     "runtime": runtime,
                     "plugins": plugins,
+                    "required_env_vars": required_env_vars,
                     "vcpus": vcpus,
                     "memory": memory,
                     "gpu_count": gpu_count,
@@ -153,7 +155,19 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
                 additional_task_kwargs = {
                     k: v
                     for k, v in task_kwargs.items()
-                    if k not in ["vcpus", "memory_mib", "gpu_count", "gpu_type", "name", "runtime", "runner", "config_class", "plugins", "config_schema"]
+                    if k not in [
+                        "vcpus", 
+                        "memory_mib", 
+                        "gpu_count", 
+                        "gpu_type", 
+                        "name", 
+                        "runtime", 
+                        "runner", 
+                        "config_class", 
+                        "plugins", 
+                        "config_schema",
+                        "required_env_vars"
+                    ]
                 }
                 automation_config["trigger_kwargs"] = trigger_kwargs
                 automation_config["task_kwargs"] = additional_task_kwargs
@@ -198,9 +212,12 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
                         build_task, total=1, description="Build succeeded"
                     )
                 except Exception as e:
+                    error_message = str(e)
                     build_progress.update(
-                        build_task, total=1, description="Build failed, please try again. If the issue persists check your automation's requirements.txt to ensure all dependencies are valid and/or our status page at https://status.blocksorg.com"
+                        build_task, total=1, description="Build failed"
                     )
+                    console.print(f"[red]Error: {error_message}[/red]")
+                    console.print("[yellow]Please check your automation's requirements.txt to ensure all dependencies are valid and/or our status page at https://status.blocksorg.com[/yellow]")
                     raise typer.Exit(1)
     except Exception as e:
         console.print(f"[red]{str(e)}[/red]")

{blocks-cli-0.1.30 → blocks-cli-0.1.32}/requirements.txt

@@ -2,4 +2,5 @@ typer>=0.13.1,<0.16.0
 toml>=0.10.0,<0.11.0
 GitPython>=3.1.14,<4
 pydantic-settings>=2.0.0,<3.0.0
-pydantic-settings[toml]
+pydantic-settings[toml]
+requests

{blocks-cli-0.1.30 → blocks-cli-0.1.32}/setup.py

@@ -6,7 +6,7 @@ with open("requirements.txt") as f:
 
 setup(
     name="blocks-cli",  
-    version="0.1.30",
+    version="0.1.32",
     packages=find_packages(),
     include_package_data=True, 
     install_requires=requirements,