Skip to content

Commit 5aa5c3c

Browse files
niklubniklub
authored
Merge branch 'develop' into fb-bros-114
2 parents 1b812e2 + b1dab66 commit 5aa5c3c

File tree

48 files changed

+1575
-3953
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1575
-3953
lines changed

‎docs/source/tags/timeseries.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,26 @@ Labeling configuration for time series data with multiple channels grouped toget
6262

6363
```html
6464
<View>
65-
<TimeSeries name="ts" value="$timeseries" valuetype="json"
65+
<TimeSeries name="ts" value="$timeseries"
66+
valuetype="url"
6667
timeColumn="time"
6768
timeFormat="%Y-%m-%d %H:%M:%S.%f"
68-
timeDisplayFormat="%Y-%m-%d"
69-
overviewChannels="velocity">
70-
<MultiChannel>
71-
<Channel column="velocity"
72-
units="miles/h"
73-
displayFormat=",.1f"
74-
legend="Velocity"/>
75-
76-
<Channel column="acceleration"
77-
units="miles/h^2"
78-
displayFormat=",.1f"
79-
legend="Acceleration"/>
69+
>
70+
71+
<MultiChannel>
72+
<Channel column="velocity" />
73+
<Channel column="acceleration" />
8074
</MultiChannel>
75+
8176
</TimeSeries>
77+
8278
<TimeSeriesLabels name="label" toName="ts">
8379
<Label value="Run" background="red"/>
8480
<Label value="Walk" background="green"/>
8581
</TimeSeriesLabels>
8682
</View>
83+
84+
<!-- {
85+
"timeseries": "https://app.heartex.ai/samples/time-series.csv?time=time&values=velocity%2Cacceleration&tf=%25Y-%25m-%25d+%25H%3A%25M%3A%25S.%25f&type=csv"
86+
} -->
8787
```

‎label_studio/core/feature_flags/stale_feature_flags.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
'fflag_fix_front_leap_32_zoom_perf_190923_short': True,
1717
'fflag_feat_front_lsdv_5452_taxonomy_labeling_110823_short': True,
1818
'fflag_fix_front_dev_3793_relative_coords_short': True,
19-
'ff_front_dev_2715_audio_3_280722_short': True,
2019
# Feb 5
2120
'fflag_feature_all_optic_1421_cold_start_v2': False,
2221
'fflag_fix_back_optic_1407_optimize_tasks_api_pagination_counts': True,

‎label_studio/feature_flags.json‎

Lines changed: 2 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -433,33 +433,7 @@
433433
"version": 4,
434434
"deleted": false
435435
},
436-
"ff_front_DEV_1713_audio_ui_150222_short": {
437-
"key": "ff_front_DEV_1713_audio_ui_150222_short",
438-
"on": false,
439-
"prerequisites": [],
440-
"targets": [],
441-
"contextTargets": [],
442-
"rules": [],
443-
"fallthrough": {
444-
"variation": 0
445-
},
446-
"offVariation": 1,
447-
"variations": [
448-
true,
449-
false
450-
],
451-
"clientSideAvailability": {
452-
"usingMobileKey": false,
453-
"usingEnvironmentId": false
454-
},
455-
"clientSide": false,
456-
"salt": "b9a9a797e1884581b1ab307952adbb2c",
457-
"trackEvents": false,
458-
"trackEventsFallthrough": false,
459-
"debugEventsUntilDate": null,
460-
"version": 2,
461-
"deleted": false
462-
},
436+
463437
"ff_front_dev_1442_unselect_shape_on_click_outside_080622_short": {
464438
"key": "ff_front_dev_1442_unselect_shape_on_click_outside_080622_short",
465439
"on": false,
@@ -649,33 +623,7 @@
649623
"version": 2,
650624
"deleted": false
651625
},
652-
"ff_front_dev_2715_audio_3_280722_short": {
653-
"key": "ff_front_dev_2715_audio_3_280722_short",
654-
"on": true,
655-
"prerequisites": [],
656-
"targets": [],
657-
"contextTargets": [],
658-
"rules": [],
659-
"fallthrough": {
660-
"variation": 0
661-
},
662-
"offVariation": 1,
663-
"variations": [
664-
true,
665-
false
666-
],
667-
"clientSideAvailability": {
668-
"usingMobileKey": false,
669-
"usingEnvironmentId": false
670-
},
671-
"clientSide": false,
672-
"salt": "a8eb8122a118496eab36bacd9dffff6b",
673-
"trackEvents": false,
674-
"trackEventsFallthrough": false,
675-
"debugEventsUntilDate": null,
676-
"version": 4,
677-
"deleted": false
678-
},
626+
679627
"ff_front_optic_1494_saved_templates_to_custom_templates": {
680628
"key": "ff_front_optic_1494_saved_templates_to_custom_templates",
681629
"on": true,

‎web/libs/datamanager/src/utils/feature-flags.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ export const FF_DEV_2186 = "ff_front_dev_2186_comments_for_update";
99

1010
export const FF_DEV_2536 = "fflag_feat_front_dev-2536_comment_notifications_short";
1111

12-
/**
13-
* Support for loading media files only a single time. Part of the Audio v3 epic.
14-
* @link https://app.launchdarkly.com/default/production/features/ff_front_dev_2715_audio_3_280722_short
15-
*/
16-
export const FF_DEV_2715 = "ff_front_dev_2715_audio_3_280722_short";
17-
1812
// Comments for annotation editor
1913
export const FF_DEV_2887 = "fflag-feat-dev-2887-comments-ui-editor-short";
2014

‎web/libs/editor/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
"react-window": "^1.8.9",
4040
"sanitize-html": "^2.12.1",
4141
"strman": "^2.0.1",
42-
"wavesurfer.js": "^6.0.1",
4342
"webfft": "^1.0.3",
4443
"xpath-range": "^1.1.1"
4544
},

‎web/libs/editor/src/components/InteractiveOverlays/BoundingBox.js‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { FF_DEV_2715, isFF } from "../../utils/feature-flags";
21
import { wrapArray } from "../../utils/utilities";
32
import { Geometry } from "./Geometry";
43

@@ -82,19 +81,10 @@ const _detect = (region) => {
8281
return Geometry.getDOMBBox(region.from_name.elementRef?.current);
8382
}
8483

85-
let type = region.type;
86-
if (type === "audioregion") {
87-
if (isFF(FF_DEV_2715)) {
88-
type = "audioregion::ultra";
89-
} else {
90-
type = "audioregion::old";
91-
}
92-
}
93-
switch (type) {
84+
switch (region.type) {
9485
case "textrange":
9586
case "richtextregion":
9687
case "textarearegion":
97-
case "audioregion::old":
9888
case "paragraphs":
9989
case "timeseriesregion": {
10090
const regionBbox = Geometry.getDOMBBox(region.getRegionElement());
@@ -114,7 +104,7 @@ const _detect = (region) => {
114104

115105
return regionBbox;
116106
}
117-
case "audioregion::ultra": {
107+
case "audioregion": {
118108
const bbox = region.bboxCoordsCanvas;
119109
const stageEl = region.parent?.stageRef?.current;
120110
const stageBbox = Geometry.getDOMBBox(stageEl, true);

‎web/libs/editor/src/components/InteractiveOverlays/NodesConnector.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { debounce } from "../../utils/debounce";
2-
import { FF_DEV_2715, FF_PER_FIELD_COMMENTS, isFF } from "../../utils/feature-flags";
2+
import { FF_PER_FIELD_COMMENTS, isFF } from "../../utils/feature-flags";
33
import { wrapArray } from "../../utils/utilities";
44
import { Geometry } from "./Geometry";
55
import { RelationShape } from "./RelationShape";
@@ -29,13 +29,7 @@ const obtainWatcher = (node) => {
2929
case "paragraphs":
3030
return DOMWatcher;
3131
case "audioregion": {
32-
if (isFF(FF_DEV_2715)) {
33-
return createPropertyWatcher(["bboxTriggers"]);
34-
}
35-
if (node.getRegionElement) {
36-
return DOMWatcher;
37-
}
38-
return null;
32+
return createPropertyWatcher(["bboxTriggers"]);
3933
}
4034
case "rectangleregion":
4135
return createPropertyWatcher(["x", "y", "width", "height", "hidden", parentImagePropsWatch]);

‎web/libs/editor/src/components/SidePanels/DetailsPanel/RegionEditor.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {
1515
import { IconPropertyAngle } from "@humansignal/icons";
1616
import { Checkbox, Select } from "@humansignal/ui";
1717
import { Block, Elem, useBEM } from "../../../utils/bem";
18-
import { FF_DEV_2715, isFF } from "../../../utils/feature-flags";
1918
import { TimeDurationControl } from "../../TimeDurationControl/TimeDurationControl";
2019
import { TimelineRegionEditor } from "./TimelineRegionEditor";
2120
import "./RegionEditor.scss";
@@ -53,7 +52,7 @@ const IconMapping = {
5352
};
5453

5554
const RegionEditorComponent: FC<RegionEditorProps> = ({ region }) => {
56-
const isAudioRegion = isFF(FF_DEV_2715) && region.type === "audioregion";
55+
const isAudioRegion = region.type === "audioregion";
5756
const isTimelineRegion = region.type === "timelineregion";
5857
const Component = isTimelineRegion ? TimelineRegionEditor : isAudioRegion ? AudioRegionProperties : RegionProperties;
5958

‎web/libs/editor/src/components/Timeline/Controls.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import type {
3131
TimelineProps,
3232
TimelineStepFunction,
3333
} from "./Types";
34-
import { FF_DEV_2715, isFF } from "../../utils/feature-flags";
3534
import { AudioControl } from "./Controls/AudioControl";
3635
import { ConfigControl } from "./Controls/ConfigControl";
3736
import { TimeDurationControl } from "../TimeDurationControl/TimeDurationControl";
@@ -175,7 +174,7 @@ export const Controls: FC<TimelineControlsProps> = memo(
175174

176175
return (
177176
<Block name="timeline-controls" tag={Space} spread style={{ gridAutoColumns: "auto" }}>
178-
{isFF(FF_DEV_2715) && mediaType === "audio" ? (
177+
{mediaType === "audio" ? (
179178
renderControls()
180179
) : (
181180
<Elem name="group" tag={Space} size="small" style={{ gridAutoColumns: "auto" }}>
@@ -311,7 +310,7 @@ export const Controls: FC<TimelineControlsProps> = memo(
311310
</Elem>
312311

313312
<Elem name="group" tag={Space} size="small">
314-
{isFF(FF_DEV_2715) && mediaType === "audio" ? (
313+
{mediaType === "audio" ? (
315314
<>
316315
{customControls?.right}
317316
<TimeDurationControl

0 commit comments

Comments
 (0)