blocks-cli 0.1.25__tar.gz → 0.1.27__tar.gz

{blocks-cli-0.1.25 → blocks-cli-0.1.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blocks-cli
-Version: 0.1.25
+Version: 0.1.27
 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.25 → blocks-cli-0.1.27}/blocks_cli/bundles.py

@@ -12,6 +12,7 @@ def get_bundle_upload_url():
     response.raise_for_status()
     return response.json()
 
+
 def upload_bundle_zip(bundle_upload_url: str, base_path: Path):
     try:
         # Generate a unique ID for the run
@@ -31,22 +32,21 @@ def upload_bundle_zip(bundle_upload_url: str, base_path: Path):
                         continue
                     file_path = os.path.join(root, file)
                     arcname = os.path.relpath(file_path, base_path)
-
                     zipf.write(file_path, arcname)
 
         # Confirm the creation of the zip file
         if not os.path.exists(zip_filename):
             raise Exception(f"Failed to create {zip_filename}")
 
-        # Upload the zip file to presigned S3 url
-        response = requests.put(bundle_upload_url, files={
-            "file": (zip_filename, open(zip_filename, "rb"))
-        })
-        response.raise_for_status() 
+        # Upload the zip file to presigned S3 URL
+        with open(zip_filename, "rb") as f:
+            response = requests.put(bundle_upload_url, data=f, headers={"Content-Type": "application/zip"})
+            response.raise_for_status() 
+
     except Exception:
         raise
     finally:
-        # remove the zip file
+        # Remove the zip file
         os.remove(zip_filename)
 
     return response.text

{blocks-cli-0.1.25 → blocks-cli-0.1.27}/blocks_cli/commands/push.py

@@ -58,9 +58,6 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
             # working directory from where the command was invoked
             cwd = file.resolve().parent
 
-            # parent folder name
-            parent_folder_name = cwd.name
-
             git_remote_url = None
 
             try:
@@ -115,11 +112,13 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
                 task_kwargs = automation.get("task_kwargs", {})
 
                 automation_name = task_kwargs.get("name")
-                vcpus = task_kwargs.get("vcpus", 1)
-                memory_mib = task_kwargs.get("memory_mib", 1024)
-                gpu_count = task_kwargs.get("gpu_count", 0)
-                gpu_type = task_kwargs.get("gpu_type", "")
 
+                # compute resource fields
+                runner = task_kwargs.get("runner")
+                vcpus = task_kwargs.get("vcpus")
+                memory = task_kwargs.get("memory")
+                gpu_count = task_kwargs.get("gpu_count")
+                gpu_type = task_kwargs.get("gpu_type")
                 repos: list = trigger_kwargs.get("repos", [])
 
                 if len(repos) == 0 and git_remote_url:
@@ -132,9 +131,10 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
                 # Extract known fields
                 automation_config = {
                     "name": automation_name,
-                    "import_path": f"{parent_folder_name}/{file.name}:{function_name}",
+                    "import_path": f"{file.name}:{function_name}",
+                    "runner": runner,
                     "vcpus": vcpus,
-                    "memory_mib": memory_mib,
+                    "memory": memory,
                     "gpu_count": gpu_count,
                     "gpu_type": gpu_type,
                     "trigger_alias": trigger_alias,
@@ -145,7 +145,7 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
                 # Add any additional args that weren't explicitly handled
                 additional_task_kwargs = {
                     k: v
-                    for k, v in trigger_kwargs.items()
+                    for k, v in task_kwargs.items()
                     if k not in ["vcpus", "memory_mib", "gpu_count", "gpu_type", "name"]
                 }
                 automation_config["trigger_kwargs"] = trigger_kwargs

{blocks-cli-0.1.25 → blocks-cli-0.1.27}/blocks_cli/config/auth.py

@@ -7,6 +7,7 @@ class AuthConfig(BaseModel):
 
     uid: Optional[str] = ""
     puid: Optional[str] = ""
+    wid: Optional[str] = ""
     # Corresponds to env variable BLOCKS_AUTH__API_KEY
     api_key: Optional[str] = ""
 
@@ -36,10 +37,11 @@ class AuthConfig(BaseModel):
     def get_auth_headers(self) -> dict:
         from blocks_cli.console import console
         headers = {}
-        if self.uid and self.puid:
-            console.print("⚠️ Using uid and puid for auth headers. This is intended for development purposes only.", style="yellow bold")
+        if self.uid and self.puid and self.wid:
+            console.print("⚠️ Using uid, puid and wid for auth headers. This is intended for development purposes only.", style="yellow bold")
             headers["x-blocks-uid"] = self.uid
             headers["x-blocks-puid"] = self.puid
+            headers["x-blocks-wid"] = self.wid
         else:
             headers["Authorization"] = f"ApiKey {self.api_key}"
 

{blocks-cli-0.1.25 → blocks-cli-0.1.27}/setup.py

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