labtasker-client 2.0.1__tar.gz → 2.2.0__tar.gz

{labtasker_client-2.0.1 → labtasker_client-2.2.0}/.gitignore

@@ -1,6 +1,7 @@
 .venv/
 .pytest_cache/
 .coverage
+coverage/
 coverage.xml
 htmlcov/
 .mypy_cache/
@@ -12,3 +13,6 @@ build/
 dist/
 site/
 .labtasker/
+.DS_Store
+.idea/
+tests/skill/runs/

{labtasker_client-2.0.1 → labtasker_client-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labtasker-client
-Version: 2.0.1
+Version: 2.2.0
 Summary: A small task queue for parallel model inference and evaluation
 Project-URL: Homepage, https://github.com/luocfprime/labtasker
 Project-URL: Repository, https://github.com/luocfprime/labtasker.git
@@ -8,6 +8,7 @@ Author-email: lcf <luocfprime@gmail.com>
 License-Expression: Apache-2.0
 License-File: LICENSE
 Requires-Python: >=3.11
-Requires-Dist: httpx<1,>=0.28
-Requires-Dist: pydantic<3,>=2.10
+Requires-Dist: httpx[socks]<1,>=0.28
+Requires-Dist: packaging<27,>=24
+Requires-Dist: pydantic<3,>=2.13.5
 Requires-Dist: typer<1,>=0.16

{labtasker_client-2.0.1 → labtasker_client-2.2.0}/pyproject.toml

@@ -1,18 +1,19 @@
 [build-system]
-requires = ["hatchling>=1.27"]
+requires = ["hatchling>=1.32.0"]
 build-backend = "hatchling.build"
 
 [project]
 name = "labtasker-client"
-version = "2.0.1"
+version = "2.2.0"
 description = "A small task queue for parallel model inference and evaluation"
 requires-python = ">=3.11"
 license = "Apache-2.0"
 license-files = ["LICENSE"]
 authors = [{ name = "lcf", email = "luocfprime@gmail.com" }]
 dependencies = [
-  "httpx>=0.28,<1",
-  "pydantic>=2.10,<3",
+  "httpx[socks]>=0.28,<1",
+  "packaging>=24,<27",
+  "pydantic>=2.13.5,<3",
   "typer>=0.16,<1",
 ]
 

{labtasker_client-2.0.1 → labtasker_client-2.2.0}/src/labtasker/__init__.py

@@ -3,12 +3,14 @@
 from labtasker.api import (
     cancel_task,
     count_tasks,
+    count_workers,
     create_queue,
     delete_queue,
     delete_task,
     get_task,
     list_queues,
     list_tasks,
+    list_workers,
     requeue_task,
     submit_task,
     update_task,
@@ -31,18 +33,31 @@ from labtasker.execution import (
     set_force_stop_timeout,
     task_info,
 )
-from labtasker.models import BulkUpdateResult, LastError, Queue, Task, TaskInfo, TaskPage
+from labtasker.models import (
+    BulkUpdateResult,
+    CountGroup,
+    GroupCountPage,
+    LastError,
+    Queue,
+    Task,
+    TaskInfo,
+    TaskPage,
+    WorkerObservation,
+    WorkerPage,
+)
 from labtasker.types import JSONValue, TaskOrderField, TaskStatus, TaskUpdate
 from labtasker.worker import loop
 
-__version__ = "2.0.1"
+__version__ = "2.2.0"
 
 __all__ = [
     "APIError",
     "BulkUpdateResult",
     "Client",
     "ConfigError",
+    "CountGroup",
     "FatalWorkerError",
+    "GroupCountPage",
     "JSONValue",
     "LabtaskerError",
     "LastError",
@@ -57,9 +72,12 @@ __all__ = [
     "TaskUpdate",
     "TransientError",
     "TransportError",
+    "WorkerObservation",
+    "WorkerPage",
     "cancel_task",
     "cancellation_requested",
     "count_tasks",
+    "count_workers",
     "create_queue",
     "delete_queue",
     "delete_task",
@@ -67,6 +85,7 @@ __all__ = [
     "get_task",
     "list_queues",
     "list_tasks",
+    "list_workers",
     "loop",
     "requeue_task",
     "set_force_stop_timeout",

{labtasker_client-2.0.1 → labtasker_client-2.2.0}/src/labtasker/api.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
+from collections.abc import Sequence
 from threading import Lock
+from typing import overload
 
 from labtasker.client import Client
-from labtasker.models import BulkUpdateResult, Queue, Task, TaskPage
+from labtasker.models import BulkUpdateResult, GroupCountPage, Queue, Task, TaskPage, WorkerPage
 from labtasker.types import JSONValue, TaskOrderField, TaskStatus, TaskUpdate
 
 _default_client: Client | None = None
@@ -41,6 +43,7 @@ def list_tasks(
     *,
     status: TaskStatus | None = None,
     name: str | None = None,
+    name_fuzzy: str | None = None,
     filter: str | None = None,
     order_by: TaskOrderField = "created_at",
     descending: bool = True,
@@ -51,6 +54,7 @@ def list_tasks(
     return _client().list_tasks(
         status=status,
         name=name,
+        name_fuzzy=name_fuzzy,
         filter=filter,
         order_by=order_by,
         descending=descending,
@@ -60,14 +64,108 @@ def list_tasks(
     )
 
 
+@overload
 def count_tasks(
     *,
     status: TaskStatus | None = None,
     name: str | None = None,
+    name_fuzzy: str | None = None,
     filter: str | None = None,
     queue: str | None = None,
-) -> int:
-    return _client().count_tasks(status=status, name=name, filter=filter, queue=queue)
+    group_by: None = None,
+    limit: int | None = None,
+    cursor: str | None = None,
+) -> int: ...
+
+
+@overload
+def count_tasks(
+    *,
+    status: TaskStatus | None = None,
+    name: str | None = None,
+    name_fuzzy: str | None = None,
+    filter: str | None = None,
+    queue: str | None = None,
+    group_by: Sequence[str],
+    limit: int | None = None,
+    cursor: str | None = None,
+) -> GroupCountPage: ...
+
+
+def count_tasks(
+    *,
+    status: TaskStatus | None = None,
+    name: str | None = None,
+    name_fuzzy: str | None = None,
+    filter: str | None = None,
+    queue: str | None = None,
+    group_by: Sequence[str] | None = None,
+    limit: int | None = None,
+    cursor: str | None = None,
+) -> int | GroupCountPage:
+    if group_by is None:
+        if limit is not None or cursor is not None:
+            from labtasker.validation import validate_grouping
+
+            validate_grouping(None, {"routes", "status"}, limit, cursor)
+        return _client().count_tasks(
+            status=status, name=name, name_fuzzy=name_fuzzy, filter=filter, queue=queue
+        )
+    return _client().count_tasks(
+        status=status,
+        name=name,
+        name_fuzzy=name_fuzzy,
+        filter=filter,
+        queue=queue,
+        group_by=group_by,
+        limit=limit,
+        cursor=cursor,
+    )
+
+
+def list_workers(
+    *,
+    filter: str | None = None,
+    limit: int = 100,
+    cursor: str | None = None,
+    queue: str | None = None,
+) -> WorkerPage:
+    return _client().list_workers(filter=filter, limit=limit, cursor=cursor, queue=queue)
+
+
+@overload
+def count_workers(
+    *,
+    filter: str | None = None,
+    group_by: None = None,
+    limit: int | None = None,
+    cursor: str | None = None,
+    queue: str | None = None,
+) -> int: ...
+
+
+@overload
+def count_workers(
+    *,
+    filter: str | None = None,
+    group_by: Sequence[str],
+    limit: int | None = None,
+    cursor: str | None = None,
+    queue: str | None = None,
+) -> GroupCountPage: ...
+
+
+def count_workers(
+    *,
+    filter: str | None = None,
+    group_by: Sequence[str] | None = None,
+    limit: int | None = None,
+    cursor: str | None = None,
+    queue: str | None = None,
+) -> int | GroupCountPage:
+    return _client().count_workers(
+        filter=filter, group_by=group_by, limit=limit, cursor=cursor, queue=queue
+    )
 
 
 def update_task(

{labtasker_client-2.0.1 → labtasker_client-2.2.0}/src/labtasker/binding.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import inspect
 from collections.abc import Callable
 from dataclasses import dataclass
+from functools import partial
 from typing import Any, TypeVar, get_type_hints, overload
 
 from pydantic import TypeAdapter, ValidationError
@@ -185,4 +186,9 @@ def _validate_resolver(resolver: object, name: str) -> None:
 
 
 def _is_async_callable(value: object) -> bool:
-    return inspect.iscoroutinefunction(value) or inspect.iscoroutinefunction(type(value).__call__)
+    while isinstance(value, partial):
+        value = value.func
+    return any(
+        inspect.iscoroutinefunction(candidate) or inspect.isasyncgenfunction(candidate)
+        for candidate in (value, type(value).__call__)
+    )

{labtasker_client-2.0.1 → labtasker_client-2.2.0}/src/labtasker/cli.py

@@ -10,13 +10,14 @@ from pydantic import BaseModel
 from typer._click.core import Context as ClickContext
 from typer.core import TyperCommand
 
+from labtasker import __version__
 from labtasker.client import Client
 from labtasker.command_template import TemplateSyntaxError
 from labtasker.command_worker import run_command_worker
 from labtasker.config import resolve_config
 from labtasker.errors import LabtaskerError
 from labtasker.types import TaskOrderField, TaskStatus, TaskUpdate
-from labtasker.validation import RequestValidationError, validate_json_object
+from labtasker.validation import RequestValidationError, validate_grouping, validate_json_object
 
 T = TypeVar("T")
 app = typer.Typer(
@@ -44,12 +45,40 @@ config_app = typer.Typer(
     no_args_is_help=True,
     rich_markup_mode=None,
 )
+worker_app = typer.Typer(
+    help="Inspect online Worker observations.",
+    add_completion=False,
+    no_args_is_help=True,
+    rich_markup_mode=None,
+)
+app.add_typer(worker_app, name="worker")
 app.add_typer(task_app, name="task")
 app.add_typer(queue_app, name="queue")
 app.add_typer(config_app, name="config")
 logger = logging.getLogger("labtasker.cli")
 
 
+def _version_callback(value: bool) -> None:
+    if value:
+        typer.echo(f"labtasker-client {__version__}")
+        raise typer.Exit()
+
+
+@app.callback()
+def main(
+    version: Annotated[
+        bool,
+        typer.Option(
+            "--version",
+            callback=_version_callback,
+            is_eager=True,
+            help="Show the Client package version and exit.",
+        ),
+    ] = False,
+) -> None:
+    """Submit, inspect, and execute Labtasker v2 Tasks."""
+
+
 class _SeparatedCommand(TyperCommand):
     """Require the explicit boundary between Worker options and child argv."""
 
@@ -76,6 +105,12 @@ def worker_loop(
         str | None,
         typer.Option(help="Queue to claim from; otherwise use Client configuration."),
     ] = None,
+    max_consecutive_failures: Annotated[
+        int,
+        typer.Option(
+            help="Stop after this many consecutive execution failures (positive integer)."
+        ),
+    ] = 5,
     idle_timeout: Annotated[
         float,
         typer.Option(help="Seconds without an eligible Task before normal exit."),
@@ -115,6 +150,7 @@ def worker_loop(
             route=route,
             queue=queue,
             idle_timeout=idle_timeout,
+            max_consecutive_failures=max_consecutive_failures,
             force_stop_timeout=force_stop_timeout,
         )
     except (TemplateSyntaxError, RequestValidationError) as error:
@@ -218,6 +254,10 @@ def task_list(
         str | None,
         typer.Option(help="Select an exact Task name; empty string is valid."),
     ] = None,
+    name_fuzzy: Annotated[
+        str | None,
+        typer.Option(help="Case-insensitive subsequence search; every word must match."),
+    ] = None,
     filter: Annotated[
         str | None,
         typer.Option(help="Additional Task query expression."),
@@ -245,7 +285,7 @@ def task_list(
 ) -> None:
     """List one page of Tasks and print items plus next_cursor as JSON.
 
-    --status, --name, and --filter are combined with logical AND.
+    --status, --name, --name-fuzzy, and --filter are combined with logical AND.
     Reuse a returned cursor only with the same selectors and ordering.
 
     Example:
@@ -260,6 +300,7 @@ def task_list(
             lambda client: client.list_tasks(
                 status=status,
                 name=name,
+                name_fuzzy=name_fuzzy,
                 filter=filter,
                 order_by=order_by,
                 descending=descending,
@@ -282,10 +323,33 @@ def task_count(
         str | None,
         typer.Option(help="Select an exact Task name; empty string is valid."),
     ] = None,
+    name_fuzzy: Annotated[
+        str | None,
+        typer.Option(help="Case-insensitive subsequence search; every word must match."),
+    ] = None,
     filter: Annotated[
         str | None,
         typer.Option(help="Additional Task query expression."),
     ] = None,
+    group_by: Annotated[
+        list[str] | None,
+        typer.Option(
+            "--group-by",
+            help=(
+                "Comma-separated grouping fields, with no spaces "
+                "(for example: routes,status). Supported fields: routes, status. Specify once."
+            ),
+        ),
+    ] = None,
+    limit: Annotated[
+        int | None,
+        typer.Option(
+            min=1, max=1000, help="Maximum groups in this page (default 100); requires --group-by."
+        ),
+    ] = None,
+    cursor: Annotated[
+        str | None, typer.Option(help="Next group page cursor; requires --group-by.")
+    ] = None,
     queue: Annotated[
         str | None,
         typer.Option(help="Task Queue; otherwise use Client configuration."),
@@ -299,17 +363,93 @@ def task_count(
       labtasker task count --status failed \\
         --filter 'last_error.type == "ValueError"'
     """
+    count_options = _invoke(lambda: _count_options(group_by, {"routes", "status"}, limit, cursor))
     count = _invoke(
         lambda: _with_client(
             lambda client: client.count_tasks(
                 status=status,
                 name=name,
+                name_fuzzy=name_fuzzy,
                 filter=filter,
                 queue=queue,
+                **count_options,
+            )
+        )
+    )
+    _write_json({"count": count} if isinstance(count, int) else count)
+
+
+@worker_app.command("list")
+def worker_list(
+    filter: Annotated[str | None, typer.Option(help="Worker filter expression.")] = None,
+    limit: Annotated[
+        int, typer.Option(min=1, max=1000, help="Maximum Workers in this page.")
+    ] = 100,
+    cursor: Annotated[
+        str | None, typer.Option(help="Next cursor from the same Worker query.")
+    ] = None,
+    queue: Annotated[
+        str | None, typer.Option(help="Queue; otherwise use Client configuration.")
+    ] = None,
+) -> None:
+    """List one page of unexpired Worker observations as JSON, ordered by ID."""
+    _write_json(
+        _invoke(
+            lambda: _with_client(
+                lambda client: client.list_workers(
+                    filter=filter, limit=limit, cursor=cursor, queue=queue
+                )
             )
         )
     )
-    _write_json({"count": count})
+
+
+@worker_app.command("count")
+def worker_count(
+    filter: Annotated[str | None, typer.Option(help="Worker filter expression.")] = None,
+    group_by: Annotated[
+        list[str] | None,
+        typer.Option(
+            "--group-by",
+            help=(
+                "Comma-separated grouping fields, with no spaces "
+                "(for example: route,status). Supported fields: route, status. Specify once."
+            ),
+        ),
+    ] = None,
+    limit: Annotated[
+        int | None,
+        typer.Option(
+            min=1, max=1000, help="Maximum groups in this page (default 100); requires --group-by."
+        ),
+    ] = None,
+    cursor: Annotated[
+        str | None, typer.Option(help="Next group page cursor; requires --group-by.")
+    ] = None,
+    queue: Annotated[
+        str | None, typer.Option(help="Queue; otherwise use Client configuration.")
+    ] = None,
+) -> None:
+    """Count unexpired Worker observations, optionally grouped, as JSON."""
+    options = _invoke(lambda: _count_options(group_by, {"route", "status"}, limit, cursor))
+    result = _invoke(
+        lambda: _with_client(
+            lambda client: client.count_workers(filter=filter, queue=queue, **options)
+        )
+    )
+    _write_json({"count": result} if isinstance(result, int) else result)
+
+
+def _count_options(
+    group_by: list[str] | None, allowed: set[str], limit: int | None, cursor: str | None
+) -> dict[str, Any]:
+    if group_by is not None and len(group_by) != 1:
+        raise RequestValidationError("Specify --group-by only once, comma-separated with no spaces")
+    value = None if group_by is None else group_by[0].split(",")
+    fields = validate_grouping(value, allowed, limit, cursor)
+    if fields is None:
+        return {}
+    return {"group_by": fields, "limit": limit, "cursor": cursor}
 
 
 @task_app.command("update")
@@ -465,7 +605,7 @@ def _invoke(operation: Callable[[], T]) -> T:
     try:
         return operation()
     except LabtaskerError as error:
-        _write_json(error.as_envelope(), error=True)
+        _write_json(error.as_envelope())
         raise typer.Exit(1) from error
     except RequestValidationError as error:
         raise typer.BadParameter(str(error)) from error
@@ -490,17 +630,16 @@ def _json_object(value: str, *, option: str) -> dict[str, Any]:
             object_pairs_hook=reject_duplicate_keys,
         )
         return validate_json_object(parsed, field=option)
-    except (json.JSONDecodeError, ValueError, RequestValidationError) as error:
+    except (json.JSONDecodeError, ValueError, RequestValidationError, RecursionError) as error:
         raise typer.BadParameter(f"{option} must be one strict JSON object: {error}") from error
 
 
-def _write_json(value: object, *, error: bool = False) -> None:
+def _write_json(value: object) -> None:
     if isinstance(value, BaseModel):
         value = value.model_dump(mode="json")
     elif isinstance(value, list) and all(isinstance(item, BaseModel) for item in value):
         value = [item.model_dump(mode="json") for item in value]
     typer.echo(
         json.dumps(value, ensure_ascii=False, indent=2, allow_nan=False) + "\n",
-        err=error,
         nl=False,
     )