applied new SDK that fixes error handling in cli.py

Author: keighrim

Containerfile

@@ -1,5 +1,5 @@
 # Use the same base image version as the clams-python python library version
-FROM ghcr.io/clamsproject/clams-python-ffmpeg-hf:1.7.2
+FROM ghcr.io/clamsproject/clams-python-ffmpeg-hf:1.7.3
 # See https://github.com/orgs/clamsproject/packages?tab=packages&q=clams-python for more base images
 # IF you want to automatically publish this image to the clamsproject organization,
 # 1. you should have generated this template without --no-github-actions flag

cli.py

@@ -6,13 +6,17 @@
 """
 
 import argparse
+import json
 import sys
 from contextlib import redirect_stdout
 
+import jsonschema
+
 import app
 
 import clams.app
 from clams import AppMetadata
+from clams.envelop import EnvelopeError
 
 
 def metadata_to_argparser(app_metadata: AppMetadata) -> argparse.ArgumentParser:
@@ -81,11 +85,24 @@ def metadata_to_argparser(app_metadata: AppMetadata) -> argparse.ArgumentParser:
                 params[pname] = pvalue
             else:
                 params[pname] = [pvalue]
-        if args.OUT_MMIF_FILE.name == '<stdout>':
-            with redirect_stdout(sys.stderr):
+        # Mirror the HTTP server's error handling (see clams.restify): an invalid
+        # input is reported and exits non-zero, while an app-level failure is
+        # recorded as an error view instead of crashing with a raw traceback.
+        try:
+            if args.OUT_MMIF_FILE.name == '<stdout>':
+                with redirect_stdout(sys.stderr):
+                    out_mmif = clamsapp.annotate(in_data, **params)
+            else:
                 out_mmif = clamsapp.annotate(in_data, **params)
-        else:
-            out_mmif = clamsapp.annotate(in_data, **params)
+        except (jsonschema.exceptions.ValidationError, json.JSONDecodeError, EnvelopeError) as e:
+            detail = e.message if isinstance(e, jsonschema.exceptions.ValidationError) else str(e)
+            print(f"Invalid input data. See below for validation error.\n\n{detail}", file=sys.stderr)
+            sys.exit(1)
+        except Exception:
+            clamsapp.logger.exception("Error in annotation")
+            out_mmif = clamsapp.record_error(in_data, **params).serialize(pretty=True)
+            args.OUT_MMIF_FILE.write(out_mmif)
+            sys.exit(1)
         args.OUT_MMIF_FILE.write(out_mmif)
     else:
         arg_parser.print_help()

requirements.txt

@@ -1,7 +1,8 @@
 # Make sure clams-python version is explicitly specified, at least the lower bound
-clams-python==1.7.2
-# mmif-python[cv] transitively provides PyAV, Pillow, ffmpeg-python, wurlitzer
-# (the modern post-cv2 vdh stack). The visualize/ scripts use PyAV directly.
+clams-python==1.7.3
+# mmif-python[cv] pulls the video I/O deps: PyAV, Pillow, ffmpeg-python,
+# wurlitzer, and opencv-python. This app uses only the PyAV/PTS-based vdh
+# path, but the [cv] extra still bundles opencv-python regardless.
 mmif-python[cv]
 torch==2.*
 torchvision