Merge branch 'master' of https://github.com/uds-lsv/human

Author: Moritz Wolf

Pipfile.lock

@@ -6,7 +6,6 @@
 def create_app():
     return Flask(__name__)
 
-
 app = create_app()
 app.config['SECRET_KEY']='secret_session'
 socketio = SocketIO(app)
@@ -19,6 +18,5 @@ def create_session():
 def disconnect_user():
     session.pop('secret_session', None)
 
-
 if __name__ == '__main__':
     app.run(debug=True)

app/main.py

@@ -767,6 +767,8 @@ def get_daily_annotations(df: pd.DataFrame):
     '''
     get amount of annotations per day
     '''
+    if df.empty:
+        return []
     df = df.set_index('timestamp')
     days = [group[1].shape[0] for group in df.groupby([df.index.year,df.index.month,df.index.day])]
     return days

app/routes.py

@@ -24,7 +24,6 @@ export class Automaton {
 
     currentannotation
     machine: any
-    timestamp = new Date().getTime()
 
     constructor() {}
 
@@ -33,9 +32,12 @@ export class Automaton {
      * @param data (optional) data object which is sent to next state as an event
      */
     next(target: string, data?: any) {
-        console.log(target)
-        let choice = { type: target, data }
-        this.CURRENTSTATE.send(choice)
+        return new Promise((resolve, reject) => {
+            console.log(target)
+            let choice = { type: target, data }
+            this.CURRENTSTATE.send(choice)
+            resolve(null)
+        })
     }
 
     initAutomaton(annotationProtocol, start?) {
@@ -160,10 +162,15 @@ export class Automaton {
         },
         showUI: (_, event, actionMeta) => {
             const timestamp2 = new Date().getTime()
-            Data.annotations['timings'].push(
-                (actionMeta.state.value, timestamp2 - this.timestamp)
-            )
-            this.timestamp = timestamp2
+            if (Data.timestamp) {
+                console.log(
+                    (actionMeta.state.value, timestamp2 - Data.timestamp)
+                )
+                Data.annotations['timings'].push(
+                    (actionMeta.state.value, timestamp2 - Data.timestamp)
+                )
+            }
+            Data.timestamp = timestamp2
 
             let meta =
                 actionMeta.state.meta[

app/static/automaton.ts

@@ -28,6 +28,7 @@ export let Data = {
     guiBBoxes: [],
     scales: { x: 1, y: 1 },
     active: -1,
+    timestamp: 0,
     reset: () => {
         Data.data = undefined
         Data.text = ''
@@ -40,6 +41,7 @@ export let Data = {
         Data.predicted_labels = []
         Data.guiBBoxes = []
         Data.scales = { x: 1, y: 1 }
+        Data.timestamp = 0
     },
 }
 window['data'] = Data

app/static/data.ts

@@ -81,7 +81,7 @@ <h3 class="card-subtitle">Context</h3>
                         id="fzf-toggle">fzf</button>
                 </div>
             </div>
-            <ul style="overflow: scroll; height: 100%; margin-top: 10px; -webkit-overflow-scrolling: touch;"
+            <ul style="overflow: scroll; margin-top: 10px; -webkit-overflow-scrolling: touch;"
                 id="word-list" class="list-group">
                 <button id="input-item" class="list-group-item" style="text-align: left;"></button>
             </ul>

app/templates/annotation_page.html

@@ -11,5 +11,6 @@ dependencies:
   - pandas
   - pip
   - pillow
-  - pip:
-    - requests-toolbelt
+  - pytables
+  - requests-toolbelt
+  - tqdm

environment.yml

@@ -12,7 +12,7 @@ MarkupSafe==1.1.1
 numpy==1.20.2
 olefile==0.46
 pandas==1.2.4
-Pillow==8.2.0
+Pillow==8.3.2
 python-dateutil==2.8.1
 pytz==2020.1
 requests==2.25.1