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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blocks-cli
-Version: 0.1.24
+Version: 0.1.25
 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
@@ -69,4 +69,3 @@ blocks init --api-key <your-api-key>
 blocks push automation.py
 ```
 
-

{blocks-cli-0.1.24 → blocks-cli-0.1.25}/README.md

@@ -36,4 +36,4 @@ def my_automation(event):
 ```bash
 blocks init --api-key <your-api-key>
 blocks push automation.py
-```
+```

blocks-cli-0.1.25/blocks_cli/builds.py

@@ -0,0 +1,20 @@
+import time
+
+from blocks_cli.api import api_client
+from blocks_cli.config.config import config
+
+def poll_build_status(image_id: str, build_id: str):
+    build_completed = False
+    while not build_completed:
+        time.sleep(0.5)
+        res = api_client.get(f"{config.clients.orchestrator_url}/v1/images/{image_id}/builds/{build_id}")
+        build_status_response = res.json()
+        
+        is_completed = build_status_response.get("is_completed")
+        is_succeeded = build_status_response.get("is_succeeded")
+
+        build_completed = is_completed
+
+        if is_completed and not is_succeeded:
+                raise Exception("Build failed")
+        

{blocks-cli-0.1.24 → blocks-cli-0.1.25}/blocks_cli/commands/configure.py

@@ -33,7 +33,6 @@ def configure(apikey: str = typer.Option(None, "--key", help="Blocks API key")):
                 print()
 
             new_api_key = typer.prompt("API Key", existing_api_key, show_default=False)
-
         else:
             new_api_key = apikey
 
@@ -44,7 +43,7 @@ def configure(apikey: str = typer.Option(None, "--key", help="Blocks API key")):
         with Progress(
             SpinnerColumn(),
             TextColumn("[progress.description]{task.description}"),
-            transient=True,
+            transient=False,
         ) as init_progress:
             try:
                 api_task = init_progress.add_task(description="Verifying API key...", total=None)
@@ -54,21 +53,17 @@ def configure(apikey: str = typer.Option(None, "--key", help="Blocks API key")):
                 })
 
                 if response.status_code > 299:
-                    raise Exception("API Key is invalid. Please check your API key at [link=https://app.blocksorg.com]https://app.blocksorg.com[/link]")
+                    raise Exception("API Key is invalid. Please check your API key at [white]https://app.blocksorg.com[/white]")
                 
                 config.auth.save_api_key(new_api_key)
-                init_progress.update(api_task, description=":white_check_mark: API key verified and saved successfully")
-                init_progress.refresh()
+                last_digits = new_api_key[-8:]
+                init_progress.update(api_task, description=f"[green]API key verified and saved successfully [italic][dim]...{last_digits}[/dim][/italic][/green]")
             except Exception as e:
-                raise InvalidApiKeyError(f"{e}")
-        
-        last_digits = new_api_key[-8:]
-
-        console.print(f"[green]API key saved successfully [italic][dim]...{last_digits}[/dim][/italic][/green]")
+                raise InvalidApiKeyError(f"Failed to verify API key. Please check your API key at [white]https://app.blocksorg.com[/white]")
 
     except InvalidApiKeyError as e:
-        console.print(f":cross_mark: [red]{e}[/red]")
+        console.print(f"[red]{e}[/red]")
         raise typer.Exit(code=1)
     except Exception as e:
-        console.print(f":cross_mark: Error configuring blocks")
+        console.print(f"[red]Error configuring blocks[/red]")
         raise typer.Exit(code=1)

{blocks-cli-0.1.24 → blocks-cli-0.1.25}/blocks_cli/commands/create.py

@@ -63,7 +63,7 @@ def {name}(input):
                 f.write('''blocks-sdk>={version}'''.format(version=latest_version))
 
             console.print(f"Successfully created automation [green]{name}[/green] in [green]{automation_dir.absolute()}[/green]")
-            console.print(Panel.fit(f"[green]{name}/\n   main.py\n   requirements.txt[/green]"))
+            console.print(f"[green]{name}/\n   main.py\n   requirements.txt[/green]")
             console.print(f"[blue]Choose an event from [white]https://docs.blocksorg.com/events[/white] and run [white]blocks test .blocks/{name}/main.py[/white] to test the automation[/blue]")
 
         except Exception as e:

blocks-cli-0.1.25/blocks_cli/commands/init.py

@@ -0,0 +1,79 @@
+import git
+import typer
+from pathlib import Path
+
+from rich.progress import Progress, SpinnerColumn, TextColumn
+
+from blocks_cli.api import api_client
+from blocks_cli.commands.__base__ import blocks_cli
+from blocks_cli.package import warn_current_package_version
+from blocks_cli.config.config import config
+from blocks_cli.console import console
+from blocks_cli.fs import find_dir
+
+class AlreadyInitializedError(Exception):
+    pass
+
+@blocks_cli.command()
+def init(apikey: str = typer.Option(None, "--key", help="API key for authentication")):
+    """Initialize blocks in the current directory."""
+    try:
+        warn_current_package_version()
+
+        # finds .blocks directory already inside or .blocks is below the current directory
+        blocks_dir = find_dir(target=".blocks")
+
+        if blocks_dir is not None:
+            if apikey:
+                console.print(f"[yellow]To change your API key, use [white]blocks configure --key {apikey}[/white][/yellow]")
+            raise AlreadyInitializedError(f"Blocks is already initialized: [white]{blocks_dir}[/white]")
+        else:
+                # We are in some other subdirectory
+            working_dir = Path.cwd()
+            try:
+                # Try to find the root of the directory if git is initialized
+                repo = git.Repo(search_parent_directories=True)
+                working_dir = repo.working_dir
+            except Exception as e:
+                pass
+
+            # working_dir is equal to root of the directory or the current directory if git is not initialized
+            working_dir = Path(working_dir)
+            blocks_dir = working_dir / ".blocks"
+            if not blocks_dir.exists():
+                blocks_dir.mkdir()
+                console.print(f"[green]Created [white].blocks[/white] folder: [white]{blocks_dir}[/white][/green]")
+            else:
+                if apikey:
+                    console.print(f"[yellow]To change your API key, use [white]blocks configure --key {apikey}[/white][/yellow]")
+                raise AlreadyInitializedError(f"[yellow]Blocks is already initialized: [white]{blocks_dir}[/white][/yellow]")
+
+        # Verify and save API key if provided
+        if apikey:
+            with Progress(
+                SpinnerColumn(),
+                TextColumn("[progress.description]{task.description}"),
+                transient=False,
+            ) as progress:
+                api_task = progress.add_task(description="Verifying API key...", total=None, style="blue")
+
+                response = api_client.get(f"{config.clients.client_url}/v1/apikeys/{apikey}", headers={
+                    "Authorization": f"ApiKey {apikey}"
+                })
+
+                if response.status_code > 299:
+                    raise Exception("API Key is invalid. Please check your API key at [white]https://app.blocksorg.com[/white]")
+                
+                config.auth.save_api_key(apikey)
+                last_digits = apikey[-8:]
+                progress.update(api_task, description=f"[green]API key verified and saved successfully [italic][dim]...{last_digits}[/dim][/italic][/green]")
+                progress.refresh()
+
+        console.print("[green]Blocks has been successfully initialized.[/green]")
+
+    except AlreadyInitializedError as e:
+        console.print(f"[yellow]{str(e)}[/yellow]")
+        raise typer.Exit(code=0)
+    except Exception as e:
+        console.print(f"[red]{str(e)}[/red]")
+        raise typer.Exit(code=1)

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

@@ -2,8 +2,9 @@ import git
 import typer
 import importlib.util
 import sys
-from pathlib import Path
+import re
 
+from pathlib import Path
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
 from blocks_cli.console import console
@@ -28,6 +29,32 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
         ) as init_progress:
             init_task = init_progress.add_task(description="Initializing...", total=None)
 
+            state, _ = get_blocks_state_and_module_from_file(file)
+
+            if not state.automations:
+                raise Exception(f"No automations found in the specified file")
+
+            automation_names = []
+            try:
+                automation_names = [automation.get("task_kwargs",{})["name"] for automation in state.automations]
+            except Exception as e:
+                raise Exception("Automations must have a name defined in the [white]@task[/white] decorator")
+
+            for automation_name in automation_names:
+                is_valid = re.match(r"^[a-zA-Z0-9][a-zA-Z0-9_-]*$", automation_name)
+                if is_valid is None:
+                    raise Exception(f"[red]Automation [white]'{automation_name}'[/white] is not a valid name. Automation names must start with a letter or number and can only contain letters, numbers, dashes, and underscores.[/red]")
+
+            trigger_aliases = []
+            try:
+                trigger_aliases = [automation.get("trigger_alias") for automation in state.automations]
+            except Exception as e:
+                raise Exception("Event must be defined in the [white]@on[/white] decorator")
+
+            for trigger_alias in trigger_aliases:
+                if trigger_alias is None or trigger_alias == "":
+                    raise Exception(f"Event [white]'{trigger_alias}'[/white] is not a valid. For a list of supported events, please visit [white]https://docs.blocksorg.com/docs/events[/white]")
+
             # working directory from where the command was invoked
             cwd = file.resolve().parent
 
@@ -57,9 +84,7 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
             )
 
             # get pip dependencies
-
             pip_dependencies = []
-            
             if Path(requirements_path).exists():
                 with open(requirements_path, "r") as f:
                     pip_dependencies = f.read().splitlines()
@@ -68,8 +93,6 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
                 init_task, total=1, description="Collecting automations..."
             )
 
-            state, _ = get_blocks_state_and_module_from_file(file)
-
         # Construct payload
         with Progress(
             SpinnerColumn(),
@@ -161,10 +184,16 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
             image_id = res.json().get("image_id")
             is_build_triggered = res.json().get("is_build_triggered")
             if is_build_triggered:
-                build_status = poll_build_status(image_id, build_id)
-                build_progress.update(
-                    build_task, total=1, description="Build completed successfully"
-                )
+                try:
+                    poll_build_status(image_id, build_id)
+                    build_progress.update(
+                        build_task, total=1, description="Build succeeded"
+                    )
+                except Exception as 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"
+                    )
+                    raise typer.Exit(1)
     except Exception as e:
-        console.print(f"[red] Error pushing automation: {str(e)}[/red]")
+        console.print(f"[red]{str(e)}[/red]")
         raise typer.Exit(1)

{blocks-cli-0.1.24 → blocks-cli-0.1.25}/blocks_cli/commands/test.py

@@ -26,6 +26,8 @@ def invoke_automation_with_test_event(automation_module, automation):
         transient=False,
     ) as test_event_progress:
         test_event_task = test_event_progress.add_task(description="Preparing automation...", total=None)
+        if trigger_alias is None or trigger_alias == "":
+            raise Exception("Event must be defined in the [white]@on[/white] decorator. For a list of supported events, please visit [white]https://docs.blocksorg.com/docs/events[/white]")
         res = api_client.get(f"{config.clients.client_url}/v1/test_events", params={
             "trigger_alias": trigger_alias,
         })
@@ -35,18 +37,17 @@ def invoke_automation_with_test_event(automation_module, automation):
     event_response = res.json()
     event_data = event_response.get("event_data")
 
-    console.print(f"Invoking automation [green]{automation_name}[/green] with event [green]{trigger_alias}[/green]")
+    console.print(f"[blue]Invoking automation [white]{automation_name}[/white] with event [white]{trigger_alias}[/white][/blue]")
     console.print(
-        Rule("Automation Logs", characters="=", style="white")
+        Rule("BEGIN Automation Logs", characters="=", style="blue")
     )
 
     res = function(event_data)
-
     console.print(
-        Rule("[bold grey]END Automation Logs[/bold grey]", characters="=", style="white")
+        Rule("END Automation Logs", characters="=", style="blue")
     )
 
-    console.print(f"Automation [green]{automation_name}[/green] invoked successfully")
+    console.print(f"[green]Automation [white]{automation_name}[/white] invoked successfully[/green]")
 
        
 
@@ -72,17 +73,17 @@ def test(
             invoke_automation_with_test_event(automation_module, automation)
 
         elif num_automations > 1 and not name:
-            raise Exception("[yellow]Multiple automations found in the file, please specify which one to test with the [white]--name[/white] flag.[/yellow]")
+            raise Exception("Multiple automations found in the file, please specify which one to test with the [white]--name[/white] flag.")
         elif num_automations > 1 and name:
             # find in automations
             automation = next((a for a in automations if a.get("task_kwargs",{}).get("name") == name), None)
             if not automation:
-                raise Exception(f"[yellow]Automation with name [white]{name}[/white] not found.[/yellow]")
+                raise Exception(f"Automation with name [white]{name}[/white] not found.")
             
             invoke_automation_with_test_event(automation_module, automation)
         else:
-            raise Exception("[yellow]No valid automations found in the specified file.[/yellow]")
+            raise Exception("No valid automations found in the specified file.")
         
     except Exception as e:
-        console.print(f"[red]Error: {e}[/red]")
+        console.print(f"[red]{e}[/red]")
         raise typer.Exit(1)

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

@@ -17,7 +17,7 @@ class AuthConfig(BaseModel):
         # Allow only base64url characters (alphanumeric, '-', '_', and '=')
         # This prevents invalid characters from blowing up the config file
         if re.search(r'[^a-zA-Z0-9\-_=]', api_key):
-            raise ValueError("Invalid API key supplied. Please check your API key at [link=https://app.blocksorg.com]https://app.blocksorg.com[/link]")
+            raise ValueError("Invalid API key supplied. Please check your API key at [white]https://app.blocksorg.com[/white]")
 
         config_file = Config.get_config_file()
 

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

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

blocks-cli-0.1.24/blocks_cli/builds.py

@@ -1,11 +0,0 @@
-import time
-
-from blocks_cli.api import api_client
-from blocks_cli.config.config import config
-
-def poll_build_status(image_id: str, build_id: str):
-    build_completed = False
-    while not build_completed:
-        res = api_client.get(f"{config.clients.orchestrator_url}/v1/images/{image_id}/builds/{build_id}")
-        build_completed = res.json().get("is_completed")
-        time.sleep(1)

blocks-cli-0.1.24/blocks_cli/commands/init.py

@@ -1,63 +0,0 @@
-import git
-import typer
-from pathlib import Path
-
-from rich.progress import Progress, SpinnerColumn, TextColumn
-
-from blocks_cli.api import api_client
-from blocks_cli.commands.__base__ import blocks_cli
-from blocks_cli.package import warn_current_package_version
-from blocks_cli.config.config import config
-from blocks_cli.console import console
-
-@blocks_cli.command()
-def init(apikey: str = typer.Option(None, "--key", help="API key for authentication")):
-    """Initialize blocks in the current directory."""
-    try:
-        warn_current_package_version()
-
-        with Progress(
-            SpinnerColumn(),
-            TextColumn("[progress.description]{task.description}"),
-            transient=False,
-        ) as progress:
-
-            working_dir = Path.cwd()
-            try:
-                repo = git.Repo(search_parent_directories=True)
-                working_dir = repo.working_dir
-            except Exception as e:
-                pass
-
-            working_dir = Path(working_dir)
-
-            # Create .blocks directory if it doesn't exist
-            blocks_dir = working_dir / ".blocks"
-
-            if not blocks_dir.exists():
-                blocks_dir.mkdir()
-                folder_task = progress.add_task(description="Creating .blocks folder...", total=None)
-                progress.update(folder_task, description="[green]Created .blocks folder[/green]")
-
-            progress.refresh()
-
-            # Verify and save API key if provided
-            if apikey:
-                api_task = progress.add_task(description="Verifying API key...", total=None)
-
-                response = api_client.get(f"{config.clients.client_url}/v1/apikeys/{apikey}", headers={
-                    "Authorization": f"ApiKey {apikey}"
-                })
-
-                if response.status_code > 299:
-                    raise Exception("API Key is invalid. Please check your API key at [link=https://app.blocksorg.com]https://app.blocksorg.com[/link]")
-                
-                config.auth.save_api_key(apikey)
-                progress.update(api_task, description="[green]API key verified and saved successfully[/green]")
-                progress.refresh()
-
-        console.print("[green]Blocks has been successfully initialized.[/green]")
-
-    except Exception as e:
-        console.print(f"[red]Error initializing blocks: {str(e)}[/red]")
-        raise typer.Exit(code=1)