update bma-client-lib dep to 0.6.0, use job classes from bma-client-lib for jobs

Author: tykling

pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
 ]
 dependencies = [
     "typer-slim==0.12.5",
-    "bma-client-lib>=0.5.0",
+    "bma-client-lib>=0.6.0",
 ]
 name = "bma-cli"
 description = "BornHack Media Archive CLI Tool"

src/bma_cli/__init__.py

@@ -0,0 +1 @@
+"""This __init__.py file is empty for now."""

src/bma_cli/bma_cli.py

@@ -2,17 +2,15 @@
 
 import json
 import logging
-import sys
-import time
 import uuid
 from datetime import UTC, datetime
 from importlib.metadata import version as get_version
 from pathlib import Path
-from typing import TypedDict
 
 import click
 import typer
 from bma_client_lib import BmaClient
+from bma_client_lib.datastructures import job_types
 
 APP_NAME = "bma-cli"
 app = typer.Typer()
@@ -31,32 +29,6 @@
 logging.getLogger("bma_client").setLevel(logging.DEBUG)
 
 
-class BaseJob(TypedDict):
-    """Base class inherited by ImageConversionJob and ImageExifExtractionJob."""
-
-    job_type: str
-    job_uuid: uuid.UUID
-    basefile_uuid: uuid.UUID
-    user_uuid: uuid.UUID
-    client_uuid: uuid.UUID
-    useragent: str
-    finished: bool
-
-
-class ImageConversionJob(BaseJob):
-    """Represent an ImageConversionJob."""
-
-    filetype: str
-    width: int
-    height: int
-    mimetype: str
-    custom_aspect_ratio: bool
-
-
-class ImageExifExtractionJob(BaseJob):
-    """Represent an ImageExifExtractionJob."""
-
-
 @app.command()
 def version() -> None:
     """Return the version of bma-cli and bma-client."""
@@ -73,12 +45,12 @@ def fileinfo(file_uuid: uuid.UUID) -> None:
 
 
 @app.command()
-def jobs() -> None:
+def jobs(filter: str = "?limit=0&finished=false") -> None:  # noqa: A002
     """Get info on unfinished jobs."""
     client, config = init()
-    jobs = client.get_jobs(job_filter="?limit=0&finished=false")
+    jobs = client.get_jobs(job_filter=filter)
     click.echo(json.dumps(jobs))
-    click.echo(f"Total {len(jobs)} unfinished jobs.", err=True)
+    click.echo(f"Total {len(jobs)} jobs returned by filter {filter}.", err=True)
 
 
 @app.command()
@@ -94,26 +66,24 @@ def download(file_uuid: uuid.UUID) -> None:
 def grind() -> None:
     """Get jobs from the server and handle them."""
     client, config = init()
-
     while True:
-        # get any unfinished jobs already assigned to this client
+        # first get any unfinished jobs already assigned to this client
         jobs = client.get_jobs(job_filter=f"?limit=0&finished=false&client_uuid={client.uuid}")
         if not jobs:
             # no unfinished jobs assigned to this client, ask for new assignment
             jobs = client.get_job_assignment()
 
         if not jobs:
             click.echo("Nothing left to do.")
-            return
+            break
 
         # loop over jobs and handle each
         click.echo(f"Processing {len(jobs)} jobs for file {jobs[0]['basefile_uuid']} ...")
-        for job in jobs:
-            # make sure we have the original file locally
-            fileinfo = client.download(file_uuid=job["basefile_uuid"])
-            path = Path(config["path"], fileinfo["filename"])
-            handle_job(f=path, job=job, client=client, config=config)
-    click.echo("Done!")
+        for dictjob in jobs:
+            job = job_types[dictjob["job_type"]](**dictjob)
+            click.echo(f"Handling {job.job_type} {job.job_uuid} ...")
+            client.handle_job(job=job)
+    click.echo("Done grinding for now!")
 
 
 @app.command()
@@ -128,27 +98,12 @@ def upload(files: list[str]) -> None:
         metadata = result["bma_response"]
         click.echo(f"File {metadata['uuid']} uploaded OK!")
         file_uuids.append(metadata["uuid"])
-        # check for jobs
-        if metadata["jobs_unfinished"] == 0:
-            continue
-
-        # it seems there is work to do for the newly uploaded file!
-        jobs = client.get_job_assignment(file_uuid=metadata["uuid"])
-        if not jobs:
-            click.echo("No unassigned unfinished jobs found for this file.")
-            continue
-
-        # the grind
-        click.echo(f"Handling {len(jobs)} jobs for file {pf} ...")
-        for j in jobs:
-            # load job in a typeddict, but why?
-            klass = getattr(sys.modules[__name__], j["job_type"])
-            job = klass(**j)
-            handle_job(f=pf, job=job, client=client, config=config)
     click.echo(f"Finished uploading {len(file_uuids)} files, creating album...")
     now = datetime.isoformat(datetime.now(tz=UTC))
     album = client.create_album(file_uuids=file_uuids, title=f"Created-{now}", description=f"Created-{now}")
     url = f"{client.base_url}/albums/{album['uuid']}/"
+    if config.get("handle_jobs"):
+        grind()
     click.echo(f"Created album {album['uuid']} with the uploaded file(s) see it at {url}")
     click.echo("Done!")
 
@@ -167,15 +122,6 @@ def settings() -> None:
     click.echo(json.dumps(client.get_server_settings()))
 
 
-def handle_job(f: Path, job: ImageConversionJob | ImageExifExtractionJob, client: BmaClient, config: dict) -> None:
-    """Handle a job and upload the result."""
-    click.echo("======================================================")
-    click.echo(f"Handling job {job['job_type']} {job['job_uuid']} ...")
-    start = time.time()
-    result = client.handle_job(job=job, orig=f)
-    logger.debug(f"Getting result took {time.time() - start} seconds: {result}")
-
-
 def load_config() -> dict[str, str]:
     """Load config file."""
     # bail out on missing config