labtasker 0.2.3__tar.gz → 0.2.5__tar.gz

labtasker-0.2.5/.gitmodules

@@ -0,0 +1,8 @@
+[submodule "plugins/labtasker_plugin_task_count"]
+	path = plugins/labtasker_plugin_task_count
+	url = https://github.com/luocfprime/labtasker-plugin-task-count.git
+	branch = main
+[submodule "plugins/labtasker_plugin_script_generate"]
+	path = plugins/labtasker_plugin_script_generate
+	url = https://github.com/luocfprime/labtasker-plugin-script-generate.git
+	branch = main

{labtasker-0.2.3 → labtasker-0.2.5}/.pre-commit-config.yaml

@@ -12,11 +12,11 @@ repos:
         args: [ --fix=lf ]
 
   - repo: https://github.com/psf/black
-    rev: 24.8.0
+    rev: 25.1.0
     hooks:
       - id: black
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort

{labtasker-0.2.3 → labtasker-0.2.5}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: labtasker
-Version: 0.2.3
+Version: 0.2.5
 Summary: A task queue system for lab experiments
 Author-email: Your Name <your.email@example.com>
 License: Apache License 2.0
-Project-URL: Homepage, https://github.com/fkcptlst/labtasker
-Project-URL: Documentation, https://fkcptlst.github.io/labtasker
-Project-URL: Repository, https://github.com/fkcptlst/labtasker.git
+Project-URL: Homepage, https://github.com/luocfprime/labtasker
+Project-URL: Documentation, https://luocfprime.github.io/labtasker
+Project-URL: Repository, https://github.com/luocfprime/labtasker.git
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
@@ -42,6 +42,7 @@ Requires-Dist: stamina<26.0.0,>=25.1.0
 Requires-Dist: noneprompt<0.2.0,>=0.1.9
 Requires-Dist: mongomock<4.4.0,>=4.3.0
 Requires-Dist: jsonpickle<5.0.0,>=4.0.2
+Requires-Dist: mslex<2.0.0,>=1.3.0
 Provides-Extra: dev
 Requires-Dist: pytest<9.0.0,>=8.0.0; extra == "dev"
 Requires-Dist: pytest-cov<7.0.0,>=5.0.0; extra == "dev"
@@ -52,9 +53,9 @@ Requires-Dist: flake8<8.0.0,>=7.0.0; extra == "dev"
 Requires-Dist: pre-commit<5.0.0,>=3.0.0; extra == "dev"
 Requires-Dist: freezegun<2.0.0,>=1.5.0; extra == "dev"
 Requires-Dist: pytest-docker<4.0.0,>=3.0.0; extra == "dev"
-Requires-Dist: pytest-asyncio<0.26.0,>=0.24.0; extra == "dev"
+Requires-Dist: pytest-asyncio<0.27.0,>=0.24.0; extra == "dev"
 Requires-Dist: asgi-lifespan<3.0.0,>=2.1.0; extra == "dev"
-Requires-Dist: tox<4.25.0,>=4.24.0; extra == "dev"
+Requires-Dist: tox<4.26.0,>=4.24.0; extra == "dev"
 Requires-Dist: pytest-dependency<0.7.0,>=0.6.0; extra == "dev"
 Requires-Dist: pytest-sugar<2.0.0,>=1.0.0; extra == "dev"
 Provides-Extra: doc
@@ -63,15 +64,16 @@ Requires-Dist: mkdocs-glightbox<0.5.0,>=0.4.0; extra == "doc"
 Requires-Dist: mike<2.2.0,>=2.1.3; extra == "doc"
 Provides-Extra: plugins
 Requires-Dist: labtasker-plugin-task-count; extra == "plugins"
+Requires-Dist: labtasker-plugin-script-generate; extra == "plugins"
 Dynamic: license-file
 
 <p align="center"><em>Make your ML experiment wrapper scripts smarter with...</em></p>
 <h1 align="center" style="font-size: 40px;"> <a href="">Labtasker</a></h1>
-<p align="center"><a href="https://fkcptlst.github.io/labtasker/latest/install/install/">Install</a> • <a href="https://fkcptlst.github.io/labtasker/latest/guide/basic/">Tutorial / Demo</a> • <a href="https://fkcptlst.github.io/labtasker/latest/">Documentation</a> • <a href="https://fkcptlst.github.io/labtasker/latest/faq/">FAQs</a> • <a href="https://github.com/fkcptlst/labtasker/releases">Releases</a></p>
+<p align="center"><a href="https://luocfprime.github.io/labtasker/latest/install/install/">Install</a> • <a href="https://luocfprime.github.io/labtasker/latest/guide/basic/">Tutorial / Demo</a> • <a href="https://luocfprime.github.io/labtasker/latest/">Documentation</a> • <a href="https://luocfprime.github.io/labtasker/latest/faq/">FAQs</a> • <a href="https://github.com/luocfprime/labtasker/releases">Releases</a></p>
 
 <p align="center">
-  <img src="https://github.com/fkcptlst/labtasker/actions/workflows/unit-test-matrix.yml/badge.svg" alt="unit-test-matrix" />
-  <a href="https://codecov.io/gh/fkcptlst/labtasker"><img src="https://codecov.io/gh/fkcptlst/labtasker/graph/badge.svg?token=KQFBV3QRPY" alt="codecov" /></a>
+  <img src="https://github.com/luocfprime/labtasker/actions/workflows/unit-test-matrix.yml/badge.svg" alt="unit-test-matrix" />
+  <a href="https://codecov.io/gh/luocfprime/labtasker"><img src="https://codecov.io/gh/luocfprime/labtasker/graph/badge.svg?token=KQFBV3QRPY" alt="codecov" /></a>
   <img src="https://img.shields.io/badge/Python-3.8%20|%203.9%20|%203.10%20|%203.11%20|%203.12%20|%203.13-blue" alt="Python version" />
   <a href="https://pypi.org/project/labtasker/"><img src="https://img.shields.io/pypi/v/labtasker" alt="PyPI" /></a>
 </p>
@@ -89,7 +91,7 @@ parallelization, dynamic task prioritization, failure handling, halfway resume,
 
 ![comparison](docs/docs/assets/comparison.png)
 
-🐳 For detailed examples and concepts, check out the [documentation](https://fkcptlst.github.io/labtasker/).
+🐳 For detailed examples and concepts, check out the [documentation](https://luocfprime.github.io/labtasker/).
 
 ## 🧪️ A Quick Demo
 
@@ -100,7 +102,8 @@ such as sending emails on task failure.
 
 ![demo](docs/docs/assets/gifs/demo.gif)
 
-For more detailed steps, please refer to the content in the [Tutorial / Demo](https://fkcptlst.github.io/labtasker/latest/guide/basic/).
+For more detailed steps, please refer to the content in
+the [Tutorial / Demo](https://luocfprime.github.io/labtasker/latest/guide/basic/).
 
 ## ⚡️ Features
 
@@ -112,30 +115,37 @@ For more detailed steps, please refer to the content in the [Tutorial / Demo](ht
 ## 🔮 Supercharge Your ML Experiments with Labtasker
 
 - ⚡️ **Effortless Parallelization:** Distribute tasks across multiple GPU workers with just a few lines of code.
-- 🛡️ **Intelligent Failure Management:** Automatically capture exceptions, retry failed tasks, and maintain detailed error logs.
-- 🔄 **Seamless Recovery:** Resume failed experiments with a single command - no more scavenging through logs or directories.
-- 🎯 **Real-time Prioritization:** Changed your mind about experiment settings? Instantly cancel, add, or reschedule tasks without disrupting existing ones.
-- 🤖 **Workflow Automation:** Set up smart event triggers for email notifications or task workflow based on FSM transition events.
-- 📊 **Streamlined Logging:** All stdout/stderr automatically organized in `.labtasker/logs` - zero configuration required.
-- 🧩 **Extensible Plugin System:** Create custom command combinations or leverage community plugins to extend functionality.
+- 🛡️ **Intelligent Failure Management:** Automatically capture exceptions, retry failed tasks, and maintain detailed
+  error logs.
+- 🔄 **Seamless Recovery:** Resume failed experiments with a single command - no more scavenging through logs or
+  directories.
+- 🎯 **Real-time Prioritization:** Changed your mind about experiment settings? Instantly cancel, add, or reschedule
+  tasks without disrupting existing ones.
+- 🤖 **Workflow Automation:** Set up smart event triggers for email notifications or task workflow based on FSM
+  transition events.
+- 📊 **Streamlined Logging:** All stdout/stderr automatically organized in `.labtasker/logs` - zero configuration
+  required.
+- 🧩 **Extensible Plugin System:** Create custom command combinations or leverage community plugins to extend
+  functionality.
 
 ## 🛠️ Installation
 
 > [!NOTE]
 > You need a running Labtasker server to use the client tools.
 > Simply use the installed Python CLI `labtasker-server serve` or use docker-compose to deploy the server.
-> See [deployment instructions](https://fkcptlst.github.io/labtasker/latest/install/deployment/).
+> See [deployment instructions](https://luocfprime.github.io/labtasker/latest/install/deployment/).
 
 ### 1. Install via PyPI
 
 ```bash
-pip install labtasker
+# Install with optional bundled plugins
+pip install 'labtasker[plugins]'
 ```
 
 ### 2. Install the Latest Version from GitHub
 
 ```bash
-pip install git+https://github.com/fkcptlst/labtasker.git
+pip install git+https://github.com/luocfprime/labtasker.git
 ```
 
 ## 🚀 Quick Start
@@ -154,10 +164,14 @@ labtasker init
 
 Then, use `labtasker submit` to submit tasks and use `labtasker loop` to run tasks across any number of workers.
 
+> [!TIP]
+> If you think manually writing 2 scripts for submit and run is laborious, you can checkout the [labtasker-plugin-script-generate](https://github.com/luocfprime/labtasker-plugin-script-generate).
+> It automatically generate 2 scripts based on the script you provided.
+
 ## 📚 Documentation
 
 For detailed information on demo, tutorial, deployment, usage, please refer to
-the [documentation](https://fkcptlst.github.io/labtasker/).
+the [documentation](https://luocfprime.github.io/labtasker/).
 
 ## 🔒 License
 

{labtasker-0.2.3 → labtasker-0.2.5}/README.md

@@ -1,10 +1,10 @@
 <p align="center"><em>Make your ML experiment wrapper scripts smarter with...</em></p>
 <h1 align="center" style="font-size: 40px;"> <a href="">Labtasker</a></h1>
-<p align="center"><a href="https://fkcptlst.github.io/labtasker/latest/install/install/">Install</a> • <a href="https://fkcptlst.github.io/labtasker/latest/guide/basic/">Tutorial / Demo</a> • <a href="https://fkcptlst.github.io/labtasker/latest/">Documentation</a> • <a href="https://fkcptlst.github.io/labtasker/latest/faq/">FAQs</a> • <a href="https://github.com/fkcptlst/labtasker/releases">Releases</a></p>
+<p align="center"><a href="https://luocfprime.github.io/labtasker/latest/install/install/">Install</a> • <a href="https://luocfprime.github.io/labtasker/latest/guide/basic/">Tutorial / Demo</a> • <a href="https://luocfprime.github.io/labtasker/latest/">Documentation</a> • <a href="https://luocfprime.github.io/labtasker/latest/faq/">FAQs</a> • <a href="https://github.com/luocfprime/labtasker/releases">Releases</a></p>
 
 <p align="center">
-  <img src="https://github.com/fkcptlst/labtasker/actions/workflows/unit-test-matrix.yml/badge.svg" alt="unit-test-matrix" />
-  <a href="https://codecov.io/gh/fkcptlst/labtasker"><img src="https://codecov.io/gh/fkcptlst/labtasker/graph/badge.svg?token=KQFBV3QRPY" alt="codecov" /></a>
+  <img src="https://github.com/luocfprime/labtasker/actions/workflows/unit-test-matrix.yml/badge.svg" alt="unit-test-matrix" />
+  <a href="https://codecov.io/gh/luocfprime/labtasker"><img src="https://codecov.io/gh/luocfprime/labtasker/graph/badge.svg?token=KQFBV3QRPY" alt="codecov" /></a>
   <img src="https://img.shields.io/badge/Python-3.8%20|%203.9%20|%203.10%20|%203.11%20|%203.12%20|%203.13-blue" alt="Python version" />
   <a href="https://pypi.org/project/labtasker/"><img src="https://img.shields.io/pypi/v/labtasker" alt="PyPI" /></a>
 </p>
@@ -22,7 +22,7 @@ parallelization, dynamic task prioritization, failure handling, halfway resume,
 
 ![comparison](docs/docs/assets/comparison.png)
 
-🐳 For detailed examples and concepts, check out the [documentation](https://fkcptlst.github.io/labtasker/).
+🐳 For detailed examples and concepts, check out the [documentation](https://luocfprime.github.io/labtasker/).
 
 ## 🧪️ A Quick Demo
 
@@ -33,7 +33,8 @@ such as sending emails on task failure.
 
 ![demo](docs/docs/assets/gifs/demo.gif)
 
-For more detailed steps, please refer to the content in the [Tutorial / Demo](https://fkcptlst.github.io/labtasker/latest/guide/basic/).
+For more detailed steps, please refer to the content in
+the [Tutorial / Demo](https://luocfprime.github.io/labtasker/latest/guide/basic/).
 
 ## ⚡️ Features
 
@@ -45,30 +46,37 @@ For more detailed steps, please refer to the content in the [Tutorial / Demo](ht
 ## 🔮 Supercharge Your ML Experiments with Labtasker
 
 - ⚡️ **Effortless Parallelization:** Distribute tasks across multiple GPU workers with just a few lines of code.
-- 🛡️ **Intelligent Failure Management:** Automatically capture exceptions, retry failed tasks, and maintain detailed error logs.
-- 🔄 **Seamless Recovery:** Resume failed experiments with a single command - no more scavenging through logs or directories.
-- 🎯 **Real-time Prioritization:** Changed your mind about experiment settings? Instantly cancel, add, or reschedule tasks without disrupting existing ones.
-- 🤖 **Workflow Automation:** Set up smart event triggers for email notifications or task workflow based on FSM transition events.
-- 📊 **Streamlined Logging:** All stdout/stderr automatically organized in `.labtasker/logs` - zero configuration required.
-- 🧩 **Extensible Plugin System:** Create custom command combinations or leverage community plugins to extend functionality.
+- 🛡️ **Intelligent Failure Management:** Automatically capture exceptions, retry failed tasks, and maintain detailed
+  error logs.
+- 🔄 **Seamless Recovery:** Resume failed experiments with a single command - no more scavenging through logs or
+  directories.
+- 🎯 **Real-time Prioritization:** Changed your mind about experiment settings? Instantly cancel, add, or reschedule
+  tasks without disrupting existing ones.
+- 🤖 **Workflow Automation:** Set up smart event triggers for email notifications or task workflow based on FSM
+  transition events.
+- 📊 **Streamlined Logging:** All stdout/stderr automatically organized in `.labtasker/logs` - zero configuration
+  required.
+- 🧩 **Extensible Plugin System:** Create custom command combinations or leverage community plugins to extend
+  functionality.
 
 ## 🛠️ Installation
 
 > [!NOTE]
 > You need a running Labtasker server to use the client tools.
 > Simply use the installed Python CLI `labtasker-server serve` or use docker-compose to deploy the server.
-> See [deployment instructions](https://fkcptlst.github.io/labtasker/latest/install/deployment/).
+> See [deployment instructions](https://luocfprime.github.io/labtasker/latest/install/deployment/).
 
 ### 1. Install via PyPI
 
 ```bash
-pip install labtasker
+# Install with optional bundled plugins
+pip install 'labtasker[plugins]'
 ```
 
 ### 2. Install the Latest Version from GitHub
 
 ```bash
-pip install git+https://github.com/fkcptlst/labtasker.git
+pip install git+https://github.com/luocfprime/labtasker.git
 ```
 
 ## 🚀 Quick Start
@@ -87,10 +95,14 @@ labtasker init
 
 Then, use `labtasker submit` to submit tasks and use `labtasker loop` to run tasks across any number of workers.
 
+> [!TIP]
+> If you think manually writing 2 scripts for submit and run is laborious, you can checkout the [labtasker-plugin-script-generate](https://github.com/luocfprime/labtasker-plugin-script-generate).
+> It automatically generate 2 scripts based on the script you provided.
+
 ## 📚 Documentation
 
 For detailed information on demo, tutorial, deployment, usage, please refer to
-the [documentation](https://fkcptlst.github.io/labtasker/).
+the [documentation](https://luocfprime.github.io/labtasker/).
 
 ## 🔒 License
 

{labtasker-0.2.3 → labtasker-0.2.5}/docker-compose.yml

@@ -58,7 +58,7 @@ services:
       context: .
       dockerfile: Dockerfile
       network: host
-    image: ghcr.io/fkcptlst/labtasker-api
+    image: ghcr.io/luocfprime/labtasker-api
     container_name: labtasker-api
     environment:
       - DB_USER=${DB_USER}

{labtasker-0.2.3 → labtasker-0.2.5}/labtasker/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.3"
+__version__ = "0.2.5"
 
 from labtasker.client.client_api import *
 from labtasker.client.core.config import get_client_config

{labtasker-0.2.3 → labtasker-0.2.5}/labtasker/api_models.py

@@ -206,7 +206,7 @@ class TaskFetchResponse(BaseResponseModel):
 
 class TaskLsRequest(BaseRequestModel):
     offset: int = Field(0, ge=0)
-    limit: int = Field(100, ge=0, le=1000)
+    limit: int = Field(100, gt=0, le=1000)
     task_id: Optional[str] = None
     task_name: Optional[str] = None
     status: Optional[str] = Field(
@@ -268,7 +268,7 @@ class WorkerStatusUpdateRequest(BaseRequestModel):
 
 class WorkerLsRequest(BaseRequestModel):
     offset: int = Field(0, ge=0)
-    limit: int = Field(100, ge=0, le=1000)
+    limit: int = Field(100, gt=0, le=1000)
     worker_id: Optional[str] = None
     worker_name: Optional[str] = None
     status: Optional[str] = Field(None, pattern=r"^(active|suspended|crashed)$")

{labtasker-0.2.3 → labtasker-0.2.5}/labtasker/client/cli/loop.py

@@ -1,17 +1,14 @@
 """Implements `labtasker loop xxx`"""
 
 import json
-import os
-import shlex
 import subprocess
+import sys
 from collections import defaultdict
 from typing import List, Optional
 
 import typer
 from typing_extensions import Annotated
 
-import labtasker
-import labtasker.client.core.context
 from labtasker.client.cli.cli import app
 from labtasker.client.core.cli_utils import (
     cli_utils_decorator,
@@ -20,8 +17,9 @@ from labtasker.client.core.cli_utils import (
 )
 from labtasker.client.core.cmd_parser import cmd_interpolate
 from labtasker.client.core.config import get_client_config
-from labtasker.client.core.exceptions import CmdParserError
-from labtasker.client.core.job_runner import finish, loop_run
+from labtasker.client.core.context import task_info
+from labtasker.client.core.exceptions import CmdParserError, _LabtaskerJobFailed
+from labtasker.client.core.job_runner import loop_run
 from labtasker.client.core.logging import (
     logger,
     set_verbose,
@@ -56,9 +54,15 @@ def loop(
     ] = None,
     option_cmd: str = typer.Option(
         None,
-        "--cmd",
+        "--command",
+        "--command",
         "-c",
-        help="Alternative way to specify the command to run. Supports the same argument interpolation the same way as the positional argument. Except you need to quote the entire command.",
+        help="Specify the command to run with shell=True. Supports the same argument interpolation the same way as the positional argument. Except you need to quote the entire command.",
+    ),
+    executable: Optional[str] = typer.Option(
+        None,
+        "--executable",
+        help="Specify the shell executable to run the command with.",
     ),
     extra_filter: Optional[str] = typer.Option(
         None,
@@ -99,13 +103,17 @@ def loop(
     """
     if cmd and option_cmd:
         raise typer.BadParameter(
-            "Only one of [CMD] and [--cmd] can be specified. Please use one of them."
+            "Only one of [CMD] and [--command] can be specified. Please use one of them."
         )
 
-    cmd = cmd if cmd else shlex.split(option_cmd, posix=(os.name == "posix"))
+    cmd = cmd if cmd else option_cmd
+    if not cmd and not sys.stdin.isatty():
+        # try reading multi-line cmd from stdin if shell mode
+        cmd = sys.stdin.read()
+
     if not cmd:
         raise typer.BadParameter(
-            "Command cannot be empty. Either specify via positional argument [CMD] or `--cmd`."
+            "Command cannot be empty. Either specify via positional argument [CMD] or `--command`."
         )
 
     parsed_filter = parse_filter(extra_filter)
@@ -145,11 +153,17 @@ def loop(
         )
         logger.info(f"Prepared to run interpolated command: {interpolated_cmd}")
 
+        use_shell = False
+        if isinstance(interpolated_cmd, str):
+            use_shell = True
+
         with subprocess.Popen(
             args=interpolated_cmd,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
+            executable=executable,
+            shell=use_shell,
         ) as process:
             while True:
                 output = process.stdout.readline()
@@ -166,11 +180,11 @@ def loop(
 
             process.wait()
             if process.returncode != 0:
-                finish("failed")
-            else:
-                finish("success")
+                raise _LabtaskerJobFailed(
+                    "Job process finished with non-zero exit code."
+                )
 
-        logger.info(f"Task {labtasker.client.core.context.task_info().task_id} ended.")
+        logger.info(f"Task {task_info().task_id} ended.")
 
     run_cmd()
 

{labtasker-0.2.3 → labtasker-0.2.5}/labtasker/client/cli/task.py

@@ -3,6 +3,7 @@
 import io
 import json
 import os
+import sys
 import tempfile
 from functools import partial
 from pathlib import Path
@@ -51,6 +52,10 @@ from labtasker.constants import Priority
 app = typer.Typer()
 
 
+class _ReEdit(Exception):
+    pass
+
+
 def commented_seq_from_dict_list(
     entries: List[Dict[str, Any]],
 ) -> ruamel.yaml.CommentedSeq:
@@ -373,6 +378,10 @@ def update(
         help="Updated values of fields. Specify multiple options via repeating `-u`. "
         "E.g. `labtasker task update -u args.arg1=foo -u metadata.tag=test`",
     ),
+    limit: int = typer.Option(
+        1000,
+        help="Limit the number of tasks returned.",
+    ),
     offset: int = typer.Option(
         0,
         help="Initial offset for pagination (In case there are too many items for update, only 1000 results starting from offset is displayed. "
@@ -441,7 +450,7 @@ def update(
         task_name=task_name,
         status=status,
         extra_filter=extra_filter,
-        limit=1000,
+        limit=limit,
         offset=offset,
     ).content
     use_editor = not updates
@@ -495,6 +504,22 @@ def handle_editor_mode(old_tasks, readonly_fields, editor):
                 with open(temp_file_path, "r", encoding="utf-8") as temp_file:
                     modified = yaml.safe_load(temp_file)
 
+                # check if length match
+                if len(modified) != len(old_tasks_primitive):
+                    raise _ReEdit(
+                        "Number of tasks in the file should match the number of tasks in the original list. "
+                        f"Expected {len(old_tasks_primitive)}, got {len(modified)}. "
+                        "If you want to add/delete tasks, you should use `labtasker task submit` or `labtasker task delete`."
+                    )
+
+                # check if task order match
+                for mod, old in zip(modified, old_tasks_primitive):
+                    if mod["task_id"] != old["task_id"]:
+                        raise _ReEdit(
+                            "Task IDs in the modified file should match the task IDs in the original list in the same order. "
+                            f"Expected {old['task_id']}, got {mod['task_id']}."
+                        )
+
                 # Calculate diffs and create task updates
                 update_dicts = diff(
                     old_tasks_primitive, modified, readonly_fields=list(readonly_fields)
@@ -538,8 +563,8 @@ def handle_editor_mode(old_tasks, readonly_fields, editor):
                     # No validation errors, we can break the loop
                     break
 
-            except yaml.error.YAMLError as e:
-                stderr_console.print(f"[bold red]YAML Error:[/bold red] {str(e)}")
+            except (_ReEdit, yaml.error.YAMLError) as e:
+                stderr_console.print(f"[bold red]Error:[/bold red] {str(e)}")
                 if not typer.confirm("Continue to edit?", default=True):
                     raise typer.Abort()
                 # Continue the loop with the current file state
@@ -607,7 +632,9 @@ def display_updated_tasks(updated_tasks, update_dicts):
             # If replace_fields is empty or not available, try to infer from the update
             if not modified_fields:
                 modified_fields = [
-                    k for k in update_dict.keys() if k not in ("_id", "replace_fields")
+                    k
+                    for k in update_dict.keys()
+                    if k not in ("_id", "task_id", "replace_fields")
                 ]
 
             # Add comment for each modified field
@@ -634,7 +661,10 @@ def display_updated_tasks(updated_tasks, update_dicts):
 @app.command()
 @cli_utils_decorator
 def delete(
-    task_id: str = typer.Argument(..., help="ID of the task to delete."),
+    task_ids: List[str] = typer.Argument(
+        ... if sys.stdin.isatty() else None,
+        help="IDs of the task to delete.",
+    ),
     yes: bool = typer.Option(False, "--yes", "-y", help="Skip confirmation prompt."),
 ):
     """
@@ -647,14 +677,17 @@ def delete(
         labtasker task delete task-123
         labtasker task delete task-123 --yes  # Skip confirmation
     """
+    if task_ids is None:  # read from stdin to support piping
+        task_ids = [line.strip() for line in sys.stdin.readlines() if line.strip()]
     if not yes:
         typer.confirm(
-            f"Are you sure you want to delete task '{task_id}'?",
+            f"Are you sure you want to delete tasks '{task_ids}'?",
             abort=True,
         )
     try:
-        delete_task(task_id=task_id)
-        stdout_console.print(f"Task {task_id} deleted.")
+        for task_id in task_ids:
+            delete_task(task_id=task_id)
+            stdout_console.print(f"Task {task_id} deleted.")
     except LabtaskerHTTPStatusError as e:
         if e.response.status_code == HTTP_404_NOT_FOUND:
             raise typer.BadParameter("Task not found")

{labtasker-0.2.3 → labtasker-0.2.5}/labtasker/client/cli/worker.py

@@ -1,8 +1,9 @@
 """Manage workers (CRUD operations)."""
 
 import json
+import sys
 from functools import partial
-from typing import Optional
+from typing import List, Optional
 
 import click
 import typer
@@ -206,7 +207,9 @@ def report(
 @app.command()
 @cli_utils_decorator
 def delete(
-    worker_id: str = typer.Argument(..., help="ID of the worker to delete."),
+    worker_ids: List[str] = typer.Argument(
+        ... if sys.stdin.isatty() else None, help="IDs of the worker to delete."
+    ),
     cascade_update: bool = typer.Option(
         True,
         help="Whether to cascade set the worker id of relevant tasks to None",
@@ -216,14 +219,17 @@ def delete(
     """
     Delete a worker by worker_id.
     """
+    if worker_ids is None:  # read from stdin to support piping
+        worker_ids = [line.strip() for line in sys.stdin.readlines() if line.strip()]
     if not yes:
         typer.confirm(
-            f"Are you sure you want to delete worker '{worker_id}'?",
+            f"Are you sure you want to delete worker '{worker_ids}'?",
             abort=True,
         )
     try:
-        delete_worker(worker_id=worker_id, cascade_update=cascade_update)
-        stdout_console.print(f"Worker {worker_id} deleted.")
+        for worker_id in worker_ids:
+            delete_worker(worker_id=worker_id, cascade_update=cascade_update)
+            stdout_console.print(f"Worker {worker_id} deleted.")
     except LabtaskerHTTPStatusError as e:
         if e.response.status_code == HTTP_404_NOT_FOUND:
             raise typer.BadParameter("Worker not found")

{labtasker-0.2.3 → labtasker-0.2.5}/labtasker/client/core/cli_utils.py

@@ -12,7 +12,7 @@ import httpx
 import pydantic
 import typer
 import yaml
-from noneprompt import CancelledError, Choice, ListPrompt
+from noneprompt import Choice, ListPrompt
 from prompt_toolkit import Application
 from prompt_toolkit.layout import Float, FloatContainer, Layout, Window
 from prompt_toolkit.layout.controls import FormattedTextControl
@@ -543,11 +543,17 @@ class TimedListPrompt(ListPrompt):
     """A ListPrompt with countdown and timeout functionality."""
 
     def __init__(
-        self, *args, timeout: int = 10, default: Optional[Choice] = None, **kwargs
+        self,
+        *args,
+        timeout: int = 10,
+        default: Optional[Choice] = None,
+        keyboard_interrupt_default: Optional[Choice] = None,
+        **kwargs,
     ):
         super().__init__(*args, **kwargs)
         self.timeout = timeout
         self.default = default
+        self.keyboard_interrupt_default = keyboard_interrupt_default
         self.countdown_text = [
             ("class:countdown", "TIMER: "),
             ("class:countdown-emphasis", f"{timeout}"),
@@ -604,32 +610,32 @@ class TimedListPrompt(ListPrompt):
         app = self._build_application(no_ansi=False, style=Style([]))
         countdown_task = asyncio.create_task(self._run_countdown(app))
 
-        try:
-            result = await app.run_async()
-            countdown_task.cancel()
-            if result is not None and not isinstance(result, type(...)):
-                return result
-            if self.default is not None:
-                return self.default
-            raise CancelledError("No answer selected!")
-        except (asyncio.CancelledError, KeyboardInterrupt):
-            return None
+        result = await app.run_async()
+        countdown_task.cancel()
+        if result is None:  # timed out
+            return self.default
+        elif isinstance(result, type(...)):  # keyboard interrupt
+            return self.keyboard_interrupt_default
+        else:
+            return result
 
 
 def make_a_choice(
-    question: str, options: List[Choice], default: Choice, timeout: int = 10
+    question: str,
+    options: List[Choice],
+    default: Choice,
+    keyboard_interrupt_default: Choice,
+    timeout: int = 10,
 ) -> Optional[Choice]:
     """Helper function to create and run a timed choice prompt."""
     prompt = TimedListPrompt(
-        question, choices=options, timeout=timeout, default=default
+        question,
+        choices=options,
+        timeout=timeout,
+        default=default,
+        keyboard_interrupt_default=keyboard_interrupt_default,
     )
-    try:
-        result = asyncio.run(prompt.prompt_async())
-        if isinstance(result, type(...)):
-            return default
-        return result
-    except KeyboardInterrupt:
-        return default
+    return asyncio.run(prompt.prompt_async())
 
 
 ls_format_iter = {