Merge branch 'fb-leap-1737/playpause-audio-hotkey' of ssh://github.com/heartexlabs/label-studio into fb-leap-1737/playpause-audio-hotkey

Author: Gondragos

.github/workflows/build_pypi.yml

@@ -98,7 +98,9 @@ jobs:
         run: yarn version:libs
 
       - name: "Install poetry"
-        run: pipx install poetry
+        env:
+          POETRY_VERSION: ${{ vars.POETRY_VERSION }}
+        run: pipx install "poetry==${POETRY_VERSION}"
 
       - name: "Set up Python"
         id: setup_python

.github/workflows/docker-build.yml

@@ -143,8 +143,9 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |
-            BRANCH_OVERRIDE: ${{ inputs.branch_name }}
-            VERSION_OVERRIDE: ${{ steps.version.outputs.build_version }}
+            BRANCH_OVERRIDE=${{ inputs.branch_name }}
+            VERSION_OVERRIDE=${{ steps.version.outputs.build_version }}
+            POETRY_VERSION=${{ vars.POETRY_VERSION }}
 
       - name: Create Docker image tag Check
         uses: actions/github-script@v7

.github/workflows/follow-merge-upstream-repo-sync.yml

@@ -91,7 +91,9 @@ jobs:
 
       - name: "Install poetry"
         if: steps.details.outputs.poetry
-        run: pipx install poetry
+        env:
+          POETRY_VERSION: ${{ vars.POETRY_VERSION }}
+        run: pipx install "poetry==${POETRY_VERSION}"
 
       - name: "Set up Python"
         id: setup_python

.github/workflows/test_conda.yml

@@ -47,7 +47,9 @@ jobs:
           activate-environment: test-environment
 
       - name: "Install poetry"
-        run: pipx install poetry
+        env:
+          POETRY_VERSION: ${{ vars.POETRY_VERSION }}
+        run: pipx install "poetry==${POETRY_VERSION}"
 
       - name: "Set up Python"
         id: setup_python

.github/workflows/test_migrations.yml

@@ -35,7 +35,9 @@ jobs:
           ref: ${{ inputs.ref }}
 
       - name: "Install poetry"
-        run: pipx install poetry
+        env:
+          POETRY_VERSION: ${{ vars.POETRY_VERSION }}
+        run: pipx install "poetry==${POETRY_VERSION}"
 
       - name: "Set up Python"
         id: setup_python
@@ -98,7 +100,9 @@ jobs:
           fetch-depth: 0
 
       - name: "Install poetry"
-        run: pipx install poetry
+        env:
+          POETRY_VERSION: ${{ vars.POETRY_VERSION }}
+        run: pipx install "poetry==${POETRY_VERSION}"
 
       - name: "Set up Python"
         id: setup_python

.github/workflows/tests.yml

@@ -46,7 +46,9 @@ jobs:
           ref: ${{ inputs.head_sha }}
 
       - name: "Install poetry"
-        run: pipx install poetry
+        env:
+          POETRY_VERSION: ${{ vars.POETRY_VERSION }}
+        run: pipx install "poetry==${POETRY_VERSION}"
 
       - name: "Set up Python ${{ matrix.python-version }}"
         id: setup_python
@@ -131,7 +133,9 @@ jobs:
           ref: ${{ inputs.head_sha }}
 
       - name: "Install poetry"
-        run: pipx install poetry
+        env:
+          POETRY_VERSION: ${{ vars.POETRY_VERSION }}
+        run: pipx install "poetry==${POETRY_VERSION}"
 
       - name: "Set up Python ${{ matrix.python-version }}"
         id: setup_python
@@ -208,7 +212,9 @@ jobs:
           ref: ${{ inputs.head_sha }}
 
       - name: "Install poetry"
-        run: pipx install "poetry<2.0.0"
+        env:
+          POETRY_VERSION: ${{ vars.POETRY_VERSION }}
+        run: pipx install "poetry==${POETRY_VERSION}"
 
       - name: "Set up Python ${{ matrix.python-version }}"
         id: setup_python

.github/workflows/update_pip_dependency.yml

@@ -29,7 +29,9 @@ jobs:
           git config --global user.email '[email protected]'
 
       - name: "Install poetry"
-        run: pipx install poetry
+        env:
+          POETRY_VERSION: ${{ vars.POETRY_VERSION }}
+        run: pipx install "poetry==${POETRY_VERSION}"
 
       - name: "Set up Python"
         id: setup_python

Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 ARG NODE_VERSION=18
 ARG PYTHON_VERSION=3.12
-ARG POETRY_VERSION=1.8.4
+ARG POETRY_VERSION=2.0.1
 ARG VERSION_OVERRIDE
 ARG BRANCH_OVERRIDE
 

docs/source/guide/script_examples.md

@@ -470,4 +470,131 @@ This is an example of a "hard" block, meaning that the user must resolve the iss
 * [View](/tags/view.html)
 * [RectangleLabels](/tags/rectanglelabels.html)
 * [TextArea](/tags/textarea.html)
-* [Labels](/tags/labels.html)
+* [Labels](/tags/labels.html)
+
+## Sync videos with frame offset
+
+This labeling configuration arranges three video players vertically, making it easier to view and annotate each video frame. 
+
+The script ensures the videos are synced, with one player showing one frame forward, and another player the previous frame. 
+
+![Screenshot of JSON error message](/images/project/video_sync.png)
+
+#### Script
+
+```javascript
+// Wait for the Label Studio Interface to be ready
+await LSI;
+
+// Get references to the video objects by their names
+var videoMinus1 = LSI.annotation.names.get('videoMinus1');
+var video0 = LSI.annotation.names.get('video0');
+var videoPlus1 = LSI.annotation.names.get('videoPlus1');
+
+if (!videoMinus1 || !video0 || !videoPlus1) return;
+
+// Convert frameRate to a number and ensure it's valid
+var frameRate = Number.parseFloat(video0.framerate) || 24;
+var frameDuration = 1 / frameRate;
+
+// Function to adjust video sync with offset and guard against endless loops
+function adjustVideoSync(video, offsetFrames) {
+  video.isSyncing = false;
+  
+  ["seek", "play", "pause"].forEach(event => {
+    video.syncHandlers.set(event, function(data) {
+      if (video.isSyncing) return;
+      
+      video.isSyncing = true;
+
+      if (!video.ref.current || video === video0) {
+        video.isSyncing = false;
+        return;
+      }
+	  
+      const videoElem = video.ref.current;
+      
+      adjustedTime = (video0.ref.current.currentFrame + offsetFrames) * frameDuration;
+      adjustedTime = Math.max(0, Math.min(adjustedTime, video.ref.current.duration));
+      
+      if (data.playing) {
+        if (!videoElem.playing) videoElem.play();
+      } else {
+        if (videoElem.playing) videoElem.pause();
+      }
+
+      if (data.speed) {
+        video.speed = data.speed;
+      }
+
+      videoElem.currentTime = adjustedTime;
+      if (Math.abs(videoElem.currentTime - adjustedTime) > frameDuration/2) {
+        videoElem.currentTime = adjustedTime;
+      }
+
+      video.isSyncing = false;
+    });
+  });
+}
+
+// Adjust offsets for each video
+adjustVideoSync(videoMinus1, -1);
+adjustVideoSync(videoPlus1, 1);
+adjustVideoSync(video0, 0);
+```
+
+**Related LSI instance methods:**
+
+* [annotation](scripts#LSI-annotation)
+
+#### Labeling config
+
+Each video is wrapped in a `<View>` tag with a width of 100% to ensure they stack on top of each other. The `Header` tag provides a title for 
+each video, indicating which frame is being displayed. 
+
+The `Video` tags are used to load the video content, with the `name` attribute uniquely identifying each video player. 
+
+The `TimelineLabels` tag is connected to the second video (`video0`), allowing annotators to label specific segments of that video. The labels `class1` and `class2` can be used to categorize the content of the video, enhancing the  annotation process. 
+
+```xml
+<View>
+  <View style="display: flex">
+  <View style="width: 100%">
+    <Header value="Video -1 Frame"/>
+    <Video name="videoMinus1" value="$video_url" 
+           height="200" sync="lag" frameRate="29.97"/>
+  </View>
+  <View style="width: 100%">
+    <Header value="Video +1 Frame"/>
+    <Video name="videoPlus1" value="$video_url" 
+           height="200" sync="lag" frameRate="29.97"/>
+  </View>
+  </View>
+  <View style="width: 100%; margin-bottom: 1em;">
+    <Header value="Video 0 Frame"/>
+    <Video name="video0" value="$video_url"
+           height="400" sync="lag" frameRate="29.97"/>
+  </View>
+  <TimelineLabels name="timelinelabels" toName="video0">
+    <Label value="class1"/>
+    <Label value="class2"/>
+  </TimelineLabels>
+</View>
+```
+
+**Related tags:**
+
+* [View](/tags/view.html)
+* [Video](/tags/video.html)
+* [TimelineLabels](/tags/timelinelabels.html)
+* [Label](/tags/label.html)
+
+#### Data
+
+```json
+{
+  "data": {
+    "video_url": "https://example.com/path/to/video.mp4"
+  }
+}
+```

docs/themes/v2/source/images/project/video_sync.png

@@ -14,7 +14,6 @@
 import traceback as tb
 import uuid
 from collections import defaultdict
-from datetime import datetime
 from functools import wraps
 from typing import Any, Callable, Generator, Iterable, Mapping, Optional
 
@@ -41,6 +40,7 @@
     pre_save,
 )
 from django.db.utils import OperationalError
+from django.utils import timezone
 from django.utils.crypto import get_random_string
 from django.utils.module_loading import import_string
 from django_filters.rest_framework import DjangoFilterBackend
@@ -261,7 +261,7 @@ def datetime_to_timestamp(dt):
 
 
 def timestamp_now():
-    return datetime_to_timestamp(datetime.utcnow())
+    return datetime_to_timestamp(timezone.now())
 
 
 def find_first_one_to_one_related_field_by_prefix(instance, prefix):

label_studio/core/utils/common.py

@@ -3,7 +3,7 @@
 import json
 import logging
 import re
-from datetime import datetime, timedelta
+from datetime import timedelta
 from typing import Union
 from urllib.parse import urlparse
 
@@ -15,6 +15,7 @@
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from io_storages.base_models import (
     ExportStorage,
@@ -144,7 +145,7 @@ def generate_http_url(self, url):
         container = r.netloc
         blob = r.path.lstrip('/')
 
-        expiry = datetime.utcnow() + timedelta(minutes=self.presign_ttl)
+        expiry = timezone.now() + timedelta(minutes=self.presign_ttl)
 
         sas_token = generate_blob_sas(
             account_name=self.get_account_name(),

label_studio/io_storages/azure_blob/models.py

@@ -1,6 +1,6 @@
 {
-  "message": "refactor: OPTIC-1518: remove a batch of ff (#6892)",
-  "commit": "3c03818a813dfcd19fd5a0600a8933c84405507a",
-  "date": "2025-01-13T17:05:01.000Z",
+  "message": "feat: OPTIC-1417: Improve projects list API usage with frontend query cache. (#6844)",
+  "commit": "62e08b0f79eb7ff27712b4031e09e1c2a796b3b4",
+  "date": "2025-01-14T13:56:44.000Z",
   "branch": "develop"
 }

web/dist/apps/labelstudio/543.js

@@ -1,6 +1,6 @@
 {
-  "message": "refactor: OPTIC-1518: remove a batch of ff (#6892)",
-  "commit": "3c03818a813dfcd19fd5a0600a8933c84405507a",
-  "date": "2025-01-13T17:05:01.000Z",
+  "message": "feat: OPTIC-1417: Improve projects list API usage with frontend query cache. (#6844)",
+  "commit": "62e08b0f79eb7ff27712b4031e09e1c2a796b3b4",
+  "date": "2025-01-14T13:56:44.000Z",
   "branch": "develop"
 }

web/dist/apps/labelstudio/543.js.map

@@ -1,6 +1,6 @@
 {
-  "message": "refactor: OPTIC-1518: remove a batch of ff (#6892)",
-  "commit": "3c03818a813dfcd19fd5a0600a8933c84405507a",
-  "date": "2025-01-13T17:05:01.000Z",
+  "message": "feat: OPTIC-1417: Improve projects list API usage with frontend query cache. (#6844)",
+  "commit": "62e08b0f79eb7ff27712b4031e09e1c2a796b3b4",
+  "date": "2025-01-14T13:56:44.000Z",
   "branch": "develop"
 }

web/dist/apps/labelstudio/main.js

@@ -49,6 +49,7 @@ export const ActionsButton = injector(
           onOk() {
             const body = formRef.current?.assembleFormData({ asJSON: true });
 
+            store.SDK.invoke("actionDialogOk", action.id, { body });
             store.invokeAction(action.id, { body });
           },
         });