Further OCR/Frame bugfixes

Author: haydenmccormick

README.md

@@ -66,14 +66,16 @@ With this, the mounted directory `/data` in the container is accessable from ins
 
 
 
-## Running the server without Docker/Podman
+## Running the server locally
 
 First install the python dependencies listed in `requirements.txt`:
 
 ````bash
 $ pip install -r requirements.txt
 ````
 
+You will also need to install opencv-python if you are not running within a container (`pip install opencv-python`).
+
 Let's again assume that the data are in a local directory `/Users/Shared/archive` with sub directories `audio`, `image`, `text` and`video`. You need to copy, symlink, or mount that local directory into the `static` directory. Note that the `static/data` symbolic link that is in the repository is set up to work with the docker containers, if you keep it in that form your data need to be in `/data`, otherwise you need to change the link to fit your needs, for example, you could remove the symbolic link and replace it with one that uses your local directory:
 
 ```bash

app.py

@@ -21,7 +21,8 @@ def ocrpage():
     data = request.json
     try:
         page_number = data["page_number"]
-        return (render_ocr(data['vid_path'], page_number))
+        view_id = data["view_id"]
+        return (render_ocr(data['vid_path'], data["view_id"], page_number))
     except Exception as e:
         return f'<p class="error">Unexpected error of type {type(e)}: {e}</h1>'
         pass

ocr.py

@@ -114,11 +114,11 @@ def paginate(frames_list):
 
     return {i: page for (i, page) in enumerate(pages)}
 
-def render_ocr(vid_path, page_number):
+def render_ocr(vid_path, view_id, page_number):
     """Iterate through frames and display the contents/alignments."""
     # Path for storing temporary images generated by cv2
     cv2_vid = cv2.VideoCapture(vid_path)
-    f = open(session["frames_pages"])
+    f = open(session[f"{view_id}-page-file"])
     frames_pages = json.load(f)
     page = frames_pages[str(page_number)]
     for frame_num, frame in page:
@@ -135,6 +135,7 @@ def render_ocr(vid_path, page_number):
 
     return render_template('ocr.html',
                            vid_path=vid_path,
+                           view_id=view_id,
                            page=page,
                            n_pages=len(frames_pages),
                            page_number=str(page_number))
@@ -180,10 +181,10 @@ def get_ocr_views(mmif):
             views.append(view)
     return views
 
-def save_json(dict):
+def save_json(dict, view_id):
     # jsonified_pages = json.dumps(dict)
     with tempfile.NamedTemporaryFile(
         prefix="/app/static/tmp/", suffix=".json", delete=False) as tf:
         pages_json = open(tf.name, "w")
         json.dump(dict, pages_json)
-        session["frames_pages"] = tf.name
+        session[f"{view_id}-page-file"] = tf.name

requirements.txt

@@ -1,3 +1,3 @@
 spacy==2.3.2
 clams-python==1.0.0
-flask-session
+flask-session==0.5.0

static/tmp/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

templates/ocr.html

@@ -1,4 +1,4 @@
-<div id="ocr_tab">
+<div id="ocr_tab_{{view_id}}">
     {% for frame_num, frame in page %}
         {% set filename = frame["id"] %}
         {% set id = frame["id"] %}
@@ -37,7 +37,7 @@ <h4>
         </div>
     {% endfor %}
     {% if n_pages > 1 %}
-        <div id="page-buttons">
+        <div class="page-buttons">
         </div>
     {% endif %}
 </div>
@@ -119,6 +119,7 @@ <h4>
 function changePage(page) {
         var data = {
             "vid_path": "{{vid_path}}",
+            "view_id": "{{view_id}}",
             "page_number": parseInt("{{page_number}}")
         }
         if (page == BACKWARD) {
@@ -137,7 +138,7 @@ <h4>
             contentType: "application/json",
             data: JSON.stringify(data),
             success: function(res_html){
-              $('#ocr_tab').parent().html(res_html);
+              $('#ocr_tab_{{view_id}}').parent().html(res_html);
             }
         })
         }
@@ -173,7 +174,7 @@ <h4>
             })
         })
 
-        $("#page-buttons").each(function() {
+        $("#ocr_tab_{{view_id}} .page-buttons").each(function() {
             page_number = parseInt("{{page_number}}")
             n_pages = parseInt("{{n_pages}}")
 
@@ -199,5 +200,5 @@ <h4>
 
             $(this).append(`<input id="page-input" onKeyPress="if(event.keyCode==13) enterPageNumber();" />`)
         })
-    })  
+    })
   </script>

utils.py

@@ -371,5 +371,5 @@ def prepare_ocr_visualization(mmif, view):
     find_duplicates(frames_list)
     frames_pages = paginate(frames_list)
     # Save page list as temp file
-    save_json(frames_pages)
-    return render_ocr(vid_path, 0)
+    save_json(frames_pages, view.id)
+    return render_ocr(vid_path, view.id, 0)