updates for clams 1.0.0

Author: haydenmccormick

Dockerfile

@@ -1,8 +1,4 @@
-FROM python:3.6-slim-buster
-
-# Additional required files for openCV
-RUN apt-get update
-RUN apt-get install ffmpeg libsm6 libxext6  -y
+FROM ghcr.io/clamsproject/clams-python-opencv4:1.0.0
 
 WORKDIR ./app
 
@@ -12,4 +8,4 @@ RUN pip install -r requirements.txt
 
 COPY ./ ./
 
-CMD ["python", "app.py"]
+CMD ["python", "app.py"]

requirements.txt

@@ -1,4 +1,2 @@
 spacy==2.3.2
-lapps==0.0.2
-clams-python==0.5.0
-opencv-python==4.4.0.44
+clams-python==1.0.0

utils.py

@@ -120,7 +120,9 @@ def get_boxes(mmif):
 def get_document_type_short_form(document):
     """Returns 'Video', 'Text', 'Audio' or 'Image' from the document type of
     the document."""
-    document_type = os.path.split(str(document.at_type))[1]
+    # Remove trailing "/v1" in newer @types
+    at_type = re.sub(r"\/v\d*$", "", str(document.at_type))
+    document_type = os.path.split(at_type)[1]
     return document_type[:-8]
 
 
@@ -235,7 +237,6 @@ def get_alignment_views(mmif):
 # Remder Media as HTML ------------
 
 def html_video(vpath, vtt_srcview=None):
-    print(vpath)
     vpath = url2posix(vpath)
     html = StringIO()
     html.write('<video id="vid" controls>\n')
@@ -311,7 +312,6 @@ def check_view_alignment(annotations):
             anno_stack.append(annotation.id)
         if len(anno_stack) == 3:
             if not (anno_stack[0]["source"] in anno_stack and anno_stack[0]["target"] in anno_stack):
-                print(anno_stack)
                 return False
             anno_stack = []
     return True