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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labtasker-client
-Version: 2.0.1
+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.1 → labtasker_client-2.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "labtasker-client"
-version = "2.0.1"
+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.1 → 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.1"
+__version__ = "2.1.0"
 
 __all__ = [
     "APIError",

{labtasker_client-2.0.1 → 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."""
 
@@ -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,
     )