labtasker-client 2.0.0__tar.gz → 2.1.0__tar.gz

{labtasker_client-2.0.0 → labtasker_client-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labtasker-client
-Version: 2.0.0
+Version: 2.1.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

{labtasker_client-2.0.0 → labtasker_client-2.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "labtasker-client"
-version = "2.0.0"
+version = "2.1.0"
 description = "A small task queue for parallel model inference and evaluation"
 requires-python = ">=3.11"
 license = "Apache-2.0"

{labtasker_client-2.0.0 → labtasker_client-2.1.0}/src/labtasker/__init__.py

@@ -35,7 +35,7 @@ from labtasker.models import BulkUpdateResult, LastError, Queue, Task, TaskInfo,
 from labtasker.types import JSONValue, TaskOrderField, TaskStatus, TaskUpdate
 from labtasker.worker import loop
 
-__version__ = "2.0.0"
+__version__ = "2.1.0"
 
 __all__ = [
     "APIError",

{labtasker_client-2.0.0 → labtasker_client-2.1.0}/src/labtasker/binding.py

@@ -119,7 +119,7 @@ class CompiledBinding:
 
 
 def compile_binding(function: Callable[..., Any]) -> CompiledBinding:
-    if inspect.iscoroutinefunction(function):
+    if _is_async_callable(function):
         raise TypeError("Labtasker v2 Worker handlers must be synchronous functions.")
     signature = inspect.signature(function)
     try:
@@ -170,7 +170,7 @@ def compile_binding(function: Callable[..., Any]) -> CompiledBinding:
 def _validate_resolver(resolver: object, name: str) -> None:
     if not callable(resolver):
         raise TypeError(f"TaskArg resolver for {name!r} must be callable.")
-    if inspect.iscoroutinefunction(resolver):
+    if _is_async_callable(resolver):
         raise TypeError(f"TaskArg resolver for {name!r} must be synchronous.")
     try:
         signature = inspect.signature(resolver)
@@ -182,3 +182,7 @@ def _validate_resolver(resolver: object, name: str) -> None:
         inspect.Parameter.POSITIONAL_OR_KEYWORD,
     }:
         raise TypeError(f"TaskArg resolver for {name!r} must accept exactly one value.")
+
+
+def _is_async_callable(value: object) -> bool:
+    return inspect.iscoroutinefunction(value) or inspect.iscoroutinefunction(type(value).__call__)

{labtasker_client-2.0.0 → labtasker_client-2.1.0}/src/labtasker/cli.py

@@ -10,6 +10,7 @@ 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
@@ -50,6 +51,27 @@ 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."""
 
@@ -98,7 +120,7 @@ def worker_loop(
 
     Example:
 
-    
+    \b
       labtasker loop --route train -- \\
         python train.py --seed '%{seed}' --lr '%{optimizer.lr}'
     """
@@ -174,7 +196,7 @@ def task_submit(
 
     Example:
 
-    
+    \b
       labtasker task submit --name baseline \\
         --args '{"seed":1,"enabled":true}' \\
         --metadata '{"group":"paper"}' --route train
@@ -250,7 +272,7 @@ def task_list(
 
     Example:
 
-    
+    \b
       labtasker task list --status pending \\
         --filter 'priority >= 10 and metadata.group == "paper"' \\
         --order-by priority --descending --limit 100
@@ -295,7 +317,7 @@ def task_count(
 
     Example:
 
-    
+    \b
       labtasker task count --status failed \\
         --filter 'last_error.type == "ValueError"'
     """
@@ -339,7 +361,7 @@ def task_update(
 
     Examples:
 
-    
+    \b
       labtasker task update t_ABCDEFGHIJKL \\
         --changes '{"priority":20}'
       labtasker task update --filter 'status == "pending"' \\
@@ -465,7 +487,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
@@ -494,13 +516,12 @@ def _json_object(value: str, *, option: str) -> dict[str, Any]:
         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,
     )

{labtasker_client-2.0.0 → labtasker_client-2.1.0}/src/labtasker/command_worker.py

@@ -244,13 +244,21 @@ def _start_drain(
     name: str,
 ) -> threading.Thread:
     def drain() -> None:
+        relay = True
         while True:
-            chunk = source.read(65536)
+            chunk = os.read(source.fileno(), 65536)
             if not chunk:
                 return
             with lock:
                 log.write(chunk)
-            _write_bytes(destination, chunk)
+            if relay:
+                try:
+                    _write_bytes(destination, chunk)
+                except Exception:
+                    # The child must never block on a full pipe merely because the
+                    # caller closed or replaced its output stream. Keep draining and
+                    # journaling after live relay becomes unavailable.
+                    relay = False
 
     thread = threading.Thread(target=drain, name=f"labtasker-command-{name}", daemon=True)
     thread.start()

{labtasker_client-2.0.0 → labtasker_client-2.1.0}/src/labtasker/config.py

@@ -190,4 +190,10 @@ def _validate_token(value: str | None, *, source: str) -> str | None:
         return None
     if not isinstance(value, str) or not value:
         raise invalid_config("Token must be a non-empty string.", source=source, field="token")
+    if any(not 0x21 <= ord(character) <= 0x7E for character in value):
+        raise invalid_config(
+            "Token must contain only visible ASCII characters.",
+            source=source,
+            field="token",
+        )
     return value

labtasker_client-2.0.0/src/labtasker/py.typed

@@ -1 +0,0 @@
-