blocks-cli 0.1.26__tar.gz → 0.1.28__tar.gz

{blocks-cli-0.1.26 → blocks-cli-0.1.28}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: blocks-cli
-Version: 0.1.26
+Version: 0.1.28
 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
 Author-email: dev@blocksorg.com
 License: AGPL
-Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
@@ -68,4 +67,3 @@ def my_automation(event):
 blocks init --api-key <your-api-key>
 blocks push automation.py
 ```
-

{blocks-cli-0.1.26 → blocks-cli-0.1.28}/blocks_cli/commands/create.py

@@ -29,8 +29,8 @@ def create(
         warn_current_package_version()
 
         # Validate automation name (only allow alphanumeric, dash, and underscore)
-        if not name or re.search(r'[^a-zA-Z0-9\_]', name):
-            raise InvalidAutomationNameError("Automation name must contain only letters, numbers, and underscores")
+        if not name or re.search(r'[^a-zA-Z0-9\_-]', name) or name[0].isdigit():
+            raise InvalidAutomationNameError("Automation name cannot start with a number, and must contain only letters, numbers, dashes, and underscores")
 
         blocks_dir = find_dir(target=".blocks")
 
@@ -45,6 +45,8 @@ def create(
         try:
             # Create directory and files
             automation_dir.mkdir(parents=True)
+
+            function_name = name.replace("-", "_")
             
             # Create main.py with basic template
             with open(automation_dir / 'main.py', 'w') as f:
@@ -52,9 +54,9 @@ def create(
 
 @task(name="{name}")
 @on("", repos=[])
-def {name}(input):
+def {function_name}(input):
     print(input)
-'''.format(name=name))
+'''.format(name=name, function_name=function_name))
 
             sdk_version = get_latest_sdk_version()
             latest_version = sdk_version.get("latest_version")

{blocks-cli-0.1.26 → blocks-cli-0.1.28}/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:
@@ -127,16 +126,19 @@ def push(file: Path = typer.Argument(..., help="Name of blocks file to push.")):
 
                 function_name = automation.get("function_name")
                 function_source_code = automation.get("function_source_code")
+                config_schema = automation.get("config_schema")
                 trigger_alias = automation.get("trigger_alias")
 
                 # 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,
+                    "config_schema": config_schema,
                     "trigger_alias": trigger_alias,
                     "trigger_kwargs": {},
                     "task_kwargs": {},
@@ -145,7 +147,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.26 → blocks-cli-0.1.28}/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.26 → blocks-cli-0.1.28}/setup.py

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